diff -Nup ldap_integration/ldapauth.install ldap_integration/ldapauth.install
--- ldap_integration/ldapauth.install	2007-04-16 22:50:50.000000000 -0400
+++ ldap_integration/ldapauth.install	2007-05-10 12:14:54.000000000 -0400
@@ -8,70 +8,42 @@ function ldapauth_install() {
     case 'mysql':
     case 'mysqli':
       db_query("CREATE TABLE {ldapauth} (
-				sid  int NOT NULL auto_increment,
-				name varchar(255) NOT NULL default '',
-				status int NOT NULL default '0',
-				server varchar(255) NOT NULL default '',
-				port int(10) NOT NULL default '389',
-				tls int NOT NULL default '0',
-				encrypted int NOT NULL default '0',
-				basedn text NOT NULL,
-				user_attr varchar(255) NOT NULL default '',
-				mail_attr VARCHAR(255) NOT NULL DEFAULT '',
-				binddn varchar(255) NOT NULL default '',
-				bindpw varchar(255) NOT NULL default '',
-				bindpw_clear varchar(255) NOT NULL default '',
-				ldap_groups_in_dn int NOT NULL default '0',
-				ldap_groups_in_dn_desc int NOT NULL default '0',
-				ldap_group_dn_attribute varchar(255) default '',
-				ldap_group_attr varchar(255) default '',
-				ldap_groups_in_attr int NOT NULL default '0',
-				ldap_groups_as_entries int NOT NULL default '0',
-				ldap_group_entries varchar(255) default '',
-				ldap_group_entries_attribute varchar(255) default '',
-        ldapdata_binddn VARCHAR(255) NOT NULL default '',
-        ldapdata_bindpw VARCHAR(255) NOT NULL default '',
-        ldapdata_bindpw_clear VARCHAR(2) NOT NULL default '',
-        ldapdata_rwattrs LONGTEXT, 
-      	ldapdata_roattrs LONGTEXT, 
-        ldapdata_mappings LONGTEXT,
+        sid int NOT NULL auto_increment,
+        name varchar(255) NOT NULL default '',
+        status int NOT NULL default '0',
+        server varchar(255) NOT NULL default '',
+        port int(10) NOT NULL default '389',
+        tls int NOT NULL default '0',
+        encrypted int NOT NULL default '0',
+        basedn text(1000) NOT NULL default '',
+        user_attr varchar(255) NOT NULL default '',
+        mail_attr VARCHAR(255) NOT NULL DEFAULT '',
+        binddn varchar(255) NOT NULL default '',
+        bindpw varchar(255) NOT NULL default '',
+        bindpw_clear varchar(255) NOT NULL default '',
         PRIMARY KEY (name),
         KEY sid (sid)
       ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
       break;
-      case 'pgsql':
+    case 'pgsql':
       db_query("CREATE TABLE {ldapauth} (
-      sid SERIAL,
-      name VARCHAR(255) NOT NULL DEFAULT '',
-      status INTEGER NOT NULL DEFAULT 0,
-      server VARCHAR(255) NOT NULL DEFAULT '',
-      port INTEGER NOT NULL DEFAULT 389,
-      tls INTEGER NOT NULL DEFAULT 0,
-      encrypted INTEGER NOT NULL DEFAULT 0,
-      basedn TEXT,
-      user_attr VARCHAR(255) NOT NULL DEFAULT '',
-			mail_attr VARCHAR(255) NOT NULL DEFAULT '',
-      binddn VARCHAR(255) NOT NULL DEFAULT '',
-      bindpw VARCHAR(255) NOT NULL DEFAULT '',
-      bindpw_clear VARCHAR(255) NOT NULL DEFAULT '',
-      ldap_groups_in_dn INTEGER NOT NULL DEFAULT 0,
-      ldap_groups_in_dn_desc INTEGER NOT NULL DEFAULT 0,
-      ldap_group_dn_attribute VARCHAR(255) DEFAULT '',
-      ldap_group_attr VARCHAR(255) DEFAULT '',
-      ldap_groups_in_attr INTEGER NOT NULL DEFAULT 0,
-      ldap_groups_as_entries INTEGER NOT NULL DEFAULT 0,
-      ldap_group_entries VARCHAR(255) DEFAULT '',
-      ldap_group_entries_attribute VARCHAR(255) DEFAULT '',
-      ldapdata_binddn VARCHAR(255) NOT NULL default '',
-      ldapdata_bindpw VARCHAR(255) NOT NULL default '',
-      ldapdata_bindpw_clear VARCHAR(2) NOT NULL default '',
-      ldapdata_rwattrs TEXT, 
-    	ldapdata_roattrs TEXT, 
-      ldapdata_mappings TEXT,
-      PRIMARY KEY (name)
+        sid SERIAL,
+        name VARCHAR(255) NOT NULL DEFAULT '',
+        status INTEGER NOT NULL DEFAULT 0,
+        server VARCHAR(255) NOT NULL DEFAULT '',
+        port INTEGER NOT NULL DEFAULT 389,
+        tls INTEGER NOT NULL DEFAULT 0,
+        encrypted INTEGER NOT NULL DEFAULT 0,
+        basedn TEXT(1000) NOT NULL default '',
+        user_attr VARCHAR(255) NOT NULL DEFAULT '',
+        mail_attr VARCHAR(255) NOT NULL DEFAULT '',
+        binddn VARCHAR(255) NOT NULL DEFAULT '',
+        bindpw VARCHAR(255) NOT NULL DEFAULT '',
+        bindpw_clear VARCHAR(255) NOT NULL DEFAULT '',
+        PRIMARY KEY (name)
       )"); 
       db_query("CREATE INDEX {ldapauth}_sid_idx ON {ldapauth} (sid)");
-      break;      
+      break;
   }
 }
 
@@ -87,37 +59,14 @@ function ldapauth_uninstall() {
   variable_del('ldap_alter_email_field');
   variable_del('ldap_user_pass_form');
   variable_del('ldap_disable_user_request_password');
-  variable_del('ldap_forget_passwords');
-  variable_del('ldap_login_process');
-  
 }
 
-/** 
+/**
  * Implementation of hook_update_N()
  */
 
 function ldapauth_update_1() {
-  $ret = array();
-  switch ($GLOBALS['db_type']) {
-    case 'mysql':
-    case 'mysqli':
-      $ret[] = update_sql("ALTER TABLE {ldapauth} ADD ldapdata_binddn VARCHAR(255) NOT NULL default '' ");
-      $ret[] = update_sql("ALTER TABLE {ldapauth} ADD ldapdata_bindpw VARCHAR(255) NOT NULL default '' ");
-      $ret[] = update_sql("ALTER TABLE {ldapauth} ADD ldapdata_bindpw_clear VARCHAR(2) NOT NULL default '' ");
-      $ret[] = update_sql("ALTER TABLE {ldapauth} ADD ldapdata_rwattrs LONGTEXT NOT NULL default '' "); 
-      $ret[] = update_sql("ALTER TABLE {ldapauth} ADD ldapdata_roattrs LONGTEXT NOT NULL default '' "); 
-      $ret[] = update_sql("ALTER TABLE {ldapauth} ADD ldapdata_mappings LONGTEXT NOT NULL default '' ");
-      break;
-    case 'pgsql':
-      $ret[] = update_sql("ALTER TABLE {ldapauth} ADD ldapdata_binddn VARCHAR(255) NOT NULL default '' ");
-      $ret[] = update_sql("ALTER TABLE {ldapauth} ADD ldapdata_bindpw VARCHAR(255) NOT NULL default '' ");
-      $ret[] = update_sql("ALTER TABLE {ldapauth} ADD ldapdata_bindpw_clear VARCHAR(2) NOT NULL default '' ");
-      $ret[] = update_sql("ALTER TABLE {ldapauth} ADD ldapdata_rwattrs TEXT NOT NULL default '' "); 
-      $ret[] = update_sql("ALTER TABLE {ldapauth} ADD ldapdata_roattrs TEXT NOT NULL default '' "); 
-      $ret[] = update_sql("ALTER TABLE {ldapauth} ADD ldapdata_mappings TEXT NOT NULL default '' ");
-      break;    
-    }
-  return $ret;
+  /* update removed to ldapdata.install */
 }
 
 function ldapauth_update_2() {
@@ -131,7 +80,7 @@ function ldapauth_update_2() {
     case 'pgsql':
       $ret[] = update_sql("ALTER TABLE {ldapauth} ADD mail_attr VARCHAR(255) NOT NULL default '' AFTER user_attr ");
       $ret[] = update_sql("ALTER TABLE {ldapauth} MODIFY basedn TEXT(1000) NOT NULL default '' ");
-      break;    
-    }
+      break;
+  }
   return $ret;
 }
\ No newline at end of file
diff -Nup ldap_integration/ldapdata.install ldap_integration/ldapdata.install
--- ldap_integration/ldapdata.install	1969-12-31 19:00:00.000000000 -0500
+++ ldap_integration/ldapdata.install	2007-05-10 12:15:09.000000000 -0400
@@ -0,0 +1,42 @@
+<?php
+// $Id$
+/**
+ * Implementation of hook_install().
+ */
+function ldapdata_install() {
+  switch ($GLOBALS['db_type']) {
+    case 'mysql':
+    case 'mysqli':
+      db_query("ALTER TABLE {ldapauth} ADD (
+        ldapdata_binddn VARCHAR(255) NOT NULL default '',
+        ldapdata_bindpw VARCHAR(255) NOT NULL default '',
+        ldapdata_bindpw_clear VARCHAR(2) NOT NULL default '',
+        ldapdata_rwattrs LONGTEXT, 
+      	ldapdata_roattrs LONGTEXT, 
+        ldapdata_mappings LONGTEXT
+      )");
+      break;
+    case 'pgsql':
+      db_query("ALTER TABLE {ldapauth} ADD (
+        ldapdata_binddn VARCHAR(255) NOT NULL default '',
+        ldapdata_bindpw VARCHAR(255) NOT NULL default '',
+        ldapdata_bindpw_clear VARCHAR(2) NOT NULL default '',
+        ldapdata_rwattrs TEXT, 
+        ldapdata_roattrs TEXT, 
+        ldapdata_mappings TEXT
+      )"); 
+      break;
+  }
+}
+
+/**
+ * Implementation of hook_uninstall().
+ */
+function ldapdata_uninstall() {
+  db_query("ALTER TABLE {ldapauth} DROP COLUMN ldapdata_binddn");
+  db_query("ALTER TABLE {ldapauth} DROP COLUMN ldapdata_bindpw");
+  db_query("ALTER TABLE {ldapauth} DROP COLUMN ldapdata_bindpw_clear");
+  db_query("ALTER TABLE {ldapauth} DROP COLUMN ldapdata_rwattrs");
+  db_query("ALTER TABLE {ldapauth} DROP COLUMN ldapdata_roattrs");
+  db_query("ALTER TABLE {ldapauth} DROP COLUMN ldapdata_mappings");
+}
\ No newline at end of file
diff -Nup ldap_integration/ldapgroups.install ldap_integration/ldapgroups.install
--- ldap_integration/ldapgroups.install	1969-12-31 19:00:00.000000000 -0500
+++ ldap_integration/ldapgroups.install	2007-05-10 12:15:28.000000000 -0400
@@ -0,0 +1,48 @@
+<?php
+// $Id$
+/**
+ * Implementation of hook_install().
+ */
+function ldapgroups_install() {
+  switch ($GLOBALS['db_type']) {
+    case 'mysql':
+    case 'mysqli':
+      db_query("ALTER TABLE {ldapauth} ADD (
+        ldap_groups_in_dn int NOT NULL default '0',
+        ldap_groups_in_dn_desc int NOT NULL default '0',
+        ldap_group_dn_attribute varchar(255) default '',
+        ldap_group_attr varchar(255) default '',
+        ldap_groups_in_attr int NOT NULL default '0',
+        ldap_groups_as_entries int NOT NULL default '0',
+        ldap_group_entries varchar(255) default '',
+        ldap_group_entries_attribute varchar(255) default ''
+      )");
+      break;
+    case 'pgsql':
+      db_query("ALTER TABLE {ldapauth} ADD (
+        ldap_groups_in_dn INTEGER NOT NULL DEFAULT 0,
+        ldap_groups_in_dn_desc INTEGER NOT NULL DEFAULT 0,
+        ldap_group_dn_attribute VARCHAR(255) DEFAULT '',
+        ldap_group_attr VARCHAR(255) DEFAULT '',
+        ldap_groups_in_attr INTEGER NOT NULL DEFAULT 0,
+        ldap_groups_as_entries INTEGER NOT NULL DEFAULT 0,
+        ldap_group_entries VARCHAR(255) DEFAULT '',
+        ldap_group_entries_attribute VARCHAR(255) DEFAULT ''
+      )"); 
+      break;
+  }
+}
+
+/**
+ * Implementation of hook_uninstall().
+ */
+function ldapgroups_uninstall() {
+  db_query("ALTER TABLE {ldapauth} DROP COLUMN ldap_groups_in_dn");
+  db_query("ALTER TABLE {ldapauth} DROP COLUMN ldap_groups_in_dn_desc");
+  db_query("ALTER TABLE {ldapauth} DROP COLUMN ldap_group_dn_attribute");
+  db_query("ALTER TABLE {ldapauth} DROP COLUMN ldap_group_attr");
+  db_query("ALTER TABLE {ldapauth} DROP COLUMN ldap_groups_in_attr");
+  db_query("ALTER TABLE {ldapauth} DROP COLUMN ldap_groups_as_entries");
+  db_query("ALTER TABLE {ldapauth} DROP COLUMN ldap_group_entries");
+  db_query("ALTER TABLE {ldapauth} DROP COLUMN ldap_group_entries_attribute");
+}
\ No newline at end of file