[Pkg-shadow-commits] r1044 - trunk/debian/patches
Nicolas FRANCOIS
nekral-guest at costa.debian.org
Tue Jul 11 22:03:21 UTC 2006
Author: nekral-guest
Date: 2006-07-11 22:03:21 +0000 (Tue, 11 Jul 2006)
New Revision: 1044
Modified:
trunk/debian/patches/504_undef_USE_PAM.dpatch
Log:
Allow the MD5_CRYPT_ENAB variable because it is used by crypt_make_salt.
Make sure that libmisc/salt.c is only used by non-PAM enabled utilities.
Modified: trunk/debian/patches/504_undef_USE_PAM.dpatch
===================================================================
--- trunk/debian/patches/504_undef_USE_PAM.dpatch 2006-07-11 22:00:26 UTC (rev 1043)
+++ trunk/debian/patches/504_undef_USE_PAM.dpatch 2006-07-11 22:03:21 UTC (rev 1044)
@@ -2,50 +2,46 @@
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
- #undef USE_PAM
-
-Index: shadow-4.0.16/src/chage.c
+Index: shadow-4.0.17/src/chage.c
===================================================================
---- shadow-4.0.16.orig/src/chage.c 2006-05-31 23:23:54.635352472 +0700
-+++ shadow-4.0.16/src/chage.c 2006-05-31 23:24:50.945791984 +0700
+--- shadow-4.0.17.orig/src/chage.c 2006-06-25 16:12:38.000000000 +0200
++++ shadow-4.0.17/src/chage.c 2006-07-11 22:25:06.000000000 +0200
@@ -28,6 +28,7 @@
*/
#include <config.h>
+#undef USE_PAM
- #ident "$Id: chage.c,v 1.71 2006/02/21 22:44:35 kloczek Exp $"
+ #ident "$Id: chage.c,v 1.72 2006/06/20 20:00:04 kloczek Exp $"
-Index: shadow-4.0.16/src/chpasswd.c
+Index: shadow-4.0.17/src/chpasswd.c
===================================================================
---- shadow-4.0.16.orig/src/chpasswd.c 2006-05-31 23:23:54.687344568 +0700
-+++ shadow-4.0.16/src/chpasswd.c 2006-05-31 23:24:50.946791832 +0700
+--- shadow-4.0.17.orig/src/chpasswd.c 2006-06-24 12:18:55.000000000 +0200
++++ shadow-4.0.17/src/chpasswd.c 2006-07-11 22:25:06.000000000 +0200
@@ -28,6 +28,7 @@
*/
#include <config.h>
+#undef USE_PAM
- #ident "$Id: chpasswd.c,v 1.34 2005/10/19 15:21:07 kloczek Exp $"
+ #ident "$Id: chpasswd.c,v 1.37 2006/06/24 10:18:55 kloczek Exp $"
-Index: shadow-4.0.16/src/groupadd.c
+Index: shadow-4.0.17/src/groupadd.c
===================================================================
---- shadow-4.0.16.orig/src/groupadd.c 2006-05-31 23:23:54.728338336 +0700
-+++ shadow-4.0.16/src/groupadd.c 2006-05-31 23:24:50.948791528 +0700
+--- shadow-4.0.17.orig/src/groupadd.c 2006-06-24 07:52:00.000000000 +0200
++++ shadow-4.0.17/src/groupadd.c 2006-07-11 22:25:06.000000000 +0200
@@ -28,6 +28,7 @@
*/
#include <config.h>
+#undef USE_PAM
- #ident "$Id: groupadd.c,v 1.51 2006/01/18 19:55:15 kloczek Exp $"
+ #ident "$Id: groupadd.c,v 1.53 2006/06/24 05:52:00 kloczek Exp $"
-Index: shadow-4.0.16/src/groupdel.c
+Index: shadow-4.0.17/src/groupdel.c
===================================================================
---- shadow-4.0.16.orig/src/groupdel.c 2006-05-31 23:23:54.770331952 +0700
-+++ shadow-4.0.16/src/groupdel.c 2006-05-31 23:24:50.949791376 +0700
+--- shadow-4.0.17.orig/src/groupdel.c 2006-01-18 20:55:15.000000000 +0100
++++ shadow-4.0.17/src/groupdel.c 2006-07-11 22:25:06.000000000 +0200
@@ -28,6 +28,7 @@
*/
@@ -54,10 +50,10 @@
#ident "$Id: groupdel.c,v 1.31 2006/01/18 19:55:15 kloczek Exp $"
-Index: shadow-4.0.16/src/groupmod.c
+Index: shadow-4.0.17/src/groupmod.c
===================================================================
---- shadow-4.0.16.orig/src/groupmod.c 2006-05-31 23:23:54.816324960 +0700
-+++ shadow-4.0.16/src/groupmod.c 2006-05-31 23:24:50.950791224 +0700
+--- shadow-4.0.17.orig/src/groupmod.c 2006-06-25 16:12:38.000000000 +0200
++++ shadow-4.0.17/src/groupmod.c 2006-07-11 22:25:06.000000000 +0200
@@ -28,6 +28,7 @@
*/
@@ -66,10 +62,10 @@
#ident "$Id: groupmod.c,v 1.37 2005/10/19 15:21:07 kloczek Exp $"
-Index: shadow-4.0.16/src/newusers.c
+Index: shadow-4.0.17/src/newusers.c
===================================================================
---- shadow-4.0.16.orig/src/newusers.c 2006-05-31 23:23:54.858318576 +0700
-+++ shadow-4.0.16/src/newusers.c 2006-05-31 23:24:50.952790920 +0700
+--- shadow-4.0.17.orig/src/newusers.c 2006-03-07 16:50:33.000000000 +0100
++++ shadow-4.0.17/src/newusers.c 2006-07-11 22:25:06.000000000 +0200
@@ -34,6 +34,7 @@
*/
@@ -78,51 +74,102 @@
#ident "$Id: newusers.c,v 1.33 2006/03/07 15:47:32 kloczek Exp $"
-Index: shadow-4.0.16/src/useradd.c
+Index: shadow-4.0.17/src/useradd.c
===================================================================
---- shadow-4.0.16.orig/src/useradd.c 2006-05-31 23:23:54.900312192 +0700
-+++ shadow-4.0.16/src/useradd.c 2006-05-31 23:24:50.957790160 +0700
+--- shadow-4.0.17.orig/src/useradd.c 2006-06-22 13:30:32.000000000 +0200
++++ shadow-4.0.17/src/useradd.c 2006-07-11 22:48:17.000000000 +0200
@@ -28,6 +28,7 @@
*/
#include <config.h>
+#undef USE_PAM
- #ident "$Id: useradd.c,v 1.96 2006/05/30 18:28:45 kloczek Exp $"
+ #ident "$Id: useradd.c,v 1.99 2006/06/22 11:30:32 kloczek Exp $"
-Index: shadow-4.0.16/src/userdel.c
+Index: shadow-4.0.17/src/userdel.c
===================================================================
---- shadow-4.0.16.orig/src/userdel.c 2006-05-31 23:23:54.947305048 +0700
-+++ shadow-4.0.16/src/userdel.c 2006-05-31 23:24:50.959789856 +0700
+--- shadow-4.0.17.orig/src/userdel.c 2006-07-10 06:11:32.000000000 +0200
++++ shadow-4.0.17/src/userdel.c 2006-07-11 22:48:17.000000000 +0200
@@ -28,6 +28,7 @@
*/
#include <config.h>
+#undef USE_PAM
- #ident "$Id: userdel.c,v 1.64 2006/05/12 23:37:33 kloczek Exp $"
+ #ident "$Id: userdel.c,v 1.66 2006/07/10 04:11:32 kloczek Exp $"
-Index: shadow-4.0.16/src/usermod.c
+Index: shadow-4.0.17/src/usermod.c
===================================================================
---- shadow-4.0.16.orig/src/usermod.c 2006-05-31 23:23:54.989298664 +0700
-+++ shadow-4.0.16/src/usermod.c 2006-05-31 23:24:50.963789248 +0700
+--- shadow-4.0.17.orig/src/usermod.c 2006-06-25 15:10:29.000000000 +0200
++++ shadow-4.0.17/src/usermod.c 2006-07-11 22:48:15.000000000 +0200
@@ -28,6 +28,7 @@
*/
#include <config.h>
+#undef USE_PAM
- #ident "$Id: usermod.c,v 1.66 2006/05/07 17:44:39 kloczek Exp $"
+ #ident "$Id: usermod.c,v 1.69 2006/06/25 13:10:29 kloczek Exp $"
-Index: shadow-4.0.16/src/chgpasswd.c
+Index: shadow-4.0.17/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
+--- shadow-4.0.17.orig/src/chgpasswd.c 2006-06-20 22:00:04.000000000 +0200
++++ shadow-4.0.17/src/chgpasswd.c 2006-07-11 22:25:06.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 $"
+ #ident "$Id: chgpasswd.c,v 1.5 2006/06/20 20:00:04 kloczek Exp $"
+Index: shadow-4.0.17/lib/getdef.c
+===================================================================
+--- shadow-4.0.17.orig/lib/getdef.c 2006-07-11 22:49:19.000000000 +0200
++++ shadow-4.0.17/lib/getdef.c 2006-07-11 22:52:15.000000000 +0200
+@@ -82,6 +82,9 @@
+ {"UMASK", NULL},
+ {"USERDEL_CMD", NULL},
+ {"USERGROUPS_ENAB", NULL},
++ /* some utilities are not compiled with PAM, and need
++ * MD5_CRYPT_ENAB variable to know wether the passwords use MD5 */
++ {"MD5_CRYPT_ENAB", NULL},
+ #ifndef USE_PAM
+ {"CHFN_AUTH", NULL},
+ {"CHSH_AUTH", NULL},
+@@ -93,7 +96,6 @@
+ {"LASTLOG_ENAB", NULL},
+ {"LOGIN_STRING", NULL},
+ {"MAIL_CHECK_ENAB", NULL},
+- {"MD5_CRYPT_ENAB", NULL},
+ {"MOTD_FILE", NULL},
+ {"NOLOGINS_FILE", NULL},
+ {"OBSCURE_CHECKS_ENAB", NULL},
+Index: shadow-4.0.17/lib/prototypes.h
+===================================================================
+--- shadow-4.0.17.orig/lib/prototypes.h 2006-07-11 22:55:07.000000000 +0200
++++ shadow-4.0.17/lib/prototypes.h 2006-07-11 22:59:42.000000000 +0200
+@@ -130,8 +130,12 @@
+ /* rlogin.c */
+ extern int do_rlogin (const char *, char *, int, char *, int);
+
++#ifndef USE_PAM
++/* As we are messing up with USE_PAM in libmisc/salt.c, make sure
++ * crypt_make_salt is never used with utilities compiled with PAM */
+ /* salt.c */
+ extern char *crypt_make_salt (void);
++#endif
+
+ /* setugid.c */
+ extern int setup_groups (const struct passwd *);
+Index: shadow-4.0.17/libmisc/salt.c
+===================================================================
+--- shadow-4.0.17.orig/libmisc/salt.c 2006-07-11 22:54:04.000000000 +0200
++++ shadow-4.0.17/libmisc/salt.c 2006-07-11 22:54:23.000000000 +0200
+@@ -6,6 +6,7 @@
+ */
+
+ #include <config.h>
++#undef USE_PAM
+
+ #ident "$Id: salt.c,v 1.10 2005/08/31 17:24:58 kloczek Exp $"
+
More information about the Pkg-shadow-commits
mailing list