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.

diff --git a/ChangeLog b/ChangeLog
index c2c1599865c66282e255b79a7c950b242047ef93..1bf0a6421e7c31366df33be0d8008dcfb969f1e7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-01-26  Nicolas François  <nicolas.francois@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@centraliens.net>
 
        * src/gpasswd.c, src/chfn.c, src/chage.c, src/chsh.c, src/grpck.c,

diff --git a/lib/encrypt.c b/lib/encrypt.c
index 9a880e83bed13051bd093733d25265df205c265c..6b6d270b4e399d39623719965e287397b945d1b7 100644 (file)
--- a/lib/encrypt.c
+++ b/lib/encrypt.c
@@ -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];

diff --git a/lib/groupio.c b/lib/groupio.c
index 7d84dd9728a6899bcc84bcb366dd6fcbe66091dd..9d9b3d30095834f4364506926d5b5700b104d52d 100644 (file)
--- a/lib/groupio.c
+++ b/lib/groupio.c
@@ -3,6 +3,8 @@
 
 #ident "$Id$"
 
+#include <stdio.h>
+
 #include "prototypes.h"
 #include "defines.h"
 #include "commonio.h"
@@ -230,7 +232,7 @@ static int group_open_hook (void)
  * 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,

diff --git a/libmisc/salt.c b/libmisc/salt.c
index 30ac920ff90bc8c7f6a6b81dbc6ba96677c24e31..c61d3e190a806e5e4c1ca5862eddb5f71c89049e 100644 (file)
--- a/libmisc/salt.c
+++ b/libmisc/salt.c
@@ -13,6 +13,7 @@
 
 #include <sys/time.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <assert.h>
 #include "prototypes.h"
 #include "defines.h"

diff --git a/src/chgpasswd.c b/src/chgpasswd.c
index f2bde98df6ae301459e775a847ca3b1637717298..77176feb58764ca374fe291f30a683faf29d4020 100644 (file)
--- a/src/chgpasswd.c
+++ b/src/chgpasswd.c
@@ -342,7 +342,9 @@ int main (int argc, char **argv)
 
        check_perms ();
 
+#ifdef SHADOWGRP
        is_shadow_grp = sgr_file_present ();
+#endif
 
        open_files ();
 

diff --git a/src/usermod.c b/src/usermod.c
index 509f365c6643d475b810a6d389ba12be4f5e560f..d7ff6fdf3ee7240ec6cbb53f516fc8ff901c183d 100644 (file)
--- a/src/usermod.c
+++ b/src/usermod.c
@@ -1113,7 +1113,9 @@ static void close_files (void)
        pw_locked = 0;
        spw_locked = 0;
        gr_locked = 0;
+#ifdef SHADOWGRP
        sgr_locked = 0;
+#endif
 
        /*
         * Close the DBM and/or flat files