[Pkg-shadow-commits] r1745 - in upstream/trunk: . lib libmisc src

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-01-26 17:41:20 +0000 (Sat, 26 Jan 2008)
New Revision: 1745

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/lib/encrypt.c
   upstream/trunk/lib/groupio.c
   upstream/trunk/libmisc/salt.c
   upstream/trunk/src/chgpasswd.c
   upstream/trunk/src/usermod.c
Log:
Fix build failures with --disable-shadowgrp. Thanks to J?\195?\188rgen
Daubert for the patch.
* libmisc/salt.c: Include <stdio.h>, needed for stderr and printf
  functions.
* lib/encrypt.c: Include <stdio.h>, needed for perror, stderr and
  printf functions
* src/usermod.c: sgr_locked exists only if SHADOWGRP is defined.
* src/chgpasswd.c: Only check is the gshadow file exists if
  SHADOWGRP is defined.



Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-01-24 21:07:14 UTC (rev 1744)
+++ upstream/trunk/ChangeLog	2008-01-26 17:41:20 UTC (rev 1745)
@@ -1,3 +1,15 @@
+2008-01-26  Nicolas François  <nicolas.francois at centraliens.net>
+
+	Fix build failures with --disable-shadowgrp. Thanks to Jürgen
+	Daubert for the patch.
+	* libmisc/salt.c: Include <stdio.h>, needed for stderr and printf
+	functions.
+	* lib/encrypt.c: Include <stdio.h>, needed for perror, stderr and
+	printf functions
+	* src/usermod.c: sgr_locked exists only if SHADOWGRP is defined.
+	* src/chgpasswd.c: Only check is the gshadow file exists if
+	SHADOWGRP is defined.
+
 2008-01-24  Nicolas François  <nicolas.francois at centraliens.net>
 
 	* src/gpasswd.c, src/chfn.c, src/chage.c, src/chsh.c, src/grpck.c,

Modified: upstream/trunk/lib/encrypt.c
===================================================================
--- upstream/trunk/lib/encrypt.c	2008-01-24 21:07:14 UTC (rev 1744)
+++ upstream/trunk/lib/encrypt.c	2008-01-26 17:41:20 UTC (rev 1745)
@@ -32,8 +32,11 @@
 #ident "$Id$"
 
 #include <unistd.h>
+#include <stdio.h>
+
 #include "prototypes.h"
 #include "defines.h"
+
 char *pw_encrypt (const char *clear, const char *salt)
 {
 	static char cipher[128];

Modified: upstream/trunk/lib/groupio.c
===================================================================
--- upstream/trunk/lib/groupio.c	2008-01-24 21:07:14 UTC (rev 1744)
+++ upstream/trunk/lib/groupio.c	2008-01-26 17:41:20 UTC (rev 1745)
@@ -3,6 +3,8 @@
 
 #ident "$Id$"
 
+#include <stdio.h>
+
 #include "prototypes.h"
 #include "defines.h"
 #include "commonio.h"
@@ -230,7 +232,7 @@
  * same name, password and gid.
  *
  * It merge the members of the second entry in the first one, and return
- * the modified first entry on success, or NUll on failure (with errno
+ * the modified first entry on success, or NULL on failure (with errno
  * set).
  */
 static struct commonio_entry *merge_group_entries (struct commonio_entry *gr1,

Modified: upstream/trunk/libmisc/salt.c
===================================================================
--- upstream/trunk/libmisc/salt.c	2008-01-24 21:07:14 UTC (rev 1744)
+++ upstream/trunk/libmisc/salt.c	2008-01-26 17:41:20 UTC (rev 1745)
@@ -13,6 +13,7 @@
 
 #include <sys/time.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <assert.h>
 #include "prototypes.h"
 #include "defines.h"

Modified: upstream/trunk/src/chgpasswd.c
===================================================================
--- upstream/trunk/src/chgpasswd.c	2008-01-24 21:07:14 UTC (rev 1744)
+++ upstream/trunk/src/chgpasswd.c	2008-01-26 17:41:20 UTC (rev 1745)
@@ -342,7 +342,9 @@
 
 	check_perms ();
 
+#ifdef SHADOWGRP
 	is_shadow_grp = sgr_file_present ();
+#endif
 
 	open_files ();
 

Modified: upstream/trunk/src/usermod.c
===================================================================
--- upstream/trunk/src/usermod.c	2008-01-24 21:07:14 UTC (rev 1744)
+++ upstream/trunk/src/usermod.c	2008-01-26 17:41:20 UTC (rev 1745)
@@ -1113,7 +1113,9 @@
 	pw_locked = 0;
 	spw_locked = 0;
 	gr_locked = 0;
+#ifdef	SHADOWGRP
 	sgr_locked = 0;
+#endif
 
 	/*
 	 * Close the DBM and/or flat files