[Pkg-openldap-devel] r1253 - in openldap/trunk/debian: . patches

[matthijs at alioth.debian.org]

tags 549642 pending
thanks

Author: matthijs
Date: 2010-04-11 21:01:18 +0000 (Sun, 11 Apr 2010)
New Revision: 1253

Added:
   openldap/trunk/debian/patches/shutdown-issue-6322
Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/patches/series
Log:
 * Add new patch. Updated changelog.
 * This still needs to be tested.


Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2010-04-11 20:16:54 UTC (rev 1252)
+++ openldap/trunk/debian/changelog	2010-04-11 21:01:18 UTC (rev 1253)
@@ -14,8 +14,9 @@
   * Make lintian a bit more happy (Closes: #518660)
   * Fix bashism (Closes: #518657)
   * Refresh all patches.
+  * Add patch from upstream (Closes: #549642)
 
- -- Matthijs Mohlmann <matthijs at cacholong.nl>  Sun, 11 Apr 2010 22:13:46 +0200
+ -- Matthijs Mohlmann <matthijs at cacholong.nl>  Sun, 11 Apr 2010 22:39:02 +0200
 
 openldap (2.4.17-2.1) unstable; urgency=high
 

Modified: openldap/trunk/debian/patches/series
===================================================================
--- openldap/trunk/debian/patches/series	2010-04-11 20:16:54 UTC (rev 1252)
+++ openldap/trunk/debian/patches/series	2010-04-11 21:01:18 UTC (rev 1253)
@@ -9,3 +9,4 @@
 libldap-symbol-versions
 getaddrinfo-is-threadsafe
 do-not-second-guess-sonames
+shutdown-issue-6322

Added: openldap/trunk/debian/patches/shutdown-issue-6322
===================================================================
--- openldap/trunk/debian/patches/shutdown-issue-6322	                        (rev 0)
+++ openldap/trunk/debian/patches/shutdown-issue-6322	2010-04-11 21:01:18 UTC (rev 1253)
@@ -0,0 +1,35 @@
+Index: b/servers/slapd/daemon.c
+===================================================================
+--- a/servers/slapd/daemon.c
++++ b/servers/slapd/daemon.c
+@@ -1720,9 +1720,12 @@
+ 
+ 	for ( l = 0; slap_listeners[l] != NULL; l++ ) {
+ 		Listener *lr = slap_listeners[l];
++		slap_listeners[l] = NULL;
+ 
+ 		if ( lr->sl_sd != AC_SOCKET_INVALID ) {
+-			if ( remove ) slapd_remove( lr->sl_sd, NULL, 0, 0, 0 );
++			int s = lr->sl_sd;
++			lr->sl_sd = AC_SOCKET_INVALID;
++			if ( remove ) slapd_remove( s, NULL, 0, 0, 0 );
+ 
+ #ifdef LDAP_PF_LOCAL
+ 			if ( lr->sl_sa.sa_addr.sa_family == AF_LOCAL ) {
+@@ -1730,7 +1733,7 @@
+ 			}
+ #endif /* LDAP_PF_LOCAL */
+ 
+-			slapd_close( lr->sl_sd );
++			slapd_close( s );
+ 		}
+ 
+ 		if ( lr->sl_url.bv_val ) {
+@@ -1742,7 +1745,6 @@
+ 		}
+ 
+ 		free( lr );
+-		slap_listeners[l] = NULL;
+ 	}
+ }
+