Changeset 165

Timestamp:

09/04/07 16:53:53 (20 months ago)

Author:

smoku

Message:

Integrated LDAP append-realm patch by Andrew Klang. Closes #60

Location:

trunk

Files:

• c2s/authreg_ldap.c (modified) (6 diffs)
• etc/c2s.xml.dist.in (modified) (1 diff)

trunk/c2s/authreg_ldap.c

@@ -42 +42 @@
 #define AR_LDAP_FLAGS_RECONNECT (0x8)
 #define AR_LDAP_FLAGS_DISABLE_REFERRALS (0x10)
+#define AR_LDAP_FLAGS_APPEND_REALM (0x20)
 
 /** internal structure, holds our data */
@@ -199 +200 @@
     }
 
-    snprintf(filter, 1024, "(%s=%s)", data->uidattr, username);
+    if (data->flags & AR_LDAP_FLAGS_APPEND_REALM) {
+        snprintf(filter, 1024, "(%s=%s@%s)", data->uidattr, username, realm);
+    } else {
+        snprintf(filter, 1024, "(%s=%s)", data->uidattr, username);
+    }
 
     if(ldap_set_rebind_proc(data->ld, &rebindProc, data)) {
@@ -402 +407 @@
     if(config_get(ar->c2s->config, ldap_entry) != NULL)
       data->flags |= AR_LDAP_FLAGS_V3;
+
     if (l>0)
         snprintf(ldap_entry,sizeof(ldap_entry), "authreg.ldap%d.startls", l );
@@ -408 +414 @@
     if(config_get(ar->c2s->config, ldap_entry) != NULL)
       data->flags |= AR_LDAP_FLAGS_STARTTLS;
+
     if (l>0)
         snprintf(ldap_entry,sizeof(ldap_entry), "authreg.ldap%d.ssl", l );
@@ -414 +421 @@
     if(config_get(ar->c2s->config, ldap_entry) != NULL)
       data->flags |= AR_LDAP_FLAGS_SSL;
+
     if (l>0)
         snprintf(ldap_entry,sizeof(ldap_entry), "authreg.ldap%d.disablereferrals", l );
@@ -420 +428 @@
     if(config_get(ar->c2s->config, ldap_entry) != NULL)
       data->flags |= AR_LDAP_FLAGS_DISABLE_REFERRALS;
+
+    if (l>0)
+        snprintf(ldap_entry,sizeof(ldap_entry), "authreg.ldap%d.append-realm", l );
+    else
+        snprintf(ldap_entry, sizeof(ldap_entry), "authreg.ldap.append-realm");
+    if(config_get(ar->c2s->config, ldap_entry) != NULL)
+      data->flags |= AR_LDAP_FLAGS_APPEND_REALM;
 
     if((data->flags & AR_LDAP_FLAGS_STARTTLS) && (data->flags & AR_LDAP_FLAGS_SSL)) {

trunk/etc/c2s.xml.dist.in

@@ -380 +380 @@
       <uidattr>uid</uidattr>
 
+      <!-- Enable the append-realm element if you want to append
+           realm value (usernam@realm) to the uidattr value
+      <append-realm/>
+      -->
+
       <!-- base DN of the tree. You should specify a DN for each
            authentication realm declared in the <local/> section above,