Index: ldapauth.module
===================================================================
--- ldapauth.module     (revision 3043)
+++ ldapauth.module     (working copy)
@@ -515,17 +515,17 @@
       form_set_error( 'name', t('An LDAP config with that name already exists.'));
     }

-    db_query("INSERT INTO {ldapauth} (name, status, server, port, tls, encrypted, basedn, user_attr, mail_attr, binddn, bindpw) VALUES ('%s', '%d', '%s', '%d', '%d', '%d', '%s', '%s', '%s', '%s', '%s')", $form_values['name'], 1, $form_values['server'], $form_values['port'], $form_values['tls'], $form_values['encrypted'], $form_values['basedn'], trim($form_values['user_attr']), trim($form_values['mail_attr']), $form_values['binddn'], $form_values['bindpw']);
+    db_query("INSERT INTO {ldapauth} (name, status, server, port, tls, encrypted, basedn, user_attr, mail_attr, binddn, bindpw) VALUES ('%s', %d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s')", $form_values['name'], 1, $form_values['server'], $form_values['port'], $form_values['tls'], $form_values['encrypted'], $form_values['basedn'], trim($form_values['user_attr']), trim($form_values['mail_attr']), $form_values['binddn'], $form_values['bindpw']);
     drupal_set_message(t('LDAP Configuration %config has been added.', array('%config' => $form_values['name'])));
     watchdog('ldap', t('ldapauth: ldap config %config added.', array('%config' => $form_values['name'])));
   }
   else {
     if ( !$form_values['bindpw_clear'] && $form_values['bindpw']) {
-      db_query("UPDATE {ldapauth} SET name = '%s', server = '%s', port = '%d', tls = '%d', encrypted = '%d', basedn = '%s', user_attr = '%s', mail_attr = '%s', binddn = '%s', bindpw = '%s', bindpw_clear = '%d' WHERE name = '%s'", $form_values['name'], $form_values['server'], $form_values['port'], $form_values['tls'], $form_values['encrypted'], $form_values['basedn'], trim($form_values['user_attr']), trim($form_values['mail_attr']), $form_values['binddn'], $form_values['bindpw'], $form_values['bindpw_clear'], $form_values['old-name']);
+      db_query("UPDATE {ldapauth} SET name = '%s', server = '%s', port = %d, tls = %d, encrypted = %d, basedn = '%s', user_attr = '%s', mail_attr = '%s', binddn = '%s', bindpw = '%s', bindpw_clear = %d WHERE name = '%s'", $form_values['name'], $form_values['server'], $form_values['port'], $form_values['tls'], $form_values['encrypted'], $form_values['basedn'], trim($form_values['user_attr']), trim($form_values['mail_attr']), $form_values['binddn'], $form_values['bindpw'], $form_values['bindpw_clear'], $form_values['old-name']);
     }
     else {
       // set the clear password switch
-      db_query("UPDATE {ldapauth} SET name = '%s', server = '%s', port = '%d', tls = '%d', encrypted = '%d', basedn = '%s', user_attr = '%s', mail_attr = '%s', binddn = '%s', bindpw_clear = '%d' WHERE name = '%s'", $form_values['name'], $form_values['server'], $form_values['port'], $form_values['tls'], $form_values['encrypted'], $form_values['basedn'], trim($form_values['user_attr']), trim($form_values['mail_attr']), $form_values['binddn'], $form_values['bindpw_clear'], $form_values['old-name']);
+      db_query("UPDATE {ldapauth} SET name = '%s', server = '%s', port = %d, tls = %d, encrypted = %d, basedn = '%s', user_attr = '%s', mail_attr = '%s', binddn = '%s', bindpw_clear = %d WHERE name = '%s'", $form_values['name'], $form_values['server'], $form_values['port'], $form_values['tls'], $form_values['encrypted'], $form_values['basedn'], trim($form_values['user_attr']), trim($form_values['mail_attr']), $form_values['binddn'], $form_values['bindpw_clear'], $form_values['old-name']);
     }
     drupal_set_message(t('LDAP Configuration %config has been updated.', array('%config' => $form_values['name'])));
     watchdog('ldap', t('ldapauth: ldap config %config updated.', array('%config' => $form_values['name'])));
@@ -581,7 +581,7 @@
   }

   // Cycle through LDAP configurations.  First one to succeed wins.
-  $result = db_query("SELECT name FROM {ldapauth} WHERE status = '%d' ORDER BY sid", 1);
+  $result = db_query("SELECT name FROM {ldapauth} WHERE status = %d ORDER BY sid", 1);
   while ($row = db_fetch_object($result)) {
     // Initialize LDAP
     _ldapauth_init($row->name);
@@ -619,7 +619,7 @@
     case 'login':
       // This is to convert from old ldap_integration to new ldapauth
       if ($user->ldap_authentified) {
-        db_query("UPDATE {authmap} SET module = 'ldapauth' WHERE uid = '%d'", $user->uid);
+        db_query("UPDATE {authmap} SET module = 'ldapauth' WHERE uid = %d", $user->uid);
         return;
       }
       break;
Index: ldapauth.install
===================================================================
--- ldapauth.install    (revision 3043)
+++ ldapauth.install    (working copy)
@@ -44,6 +44,34 @@
       )");
       db_query("CREATE INDEX {ldapauth}_sid_idx ON {ldapauth} (sid)");
       break;
+    case 'oracle10':
+      db_query("CREATE TABLE {ldapauth} (
+        sid INTEGER NOT NULL,
+        name VARCHAR2(255) DEFAULT '',
+        status INTEGER DEFAULT 0 NOT NULL,
+        server VARCHAR2(255) DEFAULT '',
+        port INTEGER DEFAULT 389 NOT NULL,
+        tls INTEGER DEFAULT 0 NOT NULL,
+        encrypted INTEGER DEFAULT 0 NOT NULL,
+        basedn VARCHAR2(4000),
+        user_attr VARCHAR2(255) DEFAULT '',
+        mail_attr VARCHAR2(255) DEFAULT '',
+        binddn VARCHAR2(255) DEFAULT '',
+        bindpw VARCHAR2(255) DEFAULT '',
+        bindpw_clear VARCHAR2(255) DEFAULT '',
+        CONSTRAINT {ldapauth}_pkey PRIMARY KEY (name)
+      )");
+      db_query("CREATE SEQUENCE {ldapauth}_sid_seq");
+      db_query("CREATE TRIGGER trg_{ldapauth}_ins BEFORE INSERT ON {ldapauth} FOR EACH ROW
+        BEGIN
+          IF :new.sid IS NULL THEN
+            -- Populate the autoincrement field.
+            SELECT {ldapauth}_sid_seq.NEXTVAL INTO :new.sid FROM dual;
+          END IF;
+        END;
+      ");
+      db_query("CREATE INDEX {ldapauth}_sid_idx ON {ldapauth} (sid)");
+      break;
   }
 }

@@ -52,6 +80,11 @@
  */
 function ldapauth_uninstall() {
   db_query('DROP TABLE {ldapauth}');
+  switch ($GLOBALS['db_type']) {
+    case 'oracle10':
+      db_query( 'DROP SEQUENCE {ldapauth}_sid_seq' );
+      break;
+  }
   variable_del('ldap_forget_passwords');
   variable_del('ldap_login_process');
   variable_del('ldap_disable_request_new_password');
@@ -85,4 +118,4 @@
       break;
   }
   return $ret;
-}
\ No newline at end of file
+}