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

diff --git a/servers/slapd/user.c b/servers/slapd/user.c
index 372b3ffc24..29aa25b429 100644
--- a/servers/slapd/user.c
+++ b/servers/slapd/user.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * Portions Copyright 1999 PM Lashley.
  * All rights reserved.
  *
@@ -63,13 +63,8 @@ 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 );
 	    }
@@ -102,13 +97,8 @@ 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 );
 	    }
@@ -119,14 +109,8 @@ 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 );
 	}
@@ -139,27 +123,15 @@ 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 );
 	}
@@ -168,27 +140,15 @@ 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 );
 	}