summaryrefslogtreecommitdiff
path: root/nsswitch
diff options
context:
space:
mode:
authorGarming Sam <garming@catalyst.net.nz>2013-12-16 16:51:10 +1300
committerAndrew Bartlett <abartlet@samba.org>2014-01-15 01:37:38 +0100
commit2c2f175b0d34b30813595a5c34290e325f775687 (patch)
treeefe4a7da3624c8a7480b33ba420b242f1eb2d461 /nsswitch
parent3a814e329bf5cf62a3d7c309b568b6dff5118960 (diff)
downloadsamba-2c2f175b0d34b30813595a5c34290e325f775687.tar.gz
Revert "pam_winbind: fix segfault in pam_sm_authenticate()"
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
Diffstat (limited to 'nsswitch')
-rw-r--r--nsswitch/pam_winbind.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index 1eeca6915c8..258e5ac2f72 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -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;
}