minor cleanup

[openldap] / servers / slapd / user.c

diff --git a/servers/slapd/user.c b/servers/slapd/user.c
index 5412780c754a120badabd229f4a88cab251d302c..23cd431a6db9294d6b7306d5f8ab0a18601e03aa 100644 (file)
--- a/servers/slapd/user.c
+++ b/servers/slapd/user.c
@@ -1,6 +1,11 @@
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /* user.c - set user id, group id and group access list
  *
- * Copyright 1999 by PM Lashley and The OpenLDAP Foundation.
+ * Copyright 1999 by PM Lashley.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted only
@@ -32,36 +37,51 @@
 
 /*
  * Set real and effective user id and group id, and group access list
+ * The user and group arguments are freed.
  */
 
 void
 slap_init_user( char *user, char *group )
 {
-    uid_t      uid = (uid_t) 0;
-    gid_t      gid = (gid_t) 0;
+    uid_t      uid;
+    gid_t      gid;
+    int                got_uid = 0, got_gid = 0;
 
     if ( user ) {
        struct passwd *pwd;
        if ( isdigit( (unsigned char) *user )) {
+           got_uid = 1;
            uid = atoi( user );
 #ifdef HAVE_GETPWUID
            pwd = getpwuid( uid );
            goto did_getpw;
+#else
+           free( user );
+           user = NULL;
 #endif
        } else {
            pwd = getpwnam( user );
        did_getpw:
            if ( pwd == NULL ) {
+#ifdef NEW_LOGGING
+                   LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                              "slap_init_user: No passwd entry for user %s\n",
+                              user ));
+#else
                Debug( LDAP_DEBUG_ANY, "No passwd entry for user %s\n",
                       user, 0, 0 );
-               exit( 1 );
+#endif
+
+               exit( EXIT_FAILURE );
            }
-           if ( uid > 0 ) {
+           if ( got_uid ) {
                free( user );
                user = (pwd != NULL ? ch_strdup( pwd->pw_name ) : NULL);
            } else {
+               got_uid = 1;
                uid = pwd->pw_uid;
            }
+           got_gid = 1;
            gid = pwd->pw_gid;
 #ifdef HAVE_ENDPWENT
            endpwent();
@@ -83,19 +103,32 @@ slap_init_user( char *user, char *group )
                gid = grp->gr_gid;
        did_group:
            if ( grp == NULL ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                          "slap_init_user: No group entry for group %s\n", group));
+#else
                Debug( LDAP_DEBUG_ANY, "No group entry for group %s\n",
                       group, 0, 0 );
-               exit( 1 );
+#endif
+
+               exit( EXIT_FAILURE );
            }
        }
        free( group );
+       got_gid = 1;
     }
 
     if ( user ) {
        if ( getuid() == 0 && initgroups( user, gid ) != 0 ) {
+#ifdef NEW_LOGGING
+           LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                      "slap_init_user: Could not set the group access (gid) list.\n" ));
+#else
            Debug( LDAP_DEBUG_ANY,
                   "Could not set the group access (gid) list\n", 0, 0, 0 );
-           exit( 1 );
+#endif
+
+           exit( EXIT_FAILURE );
        }
        free( user );
     }
@@ -104,32 +137,56 @@ slap_init_user( char *user, char *group )
     endgrent();
 #endif
 
-    if ( gid > 0 ) {
+    if ( got_gid ) {
        if ( setgid( gid ) != 0 ) {
+#ifdef NEW_LOGGING
+           LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                      "slap_init_user: could not set real group id to %d\n", (int)gid));
+#else
            Debug( LDAP_DEBUG_ANY, "Could not set real group id to %d\n",
-                  gid, 0, 0 );
-           exit( 1 );
+                      (int) gid, 0, 0 );
+#endif
+
+           exit( EXIT_FAILURE );
        }
 #ifdef HAVE_SETEGID
        if ( setegid( gid ) != 0 ) {
+#ifdef NEW_LOGGING
+           LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                      "slap_init_user: Could not set effective group id to %d\n",(int)gid));
+#else
            Debug( LDAP_DEBUG_ANY, "Could not set effective group id to %d\n",
-                  gid, 0, 0 );
-           exit( 1 );
+                      (int) gid, 0, 0 );
+#endif
+
+           exit( EXIT_FAILURE );
        }
 #endif
     }
 
-    if ( uid > 0 ) {
+    if ( got_uid ) {
        if ( setuid( uid ) != 0 ) {
-           Debug( LDAP_DEBUG_ANY, "Could not set effective user id to %d\n",
-                  uid, 0, 0 );
-           exit( 1 );
+#ifdef NEW_LOGGING
+           LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                      "slap_init_user: Could not set real user id to %d\n", (int)uid ));
+#else
+           Debug( LDAP_DEBUG_ANY, "Could not set real user id to %d\n",
+                      (int) uid, 0, 0 );
+#endif
+
+           exit( EXIT_FAILURE );
        }
 #ifdef HAVE_SETEUID
        if ( seteuid( uid ) != 0 ) {
-           Debug( LDAP_DEBUG_ANY, "Could not set real user id to %d\n",
-                  uid, 0, 0 );
-           exit( 1 );
+#ifdef NEW_LOGGING
+           LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                      "slap_init_user: Could not set effective user id to %d\n", (int)uid ));
+#else
+           Debug( LDAP_DEBUG_ANY, "Could not set effective user id to %d\n",
+                      (int) uid, 0, 0 );
+#endif
+
+           exit( EXIT_FAILURE );
        }
 #endif
     }