Revert "pam_winbind: fix segfault in pam_sm_authenticate()"
authorGarming Sam <garming@catalyst.net.nz>
Mon, 16 Dec 2013 03:51:10 +0000 (16:51 +1300)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 15 Jan 2014 00:37:38 +0000 (01:37 +0100)
This reverts commit ec0f51b200d6e5b99bbd872e169621c17f33524c.

A more generic fix is now in use.

Pair-programmed-with: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Wed Jan 15 01:37:38 CET 2014 on sn-devel-104

nsswitch/pam_winbind.c

index 1eeca6915c81496da66e61d625a3131e18836c3a..258e5ac2f72e61ed1b5626bd12c3b942f0bbbe0d 100644 (file)
@@ -2751,10 +2751,9 @@ out:
                _pam_free_data_info3(pamh);
        }
 
-       if (ctx != NULL) {
-               _PAM_LOG_FUNCTION_LEAVE("pam_sm_authenticate", ctx, retval);
-               TALLOC_FREE(ctx);
-       }
+       _PAM_LOG_FUNCTION_LEAVE("pam_sm_authenticate", ctx, retval);
+
+       TALLOC_FREE(ctx);
 
        return retval;
 }