[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  39ea30d s3-build: remove source4 include path for autoconf build as well.
       via  9943761 s3-rpcclient: allow to define validation level for samlogon.
      from  ef0a390 s3-waf: fix lib/addns include path.

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


- Log -----------------------------------------------------------------
commit 39ea30de0fb9ebf64b7c7ab8f6731fcf98ed294b
Author: Günther Deschner <gd at samba.org>
Date:   Mon Jan 24 16:55:05 2011 +0100

    s3-build: remove source4 include path for autoconf build as well.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Mon Jan 24 17:40:56 CET 2011 on sn-devel-104

commit 99437614fa8028d60356ee79611d94051ec756ec
Author: Günther Deschner <gd at samba.org>
Date:   Fri Jan 21 16:58:32 2011 +0100

    s3-rpcclient: allow to define validation level for samlogon.
    
    Guenther

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

Summary of changes:
 source3/Makefile.in               |    1 -
 source3/rpc_client/cli_netlogon.c |    2 +-
 source3/rpc_client/cli_netlogon.h |    1 +
 source3/rpcclient/cmd_netlogon.c  |    6 +++---
 4 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index d92224e..0ce97b8 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -188,7 +188,6 @@ FLAGS = -I. \
 	$(ISA) \
 	-I$(srcdir)/lib \
 	-I.. \
-	-I../source4 \
 	-D_SAMBA_BUILD_=3
 
 PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \
diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c
index 3046d27..914bfd3 100644
--- a/source3/rpc_client/cli_netlogon.c
+++ b/source3/rpc_client/cli_netlogon.c
@@ -159,6 +159,7 @@ NTSTATUS rpccli_netlogon_sam_logon(struct rpc_pipe_client *cli,
 				   const char *username,
 				   const char *password,
 				   const char *workstation,
+				   uint16_t validation_level,
 				   int logon_type)
 {
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -168,7 +169,6 @@ NTSTATUS rpccli_netlogon_sam_logon(struct rpc_pipe_client *cli,
 	union netr_LogonLevel *logon;
 	union netr_Validation validation;
 	uint8_t authoritative;
-	int validation_level = 3;
 	fstring clnt_name_slash;
 	struct dcerpc_binding_handle *b = cli->binding_handle;
 
diff --git a/source3/rpc_client/cli_netlogon.h b/source3/rpc_client/cli_netlogon.h
index 107c222..bb38b75 100644
--- a/source3/rpc_client/cli_netlogon.h
+++ b/source3/rpc_client/cli_netlogon.h
@@ -15,6 +15,7 @@ NTSTATUS rpccli_netlogon_sam_logon(struct rpc_pipe_client *cli,
 				   const char *username,
 				   const char *password,
 				   const char *workstation,
+				   uint16_t validation_level,
 				   int logon_type);
 NTSTATUS rpccli_netlogon_sam_network_logon(struct rpc_pipe_client *cli,
 					   TALLOC_CTX *mem_ctx,
diff --git a/source3/rpcclient/cmd_netlogon.c b/source3/rpcclient/cmd_netlogon.c
index 1942352..c909efe 100644
--- a/source3/rpcclient/cmd_netlogon.c
+++ b/source3/rpcclient/cmd_netlogon.c
@@ -718,7 +718,7 @@ static NTSTATUS cmd_netlogon_sam_logon(struct rpc_pipe_client *cli,
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 	int logon_type = NetlogonNetworkInformation;
 	const char *username, *password;
-	int auth_level = 2;
+	uint16_t validation_level = 3;
 	uint32 logon_param = 0;
 	const char *workstation = NULL;
 
@@ -740,14 +740,14 @@ static NTSTATUS cmd_netlogon_sam_logon(struct rpc_pipe_client *cli,
 		sscanf(argv[4], "%i", &logon_type);
 
 	if (argc >= 6)
-		sscanf(argv[5], "%i", &auth_level);
+		validation_level = atoi(argv[5]);
 
 	if (argc == 7)
 		sscanf(argv[6], "%x", &logon_param);
 
 	/* Perform the sam logon */
 
-	result = rpccli_netlogon_sam_logon(cli, mem_ctx, logon_param, lp_workgroup(), username, password, workstation, logon_type);
+	result = rpccli_netlogon_sam_logon(cli, mem_ctx, logon_param, lp_workgroup(), username, password, workstation, validation_level, logon_type);
 
 	if (!NT_STATUS_IS_OK(result))
 		goto done;


-- 
Samba Shared Repository