X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fuser.c;h=d7166b5972ccb90b486e4d2bc4adf83a3fbd13b3;hb=fb2e448e877a8a387084dde517362c9f7bf1b6b7;hp=2a3cf268ef1878774e8b971b89cb9ba606e16f99;hpb=3c598e89fb34a892d369a138daa8c3314294493c;p=openldap

diff --git a/servers/slapd/user.c b/servers/slapd/user.c
index 2a3cf268ef..d7166b5972 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-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * Portions Copyright 1999 PM Lashley.
  * All rights reserved.
  *
@@ -34,6 +34,7 @@
 #include <ac/unistd.h>
 
 #include "slap.h"
+#include "lutil.h"
 
 /*
  * Set real and effective user id and group id, and group access list
@@ -49,9 +50,17 @@ slap_init_user( char *user, char *group )
 
     if ( user ) {
 	struct passwd *pwd;
-	if ( isdigit( (unsigned char) *user )) {
+	if ( isdigit( (unsigned char) *user ) ) {
+	    unsigned u;
+
 	    got_uid = 1;
-	    uid = atoi( user );
+	    if ( lutil_atou( &u, user ) != 0 ) {
+		Debug( LDAP_DEBUG_ANY, "Unble to parse user %s\n",
+		       user, 0, 0 );
+
+		exit( EXIT_FAILURE );
+	    }
+	    uid = (uid_t)u;
 #ifdef HAVE_GETPWUID
 	    pwd = getpwuid( uid );
 	    goto did_getpw;
@@ -63,13 +72,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 );
 	    }
@@ -91,7 +95,15 @@ slap_init_user( char *user, char *group )
     if ( group ) {
 	struct group *grp;
 	if ( isdigit( (unsigned char) *group )) {
-	    gid = atoi( group );
+	    unsigned g;
+
+	    if ( lutil_atou( &g, group ) != 0 ) {
+		Debug( LDAP_DEBUG_ANY, "Unble to parse group %s\n",
+		       group, 0, 0 );
+
+		exit( EXIT_FAILURE );
+	    }
+	    gid = (uid_t)g;
 #ifdef HAVE_GETGRGID
 	    grp = getgrgid( gid );
 	    goto did_group;
@@ -102,13 +114,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 +126,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 +140,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 +157,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 );
 	}