diff options
Diffstat (limited to 'src/groupmems.c')
-rw-r--r-- | src/groupmems.c | 44 |
1 files changed, 11 insertions, 33 deletions
diff --git a/src/groupmems.c b/src/groupmems.c index 654a8f3a..a0e3266b 100644 --- a/src/groupmems.c +++ b/src/groupmems.c @@ -1,33 +1,10 @@ /* - * Copyright (c) 2000 , International Business Machines - * George Kraft IV, gk4@us.ibm.com, 03/23/2000 - * Copyright (c) 2000 - 2006, Tomasz Kłoczko - * Copyright (c) 2007 - 2011, Nicolas François - * All rights reserved. + * SPDX-FileCopyrightText: 2000 , International Business Machines + * SPDX-FileCopyrightText: 2000 , George Kraft IV, gk4@us.ibm.com, 03/23/2000 + * SPDX-FileCopyrightText: 2000 - 2006, Tomasz Kłoczko + * SPDX-FileCopyrightText: 2007 - 2011, Nicolas François * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the copyright holders or contributors may not be used to - * endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * SPDX-License-Identifier: BSD-3-Clause */ #include <config.h> @@ -47,6 +24,7 @@ #ifdef SHADOWGRP #include "sgroupio.h" #endif +#include "shadowlog.h" /* Exit Status Values */ /*@-exitarg@*/ @@ -65,7 +43,6 @@ * Global variables */ const char *Prog; -FILE *shadow_logfd = NULL; static char *adduser = NULL; static char *deluser = NULL; @@ -85,7 +62,7 @@ static bool sgr_locked = false; static char *whoami (void); static void add_user (const char *user, const struct group *grp); -static void remove_user (const char *user, +static void remove_user (const char *user, const struct group *grp); static void purge_members (const struct group *grp); static void display_members (const char *const *members); @@ -197,7 +174,7 @@ static void add_user (const char *user, /* * remove_user - Remove an user from a given group */ -static void remove_user (const char *user, +static void remove_user (const char *user, const struct group *grp) { struct group *newgrp; @@ -587,7 +564,7 @@ static void close_files (void) #endif } -int main (int argc, char **argv) +int main (int argc, char **argv) { char *name; const struct group *grp; @@ -596,7 +573,8 @@ int main (int argc, char **argv) * Get my name so that I can use it to report errors. */ Prog = Basename (argv[0]); - shadow_logfd = stderr; + log_set_progname(Prog); + log_set_logfd(stderr); (void) setlocale (LC_ALL, ""); (void) bindtextdomain (PACKAGE, LOCALEDIR); |