Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.647
diff -u -r1.647 comment.module
--- modules/comment/comment.module	21 Aug 2008 19:36:36 -0000	1.647
+++ modules/comment/comment.module	24 Aug 2008 04:11:40 -0000
@@ -244,6 +244,7 @@
     'access comments' => t('View comments attached to content.'),
     'post comments' => t('Add comments to content (approval required).'),
     'post comments without approval' => t('Add comments to content (no approval required).'),
+    'administer comments per node' => t('Configure comment settings per node without the administer comments permission.'),
     'administer comments' => t('Manage and approve comments, and configure comment administration settings.'),
   );
 }
@@ -534,10 +535,16 @@
   }
   elseif (isset($form['type']) && isset($form['#node'])) {
     if ($form['type']['#value'] . '_node_form' == $form_id) {
+      // Check if user has permissions to configure comments on this node.
+      global $user;
       $node = $form['#node'];
+      $access = user_access('administer comments');
+      if($node->uid == $user->uid && !$access) {
+        $access = user_access('administer comments per node');
+      }
       $form['comment_settings'] = array(
         '#type' => 'fieldset',
-        '#access' => user_access('administer comments'),
+        '#access' => $access,
         '#title' => t('Comment settings'),
         '#collapsible' => TRUE,
         '#collapsed' => TRUE,