[SCM] Samba Shared Repository - branch master updated - aa79f76b0cfcf402bdf955cdf8356d619ace0b68

[Günther Deschner]

The branch, master has been updated
       via  aa79f76b0cfcf402bdf955cdf8356d619ace0b68 (commit)
      from  e58a8c169cd075ca900a2a144d7b5387460bbf05 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit aa79f76b0cfcf402bdf955cdf8356d619ace0b68
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:
 nsswitch/pam_winbind.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index d049bdb..62d72c2 100644
--- a/nsswitch/pam_winbind.c
+++ b/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