[Pkg-shadow-commits] r412 - branches/experimental/debian/patches
Nicolas FRANCOIS
nekral-guest at costa.debian.org
Tue Jul 26 01:00:46 UTC 2005
Author: nekral-guest
Date: 2005-07-26 01:00:45 +0000 (Tue, 26 Jul 2005)
New Revision: 412
Modified:
branches/experimental/debian/patches/362_warning_messages
branches/experimental/debian/patches/401_cppw_src.dpatch
branches/experimental/debian/patches/433_login_more_LOG_UNKFAIL_ENAB
branches/experimental/debian/patches/437_su_add_GNU_options_1
branches/experimental/debian/patches/437_su_add_GNU_options_3
branches/experimental/debian/patches/437_su_add_GNU_options_4
branches/experimental/debian/patches/443_chage_exit_values
Log:
Update to 4.0.11.1
Modified: branches/experimental/debian/patches/362_warning_messages
===================================================================
--- branches/experimental/debian/patches/362_warning_messages 2005-07-26 00:57:01 UTC (rev 411)
+++ branches/experimental/debian/patches/362_warning_messages 2005-07-26 01:00:45 UTC (rev 412)
@@ -6,141 +6,35 @@
Note: upstream and Debian login.defs and lib/getdef.c will have to be
different if some utilities are not built with their PAM support.
-Index: shadow-4.0.10/lib/getdef.c
+Index: shadow-4.0.11.1/libmisc/setupenv.c
===================================================================
---- shadow-4.0.10.orig/lib/getdef.c 2005-07-15 13:16:03.000000000 +0300
-+++ shadow-4.0.10/lib/getdef.c 2005-07-15 13:17:00.000000000 +0300
-@@ -52,6 +52,7 @@
- {"FAIL_DELAY", NULL},
- {"FAILLOG_ENAB", NULL},
- {"FTMP_FILE", NULL},
-+ {"MAIL_DIR", NULL},
- {"PASS_MAX_DAYS", NULL},
- {"PASS_MIN_DAYS", NULL},
- {"PASS_WARN_AGE", NULL},
-@@ -72,7 +73,6 @@
- {"LASTLOG_ENAB", NULL},
- {"LOGIN_STRING", NULL},
- {"MAIL_CHECK_ENAB", NULL},
-- {"MAIL_DIR", NULL},
- {"MAIL_FILE", NULL},
- {"MD5_CRYPT_ENAB", NULL},
- {"MOTD_FILE", NULL},
-Index: shadow-4.0.10/libmisc/setupenv.c
-===================================================================
---- shadow-4.0.10.orig/libmisc/setupenv.c 2005-07-15 13:16:03.000000000 +0300
-+++ shadow-4.0.10/libmisc/setupenv.c 2005-07-15 13:17:00.000000000 +0300
-@@ -235,10 +235,20 @@
+--- shadow-4.0.11.1.orig/libmisc/setupenv.c 2005-07-06 13:49:21.000000000 +0200
++++ shadow-4.0.11.1/libmisc/setupenv.c 2005-07-26 00:35:32.000000000 +0200
+@@ -234,9 +234,6 @@
+
addenv ("SHELL", info->pw_shell);
- /*
-+ * Export the user name. For BSD derived systems, it's "USER", for
-+ * all others it's "LOGNAME". We set both of them.
-+ */
-+
-+ addenv ("USER", info->pw_name);
-+ addenv ("LOGNAME", info->pw_name);
-+
-+#ifndef USE_PAM
-+ /*
- * Create the PATH environmental variable and export it.
- */
-
- cp = getdef_str ((info->pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH");
-+
- if (!cp) {
- /* not specified, use a minimal default */
- addenv ("PATH=/bin:/usr/bin", NULL);
-@@ -251,14 +261,6 @@
- }
-
- /*
-- * Export the user name. For BSD derived systems, it's "USER", for
-- * all others it's "LOGNAME". We set both of them.
-- */
--
-- addenv ("USER", info->pw_name);
-- addenv ("LOGNAME", info->pw_name);
--
- /*
- * MAILDIR environment variable for Qmail
- */
- if ((cp = getdef_str ("QMAIL_DIR")))
-@@ -281,11 +283,10 @@
- #endif
- }
+- * Create the PATH environmental variable and export it.
+- */
--#ifndef USE_PAM
/*
- * Read environment from optional config file. --marekm
- */
- if ((envf = getdef_str ("ENVIRON_FILE")))
- read_env_file (envf);
--#endif
-+#endif /* ! USE_PAM */
- }
-Index: shadow-4.0.10/src/login.c
-===================================================================
---- shadow-4.0.10.orig/src/login.c 2005-07-15 13:16:03.000000000 +0300
-+++ shadow-4.0.10/src/login.c 2005-07-15 13:17:00.000000000 +0300
-@@ -279,9 +279,11 @@
+ * Export the user name. For BSD derived systems, it's "USER", for
+@@ -247,6 +244,9 @@
+ addenv ("LOGNAME", info->pw_name);
- if ((tmp = getenv ("TZ"))) {
- addenv ("TZ", tmp);
-- } else if ((cp = getdef_str ("ENV_TZ")))
-+ }
-+#ifndef USE_PAM
-+ else if ((cp = getdef_str ("ENV_TZ")))
- addenv (*cp == '/' ? tz (cp) : cp, NULL);
--
-+#endif /* !USE_PAM */
- /*
- * Add the clock frequency so that profiling commands work
- * correctly.
-@@ -289,8 +291,11 @@
+ #ifndef USE_PAM
++ /*
++ * Create the PATH environmental variable and export it.
++ */
+ cp = getdef_str ((info->pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH");
- if ((tmp = getenv ("HZ"))) {
- addenv ("HZ", tmp);
-- } else if ((cp = getdef_str ("ENV_HZ")))
-+ }
-+#ifndef USE_PAM
-+ else if ((cp = getdef_str ("ENV_HZ")))
- addenv (cp, NULL);
-+#endif
- }
-
-
-@@ -349,8 +354,7 @@
- int retcode;
- pid_t child;
- char *pam_user;
--#endif /* USE_PAM */
--#ifndef USE_PAM
-+#else
- struct spwd *spwd = NULL;
- #endif
- /*
-@@ -505,6 +509,7 @@
-
- setup_tty ();
-
-+#ifndef USE_PAM
- umask (getdef_num ("UMASK", 077));
-
- {
-@@ -521,6 +526,7 @@
- set_filesize_limit (limit);
- }
-
-+#endif
- /*
- * The entire environment will be preserved if the -p flag
- * is used.
-Index: shadow-4.0.10/src/su.c
+ if (!cp) {
+Index: shadow-4.0.11.1/src/su.c
===================================================================
---- shadow-4.0.10.orig/src/su.c 2005-07-15 13:16:03.000000000 +0300
-+++ shadow-4.0.10/src/su.c 2005-07-15 13:17:00.000000000 +0300
-@@ -374,6 +374,7 @@
+--- shadow-4.0.11.1.orig/src/su.c 2005-07-25 17:14:13.000000000 +0200
++++ shadow-4.0.11.1/src/su.c 2005-07-26 00:35:32.000000000 +0200
+@@ -596,6 +596,7 @@
*/
if (fakelogin && (change_environment || restricted_shell(pwent.pw_shell))) {
@@ -148,7 +42,7 @@
if ((cp = getdef_str ("ENV_TZ")))
addenv (*cp == '/' ? tz (cp) : cp, NULL);
/*
-@@ -381,6 +382,7 @@
+@@ -603,6 +604,7 @@
*/
if ((cp = getdef_str ("ENV_HZ")))
addenv (cp, NULL); /* set the default $HZ, if one */
@@ -156,24 +50,3 @@
/*
* The terminal type will be left alone if it is present in
* the environment already.
-@@ -617,6 +619,7 @@
-
- signal (SIGINT, SIG_DFL);
- signal (SIGQUIT, SIG_DFL);
-+#ifndef USE_PAM
- cp = getdef_str ((pwent.pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH");
-
- /* XXX very similar code duplicated in libmisc/setupenv.c */
-@@ -629,9 +632,8 @@
- }
-
- /* setup the environment for pam later on, else we run into auth problems */
--#ifndef USE_PAM
- if (change_environment || restricted_shell(pwent.pw_shell)) {
- environ = newenvp; /* make new environment active */
- }
--#endif
-+#endif /* !USE_PAM */
-
- if (getenv ("IFS")) /* don't export user IFS ... */
- addenv ("IFS= \t\n", NULL); /* ... instead, set a safe IFS */
Modified: branches/experimental/debian/patches/401_cppw_src.dpatch
===================================================================
--- branches/experimental/debian/patches/401_cppw_src.dpatch 2005-07-26 00:57:01 UTC (rev 411)
+++ branches/experimental/debian/patches/401_cppw_src.dpatch 2005-07-26 01:00:45 UTC (rev 412)
@@ -226,10 +226,11 @@
===================================================================
--- shadow-4.0.10.orig/po/POTFILES.in 2005-07-07 02:54:12.000000000 +0200
+++ shadow-4.0.10/po/POTFILES.in 2005-07-07 03:06:03.000000000 +0200
-@@ -68,6 +68,7 @@
+@@ -68,7 +68,8 @@
src/chfn.c
src/chpasswd.c
src/chsh.c
+ src/chsh_chkshell.c
+src/cppw.c
src/expiry.c
src/faillog.c
Modified: branches/experimental/debian/patches/433_login_more_LOG_UNKFAIL_ENAB
===================================================================
--- branches/experimental/debian/patches/433_login_more_LOG_UNKFAIL_ENAB 2005-07-26 00:57:01 UTC (rev 411)
+++ branches/experimental/debian/patches/433_login_more_LOG_UNKFAIL_ENAB 2005-07-26 01:00:45 UTC (rev 412)
@@ -18,13 +18,6 @@
open, we don't have to close it.
* a HAVE_PAM_FAIL_DELAY is missing
-Additional note:
- * There are direct call to syslog. These calls should be replaced by the
- indirect SYSLOG, which set the locale to C (this avoid having localized
- time). However, this change is not done in this patch, but a patch has
- been submitted upstream.
-
-
Index: shadow-4.0.3/src/login.c
===================================================================
--- shadow-4.0.3.orig/src/login.c 2005-05-29 00:06:16.954189000 +0200
@@ -41,10 +34,10 @@
- (retcode == PAM_AUTHINFO_UNAVAIL))) {
- pam_get_item (pamh, PAM_USER,
- (const void **) &pam_user);
-- syslog (LOG_NOTICE,
+- SYSLOG ((LOG_NOTICE,
- "FAILED LOGIN %d FROM %s FOR %s, %s",
- failcount, hostname, pam_user,
-- pam_strerror (pamh, retcode));
+- pam_strerror (pamh, retcode)));
-#ifdef HAVE_PAM_FAIL_DELAY
- pam_fail_delay (pamh, 1000000 * delay);
-#endif
@@ -58,16 +51,16 @@
- (const void **) &pam_user);
-
- if (retcode == PAM_MAXTRIES)
-- syslog (LOG_NOTICE,
+- SYSLOG ((LOG_NOTICE,
- "TOO MANY LOGIN TRIES (%d) FROM %s FOR %s, %s",
- failcount, hostname,
- pam_user,
-- pam_strerror (pamh, retcode));
+- pam_strerror (pamh, retcode)));
- else
-- syslog (LOG_NOTICE,
+- SYSLOG ((LOG_NOTICE,
- "FAILED LOGIN SESSION FROM %s FOR %s, %s",
- hostname, pam_user,
-- pam_strerror (pamh, retcode));
+- pam_strerror (pamh, retcode)));
-
- fprintf (stderr, "\nLogin incorrect\n");
- pam_end (pamh, retcode);
@@ -103,9 +96,9 @@
+ }
+
+ if (retcode == PAM_MAXTRIES || failcount >= retries) {
-+ syslog (LOG_NOTICE,
++ SYSLOG ((LOG_NOTICE,
+ "TOO MANY LOGIN TRIES (%d)%s FOR `%s'",
-+ failcount, fromhost, failent_user);
++ failcount, fromhost, failent_user));
+ fprintf(stderr,
+ _("Maximum number of tries exceeded (%d)\n"),
+ failcount);
@@ -114,13 +107,13 @@
+ } else if (retcode == PAM_ABORT) {
+ /* Serious problems, quit now */
+ fprintf(stderr,_("login: abort requested by PAM\n"));
-+ syslog(LOG_ERR,"PAM_ABORT returned from pam_authenticate()");
++ SYSLOG ((LOG_ERR,"PAM_ABORT returned from pam_authenticate()"));
+ PAM_END;
+ exit(99);
+ } else if (retcode != PAM_SUCCESS) {
-+ syslog(LOG_NOTICE,"FAILED LOGIN (%d)%s FOR `%s', %s",
++ SYSLOG ((LOG_NOTICE,"FAILED LOGIN (%d)%s FOR `%s', %s",
+ failcount, fromhost, failent_user,
-+ pam_strerror (pamh, retcode));
++ pam_strerror (pamh, retcode)));
+ failed = 1;
+ }
+
Modified: branches/experimental/debian/patches/437_su_add_GNU_options_1
===================================================================
--- branches/experimental/debian/patches/437_su_add_GNU_options_1 2005-07-26 00:57:01 UTC (rev 411)
+++ branches/experimental/debian/patches/437_su_add_GNU_options_1 2005-07-26 01:00:45 UTC (rev 412)
@@ -10,13 +10,13 @@
--- shadow-4.0.10.orig/src/su.c 2005-07-19 23:12:26.000000000 +0200
+++ shadow-4.0.10/src/su.c 2005-07-19 23:43:57.000000000 +0200
@@ -49,6 +49,7 @@
+
+ #include "rcsid.h"
+ RCSID (PKG_VER "$Id: su.c,v 1.39 2005/07/18 10:14:39 kloczek Exp $")
++#include <getopt.h>
#include <grp.h>
+ #include <pwd.h>
#include <signal.h>
- #include <pwd.h>
-+#include <getopt.h>
- #include "pwauth.h"
- #include "getdef.h"
-
@@ -79,6 +80,18 @@
/* local function prototypes */
Modified: branches/experimental/debian/patches/437_su_add_GNU_options_3
===================================================================
--- branches/experimental/debian/patches/437_su_add_GNU_options_3 2005-07-26 00:57:01 UTC (rev 411)
+++ branches/experimental/debian/patches/437_su_add_GNU_options_3 2005-07-26 01:00:45 UTC (rev 412)
@@ -49,14 +49,14 @@
#ifndef USE_PAM
@@ -720,7 +731,9 @@
+ addenv ("PATH", cp);
+ }
- /* setup the environment for pam later on, else we run into auth problems */
- #ifndef USE_PAM
- environ = newenvp; /* make new environment active */
+ if (change_environment || restricted_shell(pwent.pw_shell)) {
+ environ = newenvp; /* make new environment active */
+ }
- #endif
+ #endif /* !USE_PAM */
if (getenv ("IFS")) /* don't export user IFS ... */
@@ -771,18 +784,20 @@
Modified: branches/experimental/debian/patches/437_su_add_GNU_options_4
===================================================================
--- branches/experimental/debian/patches/437_su_add_GNU_options_4 2005-07-26 00:57:01 UTC (rev 411)
+++ branches/experimental/debian/patches/437_su_add_GNU_options_4 2005-07-26 01:00:45 UTC (rev 412)
@@ -64,6 +64,13 @@
- */
-
- if (fakelogin) {
+- /*
+- * The terminal type will be left alone if it is present in
+- * the environment already.
+- */
+- if ((cp = getenv ("TERM")))
+- addenv ("TERM", cp);
+-#ifndef USE_PAM
- if ((cp = getdef_str ("ENV_TZ")))
- addenv (*cp == '/' ? tz (cp) : cp, NULL);
- /*
@@ -72,13 +79,6 @@
- if ((cp = getdef_str ("ENV_HZ")))
- addenv (cp, NULL); /* set the default $HZ, if one */
- /*
-- * The terminal type will be left alone if it is present in
-- * the environment already.
-- */
-- if ((cp = getenv ("TERM")))
-- addenv ("TERM", cp);
--#ifndef USE_PAM
-- /*
- * Also leave DISPLAY and XAUTHORITY if present, else
- * pam_xauth will not work.
- */
Modified: branches/experimental/debian/patches/443_chage_exit_values
===================================================================
--- branches/experimental/debian/patches/443_chage_exit_values 2005-07-26 00:57:01 UTC (rev 411)
+++ branches/experimental/debian/patches/443_chage_exit_values 2005-07-26 01:00:45 UTC (rev 412)
@@ -11,19 +11,19 @@
Note: upstream still has an exit (1)
-Index: shadow-4.0.10/src/chage.c
+Index: shadow-4.0.11.1/src/chage.c
===================================================================
---- shadow-4.0.10.orig/src/chage.c 2005-07-25 01:37:49.000000000 +0300
-+++ shadow-4.0.10/src/chage.c 2005-07-25 01:45:55.000000000 +0300
-@@ -81,6 +81,7 @@
-
+--- shadow-4.0.11.1.orig/src/chage.c 2005-07-25 17:28:42.000000000 +0200
++++ shadow-4.0.11.1/src/chage.c 2005-07-26 00:40:22.000000000 +0200
+@@ -86,6 +86,7 @@
#define E_SUCCESS 0 /* success */
#define E_NOPERM 1 /* permission denied */
+ #define E_USAGE 2 /* invalid command syntax */
+#define E_NOT_SHADOWED 3 /* no shadow password file */
/* local function prototypes */
static void usage (void);
-@@ -543,6 +544,15 @@
+@@ -548,6 +549,15 @@
pwent = *pw;
STRFCPY (name, pwent.pw_name);
More information about the Pkg-shadow-commits
mailing list