X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fuser.c;h=372b3ffc24ad7c239895c3be0ec3a69e4062a501;hb=49b0985c88ea6836a24c314aea2cb2dd0d129544;hp=3a3ecdff177fc8f8935e5c04662328eac7360332;hpb=4bc786f34b50aa301be6f5600f58a980070f481e;p=openldap

diff --git a/servers/slapd/user.c b/servers/slapd/user.c
index 3a3ecdff17..372b3ffc24 100644
--- a/servers/slapd/user.c
+++ b/servers/slapd/user.c
@@ -1,18 +1,19 @@
+/* user.c - set user id, group id and group access list */
 /* $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
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999 by PM Lashley.
+ * Copyright 1998-2003 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"
 
@@ -34,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.
@@ -43,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;
@@ -63,8 +63,14 @@ 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 );
+#endif
+
 		exit( EXIT_FAILURE );
 	    }
 	    if ( got_uid ) {
@@ -96,8 +102,14 @@ 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 );
+#endif
+
 		exit( EXIT_FAILURE );
 	    }
 	}
@@ -107,8 +119,15 @@ 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 );
+#endif
+
 	    exit( EXIT_FAILURE );
 	}
 	free( user );
@@ -120,14 +139,28 @@ 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",
 		       (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",
 		       (int) gid, 0, 0 );
+#endif
+
 	    exit( EXIT_FAILURE );
 	}
 #endif
@@ -135,14 +168,28 @@ slap_init_user( char *user, char *group )
 
     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",
 		       (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",
 		       (int) uid, 0, 0 );
+#endif
+
 	    exit( EXIT_FAILURE );
 	}
 #endif