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

* NEWS, src/chpasswd.c, man/chpasswd.8.xml, src/chgpasswd.c,

Browse Source 
man/chgpasswd.8.xml: Add --root option.
	* src/chpasswd.c, src/chgpasswd.c: The getopt index of long
	options is not used.
This commit is contained in:
nekral-guest
2011-11-06 18:38:10 +00:00
parent bf90350fe7
commit 799f30b08d
6 changed files with 53 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/chgpasswd.c
View File

@@ -135,6 +135,7 @@ static /*@noreturn@*/void usage (int status)
(void) fputs (_(" -m, --md5 encrypt the clear text password using\n"
" the MD5 algorithm\n"),
usageout);
(void) fputs (_(" -R, --root CHROOT_DIR directory to chroot into\n"), usageout);
#ifdef USE_SHA_CRYPT
(void) fputs (_(" -s, --sha-rounds number of SHA rounds for the SHA*\n"
" crypt algorithms\n"),
@@ -152,13 +153,13 @@ static /*@noreturn@*/void usage (int status)
*/
static void process_flags (int argc, char **argv)
{
int option_index = 0;
int c;
static struct option long_options[] = {
{"crypt-method", required_argument, NULL, 'c'},
{"encrypted", no_argument, NULL, 'e'},
{"help", no_argument, NULL, 'h'},
{"md5", no_argument, NULL, 'm'},
{"root", required_argument, NULL, 'R'},
#ifdef USE_SHA_CRYPT
{"sha-rounds", required_argument, NULL, 's'},
#endif
@@ -167,11 +168,11 @@ static void process_flags (int argc, char **argv)
while ((c = getopt_long (argc, argv,
#ifdef USE_SHA_CRYPT
"c:ehms:",
"c:ehmR:s:",
#else
"c:ehm",
"c:ehmR:",
#endif
long_options, &option_index)) != -1) {
long_options, NULL)) != -1) {
switch (c) {
case 'c':
crypt_method = optarg;
@@ -185,6 +186,8 @@ static void process_flags (int argc, char **argv)
case 'm':
md5flg = true;
break;
case 'R': /* no-op, handled in process_root_flag () */
break;
#ifdef USE_SHA_CRYPT
case 's':
sflg = true;
@@ -396,6 +399,8 @@ int main (int argc, char **argv)
(void) bindtextdomain (PACKAGE, LOCALEDIR);
(void) textdomain (PACKAGE);
process_root_flag ("-R", argc, argv);
process_flags (argc, argv);
OPENLOG ("chgpasswd");

13
src/chpasswd.c
View File

@@ -128,6 +128,7 @@ static /*@noreturn@*/void usage (int status)
(void) fputs (_(" -m, --md5 encrypt the clear text password using\n"
" the MD5 algorithm\n"),
usageout);
(void) fputs (_(" -R, --root CHROOT_DIR directory to chroot into\n"), usageout);
#ifdef USE_SHA_CRYPT
(void) fputs (_(" -s, --sha-rounds number of SHA rounds for the SHA*\n"
" crypt algorithms\n"),
@@ -145,12 +146,12 @@ static /*@noreturn@*/void usage (int status)
*/
static void process_flags (int argc, char **argv)
{
int option_index = 0;
int c;
static struct option long_options[] = {
{"crypt-method", required_argument, NULL, 'c'},
{"encrypted", no_argument, NULL, 'e'},
{"md5", no_argument, NULL, 'm'},
{"root", required_argument, NULL, 'R'},
#ifdef USE_SHA_CRYPT
{"sha-rounds", required_argument, NULL, 's'},
#endif /* USE_SHA_CRYPT */
@@ -160,11 +161,11 @@ static void process_flags (int argc, char **argv)
while ((c = getopt_long (argc, argv,
#ifdef USE_SHA_CRYPT
"c:ehms:",
"c:ehmR:s:",
#else /* !USE_SHA_CRYPT */
"c:ehm",
"c:ehmR:",
#endif /* !USE_SHA_CRYPT */
long_options, &option_index)) != -1) {
long_options, NULL)) != -1) {
switch (c) {
case 'h':
usage (E_SUCCESS);
@@ -178,6 +179,8 @@ static void process_flags (int argc, char **argv)
case 'm':
md5flg = true;
break;
case 'R': /* no-op, handled in process_root_flag () */
break;
#ifdef USE_SHA_CRYPT
case 's':
sflg = true;
@@ -387,6 +390,8 @@ int main (int argc, char **argv)
(void) bindtextdomain (PACKAGE, LOCALEDIR);
(void) textdomain (PACKAGE);
process_root_flag ("-R", argc, argv);
process_flags (argc, argv);
#ifdef USE_PAM