* 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.

diff --git a/ChangeLog b/ChangeLog
index 0ccf815359d5907405a2bba0b4ce02fc5731220b..b2901b45f70b05e4b1a35edb1f9da522c1769210 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * src/chgpasswd.c: Fix typo.

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

diff --git a/src/pwunconv.c b/src/pwunconv.c
index 3d27e964c582f0930b3556941f21725ef2f1866c..0e4d9f92323e08c44705d170377a912d4020d9db 100644 (file)
--- a/src/pwunconv.c
+++ b/src/pwunconv.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1989 - 1994, Julianne Frances Haugh
  * Copyright (c) 1996 - 2000, Marek Michałkiewicz
  * Copyright (c) 2001 - 2005, Tomasz Kłoczko
- * Copyright (c) 2008       , Nicolas François
+ * Copyright (c) 2008 - 2011, Nicolas François
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -84,6 +84,7 @@ int main (int argc, char **argv)
 
        if (1 != argc) {
                (void) fputs (_("Usage: pwunconv\n"), stderr);
+               exit (1);
        }
        Prog = Basename (argv[0]);
 
@@ -95,8 +96,8 @@ int main (int argc, char **argv)
 
 #ifdef WITH_TCB
        if (getdef_bool("USE_TCB")) {
-               fprintf(stderr, _("%s: can't work with tcb enabled\n"), Prog);
-               exit(1);
+               fprintf (stderr, _("%s: can't work with tcb enabled\n"), Prog);
+               exit (1);
        }
 #endif                         /* WITH_TCB */
 
@@ -126,7 +127,7 @@ int main (int argc, char **argv)
                fail_exit (5);
        }
        spw_locked = true;
-       if (spw_open (O_RDWR) == 0) {
+       if (spw_open (O_RDONLY) == 0) {
                fprintf (stderr,
                         _("%s: cannot open %s\n"),
                         Prog, spw_dbname ());