From fad5e3be5e4739e9e19f3f87a49c059336a436d4 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 12 Sep 2011 11:23:17 -0700 Subject: Move the talloc_move call until *after* the check on status. Don't want to move something that might be invalid. Makes the code match what is currently in 3.6.x. Autobuild-User: Jeremy Allison Autobuild-Date: Mon Sep 12 22:21:24 CEST 2011 on sn-devel-104 --- source3/auth/user_krb5.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3') diff --git a/source3/auth/user_krb5.c b/source3/auth/user_krb5.c index 489080e0e8..b106e45973 100644 --- a/source3/auth/user_krb5.c +++ b/source3/auth/user_krb5.c @@ -243,9 +243,6 @@ NTSTATUS make_session_info_krb5(TALLOC_CTX *mem_ctx, status = make_server_info_pw(&tmp, username, pw); } - /* Steal tmp server info into the server_info pointer. */ - server_info = talloc_move(mem_ctx, &tmp); - TALLOC_FREE(sampass); if (!NT_STATUS_IS_OK(status)) { @@ -254,6 +251,9 @@ NTSTATUS make_session_info_krb5(TALLOC_CTX *mem_ctx, return status; } + /* Steal tmp server info into the server_info pointer. */ + server_info = talloc_move(mem_ctx, &tmp); + /* make_server_info_pw does not set the domain. Without this * we end up with the local netbios name in substitutions for * %D. */ -- cgit