summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2017-02-16 02:13:29 +0200
committerRichard Lowe <richlowe@richlowe.net>2017-06-19 13:08:40 -0400
commiteb28af623974cfc31cb4545d2965bbaca3fb6888 (patch)
tree223ce4ab06a0c00c170abfd141b7f55db5f38e19
parent0d56f5df8a4bc5dd756cf0ea58ab3e0519c76032 (diff)
downloadillumos-joyent-eb28af623974cfc31cb4545d2965bbaca3fb6888.tar.gz
8329 ldapcachemgr: misleading-indentation
8364 ldapcachemgr does not set log file in debug mode if -l was not used Reviewed by: Jason King <jason.brian.king@gmail.com> Reviewed by: Robert Mustacchi <rm@joyent.com> Reviewed by: Yuri Pankov <yuripv@gmx.com> Approved by: Richard Lowe <richlowe@richlowe.net>
-rw-r--r--usr/src/cmd/ldapcachemgr/cachemgr.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/usr/src/cmd/ldapcachemgr/cachemgr.c b/usr/src/cmd/ldapcachemgr/cachemgr.c
index 3abb73734a..8ba7e1800e 100644
--- a/usr/src/cmd/ldapcachemgr/cachemgr.c
+++ b/usr/src/cmd/ldapcachemgr/cachemgr.c
@@ -448,9 +448,7 @@ main(int argc, char ** argv)
* no specified log file
*/
(void) strcpy(current_admin.logfile, LOGFILE);
- else
- (void) cachemgr_set_lf(&current_admin,
- current_admin.logfile);
+ (void) cachemgr_set_lf(&current_admin, current_admin.logfile);
/*
* validate the range of debug level number
* and set the number to current_admin.debug_level
@@ -470,8 +468,7 @@ main(int argc, char ** argv)
} else {
if (strlen(current_admin.logfile) == 0)
(void) strcpy(current_admin.logfile, "/dev/null");
- (void) cachemgr_set_lf(&current_admin,
- current_admin.logfile);
+ (void) cachemgr_set_lf(&current_admin, current_admin.logfile);
}
if (dofg == 0)
@@ -1405,12 +1402,11 @@ is_root(int free_uc, char *dc_str, ucred_t **ucp)
int
is_called_from_nscd(pid_t pid)
-
{
static mutex_t _door_lock = DEFAULTMUTEX;
static int doorfd = -1;
int match;
- door_info_t my_door;
+ door_info_t my_door;
/*
* the first time in we try and open and validate the door.