diff --git a/openldap2-client.changes b/openldap2-client.changes index 8cad6c7..44a82b8 100644 --- a/openldap2-client.changes +++ b/openldap2-client.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 10 15:06:12 CET 2008 - rhafer@suse.de + +- Removed bogus debugging output from slapd_getaddrinfo_dupl.dif + ------------------------------------------------------------------- Wed Jan 9 13:29:33 CET 2008 - rhafer@suse.de diff --git a/openldap2-client.spec b/openldap2-client.spec index ee2b619..08e83fe 100644 --- a/openldap2-client.spec +++ b/openldap2-client.spec @@ -28,7 +28,7 @@ Summary: OpenLDAP2 Client Utilities %endif AutoReqProv: on Version: 2.4.7 -Release: 6 +Release: 7 Source: openldap-%{version}.tar.bz2 Source1: openldap-rc.tgz Source2: addonschema.tar.gz @@ -348,6 +348,8 @@ fi %endif %changelog +* Thu Jan 10 2008 - rhafer@suse.de +- Removed bogus debugging output from slapd_getaddrinfo_dupl.dif * Wed Jan 09 2008 - rhafer@suse.de - Fixed allocation for paged results cookie (Bug #352255, ITS#5315) * Fri Dec 14 2007 - rhafer@suse.de diff --git a/openldap2.changes b/openldap2.changes index 8cad6c7..44a82b8 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 10 15:06:12 CET 2008 - rhafer@suse.de + +- Removed bogus debugging output from slapd_getaddrinfo_dupl.dif + ------------------------------------------------------------------- Wed Jan 9 13:29:33 CET 2008 - rhafer@suse.de diff --git a/openldap2.spec b/openldap2.spec index 67edeec..d0239c6 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -28,7 +28,7 @@ Summary: The New OpenLDAP Server (LDAPv3) %endif AutoReqProv: on Version: 2.4.7 -Release: 6 +Release: 7 Source: openldap-%{version}.tar.bz2 Source1: openldap-rc.tgz Source2: addonschema.tar.gz @@ -351,6 +351,8 @@ fi %endif %changelog +* Thu Jan 10 2008 - rhafer@suse.de +- Removed bogus debugging output from slapd_getaddrinfo_dupl.dif * Wed Jan 09 2008 - rhafer@suse.de - Fixed allocation for paged results cookie (Bug #352255, ITS#5315) * Fri Dec 14 2007 - rhafer@suse.de diff --git a/slapd_getaddrinfo_dupl.dif b/slapd_getaddrinfo_dupl.dif index cc69239..6b9591b 100644 --- a/slapd_getaddrinfo_dupl.dif +++ b/slapd_getaddrinfo_dupl.dif @@ -1,8 +1,8 @@ -Index: openldap-2.4.6/servers/slapd/daemon.c +Index: openldap-2.4.7/servers/slapd/daemon.c =================================================================== ---- openldap-2.4.6.orig/servers/slapd/daemon.c -+++ openldap-2.4.6/servers/slapd/daemon.c -@@ -983,7 +983,8 @@ slap_get_listener_addresses( +--- openldap-2.4.7.orig/servers/slapd/daemon.c ++++ openldap-2.4.7/servers/slapd/daemon.c +@@ -1120,7 +1120,8 @@ slap_get_listener_addresses( { #ifdef HAVE_GETADDRINFO struct addrinfo hints, *res, *sai; @@ -12,12 +12,11 @@ Index: openldap-2.4.6/servers/slapd/daemon.c char serv[7]; memset( &hints, '\0', sizeof(hints) ); -@@ -1009,43 +1010,63 @@ slap_get_listener_addresses( +@@ -1146,43 +1147,60 @@ slap_get_listener_addresses( *sap = NULL; for ( sai=res; sai; sai=sai->ai_next ) { + cmpres=1; -+fprintf(stderr,"JO\n"); if( sai->ai_addr == NULL ) { Debug( LDAP_DEBUG_ANY, "slap_get_listener_addresses: " "getaddrinfo ai_addr is NULL?\n", 0, 0, 0 ); @@ -34,7 +33,6 @@ Index: openldap-2.4.6/servers/slapd/daemon.c - goto errexit; + /* check for duplicates */ + for ( sap2 = *sal; sap && *sap2; sap2++ ){ -+fprintf(stderr,"JOJO\n"); + if ( sai->ai_family == (*sap2)->sa_family ) { + if (sai->ai_family == AF_INET6) { + cmpres = memcmp(sai->ai_addr, *sap2, @@ -44,7 +42,6 @@ Index: openldap-2.4.6/servers/slapd/daemon.c + sizeof(struct sockaddr_in)); + } + if (! cmpres ){ -+ fprintf(stderr, "DUPLICATE\n"); + break; + } }