[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  57b3b12 winbind: Fix a debug message
       via  3078b9f auth4: Remove an unused struct declaration
       via  2104f45 auth4: Move a variable closer to its use
      from  6296c32 Re-enable token groups fallback

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 57b3b122296452fd78261d21e06ffa6dd3a10156
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Feb 27 13:35:59 2017 +0000

    winbind: Fix a debug message
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Mon Mar  6 23:18:46 CET 2017 on sn-devel-144

commit 3078b9fd9aa1b755bd1d5bfe4299138b0e8a8072
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Feb 26 17:27:05 2017 +0100

    auth4: Remove an unused struct declaration
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit 2104f453148d0db7c446376a269a65119eb2236e
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Mar 3 06:03:31 2017 +0100

    auth4: Move a variable closer to its use
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 source3/winbindd/winbindd_pam.c | 3 ++-
 source4/auth/auth.h             | 1 -
 source4/auth/ntlm/auth.c        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index 741a42f..74afdcc 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -1271,7 +1271,8 @@ static NTSTATUS winbindd_dual_auth_passdb(TALLOC_CTX *mem_ctx,
 	status = make_auth_context_fixed(frame, &auth_context, challenge->data);
 
 	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(0, ("Failed to test authentication with check_sam_security_info3: %s\n", nt_errstr(status)));
+		DBG_ERR("make_auth_context_fixed failed: %s\n",
+			nt_errstr(status));
 		TALLOC_FREE(frame);
 		return status;
 	}
diff --git a/source4/auth/auth.h b/source4/auth/auth.h
index fb48694..7c62318 100644
--- a/source4/auth/auth.h
+++ b/source4/auth/auth.h
@@ -46,7 +46,6 @@ struct loadparm_context;
 #define AUTH4_INTERFACE_VERSION 0
 
 struct auth_method_context;
-struct auth_check_password_request;
 struct auth4_context;
 struct auth_session_info;
 struct ldb_dn;
diff --git a/source4/auth/ntlm/auth.c b/source4/auth/ntlm/auth.c
index a1276df..05d6c3c 100644
--- a/source4/auth/ntlm/auth.c
+++ b/source4/auth/ntlm/auth.c
@@ -266,7 +266,6 @@ _PUBLIC_ struct tevent_req *auth_check_password_send(TALLOC_CTX *mem_ctx,
 	/* if all the modules say 'not for me' this is reasonable */
 	NTSTATUS nt_status;
 	uint8_t chal[8];
-	struct auth_usersupplied_info *user_info_tmp;
 	struct tevent_immediate *im;
 
 	DEBUG(3,("auth_check_password_send: "
@@ -285,6 +284,7 @@ _PUBLIC_ struct tevent_req *auth_check_password_send(TALLOC_CTX *mem_ctx,
 
 	if (!user_info->mapped_state) {
 		int server_role = lpcfg_server_role(auth_ctx->lp_ctx);
+		struct auth_usersupplied_info *user_info_tmp;
 
 		nt_status = map_user_info(
 			auth_ctx->sam_ctx, req,


-- 
Samba Shared Repository