emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

* NEWS, src/groupadd.c, man/groupadd.8.xml: Add --root option. Open

Browse Source 
audit and syslog after the potential chroot.
	* src/groupmod.c: The index of long options is not used.
This commit is contained in:
nekral-guest
2011-11-06 18:37:51 +00:00
parent 057cbaa4ae
commit 9195f6085d
5 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/groupadd.c
View File

@@ -2,7 +2,7 @@
* Copyright (c) 1991 - 1993, Julianne Frances Haugh
* Copyright (c) 1996 - 2000, Marek Michałkiewicz
* Copyright (c) 2000 - 2006, Tomasz Kłoczko
* Copyright (c) 2007 - 2009, Nicolas François
* Copyright (c) 2007 - 2011, Nicolas François
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -88,7 +88,7 @@ static bool is_shadow_grp;
#endif
/* local function prototypes */
static void usage (int status);
static /*@noreturn@*/void usage (int status);
static void new_grent (struct group *grent);
#ifdef SHADOWGRP
@@ -105,7 +105,7 @@ static void check_perms (void);
/*
* usage - display usage message and exit
*/
static void usage (int status)
static /*@noreturn@*/void usage (int status)
{
FILE *usageout = (E_SUCCESS != status) ? stderr : stdout;
(void) fprintf (usageout,
@@ -414,7 +414,7 @@ static void process_flags (int argc, char **argv)
break;
case 'h':
usage (E_SUCCESS);
break;
/*@notreached@*/break;
case 'K':
/*
* override login.defs defaults (-K name=value)

23
src/groupmod.c
View File

@@ -127,6 +127,7 @@ static void usage (int status)
(void) fputs (_(" -o, --non-unique allow to use a duplicate (non-unique) GID\n"), usageout);
(void) fputs (_(" -p, --password PASSWORD change the password to this (encrypted)\n"
" PASSWORD\n"), usageout);
(void) fputs (_(" -R, --root CHROOT_DIR directory to chroot into\n"), usageout);
(void) fputs ("\n", usageout);
exit (status);
}
@@ -367,7 +368,6 @@ static void check_new_name (void)
*/
static void process_flags (int argc, char **argv)
{
int option_index = 0;
int c;
static struct option long_options[] = {
{"gid", required_argument, NULL, 'g'},
@@ -375,11 +375,11 @@ static void process_flags (int argc, char **argv)
{"new-name", required_argument, NULL, 'n'},
{"non-unique", no_argument, NULL, 'o'},
{"password", required_argument, NULL, 'p'},
{"root", required_argument, NULL, 'R'},
{NULL, 0, NULL, '\0'}
};
while ((c =
getopt_long (argc, argv, "g:hn:op:",
long_options, &option_index)) != -1) {
while ((c = getopt_long (argc, argv, "g:hn:op:R:",
long_options, NULL)) != -1) {
switch (c) {
case 'g':
gflg = true;
@@ -405,6 +405,8 @@ static void process_flags (int argc, char **argv)
group_passwd = optarg;
pflg = true;
break;
case 'R': /* no-op, handled in process_root_flag () */
break;
default:
usage (E_USAGE);
}
@@ -734,10 +736,6 @@ int main (int argc, char **argv)
#endif /* USE_PAM */
#endif /* ACCT_TOOLS_SETUID */
#ifdef WITH_AUDIT
audit_help_open ();
#endif
/*
* Get my name so that I can use it to report errors.
*/
@@ -747,6 +745,13 @@ int main (int argc, char **argv)
(void) bindtextdomain (PACKAGE, LOCALEDIR);
(void) textdomain (PACKAGE);
process_root_flag ("-R", argc, argv);
OPENLOG ("groupmod");
#ifdef WITH_AUDIT
audit_help_open ();
#endif
if (atexit (do_cleanups) != 0) {
fprintf (stderr,
_("%s: Cannot setup cleanup service.\n"),
@@ -756,8 +761,6 @@ int main (int argc, char **argv)
process_flags (argc, argv);
OPENLOG ("groupmod");
#ifdef ACCT_TOOLS_SETUID
#ifdef USE_PAM
{