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

diff --git a/servers/slapd/user.c b/servers/slapd/user.c
index 2613fbcfa4..d7166b5972 100644
--- a/servers/slapd/user.c
+++ b/servers/slapd/user.c
@@ -1,17 +1,19 @@
-/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- */
-/* user.c - set user id, group id and group access list
+/* user.c - set user id, group id and group access list */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999 by PM Lashley.
+ * Copyright 1998-2007 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"
 
@@ -32,7 +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
@@ -42,15 +44,23 @@
 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;
-	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;
@@ -64,6 +74,7 @@ slap_init_user( char *user, char *group )
 	    if ( pwd == NULL ) {
 		Debug( LDAP_DEBUG_ANY, "No passwd entry for user %s\n",
 		       user, 0, 0 );
+
 		exit( EXIT_FAILURE );
 	    }
 	    if ( got_uid ) {
@@ -84,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;
@@ -97,6 +116,7 @@ slap_init_user( char *user, char *group )
 	    if ( grp == NULL ) {
 		Debug( LDAP_DEBUG_ANY, "No group entry for group %s\n",
 		       group, 0, 0 );
+
 		exit( EXIT_FAILURE );
 	    }
 	}
@@ -108,6 +128,7 @@ slap_init_user( char *user, char *group )
 	if ( getuid() == 0 && initgroups( user, gid ) != 0 ) {
 	    Debug( LDAP_DEBUG_ANY,
 		   "Could not set the group access (gid) list\n", 0, 0, 0 );
+
 	    exit( EXIT_FAILURE );
 	}
 	free( user );
@@ -120,13 +141,15 @@ slap_init_user( char *user, char *group )
     if ( got_gid ) {
 	if ( setgid( gid ) != 0 ) {
 	    Debug( LDAP_DEBUG_ANY, "Could not set real group id to %d\n",
-		   gid, 0, 0 );
+		       (int) gid, 0, 0 );
+
 	    exit( EXIT_FAILURE );
 	}
 #ifdef HAVE_SETEGID
 	if ( setegid( gid ) != 0 ) {
 	    Debug( LDAP_DEBUG_ANY, "Could not set effective group id to %d\n",
-		   gid, 0, 0 );
+		       (int) gid, 0, 0 );
+
 	    exit( EXIT_FAILURE );
 	}
 #endif
@@ -135,13 +158,15 @@ slap_init_user( char *user, char *group )
     if ( got_uid ) {
 	if ( setuid( uid ) != 0 ) {
 	    Debug( LDAP_DEBUG_ANY, "Could not set real user id to %d\n",
-		   uid, 0, 0 );
+		       (int) uid, 0, 0 );
+
 	    exit( EXIT_FAILURE );
 	}
 #ifdef HAVE_SETEUID
 	if ( seteuid( uid ) != 0 ) {
 	    Debug( LDAP_DEBUG_ANY, "Could not set effective user id to %d\n",
-		   uid, 0, 0 );
+		       (int) uid, 0, 0 );
+
 	    exit( EXIT_FAILURE );
 	}
 #endif