svn commit: r1157678 - /httpd/httpd/trunk/modules/ldap/util_ldap.c

[co...@apache.org]

Author: covener
Date: Sun Aug 14 22:19:09 2011
New Revision: 1157678

URL: http://svn.apache.org/viewvc?rev=1157678&view=rev
Log:

s/lderrno/uldap_ld_errno, but keep it internal.


Modified:
    httpd/httpd/trunk/modules/ldap/util_ldap.c

Modified: httpd/httpd/trunk/modules/ldap/util_ldap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ldap/util_ldap.c?rev=1157678&r1=1157677&r2=1157678&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ldap/util_ldap.c (original)
+++ httpd/httpd/trunk/modules/ldap/util_ldap.c Sun Aug 14 22:19:09 2011
@@ -449,7 +449,7 @@ static int uldap_connection_init(request
     return(rc);
 }
 
-static int lderrno(util_ldap_connection_t *ldc) 
+static int uldap_ld_errno(util_ldap_connection_t *ldc) 
 { 
     int ldaprc;
 #ifdef LDAP_OPT_ERROR_NUMBER
@@ -460,6 +460,7 @@ static int lderrno(util_ldap_connection_
 #endif
     return LDAP_OTHER;
 }
+
 /*
  * Replacement function for ldap_simple_bind_s() with a timeout.
  * To do this in a portable way, we have to use ldap_simple_bind() and 
@@ -475,13 +476,13 @@ static int uldap_simple_bind(util_ldap_c
     int msgid = ldap_simple_bind(ldc->ldap, binddn, bindpw);
     if (msgid == -1) {
         ldc->reason = "LDAP: ldap_simple_bind() failed";
-        return lderrno(ldc);
+        return uldap_ld_errno(ldc);
     }
     rc = ldap_result(ldc->ldap, msgid, 0, timeout, &result);
     if (rc == -1) {
         ldc->reason = "LDAP: ldap_simple_bind() result retrieval failed";
         /* -1 is LDAP_SERVER_DOWN in openldap, use something else */
-        return lderrno(ldc);
+        return uldap_ld_errno(ldc);
     }
     else if (rc == 0) {
         ldc->reason = "LDAP: ldap_simple_bind() timed out";
@@ -489,7 +490,7 @@ static int uldap_simple_bind(util_ldap_c
     } else if (ldap_parse_result(ldc->ldap, result, &rc, NULL, NULL, NULL,
                                  NULL, 1) == -1) {
         ldc->reason = "LDAP: ldap_simple_bind() parse result failed";
-        return lderrno(ldc);
+        return uldap_ld_errno(ldc);
     }
     return rc;
 }