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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2009-03-13 22:26:35 +0000 (Fri, 13 Mar 2009)
New Revision: 2504

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/newusers.c
Log:
	* src/newusers.c: Make sure the SHA related variables are not
	compiled when disabled at configuration time.
	* src/newusers.c: Added FIXME


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2009-03-13 22:21:26 UTC (rev 2503)
+++ upstream/trunk/ChangeLog	2009-03-13 22:26:35 UTC (rev 2504)
@@ -1,5 +1,11 @@
 2009-03-13  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/newusers.c: Make sure the SHA related variables are not
+	compiled when disabled at configuration time.
+	* src/newusers.c: Added FIXME
+
+2009-03-13  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* src/gpasswd.c: Remove the documentation of options from the
 	main() documentation. It will always be outdated here.
 

Modified: upstream/trunk/src/newusers.c
===================================================================
--- upstream/trunk/src/newusers.c	2009-03-13 22:21:26 UTC (rev 2503)
+++ upstream/trunk/src/newusers.c	2009-03-13 22:26:35 UTC (rev 2504)
@@ -71,10 +71,14 @@
 
 static bool cflg = false;
 static bool rflg = false;	/* create a system account */
+#ifdef USE_SHA_CRYPT
 static bool sflg = false;
+#endif
 
 static char *crypt_method = NULL;
+#ifdef USE_SHA_CRYPT
 static long sha_rounds = 5000;
+#endif
 
 static bool is_shadow;
 #ifdef SHADOWGRP
@@ -236,6 +240,7 @@
 		grent.gr_name = xstrdup (gid);
 	} else {
 		grent.gr_name = xstrdup (name);
+/* FIXME: check if the group exist */
 	}
 
 	/* Check if this is a valid group name */
@@ -364,9 +369,11 @@
 {
 	void *crypt_arg = NULL;
 	if (crypt_method != NULL) {
+#ifdef USE_SHA_CRYPT
 		if (sflg) {
 			crypt_arg = &sha_rounds;
 		}
+#endif
 	}
 
 	if ((crypt_method != NULL) && (0 == strcmp(crypt_method, "NONE"))) {
@@ -387,9 +394,11 @@
 	struct spwd spent;
 	void *crypt_arg = NULL;
 	if (crypt_method != NULL) {
+#ifdef USE_SHA_CRYPT
 		if (sflg) {
 			crypt_arg = &sha_rounds;
 		}
+#endif
 	}
 
 	/*
@@ -494,7 +503,7 @@
 #ifdef USE_SHA_CRYPT
 		case 's':
 			sflg = true;
-			if (!getlong(optarg, &sha_rounds)) {
+			if (getlong(optarg, &sha_rounds) == 0) {
 				fprintf (stderr,
 				         _("%s: invalid numeric argument '%s'\n"),
 				         Prog, optarg);
@@ -531,12 +540,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 (cflg) {
 		if (   (0 != strcmp (crypt_method, "DES"))
@@ -908,6 +919,7 @@
 
 		if (   ('\0' != newpw.pw_dir[0])
 		    && (access (newpw.pw_dir, F_OK) != 0)) {
+/* FIXME: should check for directory */
 			mode_t msk = 0777 & ~getdef_num ("UMASK",
 			                                 GETDEF_DEFAULT_UMASK);
 			if (mkdir (newpw.pw_dir, msk) != 0) {