Attachment 590152 Details for Bug 829689 – httpd-2.2.15-ldapna.patch

[patch] httpd-2.2.15-ldapna.patch

httpd-2.2.15-ldapna.patch (text/plain), 3.21 KB, created by Filip Valder on 2012-06-07 10:25:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Filip Valder

Created: 2012-06-07 10:25:04 UTC

Size: 3.21 KB

patch

obsolete

>diff -ruN httpd-2.2.15/include/util_ldap.h httpd-2.2.15/include/util_ldap.h
>--- httpd-2.2.15/include/util_ldap.h	2008-01-01 23:29:45.000000000 +0100
>+++ httpd-2.2.15/include/util_ldap.h	2012-06-07 08:30:58.515702110 +0200
>@@ -30,12 +30,8 @@
> #include "apr_time.h"
> #include "apr_ldap.h"
> 
>-#if APR_HAS_MICROSOFT_LDAPSDK
> #define AP_LDAP_IS_SERVER_DOWN(s)                ((s) == LDAP_SERVER_DOWN \
>                 ||(s) == LDAP_UNAVAILABLE)
>-#else
>-#define AP_LDAP_IS_SERVER_DOWN(s)                ((s) == LDAP_SERVER_DOWN)
>-#endif
> 
> #if APR_HAS_SHARED_MEMORY
> #include "apr_rmm.h"
>diff -ruN httpd-2.2.15/modules/aaa/mod_authnz_ldap.c httpd-2.2.15/modules/aaa/mod_authnz_ldap.c
>--- httpd-2.2.15/modules/aaa/mod_authnz_ldap.c	2010-02-25 03:25:35.000000000 +0100
>+++ httpd-2.2.15/modules/aaa/mod_authnz_ldap.c	2012-06-07 08:25:41.318698756 +0200
>@@ -402,7 +402,7 @@
>                                          sec->attributes, filtbuf, password, &dn, &vals);
>     util_ldap_connection_close(ldc);
> 
>-    /* sanity check - if server is down, retry it up to 5 times */
>+    /* sanity check - if server is down/NA, retry it up to 5 times */
>     if (AP_LDAP_IS_SERVER_DOWN(result)) {
>         if (failures++ <= 5) {
>             goto start_over;
>diff -ruN httpd-2.2.15/modules/ldap/util_ldap.c httpd-2.2.15/modules/ldap/util_ldap.c
>--- httpd-2.2.15/modules/ldap/util_ldap.c	2009-12-18 15:09:40.000000000 +0100
>+++ httpd-2.2.15/modules/ldap/util_ldap.c	2012-06-07 08:29:30.133652498 +0200
>@@ -688,7 +688,7 @@
>     if (AP_LDAP_IS_SERVER_DOWN(result))
>     {
>         ldc->reason = "DN Comparison ldap_search_ext_s() "
>-                      "failed with server down";
>+                      "failed with server down/NA";
>         uldap_connection_unbind(ldc);
>         goto start_over;
>     }
>@@ -825,7 +825,7 @@
>                             (char *)value);
>     if (AP_LDAP_IS_SERVER_DOWN(result)) { 
>         /* connection failed - try again */
>-        ldc->reason = "ldap_compare_s() failed with server down";
>+        ldc->reason = "ldap_compare_s() failed with server down/NA";
>         uldap_connection_unbind(ldc);
>         goto start_over;
>     }
>@@ -971,7 +971,7 @@
>                                NULL, NULL, NULL, APR_LDAP_SIZELIMIT, &res);
>     if (AP_LDAP_IS_SERVER_DOWN(result))
>     {
>-        ldc->reason = "ldap_search_ext_s() for user failed with server down";
>+        ldc->reason = "ldap_search_ext_s() for user failed with server down/NA";
>         uldap_connection_unbind(ldc);
>         goto start_over;
>     }
>@@ -1028,7 +1028,7 @@
>                                 (char *)bindpw);
>     if (AP_LDAP_IS_SERVER_DOWN(result)) {
>         ldc->reason = "ldap_simple_bind_s() to check user credentials "
>-                      "failed with server down";
>+                      "failed with server down/NA";
>         ldap_msgfree(res);
>         uldap_connection_unbind(ldc);
>         goto start_over;
>@@ -1218,7 +1218,7 @@
>                                NULL, NULL, NULL, APR_LDAP_SIZELIMIT, &res);
>     if (AP_LDAP_IS_SERVER_DOWN(result))
>     {
>-        ldc->reason = "ldap_search_ext_s() for user failed with server down";
>+        ldc->reason = "ldap_search_ext_s() for user failed with server down/NA";
>         uldap_connection_unbind(ldc);
>         goto start_over;
>     }

Actions: View | Diff

Attachments on bug 829689: 590152 | 590153