more fixes related to ITS#3499

[openldap] / servers / slapd / user.c

diff --git a/servers/slapd/user.c b/servers/slapd/user.c
index d79325bfdd75882ef03fe3ce84399f2a6e3d4e00..d38401f3fd3f34d8304048fc4de84e1107b12012 100644 (file)
--- a/servers/slapd/user.c
+++ b/servers/slapd/user.c
@@ -1,13 +1,19 @@
-/* user.c - set user id, group id and group access list
+/* user.c - set user id, group id and group access list */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999 by PM Lashley and The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Portions Copyright 1999 PM Lashley.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License.  A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
-*/
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
 
 #include "portable.h"
 
@@ -29,7 +35,6 @@
 
 #include "slap.h"
 
-
 /*
  * Set real and effective user id and group id, and group access list
  * The user and group arguments are freed.
@@ -38,9 +43,9 @@
 void
 slap_init_user( char *user, char *group )
 {
-    uid_t      uid;
-    gid_t      gid;
-    int        got_uid = 0, got_gid = 0;
+    uid_t      uid = 0;
+    gid_t      gid = 0;
+    int                got_uid = 0, got_gid = 0;
 
     if ( user ) {
        struct passwd *pwd;
@@ -58,9 +63,15 @@ slap_init_user( char *user, char *group )
            pwd = getpwnam( user );
        did_getpw:
            if ( pwd == NULL ) {
+#ifdef NEW_LOGGING
+                   LDAP_LOG( OPERATION, INFO, 
+                               "slap_init_user: No passwd entry for user %s\n", user, 0, 0 );
+#else
                Debug( LDAP_DEBUG_ANY, "No passwd entry for user %s\n",
                       user, 0, 0 );
-               exit( 1 );
+#endif
+
+               exit( EXIT_FAILURE );
            }
            if ( got_uid ) {
                free( user );
@@ -91,9 +102,15 @@ slap_init_user( char *user, char *group )
                gid = grp->gr_gid;
        did_group:
            if ( grp == NULL ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG( OPERATION, INFO, 
+                       "slap_init_user: No group entry for group %s\n", group, 0, 0 );
+#else
                Debug( LDAP_DEBUG_ANY, "No group entry for group %s\n",
                       group, 0, 0 );
-               exit( 1 );
+#endif
+
+               exit( EXIT_FAILURE );
            }
        }
        free( group );
@@ -102,9 +119,16 @@ slap_init_user( char *user, char *group )
 
     if ( user ) {
        if ( getuid() == 0 && initgroups( user, gid ) != 0 ) {
+#ifdef NEW_LOGGING
+           LDAP_LOG( OPERATION, INFO,
+                       "slap_init_user: Could not set the group access (gid) list.\n", 
+                       0, 0, 0 );
+#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 );
     }
@@ -115,30 +139,58 @@ slap_init_user( char *user, char *group )
 
     if ( got_gid ) {
        if ( setgid( gid ) != 0 ) {
+#ifdef NEW_LOGGING
+           LDAP_LOG( OPERATION, INFO, 
+                       "slap_init_user: could not set real group id to %d\n", 
+                       (int)gid, 0, 0);
+#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, INFO, 
+                  "slap_init_user: Could not set effective group id to %d\n",
+                  (int)gid, 0, 0);
+#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 ( got_uid ) {
        if ( setuid( uid ) != 0 ) {
+#ifdef NEW_LOGGING
+           LDAP_LOG( OPERATION, INFO, 
+                       "slap_init_user: Could not set real user id to %d\n", 
+                       (int)uid, 0, 0 );
+#else
            Debug( LDAP_DEBUG_ANY, "Could not set real user id to %d\n",
-                  uid, 0, 0 );
-           exit( 1 );
+                      (int) uid, 0, 0 );
+#endif
+
+           exit( EXIT_FAILURE );
        }
 #ifdef HAVE_SETEUID
        if ( seteuid( uid ) != 0 ) {
+#ifdef NEW_LOGGING
+           LDAP_LOG( OPERATION, INFO, 
+                       "slap_init_user: Could not set effective user id to %d\n", 
+                       (int)uid, 0, 0 );
+#else
            Debug( LDAP_DEBUG_ANY, "Could not set effective user id to %d\n",
-                  uid, 0, 0 );
-           exit( 1 );
+                      (int) uid, 0, 0 );
+#endif
+
+           exit( EXIT_FAILURE );
        }
 #endif
     }