From a06ca1d4e888b8400a4841d96965d09d5c9b4ddf63c817ebbd13f8ab621fdb85 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 3 Nov 2008 13:16:59 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pam_krb5?expand=0&rev=24 --- ...krb5-2.3.1-fix-pwchange-with-use_shmem.dif | 40 ++++++++++++++----- pam_krb5.changes | 6 +++ pam_krb5.spec | 5 ++- 3 files changed, 40 insertions(+), 11 deletions(-) diff --git a/pam_krb5-2.3.1-fix-pwchange-with-use_shmem.dif b/pam_krb5-2.3.1-fix-pwchange-with-use_shmem.dif index 6acea65..cbc851a 100644 --- a/pam_krb5-2.3.1-fix-pwchange-with-use_shmem.dif +++ b/pam_krb5-2.3.1-fix-pwchange-with-use_shmem.dif @@ -1,15 +1,35 @@ -Index: pam_krb5-2.3.1-1/src/password.c -=================================================================== ---- pam_krb5-2.3.1-1.orig/src/password.c -+++ pam_krb5-2.3.1-1/src/password.c -@@ -465,6 +465,10 @@ pam_sm_chauthtok(pam_handle_t *pamh, int +diff --git a/src/password.c b/src/password.c +index 85ab240..5ed4cf1 100644 +--- a/src/password.c ++++ b/src/password.c +@@ -442,16 +442,22 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, + _pam_krb5_always_fail_prompter, + &stash->v5result); + stash->v5attempted = 1; +- if ((i == PAM_SUCCESS) && +- ((options->v4 == 1) || (options->v4_for_afs == 1))) { +- v4_get_creds(ctx, pamh, stash, userinfo, +- options, password, &i); +- if (i != 0) { +- if (options->debug) { +- debug("error obtaining initial credentials using newly-set password: %d (%s)", +- i, v5_error_message(i)); ++ if (i == PAM_SUCCESS) { ++ if ((options->v4 == 1) || (options->v4_for_afs == 1)) { ++ v4_get_creds(ctx, pamh, stash, userinfo, ++ options, password, &i); ++ if (i != 0) { ++ if (options->debug) { ++ debug("error obtaining initial credentials using newly-set password: %d (%s)", ++ i, v5_error_message(i)); ++ } } } ++ if (options->use_shmem) { ++ _pam_krb5_stash_shm_write(pamh, stash, ++ options, ++ userinfo); ++ } } -+ if ((i == PAM_SUCCESS) && options->use_shmem) -+ { -+ _pam_krb5_stash_shm_write(pamh, stash, options, userinfo); -+ } } - /* Free the new password. */ diff --git a/pam_krb5.changes b/pam_krb5.changes index fd2197f..be4f09c 100644 --- a/pam_krb5.changes +++ b/pam_krb5.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 29 11:35:39 CET 2008 - mc@suse.de + +- use the upstream fix for + pam_krb5-2.3.1-fix-pwchange-with-use_shmem.dif + ------------------------------------------------------------------- Tue Oct 28 15:09:24 CET 2008 - mc@suse.de diff --git a/pam_krb5.spec b/pam_krb5.spec index d45b2e5..bcffdc4 100644 --- a/pam_krb5.spec +++ b/pam_krb5.spec @@ -26,7 +26,7 @@ Group: Productivity/Networking/Security Provides: pam_krb AutoReqProv: on Version: 2.3.1 -Release: 39 +Release: 40 Summary: PAM Module for Kerberos Authentication Url: http://sourceforge.net/projects/pam-krb5/ Source: pam_krb5-%{version}-%{PAM_RELEASE}.tar.bz2 @@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) /usr/bin/afs5log %changelog +* Wed Oct 29 2008 mc@suse.de +- use the upstream fix for + pam_krb5-2.3.1-fix-pwchange-with-use_shmem.dif * Tue Oct 28 2008 mc@suse.de - simplify switch permissions of refresh credentials (remove pam_krb5-2.2.11-1-refresh-drop-restore-priv.dif