fix substring_comp_candidates logic if intersection of candidates

[openldap] / servers / slapd / user.c

diff --git a/servers/slapd/user.c b/servers/slapd/user.c
index e7d7252e01394f2af3dcc443f229b037bcb4e12e..8f31b06cc5185c0768439a82aa571f15824115fe 100644 (file)
--- a/servers/slapd/user.c
+++ b/servers/slapd/user.c
@@ -11,12 +11,18 @@
 
 #include "portable.h"
 
-#if defined(HAVE_PWD_H) && defined(HAVE_GRP_H)
+#if defined(HAVE_SETUID) && defined(HAVE_SETGID)
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
+
+#ifdef HAVE_PWD_H
 #include <pwd.h>
+#endif
+#ifdef HAVE_GRP_H
 #include <grp.h>
+#endif
 
 #include <ac/ctype.h>
 #include <ac/unistd.h>
@@ -31,8 +37,8 @@
 void
 slap_init_user( char *user, char *group )
 {
-    uid_t      uid = (gid_t) -1;
-    gid_t      gid = (gid_t) -1;
+    uid_t      uid = (uid_t) 0;
+    gid_t      gid = (gid_t) 0;
 
     if ( user ) {
        struct passwd *pwd;
@@ -50,7 +56,7 @@ slap_init_user( char *user, char *group )
                       user, 0, 0 );
                exit( 1 );
            }
-           if ( uid >= 0 ) {
+           if ( uid > 0 ) {
                free( user );
                user = (pwd != NULL ? ch_strdup( pwd->pw_name ) : NULL);
            } else {
@@ -98,30 +104,34 @@ slap_init_user( char *user, char *group )
     endgrent();
 #endif
 
-    if ( gid >= 0 ) {
+    if ( gid > 0 ) {
        if ( setgid( gid ) != 0 ) {
            Debug( LDAP_DEBUG_ANY, "Could not set real group id to %d\n",
                   gid, 0, 0 );
            exit( 1 );
        }
+#ifdef HAVE_SETEGID
        if ( setegid( gid ) != 0 ) {
            Debug( LDAP_DEBUG_ANY, "Could not set effective group id to %d\n",
                   gid, 0, 0 );
            exit( 1 );
        }
+#endif
     }
 
-    if ( uid >= 0 ) {
+    if ( uid > 0 ) {
        if ( setuid( uid ) != 0 ) {
-           Debug( LDAP_DEBUG_ANY, "Could not set effective user id to %d\n",
+           Debug( LDAP_DEBUG_ANY, "Could not set real user id to %d\n",
                   uid, 0, 0 );
            exit( 1 );
        }
+#ifdef HAVE_SETEUID
        if ( seteuid( uid ) != 0 ) {
-           Debug( LDAP_DEBUG_ANY, "Could not set real user id to %d\n",
+           Debug( LDAP_DEBUG_ANY, "Could not set effective user id to %d\n",
                   uid, 0, 0 );
            exit( 1 );
        }
+#endif
     }
 }