s3-nsswitch: Fix Bug #6238. Make sure wbcLogoffUserParams are properly initialized...

Fix inspired by patch from Rashid N. Achilov <citycat4@ngs.ru>.

Guenther
(cherry picked from commit 09265bcff5a2fac42f5abf34b8b439aa0a6998a1)

diff --git a/source/nsswitch/pam_winbind.c b/source/nsswitch/pam_winbind.c
index 4c24d6a7c78f58c10c1d8cc589904bd2c3c03f75..46e142c091d25afe935306cb1f3b90168c1395aa 100644 (file)
--- 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) {