Changeset 447

Timestamp:

11/02/06 17:07:31 (2 years ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/cherokee/validator_ldap.c (modified) (5 diffs)
• cherokee/trunk/configure.in (modified) (1 diff)

cherokee/trunk/ChangeLog

@@ -1 +1 @@
-2006-11-02  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+        * cherokee/validator_ldap.c (LDAP_OPT_SUCCESS): Defines it if it
+        wasn't defined previously (like in Solaris).
+
+        * cherokee/validator_ldap.c (validate_dn): Takes care of
+        ldap_start_tls_s(), if the system doesn't support it, it won't use
+        it.
+
+        * configure.in: Added check for ldap_start_tls_s()
-
-        * cherokee/thread.c (process_active_connections):

cherokee/trunk/cherokee/validator_ldap.c

@@ -36 +36 @@
-#define LDAP_DEFAULT_PORT 389
-
+#ifndef LDAP_OPT_SUCCESS
+# define LDAP_OPT_SUCCESS 0
+#endif
+
-
-static ret_t 
@@ -176 +180 @@
-         */
-        if (props->tls) {
+#ifdef LDAP_OPT_X_TLS
-                if (! cherokee_buffer_is_empty (&props->ca_file)) {
-                        re = ldap_set_option (NULL, LDAP_OPT_X_TLS_CACERTFILE, props->ca_file.buf);
@@ -184 +189 @@
-                        }
-                }
+#else
+                PRINT_ERROR_S ("Can't StartTLS, it isn't supported by LDAP client libraries\n");
+#endif
-        }
-
@@ -262 +270 @@
-        
-        if (props->tls) {
+#ifdef LDAP_HAVE_START_TLS_S
-                re = ldap_start_tls_s (conn, NULL,  NULL);
-                if (re != LDAP_OPT_SUCCESS) {
@@ -267 +276 @@
-                        goto error;
-                }
+#else
+                PRINT_ERROR_S ("Can't StartTLS, it isn't supported by LDAP client libraries\n");
+#endif
-        }
-

cherokee/trunk/configure.in

@@ -908 +908 @@
-       AC_CHECK_LIB(ldap, ldap_init, have_ldap_lib=yes, have_ldap_lib=no)
-       AC_CHECK_HEADER(ldap.h, have_ldap_include=yes, have_ldap_include=no)
+
+          AC_CHECK_LIB(ldap, ldap_start_tls_s, [
+                AC_DEFINE(LDAP_HAVE_START_TLS_S,, Define if you have ldap_start_tls_s)
+          ])
+
-       if test "$have_ldap_lib $have_ldap_include" = "yes yes"; then
-          have_ldap="yes"