chdir before chroot

diff --git a/CHANGES b/CHANGES
index e2359e88626e19483c5f11c583789a835734cab5..aee75807db032411bda6ded31dcad40efd0f08a7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ OpenLDAP 2.0.X Engineering
        Updated -lldap SASL error reporting
        Updated -lldap TLS error reporting
        Updated slapadd error reporting
+       Updated slapd chroot handling (ITS#810)
        Added slapd numericString indexing
        Build Environment
                Fixed make comment bug (ITS#811)

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index d0bbbe7e1d6e983ae3029bb5c6fffca0f3207b02..4b38c3f9b98f5934b3bb141a7d43f398ccff8559 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -301,10 +301,17 @@ int main( int argc, char **argv )
        }
 
 #if defined(HAVE_CHROOT)
-       if ( sandbox && chroot( sandbox ) ) {
-               perror("chroot");
-               rc = 1;
-               goto stop;
+       if ( sandbox ) {
+               if ( chdir( sandbox ) ) {
+                       perror("chdir");
+                       rc = 1;
+                       goto stop;
+               }
+               if ( chroot( sandbox ) ) {
+                       perror("chroot");
+                       rc = 1;
+                       goto stop;
+               }
        }
 #endif