From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Thu, 28 Jul 2011 14:40:56 +0000 (+0000)
Subject: 	* src/pwunconv.c: Exit after printing usage when arguments or
X-Git-Tag: 4.1.5~141
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=771a3624f53075467df706bb016bf9c383292292;p=thirdparty%2Fshadow.git

	* 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 0ccf81535..b2901b45f 100644
--- 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 d55f1831a..5a1e6e5f3 100644
--- 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 3d27e964c..0e4d9f923 100644
--- 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 ());