diff options
author | Jeremy Allison <jra@samba.org> | 2009-04-09 22:46:59 -0700 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2009-04-09 22:46:59 -0700 |
commit | 7f10bf980edef3ace1522d0c9c082b35e225c950 (patch) | |
tree | d4e9af21de194cca812e754b28f9358a3651f4ce /nsswitch/pam_winbind.c | |
parent | f8f68703da58cf7f61b655b48bbbc45cda647748 (diff) | |
parent | f930f504e1d5e78d2f6f36cab9ce36dbeb34e955 (diff) | |
download | samba-7f10bf980edef3ace1522d0c9c082b35e225c950.tar.gz samba-7f10bf980edef3ace1522d0c9c082b35e225c950.tar.xz samba-7f10bf980edef3ace1522d0c9c082b35e225c950.zip |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
Diffstat (limited to 'nsswitch/pam_winbind.c')
-rw-r--r-- | nsswitch/pam_winbind.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c index 62d72c291b..0d33f59a23 100644 --- a/nsswitch/pam_winbind.c +++ b/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) { @@ -2406,6 +2406,7 @@ static int _pam_delete_cred(pam_handle_t *pamh, int flags, user, "wbcLogoffUser"); wbcFreeMemory(error); wbcFreeMemory(logoff.blobs); + logoff.blobs = NULL; if (!WBC_ERROR_IS_OK(wbc_status)) { _pam_log(ctx, LOG_INFO, |