Changeset 818

Timestamp:

11/07/2005 09:50:34 AM (3 years ago)

Author:

jan

Message:

added auto-reconnect to ldap (fixes #294), patch from joerg@…

Location:

branches/lighttpd-merge-1.4.x/src

Files:

• http_auth.c (modified) (2 diffs)
• mod_auth.c (modified) (3 diffs)

branches/lighttpd-merge-1.4.x/src/http_auth.c

@@ -49 +49 @@
 };
 #endif
+
+handler_t auth_ldap_init(server *srv, mod_auth_plugin_config *s);
 
 static const char base64_pad = '=';
@@ -578 +580 @@
                 
                 /* 2. */
-                if (LDAP_SUCCESS != (ret = ldap_search_s(p->conf.ldap, p->conf.auth_ldap_basedn->ptr, LDAP_SCOPE_SUBTREE, p->ldap_filter->ptr, attrs, 0, &lm))) {
+                if (p->conf.ldap == NULL ||
+                    LDAP_SUCCESS != (ret = ldap_search_s(p->conf.ldap, p->conf.auth_ldap_basedn->ptr, LDAP_SCOPE_SUBTREE, p->ldap_filter->ptr, attrs, 0, &lm))) {
+                        if (auth_ldap_init(srv, &p->conf) != HANDLER_GO_ON)
+                                return -1;
+                        if (LDAP_SUCCESS != (ret = ldap_search_s(p->conf.ldap, p->conf.auth_ldap_basedn->ptr, LDAP_SCOPE_SUBTREE, p->ldap_filter->ptr, attrs, 0, &lm))) {
+
                         log_error_write(srv, __FILE__, __LINE__, "sssb", 
                                         "ldap:", ldap_err2string(ret), "filter:", p->ldap_filter);
                         
                         return -1;
+                        }
                 }
                 

branches/lighttpd-merge-1.4.x/src/mod_auth.c

@@ -12 +12 @@
 #include "log.h"
 #include "response.h"
+
+handler_t auth_ldap_init(server *srv, mod_auth_plugin_config *s);
 
 
@@ -506 +508 @@
                         }
                         break;
-                case AUTH_BACKEND_LDAP: 
+                case AUTH_BACKEND_LDAP: {
+                        handler_t ret = auth_ldap_init(srv, s);
+                        if (ret == HANDLER_ERROR)
+                                return (ret);
+                        break;
+                }
+                default:
+                        break;
+                }
+        }
+
+        return HANDLER_GO_ON;
+}
+
+handler_t
+auth_ldap_init(server *srv, mod_auth_plugin_config *s)
+{
 #ifdef USE_LDAP
+                        int ret;
 #if 0                   
                         if (s->auth_ldap_basedn->used == 0) {
@@ -587 +606 @@
                         return HANDLER_ERROR;
 #endif
-                        break;
-                default:
-                        break;
-                }
-        }
-        
-        return HANDLER_GO_ON;
+                return HANDLER_GO_ON;
 }