X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fuser.c;h=23cd431a6db9294d6b7306d5f8ab0a18601e03aa;hb=0f30fb0d8f0adbbb7b41fd455c57aa56d64c9853;hp=d79325bfdd75882ef03fe3ce84399f2a6e3d4e00;hpb=30b3958f94704bfafe89e36f57f21721d6440a2d;p=openldap

diff --git a/servers/slapd/user.c b/servers/slapd/user.c
index d79325bfdd..23cd431a6d 100644
--- 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
@@ -40,7 +45,7 @@ slap_init_user( char *user, char *group )
 {
     uid_t	uid;
     gid_t	gid;
-    int  	got_uid = 0, got_gid = 0;
+    int		got_uid = 0, got_gid = 0;
 
     if ( user ) {
 	struct passwd *pwd;
@@ -58,9 +63,16 @@ slap_init_user( char *user, char *group )
 	    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 ( got_uid ) {
 		free( user );
@@ -91,9 +103,15 @@ 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 );
@@ -102,9 +120,15 @@ slap_init_user( char *user, char *group )
 
     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 );
     }
@@ -115,30 +139,54 @@ slap_init_user( char *user, char *group )
 
     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 ( got_uid ) {
 	if ( setuid( uid ) != 0 ) {
+#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",
-		   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", 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",
-		   uid, 0, 0 );
-	    exit( 1 );
+		       (int) uid, 0, 0 );
+#endif
+
+	    exit( EXIT_FAILURE );
 	}
 #endif
     }