[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4837-gacb1deb

[Günther Deschner]

The branch, v3-3-test has been updated
       via  acb1debf257c6c3df325267b2a4c8e2d40c1f850 (commit)
      from  05c7d97e6cf25c05ba6a661c0a31c88946ffd5cd (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit acb1debf257c6c3df325267b2a4c8e2d40c1f850
Author: Andreas Schneider <anschneider at suse.de>
Date:   Mon Jan 19 16:26:07 2009 +0100

    Avoid flooding of syslog with failing pam_putenv messages.
    
    Signed-off-by: Andreas Schneider <anschneider at suse.de>
    Signed-off-by: Günther Deschner <gd at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 source/nsswitch/pam_winbind.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/nsswitch/pam_winbind.c b/source/nsswitch/pam_winbind.c
index 338d538..4c24d6a 100644
--- a/source/nsswitch/pam_winbind.c
+++ b/source/nsswitch/pam_winbind.c
@@ -2428,7 +2428,7 @@ out:
 	 * Delete the krb5 ccname variable from the PAM environment
 	 * if it was set by winbind.
 	 */
-	if (ctx->ctrl & WINBIND_KRB5_AUTH) {
+	if ((ctx->ctrl & WINBIND_KRB5_AUTH) && pam_getenv(pamh, "KRB5CCNAME")) {
 		pam_putenv(pamh, "KRB5CCNAME");
 	}
 


-- 
Samba Shared Repository