Changeset 1517

Timestamp:

01/14/2007 09:46:33 AM (21 months ago)

Author:

darix

Message:

- allow empty passwords with ldap.

patch by Jöerg Sonnenberger

Location:

trunk/src

Files:

• http_auth.c (modified) (1 diff)
• http_auth.h (modified) (1 diff)
• mod_auth.c (modified) (4 diffs)

trunk/src/http_auth.c

@@ -736 +736 @@
                 }
 
-
+                if (p->conf.auth_ldap_allow_empty_pw != 1 && pw[0] == '\0')
+                        return -1;
 
                 /* build filter */

trunk/src/http_auth.h

@@ -37 +37 @@
         buffer *auth_ldap_cafile;
         unsigned short auth_ldap_starttls;
+        unsigned short auth_ldap_allow_empty_pw;
 
         unsigned short auth_debug;

trunk/src/mod_auth.c

@@ -116 +116 @@
         PATCH_OPTION(auth_ldap_cafile);
         PATCH_OPTION(auth_ldap_starttls);
+        PATCH_OPTION(auth_ldap_allow_empty_pw);
 #ifdef USE_LDAP
         PATCH_OPTION(ldap);
@@ -163 +164 @@
                         } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.ldap.starttls"))) {
                                 PATCH_OPTION(auth_ldap_starttls);
+                        } else if (buffer_is_equal_string(du->key, CONST_STR_LEN("auth.backend.ldap.allow-empty-pw"))) {
+                                PATCH_OPTION(auth_ldap_allow_empty_pw);
                         }
                 }
@@ -314 +317 @@
                 { "auth.backend.ldap.bind-dn",      NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
                 { "auth.backend.ldap.bind-pw",      NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 10 */
+                { "auth.backend.ldap.allow-empty-pw",     NULL, T_CONFIG_BOOLEAN, T_CONFIG_SCOPE_CONNECTION },
                 { "auth.backend.htdigest.userfile", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
                 { "auth.backend.htpasswd.userfile", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION },
@@ -361 +365 @@
                 cv[7].destination = s->auth_ldap_cafile;
                 cv[8].destination = &(s->auth_ldap_starttls);
-                cv[9].destination = s->auth_ldap_binddn;
-                cv[10].destination = s->auth_ldap_bindpw;
-                cv[11].destination = s->auth_htdigest_userfile;
-                cv[12].destination = s->auth_htpasswd_userfile;
-                cv[13].destination = &(s->auth_debug);
+                cv[9].destination = s->auth_ldap_binddn;
+                cv[10].destination = s->auth_ldap_bindpw;
+                cv[11].destination = &(s->auth_ldap_allow_empty_pw);
+                cv[12].destination = s->auth_htdigest_userfile;
+                cv[13].destination = s->auth_htpasswd_userfile;
+                cv[14].destination = &(s->auth_debug);
 
                 p->config_storage[i] = s;