X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fuser.c;h=e12c6032a300d8a12a86f90e4d04e2dc6c2b32f8;hb=f8fb4aca7668c722f41941be719203aa8c298e12;hp=97ee7ed3f0b2bc7a8fffe4fb480faa5ce5ac52ff;hpb=ffcdc6d11d7e86260be64e47229ca75bc7b7ac20;p=openldap

diff --git a/servers/slapd/user.c b/servers/slapd/user.c
index 97ee7ed3f0..e12c6032a3 100644
--- a/servers/slapd/user.c
+++ b/servers/slapd/user.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* user.c - set user id, group id and group access list
@@ -43,9 +43,9 @@
 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;
@@ -64,9 +64,9 @@ slap_init_user( char *user, char *group )
 	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 ));
+		    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 );
@@ -104,8 +104,8 @@ slap_init_user( char *user, char *group )
 	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));
+		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 );
@@ -121,8 +121,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" ));
+	    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 );
@@ -140,8 +140,8 @@ 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));
+	    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 );
@@ -152,8 +152,8 @@ slap_init_user( char *user, char *group )
 #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));
+	    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 );
@@ -167,8 +167,8 @@ 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 ));
+	    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 );
@@ -179,8 +179,8 @@ slap_init_user( char *user, char *group )
 #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 ));
+	    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 );