Merge lp:~ubuntu-branches/ubuntu/natty/openldap/natty-201103250224 into lp:ubuntu/natty/openldap

[James Westby]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/natty/openldap now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/openldap/natty-201103250224. A merge should be performed if necessary.

Unmerged revisions

35. By Dave Walker on 2011-03-02

debian/patches/service-operational-before-detach: New patch replacing
old one of same name as previous could cause database corruption,
based on upstream commits. (LP: #727973)

=== modified file 'debian/patches/service-operational-before-detach'
--- debian/patches/service-operational-before-detach	2011-03-02 20:33:08 +0000
+++ debian/patches/service-operational-before-detach	2011-03-28 07:14:19 +0000
@@ -1,77 +1,155 @@
-Description: Wait for database startup before parent exits.
- This patch replaces the previous one named the same name,
- but is based on upstream commits; as the previous applied
- patch could cause database corruption.
- .
- Patch is based on upstream commits as described below:
- libraries/liblutil/detach.c 1.25 -> 1.26
- include/lutil.h 1.81 -> 1.82
- servers/slapd/main.c 1.276 -> 1.278
- .
-Forwarded: not-needed
-Origin: upstream, commit:1.26
-Origin: upstream, commit:1.82
-Origin: upstream, commit:1.278
-Bug: http://www.openldap.org/its/index.cgi/?findid=6848
-Bug-Ubuntu: https://launchpad.net/bugs/727973
-Reviewed-by: Dave Walker (Daviey) <[e-mail]>
-Last-Update: 2011-03-02
-
---- a/include/lutil.h
-+++ b/include/lutil.h
-@@ -48,7 +48,7 @@
- 	size_t));
- 
- /* detach.c */
--LDAP_LUTIL_F( void )
-+LDAP_LUTIL_F( int )
- lutil_detach LDAP_P((
- 	int debug,
- 	int do_close));
---- a/libraries/liblutil/detach.c
-+++ b/libraries/liblutil/detach.c
-@@ -49,10 +49,10 @@
- 
- #include "lutil.h"
- 
--void
-+int
- lutil_detach( int debug, int do_close )
- {
--	int		i, sd, nbits;
-+	int		i, sd, nbits, pid;
- 
- #ifdef HAVE_SYSCONF
- 	nbits = sysconf( _SC_OPEN_MAX );
-@@ -71,10 +71,11 @@
- 	if ( debug == 0 ) {
- 		for ( i = 0; i < 5; i++ ) {
- #ifdef HAVE_THR
--			switch ( fork1() )
-+			pid = fork1();
- #else
--			switch ( fork() )
-+			pid = fork();
- #endif
-+			switch ( pid )
- 			{
- 			case -1:
- 				sleep( 5 );
-@@ -84,7 +85,7 @@
- 				break;
- 
- 			default:
--				_exit( EXIT_SUCCESS );
-+				return pid;
- 			}
- 			break;
- 		}
-@@ -139,4 +140,5 @@
- #ifdef SIGPIPE
- 	(void) SIGNAL( SIGPIPE, SIG_IGN );
- #endif
-+	return 0;
- }
+<<<<<<< TREE
+Description: Wait for database startup before parent exits.
+ This patch replaces the previous one named the same name,
+ but is based on upstream commits; as the previous applied
+ patch could cause database corruption.
+ .
+ Patch is based on upstream commits as described below:
+ libraries/liblutil/detach.c 1.25 -> 1.26
+ include/lutil.h 1.81 -> 1.82
+ servers/slapd/main.c 1.276 -> 1.278
+ .
+Forwarded: not-needed
+Origin: upstream, commit:1.26
+Origin: upstream, commit:1.82
+Origin: upstream, commit:1.278
+Bug: http://www.openldap.org/its/index.cgi/?findid=6848
+Bug-Ubuntu: https://launchpad.net/bugs/727973
+Reviewed-by: Dave Walker (Daviey) <[e-mail]>
+Last-Update: 2011-03-02
+
+--- a/include/lutil.h
++++ b/include/lutil.h
+@@ -48,7 +48,7 @@
+ 	size_t));
+ 
+ /* detach.c */
+-LDAP_LUTIL_F( void )
++LDAP_LUTIL_F( int )
+ lutil_detach LDAP_P((
+ 	int debug,
+ 	int do_close));
+--- a/libraries/liblutil/detach.c
++++ b/libraries/liblutil/detach.c
+@@ -49,10 +49,10 @@
+ 
+ #include "lutil.h"
+ 
+-void
++int
+ lutil_detach( int debug, int do_close )
+ {
+-	int		i, sd, nbits;
++	int		i, sd, nbits, pid;
+ 
+ #ifdef HAVE_SYSCONF
+ 	nbits = sysconf( _SC_OPEN_MAX );
+@@ -71,10 +71,11 @@
+ 	if ( debug == 0 ) {
+ 		for ( i = 0; i < 5; i++ ) {
+ #ifdef HAVE_THR
+-			switch ( fork1() )
++			pid = fork1();
+ #else
+-			switch ( fork() )
++			pid = fork();
+ #endif
++			switch ( pid )
+ 			{
+ 			case -1:
+ 				sleep( 5 );
+@@ -84,7 +85,7 @@
+ 				break;
+ 
+ 			default:
+-				_exit( EXIT_SUCCESS );
++				return pid;
+ 			}
+ 			break;
+ 		}
+@@ -139,4 +140,5 @@
+ #ifdef SIGPIPE
+ 	(void) SIGNAL( SIGPIPE, SIG_IGN );
+ #endif
++	return 0;
+ }
+=======
+Description: Wait for database startup before parent exits.
+ This patch replaces the previous one named the same name,
+ but is based on upstream commits; as the previous applied
+ patch could cause database corruption.
+ .
+ Patch is based on upstream commits as described below:
+ libraries/liblutil/detach.c 1.25 -> 1.26
+ include/lutil.h 1.81 -> 1.82
+ servers/slapd/main.c 1.276 -> 1.278
+ .
+Forwarded: not-needed
+Origin: upstream, commit:1.26
+Origin: upstream, commit:1.82
+Origin: upstream, commit:1.278
+Bug: http://www.openldap.org/its/index.cgi/?findid=6848
+Bug-Ubuntu: https://launchpad.net/bugs/727973
+Bug-Debian: http://bugs.debian.org/589915
+Reviewed-by: Dave Walker (Daviey) <[e-mail]>
+Last-Update: 2011-03-02
+
+--- a/include/lutil.h
++++ b/include/lutil.h
+@@ -48,7 +48,7 @@
+ 	size_t));
+ 
+ /* detach.c */
+-LDAP_LUTIL_F( void )
++LDAP_LUTIL_F( int )
+ lutil_detach LDAP_P((
+ 	int debug,
+ 	int do_close));
+--- a/libraries/liblutil/detach.c
++++ b/libraries/liblutil/detach.c
+@@ -49,10 +49,10 @@
+ 
+ #include "lutil.h"
+ 
+-void
++int
+ lutil_detach( int debug, int do_close )
+ {
+-	int		i, sd, nbits;
++	int		i, sd, nbits, pid;
+ 
+ #ifdef HAVE_SYSCONF
+ 	nbits = sysconf( _SC_OPEN_MAX );
+@@ -71,10 +71,11 @@
+ 	if ( debug == 0 ) {
+ 		for ( i = 0; i < 5; i++ ) {
+ #ifdef HAVE_THR
+-			switch ( fork1() )
++			pid = fork1();
+ #else
+-			switch ( fork() )
++			pid = fork();
+ #endif
++			switch ( pid )
+ 			{
+ 			case -1:
+ 				sleep( 5 );
+@@ -84,7 +85,7 @@
+ 				break;
+ 
+ 			default:
+-				_exit( EXIT_SUCCESS );
++				return pid;
+ 			}
+ 			break;
+ 		}
+@@ -139,4 +140,5 @@
+ #ifdef SIGPIPE
+ 	(void) SIGNAL( SIGPIPE, SIG_IGN );
+ #endif
++	return 0;
+ }
+>>>>>>> MERGE-SOURCE
 --- a/servers/slapd/main.c
 +++ b/servers/slapd/main.c
 @@ -364,6 +364,9 @@