X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fuser.c;h=372b3ffc24ad7c239895c3be0ec3a69e4062a501;hb=49b0985c88ea6836a24c314aea2cb2dd0d129544;hp=05b859b5eae7ddbe4918f09b5c570c4efa287633;hpb=aee36002767937f0dfe7382270979f0827fcf072;p=openldap
diff --git a/servers/slapd/user.c b/servers/slapd/user.c
index 05b859b5ea..372b3ffc24 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-2003 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"
@@ -34,7 +35,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 +64,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 +103,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 +120,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 +140,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 +153,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 +169,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 +182,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 );