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.
This commit is contained in:
nekral-guest 2008-01-26 17:41:20 +00:00
parent 28a9441f4f
commit ae99674e9b
6 changed files with 23 additions and 1 deletions

View File

@ -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,

View File

@ -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];

View File

@ -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,

View File

@ -13,6 +13,7 @@
#include <sys/time.h>
#include <stdlib.h>
#include <stdio.h>
#include <assert.h>
#include "prototypes.h"
#include "defines.h"

View File

@ -342,7 +342,9 @@ int main (int argc, char **argv)
check_perms ();
#ifdef SHADOWGRP
is_shadow_grp = sgr_file_present ();
#endif
open_files ();

View File

@ -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