aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvorlon <Unknown>2007-08-27 02:20:03 +0000
committervorlon <Unknown>2007-08-27 02:20:03 +0000
commit694f6bd2ef364be78899ce8e68bf1cc4ee4a36f6 (patch)
tree37c4641c08ffba61e477a369573ca6d3d4d78920
parent4ddae8698152becf265a193397475e85d75b12c4 (diff)
downloadpam-694f6bd2ef364be78899ce8e68bf1cc4ee4a36f6.tar.gz
pam-694f6bd2ef364be78899ce8e68bf1cc4ee4a36f6.tar.bz2
pam-694f6bd2ef364be78899ce8e68bf1cc4ee4a36f6.zip
minor fix-ups for one-off lines in patches
-rw-r--r--patches-applied/007_modules_pam_unix10
-rw-r--r--patches-applied/022_pam_unix_group_time_miscfixes2
-rw-r--r--patches-applied/043_pam_unix_unknown_user_not_alert2
-rw-r--r--patches-applied/055_pam_unix_nullok_secure2
4 files changed, 8 insertions, 8 deletions
diff --git a/patches-applied/007_modules_pam_unix b/patches-applied/007_modules_pam_unix
index a812e466..34b9efb2 100644
--- a/patches-applied/007_modules_pam_unix
+++ b/patches-applied/007_modules_pam_unix
@@ -42,7 +42,7 @@ Index: Linux-PAM/modules/pam_unix/pam_unix_acct.c
===================================================================
--- Linux-PAM/modules/pam_unix/pam_unix_acct.c.orig
+++ Linux-PAM/modules/pam_unix/pam_unix_acct.c
-@@ -267,7 +267,9 @@
+@@ -266,7 +266,9 @@
curdays = time(NULL) / (60 * 60 * 24);
D(("today is %d, last change %d", curdays, spent->sp_lstchg));
@@ -53,7 +53,7 @@ Index: Linux-PAM/modules/pam_unix/pam_unix_acct.c
pam_syslog(pamh, LOG_NOTICE,
"account %s has expired (account expired)",
uname);
-@@ -294,7 +296,9 @@
+@@ -293,7 +295,9 @@
if ((curdays - spent->sp_lstchg > spent->sp_max)
&& (curdays - spent->sp_lstchg > spent->sp_inact)
&& (curdays - spent->sp_lstchg > spent->sp_max + spent->sp_inact)
@@ -64,7 +64,7 @@ Index: Linux-PAM/modules/pam_unix/pam_unix_acct.c
pam_syslog(pamh, LOG_NOTICE,
"account %s has expired (failed to change password)",
uname);
-@@ -303,7 +307,9 @@
+@@ -302,7 +306,9 @@
D(("account expired 2"));
return PAM_ACCT_EXPIRED;
}
@@ -75,7 +75,7 @@ Index: Linux-PAM/modules/pam_unix/pam_unix_acct.c
pam_syslog(pamh, LOG_DEBUG,
"expired password for user %s (password aged)",
uname);
-@@ -313,7 +319,9 @@
+@@ -312,7 +318,9 @@
return PAM_NEW_AUTHTOK_REQD;
}
if ((curdays - spent->sp_lstchg > spent->sp_max - spent->sp_warn)
@@ -148,7 +148,7 @@ Index: Linux-PAM/modules/pam_unix/support.c
++argv; /* step to next argument */
}
-@@ -693,6 +703,8 @@
+@@ -692,6 +702,8 @@
} else if (!p || (*salt == '*')) {
retval = PAM_AUTH_ERR;
} else {
diff --git a/patches-applied/022_pam_unix_group_time_miscfixes b/patches-applied/022_pam_unix_group_time_miscfixes
index 31768214..ee542fc0 100644
--- a/patches-applied/022_pam_unix_group_time_miscfixes
+++ b/patches-applied/022_pam_unix_group_time_miscfixes
@@ -7,7 +7,7 @@ Index: Linux-PAM/modules/pam_unix/support.c
===================================================================
--- Linux-PAM/modules/pam_unix/support.c.orig
+++ Linux-PAM/modules/pam_unix/support.c
-@@ -676,7 +676,7 @@
+@@ -675,7 +675,7 @@
if (on(UNIX_AUDIT, ctrl)) {
/* this might be a typo and the user has given a password
instead of a username. Careful with this. */
diff --git a/patches-applied/043_pam_unix_unknown_user_not_alert b/patches-applied/043_pam_unix_unknown_user_not_alert
index 35bad6d6..6307404f 100644
--- a/patches-applied/043_pam_unix_unknown_user_not_alert
+++ b/patches-applied/043_pam_unix_unknown_user_not_alert
@@ -2,7 +2,7 @@ Index: Linux-PAM/modules/pam_unix/support.c
===================================================================
--- Linux-PAM/modules/pam_unix/support.c.orig
+++ Linux-PAM/modules/pam_unix/support.c
-@@ -681,7 +681,7 @@
+@@ -680,7 +680,7 @@
} else {
name = NULL;
if (on(UNIX_DEBUG, ctrl) || pwd == NULL) {
diff --git a/patches-applied/055_pam_unix_nullok_secure b/patches-applied/055_pam_unix_nullok_secure
index 8cfeea8d..1d67a32b 100644
--- a/patches-applied/055_pam_unix_nullok_secure
+++ b/patches-applied/055_pam_unix_nullok_secure
@@ -48,7 +48,7 @@ Index: Linux-PAM/modules/pam_unix/support.c
return retval;
}
-@@ -693,7 +711,7 @@
+@@ -692,7 +710,7 @@
int salt_len = strlen(salt);
if (!salt_len) {
/* the stored password is NULL */