summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-04-03 09:57:53 +0200
committerKarolin Seeger <kseeger@samba.org>2009-04-17 10:06:23 +0200
commit7da73d74880a3ba2bf529bc9ce8fc681887ac50c (patch)
tree0a3c03c70e225099a7f2ac7f499ed42d16df3a6a
parent93aff1c36b94eb7f4912077bf42d04e37da0cf89 (diff)
downloadsamba-7da73d74880a3ba2bf529bc9ce8fc681887ac50c.tar.gz
samba-7da73d74880a3ba2bf529bc9ce8fc681887ac50c.tar.xz
samba-7da73d74880a3ba2bf529bc9ce8fc681887ac50c.zip
s3-nsswitch: Fix Bug #6238. Make sure wbcLogoffUserParams are properly initialized before freed.
Fix inspired by patch from Rashid N. Achilov <citycat4@ngs.ru>. Guenther (cherry picked from commit 09265bcff5a2fac42f5abf34b8b439aa0a6998a1) (cherry picked from commit b737a6202cc18bfab091d5f45a3c30e97828e927)
-rw-r--r--source/nsswitch/pam_winbind.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/nsswitch/pam_winbind.c b/source/nsswitch/pam_winbind.c
index 4c24d6a7c78..46e142c091d 100644
--- a/source/nsswitch/pam_winbind.c
+++ b/source/nsswitch/pam_winbind.c
@@ -2318,6 +2318,8 @@ static int _pam_delete_cred(pam_handle_t *pamh, int flags,
const char *user;
wbcErr wbc_status = WBC_ERR_SUCCESS;
+ ZERO_STRUCT(logoff);
+
retval = _pam_winbind_init_context(pamh, flags, argc, argv, &ctx);
if (retval) {
goto out;
@@ -2365,8 +2367,6 @@ static int _pam_delete_cred(pam_handle_t *pamh, int flags,
wbc_flags = WBFLAG_PAM_KRB5 |
WBFLAG_PAM_CONTACT_TRUSTDOM;
- ZERO_STRUCT(logoff);
-
logoff.username = user;
if (ccname) {