svn commit: samba r5556 - in branches/SAMBA_3_0/source/lib: .

[gd]

Author: gd
Date: 2005-02-25 14:12:05 +0000 (Fri, 25 Feb 2005)
New Revision: 5556

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5556

Log:
Fix the build on AIX.

use AF_UNIX instead of AF_LOCAL (thanks to Doug VanLeuven
<roamdad-at-sonic.net>) and make smbldap_open() a bit more readable.

Guenther

Modified:
   branches/SAMBA_3_0/source/lib/smbldap.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/smbldap.c
===================================================================
--- branches/SAMBA_3_0/source/lib/smbldap.c     2005-02-25 14:08:30 UTC (rev 
5555)
+++ branches/SAMBA_3_0/source/lib/smbldap.c     2005-02-25 14:12:05 UTC (rev 
5556)
@@ -873,8 +873,9 @@
 *********************************************************************/
 static int smbldap_open(struct smbldap_state *ldap_state)
 {
-       int rc;
+       int rc, opt_rc;
        SMB_ASSERT(ldap_state);
+       BOOL reopen = False;
                
 #ifndef NO_LDAP_SECURITY
        if (geteuid() != 0) {
@@ -883,12 +884,21 @@
        }
 #endif
 
-               if ((ldap_state->ldap_struct != NULL) && 
((ldap_state->last_ping + SMBLDAP_DONT_PING_TIME) < time(NULL))) {
+       if ((ldap_state->ldap_struct != NULL) && ((ldap_state->last_ping + 
SMBLDAP_DONT_PING_TIME) < time(NULL))) {
+
                struct sockaddr_un addr;
                socklen_t len = sizeof(addr);
                int sd;
-               if (ldap_get_option(ldap_state->ldap_struct, LDAP_OPT_DESC, 
&sd) == 0 &&
-                   ((getpeername(sd, (struct sockaddr *) &addr, &len) < 0) || 
addr.sun_family == AF_LOCAL)) {
+
+               opt_rc = ldap_get_option(ldap_state->ldap_struct, 
LDAP_OPT_DESC, &sd);
+               if (opt_rc == 0 && (getpeername(sd, (struct sockaddr *) &addr, 
&len)) < 0 )
+                       reopen = True;
+
+#ifdef HAVE_UNIXSOCKET
+               if (opt_rc == 0 && addr.sun_family == AF_UNIX)
+                       reopen = True;
+#endif
+               if (reopen) {
                        /* the other end has died. reopen. */
                        ldap_unbind_ext(ldap_state->ldap_struct, NULL, NULL);
                        ldap_state->ldap_struct = NULL;