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

[Matthijs Mohlmann]

Author: active2-guest
Date: 2006-06-08 19:57:51 +0000 (Thu, 08 Jun 2006)
New Revision: 674

Added:
   openldap/trunk-2.3/debian/patches/read-config-before-dropping-privileges
Modified:
   openldap/trunk-2.3/debian/changelog
   openldap/trunk-2.3/debian/patches/series
Log:
 * Added patch to read config first and then drop privileges.
   - Please review patch.


Modified: openldap/trunk-2.3/debian/changelog
===================================================================
--- openldap/trunk-2.3/debian/changelog	2006-06-08 19:55:12 UTC (rev 673)
+++ openldap/trunk-2.3/debian/changelog	2006-06-08 19:57:51 UTC (rev 674)
@@ -6,8 +6,9 @@
     - Patch to fix boolean logic in the overlays.
   * Add dependency on adduser.
   * Specify the PATH variable in the init script. (Closes: #367981)
+  * Added patch to read config before dropping privileges.
 
- -- Matthijs Mohlmann <matthijs at cacholong.nl>  Sun,  4 Jun 2006 20:15:10 +0200
+ -- Matthijs Mohlmann <matthijs at cacholong.nl>  Thu,  8 Jun 2006 21:56:10 +0200
 
 openldap2.3 (2.3.24-1) unstable; urgency=low
 

Added: openldap/trunk-2.3/debian/patches/read-config-before-dropping-privileges
===================================================================
--- openldap/trunk-2.3/debian/patches/read-config-before-dropping-privileges	2006-06-08 19:55:12 UTC (rev 673)
+++ openldap/trunk-2.3/debian/patches/read-config-before-dropping-privileges	2006-06-08 19:57:51 UTC (rev 674)
@@ -0,0 +1,30 @@
+Index: servers/slapd/main.c
+===================================================================
+--- servers/slapd/main.c.orig
++++ servers/slapd/main.c
+@@ -648,12 +648,6 @@
+ 	}
+ #endif
+ 
+-#if defined(HAVE_SETUID) && defined(HAVE_SETGID)
+-	if ( username != NULL || groupname != NULL ) {
+-		slap_init_user( username, groupname );
+-	}
+-#endif
+-
+ 	extops_init();
+ 	lutil_passwd_init();
+ 	slap_op_init();
+@@ -675,6 +669,12 @@
+ 		goto destroy;
+ 	}
+ 
++#if defined(HAVE_SETUID) && defined(HAVE_SETGID)
++	if ( username != NULL || groupname != NULL ) {
++		slap_init_user( username, groupname );
++	}
++#endif
++
+ 	if ( debug_unknowns ) {
+ 		rc = parse_debug_unknowns( debug_unknowns, &slap_debug );
+ 		ldap_charray_free( debug_unknowns );

Modified: openldap/trunk-2.3/debian/patches/series
===================================================================
--- openldap/trunk-2.3/debian/patches/series	2006-06-08 19:55:12 UTC (rev 673)
+++ openldap/trunk-2.3/debian/patches/series	2006-06-08 19:57:51 UTC (rev 674)
@@ -10,3 +10,4 @@
 ldapi-socket-place -p0
 back-bdb-fix-lock-virtual-root-entry -p0
 fix-boolean-logic -p0
+read-config-before-dropping-privileges -p0