summaryrefslogtreecommitdiff
path: root/net/samba3/files/patch-nsswitch_pam_winbind.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/samba3/files/patch-nsswitch_pam_winbind.c')
-rw-r--r--net/samba3/files/patch-nsswitch_pam_winbind.c23
1 files changed, 7 insertions, 16 deletions
diff --git a/net/samba3/files/patch-nsswitch_pam_winbind.c b/net/samba3/files/patch-nsswitch_pam_winbind.c
index 1e0c90546733..9c1a8f1bdee5 100644
--- a/net/samba3/files/patch-nsswitch_pam_winbind.c
+++ b/net/samba3/files/patch-nsswitch_pam_winbind.c
@@ -1,20 +1,11 @@
---- nsswitch/pam_winbind.c.orig Mon Aug 7 18:46:33 2006
-+++ nsswitch/pam_winbind.c Thu Aug 24 01:30:57 2006
-@@ -1016,7 +1016,7 @@
- }
- return PAM_USER_UNKNOWN;
+--- ./nsswitch/pam_winbind.c.orig Mon Apr 9 19:30:57 2007
++++ ./nsswitch/pam_winbind.c Tue Apr 17 02:06:59 2007
+@@ -1735,7 +1735,7 @@
+ ret = PAM_USER_UNKNOWN;
+ goto out;
case 0:
- pam_get_data( pamh, PAM_WINBIND_NEW_AUTHTOK_REQD, (const void **)&tmp);
+ pam_get_data( pamh, PAM_WINBIND_NEW_AUTHTOK_REQD, (void **)&tmp);
if (tmp != NULL) {
- retval = atoi(tmp);
- switch (retval) {
-@@ -1319,7 +1319,7 @@
- * By reaching here we have approved the passwords and must now
- * rebuild the password database file.
- */
-- pam_get_data( pamh, PAM_WINBIND_PWD_LAST_SET, (const void **)&pwdlastset_update);
-+ pam_get_data( pamh, PAM_WINBIND_PWD_LAST_SET, (void **)&pwdlastset_update);
-
- retval = winbind_chauthtok_request(pamh, ctrl, user, pass_old, pass_new, pwdlastset_update);
- if (retval) {
+ ret = atoi((const char *)tmp);
+ switch (ret) {