[Pkg-shadow-commits] r2505 - in upstream/trunk: . src

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2009-03-13 22:28:27 +0000 (Fri, 13 Mar 2009)
New Revision: 2505

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/chgpasswd.c
   upstream/trunk/src/chpasswd.c
Log:
	* src/chpasswd.c: Make sure the SHA related variables is not
	compiled when disabled at configuration time.
	* src/chgpasswd.c: Make sure the SHA related variables is not
	compiled when disabled at configuration time.
	* src/chgpasswd.c: Fix the test for getlong() failure.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2009-03-13 22:26:35 UTC (rev 2504)
+++ upstream/trunk/ChangeLog	2009-03-13 22:28:27 UTC (rev 2505)
@@ -3,6 +3,11 @@
 	* src/newusers.c: Make sure the SHA related variables are not
 	compiled when disabled at configuration time.
 	* src/newusers.c: Added FIXME
+	* src/chpasswd.c: Make sure the SHA related variables is not
+	compiled when disabled at configuration time.
+	* src/chgpasswd.c: Make sure the SHA related variables is not
+	compiled when disabled at configuration time.
+	* src/chgpasswd.c: Fix the test for getlong() failure.
 
 2009-03-13  Nicolas François  <nicolas.francois at centraliens.net>
 

Modified: upstream/trunk/src/chgpasswd.c
===================================================================
--- upstream/trunk/src/chgpasswd.c	2009-03-13 22:26:35 UTC (rev 2504)
+++ upstream/trunk/src/chgpasswd.c	2009-03-13 22:28:27 UTC (rev 2505)
@@ -2,7 +2,7 @@
  * Copyright (c) 1990 - 1994, Julianne Frances Haugh
  * Copyright (c) 2006       , Tomasz Kłoczko
  * Copyright (c) 2006       , Jonas Meurer
- * Copyright (c) 2007 - 2008, Nicolas François
+ * Copyright (c) 2007 - 2009, Nicolas François
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -59,10 +59,14 @@
 static bool cflg   = false;
 static bool eflg   = false;
 static bool md5flg = false;
+#ifdef USE_SHA_CRYPT
 static bool sflg   = false;
+#endif
 
 static const char *crypt_method = NULL;
+#ifdef USE_SHA_CRYPT
 static long sha_rounds = 5000;
+#endif
 
 #ifdef SHADOWGRP
 static bool is_shadow_grp;
@@ -176,7 +180,7 @@
 #ifdef USE_SHA_CRYPT
 		case 's':
 			sflg = true;
-			if (getlong(optarg, &sha_rounds) != 0) {
+			if (getlong(optarg, &sha_rounds) == 0) {
 				fprintf (stderr,
 				         _("%s: invalid numeric argument '%s'\n"),
 				         Prog, optarg);
@@ -204,12 +208,14 @@
  */
 static void check_flags (void)
 {
+#ifdef USE_SHA_CRYPT
 	if (sflg && !cflg) {
 		fprintf (stderr,
 		         _("%s: %s flag is only allowed with the %s flag\n"),
 		         Prog, "-s", "-c");
 		usage ();
 	}
+#endif
 
 	if ((eflg && (md5flg || cflg)) ||
 	    (md5flg && cflg)) {
@@ -443,9 +449,11 @@
 			if (md5flg) {
 				crypt_method = "MD5";
 			} else if (crypt_method != NULL) {
+#ifdef USE_SHA_CRYPT
 				if (sflg) {
 					arg = &sha_rounds;
 				}
+#endif
 			} else {
 				crypt_method = NULL;
 			}

Modified: upstream/trunk/src/chpasswd.c
===================================================================
--- upstream/trunk/src/chpasswd.c	2009-03-13 22:26:35 UTC (rev 2504)
+++ upstream/trunk/src/chpasswd.c	2009-03-13 22:28:27 UTC (rev 2505)
@@ -2,7 +2,7 @@
  * Copyright (c) 1990 - 1994, Julianne Frances Haugh
  * Copyright (c) 1996 - 2000, Marek Michałkiewicz
  * Copyright (c) 2000 - 2006, Tomasz Kłoczko
- * Copyright (c) 2007 - 2008, Nicolas François
+ * Copyright (c) 2007 - 2009, Nicolas François
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -57,10 +57,14 @@
 static bool cflg   = false;
 static bool eflg   = false;
 static bool md5flg = false;
+#ifdef USE_SHA_CRYPT
 static bool sflg   = false;
+#endif
 
 static const char *crypt_method = NULL;
+#ifdef USE_SHA_CRYPT
 static long sha_rounds = 5000;
+#endif
 
 static bool is_shadow_pwd;
 static bool pw_locked = false;
@@ -198,12 +202,14 @@
  */
 static void check_flags (void)
 {
+#ifdef USE_SHA_CRYPT
 	if (sflg && !cflg) {
 		fprintf (stderr,
 		         _("%s: %s flag is only allowed with the %s flag\n"),
 		         Prog, "-s", "-c");
 		usage ();
 	}
+#endif
 
 	if ((eflg && (md5flg || cflg)) ||
 	    (md5flg && cflg)) {
@@ -434,9 +440,11 @@
 			if (md5flg) {
 				crypt_method = "MD5";
 			} else if (crypt_method != NULL) {
+#ifdef USE_SHA_CRYPT
 				if (sflg) {
 					arg = &sha_rounds;
 				}
+#endif
 			} else {
 				crypt_method = NULL;
 			}