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

diff --git a/servers/slapd/user.c b/servers/slapd/user.c
index 05b859b5ea..29aa25b429 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-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"
 
@@ -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.
@@ -63,14 +63,8 @@ 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 );
-#endif
 
 		exit( EXIT_FAILURE );
 	    }
@@ -103,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", 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 );
-#endif
 
 		exit( EXIT_FAILURE );
 	    }
@@ -120,13 +109,8 @@ 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 );
-#endif
 
 	    exit( EXIT_FAILURE );
 	}
@@ -139,25 +123,15 @@ 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",
 		       (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",
 		       (int) gid, 0, 0 );
-#endif
 
 	    exit( EXIT_FAILURE );
 	}
@@ -166,25 +140,15 @@ slap_init_user( char *user, char *group )
 
     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",
 		       (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",
 		       (int) uid, 0, 0 );
-#endif
 
 	    exit( EXIT_FAILURE );
 	}