X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fuser.c;h=8df425bc38573407022c1944ceaa3c8e8177a344;hb=4d36fd5a3ed407b0a53004d1431f1669222138b4;hp=e12c6032a300d8a12a86f90e4d04e2dc6c2b32f8;hpb=0e2af54a3ffdeebe3901370683be56fcc53023b0;p=openldap

diff --git a/servers/slapd/user.c b/servers/slapd/user.c
index e12c6032a3..8df425bc38 100644
--- a/servers/slapd/user.c
+++ b/servers/slapd/user.c
@@ -34,7 +34,6 @@
 
 #include "slap.h"
 
-
 /*
  * Set real and effective user id and group id, and group access list
  * The user and group arguments are freed.
@@ -64,9 +63,8 @@ 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, 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 );
@@ -104,8 +102,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, 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 );
@@ -121,8 +119,9 @@ 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, 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 );
@@ -140,8 +139,9 @@ 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, 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 );
@@ -152,8 +152,9 @@ 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, 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 );
@@ -167,8 +168,9 @@ 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, 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 );
@@ -179,8 +181,9 @@ 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, 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 );