[SCM] Samba Shared Repository - branch master updated - 698b7fd43658d9e96d28f26c9e1dae5e770bb57f

[Günther Deschner]

The branch, master has been updated
       via  698b7fd43658d9e96d28f26c9e1dae5e770bb57f (commit)
       via  f5269ff1822564aa639395384629ae4560c5f79f (commit)
       via  0e389dc56cca8e168d4b2e2890150f3ca6a18c50 (commit)
      from  35f12009af7e70c7bf45f751bdbd12f8146a7c0b (commit)

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


- Log -----------------------------------------------------------------
commit 698b7fd43658d9e96d28f26c9e1dae5e770bb57f
Author: Günther Deschner <gd at samba.org>
Date:   Fri Oct 24 01:57:28 2008 +0200

    netapi: fix access bits in netapi.
    
    Guenther

commit f5269ff1822564aa639395384629ae4560c5f79f
Author: Günther Deschner <gd at samba.org>
Date:   Mon Oct 27 18:23:50 2008 +0100

    s3-netlogon: kill an fstring in rpc_server.
    
    Guenther

commit 0e389dc56cca8e168d4b2e2890150f3ca6a18c50
Author: Günther Deschner <gd at samba.org>
Date:   Tue Oct 28 00:06:35 2008 +0100

    s4-lsa-server: remove merge leftover.
    
    Guenther

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

Summary of changes:
 source3/lib/netapi/user.c           |    2 +-
 source3/rpc_server/srv_netlog_nt.c  |    9 +++------
 source4/rpc_server/lsa/dcesrv_lsa.c |    1 -
 3 files changed, 4 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/netapi/user.c b/source3/lib/netapi/user.c
index 2abc25d..2e319cf 100644
--- a/source3/lib/netapi/user.c
+++ b/source3/lib/netapi/user.c
@@ -553,7 +553,7 @@ WERROR NetUserDel_r(struct libnetapi_ctx *ctx,
 
 	status = rpccli_samr_OpenUser(pipe_cli, ctx,
 				      &domain_handle,
-				      STD_RIGHT_DELETE_ACCESS,
+				      SEC_STD_DELETE,
 				      user_rids.ids[0],
 				      &user_handle);
 	if (!NT_STATUS_IS_OK(status)) {
diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c
index 2dc6cd6..75fc994 100644
--- a/source3/rpc_server/srv_netlog_nt.c
+++ b/source3/rpc_server/srv_netlog_nt.c
@@ -797,22 +797,19 @@ NTSTATUS _netr_LogonSamLogon(pipes_struct *p,
 	}
 
 	if (process_creds) {
-		fstring remote_machine;
 
 		/* Get the remote machine name for the creds store. */
 		/* Note this is the remote machine this request is coming from (member server),
 		   not neccessarily the workstation name the user is logging onto.
 		*/
 
-		fstrcpy(remote_machine, r->in.computer_name);
-
 		if (!p->dc) {
 			/* Restore the saved state of the netlogon creds. */
 			bool ret;
 
 			become_root();
 			ret = secrets_restore_schannel_session_info(
-				p, remote_machine, &p->dc);
+				p, r->in.computer_name, &p->dc);
 			unbecome_root();
 			if (!ret) {
 				return NT_STATUS_INVALID_HANDLE;
@@ -827,13 +824,13 @@ NTSTATUS _netr_LogonSamLogon(pipes_struct *p,
 		if (!netlogon_creds_server_step(p->dc, r->in.credential,  r->out.return_authenticator)) {
 			DEBUG(2,("_netr_LogonSamLogon: creds_server_step failed. Rejecting auth "
 				"request from client %s machine account %s\n",
-				remote_machine, p->dc->mach_acct ));
+				r->in.computer_name, p->dc->mach_acct ));
 			return NT_STATUS_INVALID_PARAMETER;
 		}
 
 		/* We must store the creds state after an update. */
 		become_root();
-		secrets_store_schannel_session_info(p, remote_machine, p->dc);
+		secrets_store_schannel_session_info(p, r->in.computer_name, p->dc);
 		unbecome_root();
 	}
 
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index e279161..0041c5f 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -1409,7 +1409,6 @@ static NTSTATUS dcesrv_lsa_QueryTrustedDomainInfoBySid(struct dcesrv_call_state
 	NTSTATUS status;
 	struct lsa_OpenTrustedDomain open;
 	struct lsa_QueryTrustedDomainInfo query;
-	union lsa_TrustedDomainInfo *info;
 	struct dcesrv_handle *h;
 	open.in.handle = r->in.handle;
 	open.in.sid = r->in.dom_sid;


-- 
Samba Shared Repository