[Pkg-shadow-commits] r1650 - in upstream/trunk: . lib libmisc src
nekral-guest at alioth.debian.org
nekral-guest at alioth.debian.org
Sat Jan 5 16:33:44 UTC 2008
Author: nekral-guest
Date: 2008-01-05 16:33:43 +0000 (Sat, 05 Jan 2008)
New Revision: 1650
Modified:
upstream/trunk/ChangeLog
upstream/trunk/configure.in
upstream/trunk/lib/commonio.c
upstream/trunk/lib/defines.h
upstream/trunk/lib/shadowio.c
upstream/trunk/lib/shadowmem.c
upstream/trunk/libmisc/pwdcheck.c
upstream/trunk/src/chfn.c
upstream/trunk/src/chsh.c
Log:
* libmisc/pwdcheck.c: Do not include <pwd.h>. Include <shadow.h>
and "pwauth.h" only when compiled without PAM support.
* src/chfn.c, src/chsh.c: Do not include <shadow.h>
* lib/commonio.c: Do not include <shadow.h>. Do not include
<pwd.h>. Include "nscd.h" instead of <nscd.h>.
* configure.in: Do not check if shadow.h exist, but make sure it
exists.
* libmisc/pwdcheck.c, src/chfn.c, src/chsh.c, lib/defines.h,
lib/shadowmem.c, lib/shadowio.c, lib/commonio.c:
HAVE_SHADOW_H is no more needed (shadow.h should always exist).
Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog 2008-01-05 15:43:33 UTC (rev 1649)
+++ upstream/trunk/ChangeLog 2008-01-05 16:33:43 UTC (rev 1650)
@@ -1,5 +1,21 @@
2008-01-05 Nicolas François <nicolas.francois at centraliens.net>
+ * libmisc/pwdcheck.c: Do not include <pwd.h>. Include <shadow.h>
+ and "pwauth.h" only when compiled without PAM support.
+ * src/chfn.c, src/chsh.c: Do not include <shadow.h>
+ * lib/commonio.c: Do not include <shadow.h>. Do not include
+ <pwd.h>. Include "nscd.h" instead of <nscd.h>.
+
+2008-01-05 Nicolas François <nicolas.francois at centraliens.net>
+
+ * configure.in: Do not check if shadow.h exist, but make sure it
+ exists.
+ * libmisc/pwdcheck.c, src/chfn.c, src/chsh.c, lib/defines.h,
+ lib/shadowmem.c, lib/shadowio.c, lib/commonio.c:
+ HAVE_SHADOW_H is no more needed (shadow.h should always exist).
+
+2008-01-05 Nicolas François <nicolas.francois at centraliens.net>
+
* lib/groupio.c: Remove prototype of putgrent(), add parameter's
name of sgetgrent().
* lib/prototypes.h: Fix the do_pam_passwd() prototype (it returns
Modified: upstream/trunk/configure.in
===================================================================
--- upstream/trunk/configure.in 2008-01-05 15:43:33 UTC (rev 1649)
+++ upstream/trunk/configure.in 2008-01-05 16:33:43 UTC (rev 1650)
@@ -31,9 +31,12 @@
AC_CHECK_HEADERS(errno.h fcntl.h limits.h unistd.h sys/time.h utmp.h \
utmpx.h termios.h termio.h sgtty.h sys/ioctl.h syslog.h paths.h \
- utime.h ulimit.h sys/resource.h gshadow.h shadow.h lastlog.h \
+ utime.h ulimit.h sys/resource.h gshadow.h lastlog.h \
locale.h rpc/key_prot.h netdb.h)
+dnl shadow now uses the libc's shadow implementation
+AC_CHECK_HEADER([shadow.h],,[AC_MSG_ERROR([You need a libc with shadow.h])])
+
AC_CHECK_FUNCS(l64a fchmod fchown fsync getgroups gethostname getspnam \
gettimeofday getusershell getutent initgroups lchown lckpwdf lstat \
memcpy memset setgroups sigaction strchr updwtmp updwtmpx innetgr \
Modified: upstream/trunk/lib/commonio.c
===================================================================
--- upstream/trunk/lib/commonio.c 2008-01-05 15:43:33 UTC (rev 1649)
+++ upstream/trunk/lib/commonio.c 2008-01-05 16:33:43 UTC (rev 1650)
@@ -12,11 +12,7 @@
#include <errno.h>
#include <stdio.h>
#include <signal.h>
-#include <pwd.h>
-#include <nscd.h>
-#ifdef HAVE_SHADOW_H
-#include <shadow.h>
-#endif
+#include "nscd.h"
#ifdef WITH_SELINUX
#include <selinux/selinux.h>
static security_context_t old_context = NULL;
Modified: upstream/trunk/lib/defines.h
===================================================================
--- upstream/trunk/lib/defines.h 2008-01-05 15:43:33 UTC (rev 1649)
+++ upstream/trunk/lib/defines.h 2008-01-05 16:33:43 UTC (rev 1650)
@@ -101,19 +101,11 @@
* Possible cases:
* - /usr/include/shadow.h exists and includes the shadow group stuff.
* - /usr/include/shadow.h exists, but we use our own gshadow.h.
- * - /usr/include/shadow.h doesn't exist, use our own shadow.h and gshadow.h.
*/
-#if HAVE_SHADOW_H
#include <shadow.h>
#if defined(SHADOWGRP) && !defined(GSHADOW)
#include "gshadow_.h"
#endif
-#else /* not HAVE_SHADOW_H */
-#include "shadow_.h"
-#ifdef SHADOWGRP
-#include "gshadow_.h"
-#endif
-#endif /* not HAVE_SHADOW_H */
#include <limits.h>
Modified: upstream/trunk/lib/shadowio.c
===================================================================
--- upstream/trunk/lib/shadowio.c 2008-01-05 15:43:33 UTC (rev 1649)
+++ upstream/trunk/lib/shadowio.c 2008-01-05 16:33:43 UTC (rev 1650)
@@ -5,9 +5,7 @@
#include "prototypes.h"
#include "defines.h"
-#ifdef HAVE_SHADOW_H
-# include <shadow.h>
-#endif
+#include <shadow.h>
#include <stdio.h>
#include "commonio.h"
#include "shadowio.h"
Modified: upstream/trunk/lib/shadowmem.c
===================================================================
--- upstream/trunk/lib/shadowmem.c 2008-01-05 15:43:33 UTC (rev 1649)
+++ upstream/trunk/lib/shadowmem.c 2008-01-05 16:33:43 UTC (rev 1650)
@@ -5,9 +5,7 @@
#include "prototypes.h"
#include "defines.h"
-#ifdef HAVE_SHADOW_H
-# include <shadow.h>
-#endif
+#include <shadow.h>
#include <stdio.h>
#include "shadowio.h"
Modified: upstream/trunk/libmisc/pwdcheck.c
===================================================================
--- upstream/trunk/libmisc/pwdcheck.c 2008-01-05 15:43:33 UTC (rev 1649)
+++ upstream/trunk/libmisc/pwdcheck.c 2008-01-05 16:33:43 UTC (rev 1650)
@@ -2,16 +2,14 @@
#ident "$Id$"
-#include <pwd.h>
#include <stdio.h>
#include "prototypes.h"
#include "defines.h"
-#include "pwauth.h"
-#ifdef HAVE_SHADOW_H
-#include <shadow.h>
-#endif
#ifdef USE_PAM
#include "pam_defs.h"
+#else
+#include <shadow.h>
+#include "pwauth.h"
#endif
#define WRONGPWD2 "incorrect password for `%s'"
void passwd_check (const char *user, const char *passwd, const char *progname)
Modified: upstream/trunk/src/chfn.c
===================================================================
--- upstream/trunk/src/chfn.c 2008-01-05 15:43:33 UTC (rev 1649)
+++ upstream/trunk/src/chfn.c 2008-01-05 16:33:43 UTC (rev 1650)
@@ -36,9 +36,6 @@
#include <signal.h>
#include <stdio.h>
#include <sys/types.h>
-#ifdef HAVE_SHADOW_H
-#include <shadow.h>
-#endif
#ifdef WITH_SELINUX
#include <selinux/selinux.h>
#include <selinux/av_permissions.h>
Modified: upstream/trunk/src/chsh.c
===================================================================
--- upstream/trunk/src/chsh.c 2008-01-05 15:43:33 UTC (rev 1649)
+++ upstream/trunk/src/chsh.c 2008-01-05 16:33:43 UTC (rev 1650)
@@ -41,9 +41,6 @@
#include <selinux/selinux.h>
#include <selinux/av_permissions.h>
#endif
-#ifdef HAVE_SHADOW_H
-#include <shadow.h>
-#endif
#include "defines.h"
#include "exitcodes.h"
#include "getdef.h"
More information about the Pkg-shadow-commits
mailing list