[Pkg-shadow-commits] r1014 - trunk/debian/patches

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2006-06-02 22:22:43 +0000 (Fri, 02 Jun 2006)
New Revision: 1014

Modified:
   trunk/debian/patches/504_undef_USE_PAM.dpatch
   trunk/debian/patches/504_undef_USE_PAM.nolibpam
Log:
Do not build chgpasswd with PAM support. Closes: #369439


Modified: trunk/debian/patches/504_undef_USE_PAM.dpatch
===================================================================
--- trunk/debian/patches/504_undef_USE_PAM.dpatch	2006-06-02 21:43:58 UTC (rev 1013)
+++ trunk/debian/patches/504_undef_USE_PAM.dpatch	2006-06-02 22:22:43 UTC (rev 1014)
@@ -1,6 +1,6 @@
 Goal: Do not use PAM for chage, chpasswd, groupadd, groupdel, groupmod
-      newusers, useradd, userdel, usermod (keep them low-level)
-Fixes: #283961, #162181, #162199, #162228.
+      newusers, useradd, userdel, usermod, chgpasswd (keep them low-level)
+Fixes: #283961, #162181, #162199, #162228, #369806.
 
 Note:
   * If it is kept for 4.0.13, libmisc/salt.c will also require an
@@ -114,3 +114,15 @@
  
  #ident "$Id: usermod.c,v 1.66 2006/05/07 17:44:39 kloczek Exp $"
  
+Index: shadow-4.0.16/src/chgpasswd.c
+===================================================================
+--- shadow-4.0.16.orig/src/chgpasswd.c	2006-06-03 00:18:28.000000000 +0200
++++ shadow-4.0.16/src/chgpasswd.c	2006-06-03 00:18:44.000000000 +0200
+@@ -28,6 +28,7 @@
+  */
+ 
+ #include <config.h>
++#undef USE_PAM
+ 
+ #ident "$Id: chgpasswd.c,v 1.4 2006/05/19 23:47:11 kloczek Exp $"
+ 

Modified: trunk/debian/patches/504_undef_USE_PAM.nolibpam
===================================================================
--- trunk/debian/patches/504_undef_USE_PAM.nolibpam	2006-06-02 21:43:58 UTC (rev 1013)
+++ trunk/debian/patches/504_undef_USE_PAM.nolibpam	2006-06-02 22:22:43 UTC (rev 1014)
@@ -9,7 +9,8 @@
 -chage_LDADD    = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
 +chage_LDADD    = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
  chfn_LDADD     = $(LDADD) $(LIBPAM) $(LIBSELINUX)
- chgpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX)
+-chgpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX)
++chgpasswd_LDADD = $(LDADD) $(LIBSELINUX)
  chsh_LDADD     = $(LDADD) $(LIBPAM) $(LIBSELINUX)
 -chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX)
 +chpasswd_LDADD = $(LDADD) $(LIBSELINUX)