* src/pwunconv.c: Exit after printing usage when arguments or

options are provided.
	* src/pwunconv.c: Re-indent.
	* src/pwunconv.c: Open the shadow file read only.
	* src/grpunconv.c: Exit after printing usage when arguments or
	options are provided.
	* src/grpunconv.c: Open the gshadow file read only.
This commit is contained in:
nekral-guest 2011-07-28 14:40:56 +00:00
parent 7fed07f1e9
commit 771a3624f5
3 changed files with 18 additions and 6 deletions

View File

@ -1,3 +1,13 @@
2011-07-28 Nicolas François <nicolas.francois@centraliens.net>
* src/pwunconv.c: Exit after printing usage when arguments or
options are provided.
* src/pwunconv.c: Re-indent.
* src/pwunconv.c: Open the shadow file read only.
* src/grpunconv.c: Exit after printing usage when arguments or
options are provided.
* src/grpunconv.c: Open the gshadow file read only.
2011-07-28 Nicolas François <nicolas.francois@centraliens.net> 2011-07-28 Nicolas François <nicolas.francois@centraliens.net>
* src/chgpasswd.c: Fix typo. * src/chgpasswd.c: Fix typo.

View File

@ -2,7 +2,7 @@
* Copyright (c) 1996 , Michael Meskes * Copyright (c) 1996 , Michael Meskes
* Copyright (c) 1996 - 2000, Marek Michałkiewicz * Copyright (c) 1996 - 2000, Marek Michałkiewicz
* Copyright (c) 2002 - 2006, Tomasz Kłoczko * Copyright (c) 2002 - 2006, Tomasz Kłoczko
* Copyright (c) 2008 , Nicolas François * Copyright (c) 2008 - 2011, Nicolas François
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -91,6 +91,7 @@ int main (int argc, char **argv)
if (1 != argc) { if (1 != argc) {
(void) fputs (_("Usage: grpunconv\n"), stderr); (void) fputs (_("Usage: grpunconv\n"), stderr);
exit (1);
} }
Prog = Basename (argv[0]); Prog = Basename (argv[0]);
@ -124,7 +125,7 @@ int main (int argc, char **argv)
fail_exit (5); fail_exit (5);
} }
sgr_locked = true; sgr_locked = true;
if (sgr_open (O_RDWR) == 0) { if (sgr_open (O_RDONLY) == 0) {
fprintf (stderr, fprintf (stderr,
_("%s: cannot open %s\n"), Prog, sgr_dbname ()); _("%s: cannot open %s\n"), Prog, sgr_dbname ());
fail_exit (1); fail_exit (1);

View File

@ -2,7 +2,7 @@
* Copyright (c) 1989 - 1994, Julianne Frances Haugh * Copyright (c) 1989 - 1994, Julianne Frances Haugh
* Copyright (c) 1996 - 2000, Marek Michałkiewicz * Copyright (c) 1996 - 2000, Marek Michałkiewicz
* Copyright (c) 2001 - 2005, Tomasz Kłoczko * Copyright (c) 2001 - 2005, Tomasz Kłoczko
* Copyright (c) 2008 , Nicolas François * Copyright (c) 2008 - 2011, Nicolas François
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -84,6 +84,7 @@ int main (int argc, char **argv)
if (1 != argc) { if (1 != argc) {
(void) fputs (_("Usage: pwunconv\n"), stderr); (void) fputs (_("Usage: pwunconv\n"), stderr);
exit (1);
} }
Prog = Basename (argv[0]); Prog = Basename (argv[0]);
@ -126,7 +127,7 @@ int main (int argc, char **argv)
fail_exit (5); fail_exit (5);
} }
spw_locked = true; spw_locked = true;
if (spw_open (O_RDWR) == 0) { if (spw_open (O_RDONLY) == 0) {
fprintf (stderr, fprintf (stderr,
_("%s: cannot open %s\n"), _("%s: cannot open %s\n"),
Prog, spw_dbname ()); Prog, spw_dbname ());