Index: mollom.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.admin.inc,v
retrieving revision 1.32
diff -u -p -r1.32 mollom.admin.inc
--- mollom.admin.inc	10 Aug 2010 19:33:51 -0000	1.32
+++ mollom.admin.inc	31 Aug 2010 15:45:53 -0000
@@ -129,11 +129,36 @@ function mollom_admin_configure_form($fo
     case 'configure':
       drupal_set_title(t('Configure %form-title protection', array('%form-title' => $mollom_form['title'])), PASS_THROUGH);
 
-      // Display a list of fields for textual analysis (last step).
       $form['mollom']['form_id'] = array(
         '#type' => 'value',
         '#value' => $mollom_form['form_id'],
       );
+      $permissions = array();
+      foreach (module_implements('permission') as $module) {
+        $module_permissions = module_invoke($module, 'permission');
+        foreach ($module_permissions as &$info) {
+          $info['module'] = $module;
+        }
+        $permissions += $module_permissions;
+      }
+      foreach ($mollom_form['bypass access'] as $permission) {
+        if (isset($permissions[$permission])) {
+          $bypass_permissions[$permission] = l($permissions[$permission]['title'], 'admin/people/permissions', array(
+            'fragment' => 'module-' . $permissions[$permission]['module'],
+            'html' => TRUE,
+          ));
+        }
+        else {
+          $bypass_permissions[$permission] = $permissions[$permission]['title'];
+        }
+      }
+      $form['mollom']['bypass-help'] = array(
+        '#type' => 'item',
+        '#title' => t('Bypass access'),
+        '#markup' => theme('item_list', array('items' => $bypass_permissions)),
+        '#description' => t("Users with these permissions are able to bypass Mollom's protection."),
+        '#access' => !empty($mollom_form['bypass access']),
+      );
 
       $modes = array();
       // Textual analysis, if any elements are available.