X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fuser.c;h=8df425bc38573407022c1944ceaa3c8e8177a344;hb=fe569dbb7517dbb8bf1905c4f87732197114c4cf;hp=acac1ad1637762946fe5282ad50b877a5b8de89d;hpb=df8f7cbb9b79be3be9205d116d1dd0b263d6861a;p=openldap

diff --git a/servers/slapd/user.c b/servers/slapd/user.c
index acac1ad163..8df425bc38 100644
--- a/servers/slapd/user.c
+++ b/servers/slapd/user.c
@@ -1,6 +1,11 @@
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2002 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
@@ -29,7 +34,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 +42,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,8 +62,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 ) {
@@ -91,8 +101,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 );
 	    }
 	}
@@ -102,8 +118,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 );
@@ -115,14 +138,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",
-		   gid, 0, 0 );
+		       (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 );
+		       (int) gid, 0, 0 );
+#endif
+
 	    exit( EXIT_FAILURE );
 	}
 #endif
@@ -130,14 +167,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",
-		   uid, 0, 0 );
+		       (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 );
+		       (int) uid, 0, 0 );
+#endif
+
 	    exit( EXIT_FAILURE );
 	}
 #endif