Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.477
diff -u -F^f -r1.477 comment.module
--- modules/comment/comment.module	19 Aug 2006 21:40:58 -0000	1.477
+++ modules/comment/comment.module	21 Aug 2006 18:36:25 -0000
@@ -137,7 +137,7 @@ function comment_menu($may_cache) {
     $access = user_access('post comments');
     $items[] = array('path' => 'comment/edit', 'title' => t('edit comment'),
       'callback' => 'comment_edit',
-      'access' => $access, 'type' => MENU_CALLBACK);
+      'access' => user_access('edit own comments'), 'type' => MENU_CALLBACK);
   }
   else {
     if (arg(0) == 'comment' && arg(1) == 'reply' && is_numeric(arg(2))) {
@@ -161,7 +161,7 @@ function comment_menu($may_cache) {
  * Implementation of hook_perm().
  */
 function comment_perm() {
-  return array('access comments', 'post comments', 'administer comments', 'post comments without approval');
+  return array('access comments', 'post comments', 'edit own comments', 'administer comments', 'post comments without approval');
 }
 
 /**
@@ -733,7 +733,7 @@ function comment_links($comment, $return
       );
     }
     else if (user_access('post comments')) {
-      if (comment_access('edit', $comment)) {
+      if (comment_access('edit', $comment) && user_access('edit own comments')) {
         $links['comment_edit'] = array(
           'title' => t('edit'),
           'href' => "comment/edit/$comment->cid"