Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25259
Modified Files:
daemon.c
Log Message:
Resolves: #436390
Summary: LDAPI: support auto-bind
Description: String representation of socktype was not set correctly when
the socktype was PR_AF_LOCAL.
Index: daemon.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/daemon.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- daemon.c 16 May 2008 16:46:49 -0000 1.19
+++ daemon.c 16 May 2008 20:39:11 -0000 1.20
@@ -2741,7 +2741,7 @@
char *logname = "createprlistensockets";
int sockcnt = 0;
int socktype;
- char *socktype_s = NULL;
+ char *socktype_str = NULL;
PRNetAddr **lap;
int i;
@@ -2749,13 +2749,6 @@
PR_ASSERT( listenaddr != NULL );
-#if defined(ENABLE_LDAPI)
- if(local) { /* ldapi */
- socktype = PR_AF_LOCAL;
- socktype_s = "PR_AF_LOCAL";
- }
-#endif
-
/* need to know the count */
sockcnt = 0;
for (lap = listenaddr; lap && *lap; lap++) {
@@ -2773,16 +2766,21 @@
for (i = 0, lap = listenaddr; lap && *lap && i < sockcnt; i++, lap++)
{
/* create TCP socket */
socktype = PR_NetAddrFamily(*lap);
+#if defined(ENABLE_LDAPI)
+ if (PR_AF_LOCAL == socktype) {
+ socktype_str = "PR_AF_LOCAL";
+ } else
+#endif
if (PR_AF_INET6 == socktype) {
- socktype_s = "PR_AF_INET6";
+ socktype_str = "PR_AF_INET6";
} else {
- socktype_s = "PR_AF_INET";
+ socktype_str = "PR_AF_INET";
}
if ((sock[i] = PR_OpenTCPSocket(socktype)) == SLAPD_INVALID_SOCKET) {
prerr = PR_GetError();
slapi_log_error(SLAPI_LOG_FATAL, logname,
"PR_OpenTCPSocket(%s) failed: %s error %d (%s)\n",
- socktype_s,
+ socktype_str,
SLAPI_COMPONENT_NAME_NSPR, prerr, slapd_pr_strerror(prerr));
goto failed;
}
Show replies by date