Index: extended_ldapgroups.admin.inc
===================================================================
--- extended_ldapgroups.admin.inc	(revision 1004)
+++ extended_ldapgroups.admin.inc	(working copy)
@@ -54,17 +54,17 @@
       // Double-check to make sure the role was created successfully
       $result = db_query("SELECT * FROM {role} WHERE name = '%s'", $groupname);
       if (!($row = db_fetch_object($result))) {
-        watchdog('extended_ldapgroups', 'Failed to import %groupname as a Drupal role.', array('%groupname' => $groupname), WATCHDOG_ERROR);
+        watchdog('LDAP', 'Failed to import %groupname as a Drupal role.', array('%groupname' => $groupname), WATCHDOG_ERROR);
         drupal_set_message(t('Failed to import %groupname as a Drupal role.', array('%groupname' => $groupname)), 'error');
       }
       else {
-        watchdog('extended_ldapgroups', 'Successfully imported %groupname as a Drupal role.', array('%groupname' => $groupname), WATCHDOG_INFO);
+        watchdog('LDAP', 'Successfully imported %groupname as a Drupal role.', array('%groupname' => $groupname), WATCHDOG_INFO);
         drupal_set_message(t('Successfully imported %groupname as a Drupal role.', array('%groupname' => $groupname)));
       }
     } 
   }
   else {
-    watchdog('extended_ldapgroups', 'Failed to retrieve any groups from LDAP.', null, WATCHDOG_ERROR);
+    watchdog('LDAP', 'Failed to retrieve any groups from LDAP.', null, WATCHDOG_ERROR);
     drupal_set_message(t('Failed to retrieve any groups from LDAP'), 'error');
   }
 }
Index: extended_ldapgroups.module
===================================================================
--- extended_ldapgroups.module	(revision 1008)
+++ extended_ldapgroups.module	(working copy)
@@ -131,7 +131,7 @@
   if(!empty($roles_added)) {
     // Connect to the LDAP
     if (!$_ldapprov_ldap->connect(LDAPPROV_DN, LDAPPROV_PASS)) {
-      watchdog('extended_ldapgroups', 'Group update: group data could not be read in the LDAP directory. Could not bind as %dn.', array('%dn' => LDAPPROV_DN), WATCHDOG_ERROR);
+      watchdog('LDAP', 'Group update: group data could not be read in the LDAP directory. Could not bind as %dn.', array('%dn' => LDAPPROV_DN), WATCHDOG_ERROR);
       drupal_set_message(t('Group update: group data could not be read in the LDAP directory. Please contact site administrator.'), 'error');
       return;
     }
@@ -158,12 +158,12 @@
             $parts = explode(",", $group_dn);
             $search_for = $parts[0];
             if (!$group_dn) {
-              watchdog('extended_ldapgroups', 'No mapping for role "' . $role->name . '" defined.', WATCHDOG_ERROR);
+              watchdog('LDAP', 'No mapping for role "' . $role->name . '" defined.', WATCHDOG_ERROR);
               continue;
             }
             $basedns = explode("\n", $server->basedn);
             if (count($basedns) > 1) {
-              watchdog('extended_ldapgroups', 'more than one base_dn stored, only first one (' . $basedns[0] . ') will be used');
+              watchdog('LDAP', 'more than one base_dn stored, only first one (' . $basedns[0] . ') will be used');
             }
             $user_dn = $server->user_attr.'='.$user_account->name.','.$basedns[0];
             // Does the role exist as a group in LDAP?
@@ -177,13 +177,13 @@
                 $group_info = array();
                 $group_info[$ldapgroup_attr][] = $user_dn;
                 if(!ldap_mod_add($_ldapprov_ldap->connection,$group_dn,$group_info)) {
-                  watchdog('extended_ldapgroups', 'Failed to add member %user_dn to group %groupname in LDAP.', array('%user_dn' => $user_dn, '%groupname' => $group_dn), WATCHDOG_ERROR);
+                  watchdog('LDAP', 'Failed to add member %user_dn to group %groupname in LDAP.', array('%user_dn' => $user_dn, '%groupname' => $group_dn), WATCHDOG_ERROR);
                   if(LDAPPROV_DEBUG) {
                     drupal_set_message(t('Failed to add member %user_dn to group %groupname in LDAP.', array('%user_dn' => $user_dn, '%groupname' => $group_dn)), 'error');
                   }
                 }
                 else {
-                  watchdog('extended_ldapgroups', 'Successfully added member %user_dn to group %groupname in LDAP.', array('%user_dn' => $user_dn, '%groupname' => $group_dn), WATCHDOG_INFO);
+                  watchdog('LDAP', 'Successfully added member %user_dn to group %groupname in LDAP.', array('%user_dn' => $user_dn, '%groupname' => $group_dn), WATCHDOG_INFO);
                   if(LDAPPROV_DEBUG) {
                     drupal_set_message(t('Successfully added member %user_dn to group %groupname in LDAP.', array('%user_dn' => $user_dn, '%groupname' => $group_dn)));
                   }
@@ -214,7 +214,7 @@
   if(!empty($roles_removed)) {
     // Connect to the LDAP
     if (!$_ldapprov_ldap->connect(LDAPPROV_DN, LDAPPROV_PASS)) {
-      watchdog('extended_ldapgroups', 'Group update: group data could not be read in the LDAP directory. Could not bind as %dn.', array('%dn' => LDAPPROV_DN), WATCHDOG_ERROR);
+      watchdog('LDAP', 'Group update: group data could not be read in the LDAP directory. Could not bind as %dn.', array('%dn' => LDAPPROV_DN), WATCHDOG_ERROR);
       drupal_set_message(t('Group update: group data could not be read in the LDAP directory. Please contact site administrator.'), 'error');
       return;
     }
@@ -241,12 +241,12 @@
             $parts = explode(",", $group_dn);
             $search_for = $parts[0];
             if (!$group_dn) {
-              watchdog('extended_ldapgroups', 'No mapping for role "' . $role->name . '" defined.', WATCHDOG_ERROR);
+              watchdog('LDAP', 'No mapping for role "' . $role->name . '" defined.', WATCHDOG_ERROR);
               continue;
             }
             $basedns = explode("\n", $server->basedn);
             if (count($basedns) > 1) {
-              watchdog('extended_ldapgroups', 'more than one base_dn stored, only first one (' . $basedns[0] . ') will be used');
+              watchdog('LDAP', 'more than one base_dn stored, only first one (' . $basedns[0] . ') will be used');
             }
             $user_dn = $server->user_attr.'='.$user_account->name.','.$basedns[0];
             // Does the role exist as a group in LDAP?
@@ -260,13 +260,13 @@
                 $group_info = array();
                 $group_info[$ldapgroup_attr][] = $user_dn;
                 if(!ldap_mod_del($_ldapprov_ldap->connection,$group_dn,$group_info)) {
-                  watchdog('extended_ldapgroups', 'Failed to remove member %user_dn from group %groupname in LDAP.', array('%user_dn' => $user_dn, '%groupname' => $group_dn), WATCHDOG_ERROR);
+                  watchdog('LDAP', 'Failed to remove member %user_dn from group %groupname in LDAP.', array('%user_dn' => $user_dn, '%groupname' => $group_dn), WATCHDOG_ERROR);
                   if(LDAPPROV_DEBUG) {
                     drupal_set_message(t('Failed to remove member %user_dn from group %groupname in LDAP.', array('%user_dn' => $user_dn, '%groupname' => $group_dn)), 'error');
                   }
                 }
                 else {
-                  watchdog('extended_ldapgroups', 'Successfully removed member %user_dn from group %groupname in LDAP.', array('%user_dn' => $user_dn, '%groupname' => $group_dn), WATCHDOG_INFO);
+                  watchdog('LDAP', 'Successfully removed member %user_dn from group %groupname in LDAP.', array('%user_dn' => $user_dn, '%groupname' => $group_dn), WATCHDOG_INFO);
                   if(LDAPPROV_DEBUG) {
                     drupal_set_message(t('Successfully removed member %user_dn from group %groupname in LDAP.', array('%user_dn' => $user_dn, '%groupname' => $group_dn)));
                   }
@@ -389,7 +389,7 @@
 function extended_ldapgroups_ldap_group_create($form, &$form_state) {
   global $_ldapprov_ldap;
   if (!$_ldapprov_ldap->connect(LDAPPROV_DN, LDAPPROV_PASS)) {
-    watchdog('extended_ldapgroups', 'User update: user data could not be read in the LDAP directory. Could not bind as %dn.', array('%dn' => LDAPPROV_DN), WATCHDOG_ERROR);
+    watchdog('LDAP', 'User update: user data could not be read in the LDAP directory. Could not bind as %dn.', array('%dn' => LDAPPROV_DN), WATCHDOG_ERROR);
     drupal_set_message(t('User update: user data could not be read in the LDAP directory. Please contact site administrator.'), 'error');
     return;
   }
@@ -431,14 +431,14 @@
   
   if(!$success) {
     $_ldapprov_ldap->disconnect();
-    watchdog('extended_ldapgroups', 'ldapgroups_ldap_group_create: failed to create group %rolename in LDAP', array('%rolename' => $form_state['values']['name']), WATCHDOG_ERROR);
+    watchdog('LDAP', 'ldapgroups_ldap_group_create: failed to create group %rolename in LDAP', array('%rolename' => $form_state['values']['name']), WATCHDOG_ERROR);
     if(LDAPPROV_DEBUG) {
       form_set_error('name', t('Failed to create group %groupname in LDAP', array('%groupname' => $form_state['values']['name'])));
     }
     drupal_goto('admin/user/roles');
   }
   else {
-    watchdog('extended_ldapgroups', 'ldapgroups_ldap_group_create: successfully created group %rolename in LDAP', array('%rolename' => $form_state['values']['name']), WATCHDOG_INFO);
+    watchdog('LDAP', 'ldapgroups_ldap_group_create: successfully created group %rolename in LDAP', array('%rolename' => $form_state['values']['name']), WATCHDOG_INFO);
     if(LDAPPROV_DEBUG) {
       drupal_set_message(t('Successfully created group %groupname in LDAP', array('%groupname' => $form_state['values']['name'])));
     }
@@ -482,7 +482,7 @@
   }
   
   if (!$_ldapprov_ldap->connect(LDAPPROV_DN, LDAPPROV_PASS)) {
-    watchdog('extended_ldapgroups', 'Group update: group data could not be read in the LDAP directory. Could not bind as %dn.', array('%dn' => LDAPPROV_DN), WATCHDOG_ERROR);
+    watchdog('LDAP', 'Group update: group data could not be read in the LDAP directory. Could not bind as %dn.', array('%dn' => LDAPPROV_DN), WATCHDOG_ERROR);
     drupal_set_message(t('Group update: group data could not be read in the LDAP directory. Please contact site administrator.'), 'error');
     return;
   }
@@ -533,7 +533,7 @@
       
       // Connect to the LDAP
       if (!$_ldapprov_ldap->connect(LDAPPROV_DN, LDAPPROV_PASS)) {
-        watchdog('extended_ldapgroups', 'Group update: group data could not be read in the LDAP directory. Could not bind as %dn.', array('%dn' => LDAPPROV_DN), WATCHDOG_ERROR);
+        watchdog('LDAP', 'Group update: group data could not be read in the LDAP directory. Could not bind as %dn.', array('%dn' => LDAPPROV_DN), WATCHDOG_ERROR);
         drupal_set_message(t('Group update: group data could not be read in the LDAP directory. Please contact site administrator.'), 'error');
         return;
       }
@@ -605,7 +605,7 @@
 function _extended_ldapgroups_ldap_group_update($form, $form_state) {
   global $_ldapprov_ldap;
   if (!$_ldapprov_ldap->connect(LDAPPROV_DN, LDAPPROV_PASS)) {
-    watchdog('extended_ldapgroups', 'Group update: group data could not be read in the LDAP directory. Could not bind as %dn.', array('%dn' => LDAPPROV_DN), WATCHDOG_ERROR);
+    watchdog('LDAP', 'Group update: group data could not be read in the LDAP directory. Could not bind as %dn.', array('%dn' => LDAPPROV_DN), WATCHDOG_ERROR);
     drupal_set_message(t('Group update: group data could not be read in the LDAP directory. Please contact site administrator.'), 'error');
     return;
   }
@@ -631,14 +631,14 @@
         $group_dn = LDAPGROUPS_DEFAULT_DN_ATTR.'='.$role->name.','.$dn;
         if (!$_ldapprov_ldap->rename_entry($group_dn, LDAPGROUPS_DEFAULT_DN_ATTR.'='.$form_state['values']['name'], $dn, TRUE)) {
           $_ldapprov_ldap->disconnect();
-          watchdog('extended_ldapgroups', 'Group update: group %name ldap entry %dn was not renamed to a new name %name_new.', array('%name' => $role->name, '%dn' => $group_dn, '%name_new' => $form_state['values']['name']), WATCHDOG_ERROR);
+          watchdog('LDAP', 'Group update: group %name ldap entry %dn was not renamed to a new name %name_new.', array('%name' => $role->name, '%dn' => $group_dn, '%name_new' => $form_state['values']['name']), WATCHDOG_ERROR);
           if(LDAPPROV_DEBUG) {
             drupal_set_message(t('Failed to update the group in LDAP with new name %groupname', array('%groupname' => $form_state['values']['name'])), 'error');
           }
           drupal_goto('user/roles/edit/'.$form_state['values']['rid']);
         }
         else {
-          watchdog('extended_ldapgroups','Group update: group %name ldap entry %dn was successfully renamed to a new name %name_new.', array('%name' => $role->name, '%dn' => $group_dn, '%name_new' => $form_state['values']['name']), WATCHDOG_INFO);
+          watchdog('LDAP','Group update: group %name ldap entry %dn was successfully renamed to a new name %name_new.', array('%name' => $role->name, '%dn' => $group_dn, '%name_new' => $form_state['values']['name']), WATCHDOG_INFO);
           if(LDAPPROV_DEBUG) {
             drupal_set_message(t('Role successfully renamed in LDAP'));
           }
@@ -660,7 +660,7 @@
   global $_ldapprov_ldap;
 
   if (!$_ldapprov_ldap->connect(LDAPPROV_DN, LDAPPROV_PASS)) {
-    watchdog('extended_ldapgroups', 'Group update: group data could not be read in the LDAP directory. Could not bind as %dn.', array('%dn' => LDAPPROV_DN), WATCHDOG_ERROR);
+    watchdog('LDAP', 'Group update: group data could not be read in the LDAP directory. Could not bind as %dn.', array('%dn' => LDAPPROV_DN), WATCHDOG_ERROR);
     drupal_set_message(t('Group update: group data could not be read in the LDAP directory. Please contact site administrator.'), 'error');
     return;
   }
@@ -687,14 +687,14 @@
       foreach($entries as $dn) {
         $group_dn = LDAPGROUPS_DEFAULT_DN_ATTR.'='.$role->name.','.$dn;
         if ($_ldapprov_ldap->delete_entry($group_dn)) {
-          watchdog('extended_ldapgroups', 'Group deletion: group %name has been deleted from the LDAP directory.', array('%name' => $role->name), WATCHDOG_WARNING);
+          watchdog('LDAP', 'Group deletion: group %name has been deleted from the LDAP directory.', array('%name' => $role->name), WATCHDOG_WARNING);
           if(LDAPPROV_DEBUG) {
             drupal_set_message(t('Group %name has been deleted from the LDAP directory', array('%name' => $role->name)));
           }
         }
         else {
           $_ldapprov_ldap->disconnect();
-          watchdog('extended_ldapgroups', 'Group deletion: group %name has not been deleted from the LDAP directory.', array('%name' => $role->name), WATCHDOG_ERROR);
+          watchdog('LDAP', 'Group deletion: group %name has not been deleted from the LDAP directory.', array('%name' => $role->name), WATCHDOG_ERROR);
           if(LDAPPROV_DEBUG) {
             drupal_set_message(t('The group !name has not been deleted from the LDAP directory.', array('%name' => $role->name)), 'error');
           }