X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fuser.c;h=c47e156f6c5e3582ada6abae7509f2c13f157bae;hb=5b526d2544c512f0a7233439efa53dcc5dc02672;hp=23cd431a6db9294d6b7306d5f8ab0a18601e03aa;hpb=f49fd8a98e6849f74e50a01165f4214b065b9b00;p=openldap
diff --git a/servers/slapd/user.c b/servers/slapd/user.c
index 23cd431a6d..c47e156f6c 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 .
*
- * Copyright 1999 by PM Lashley.
+ * Copyright 1998-2008 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
+ * .
+ */
#include "portable.h"
@@ -33,7 +34,7 @@
#include
#include "slap.h"
-
+#include "lutil.h"
/*
* Set real and effective user id and group id, and group access list
@@ -43,15 +44,23 @@
void
slap_init_user( char *user, char *group )
{
- uid_t uid;
- gid_t gid;
+ 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;
@@ -63,14 +72,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 );
}
@@ -92,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;
@@ -103,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", 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 +126,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 +140,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 +157,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 );
}