[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  fd00867... s4:samdb.c - Make it signed-safe
       via  6a1a7ce... s4:srvsvc RPC - "srvsvc_create_ntvfs_connect"
      from  9b4d208... s4:srvsvc RPC - fix up the "ntvfs_connect" in "srvsvc_create_ntvfs_connect"

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


- Log -----------------------------------------------------------------
commit fd00867e8558cce30459316fddc4a10c95697577
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Fri Nov 6 20:14:41 2009 +0100

    s4:samdb.c - Make it signed-safe
    
    Use an unsigned argument for the numbers of groups and the counter "i" since
    the function is called only by "auth_generate_session_info" with an unsigned
    number of groups argument.

commit 6a1a7ce9ebb331eba7bf94d16bede2d6472da106
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Wed Mar 3 20:12:30 2010 +0100

    s4:srvsvc RPC - "srvsvc_create_ntvfs_connect"
    
    Previous commit was incomplete. The "service" parameter in the "tcon" structure
    should point to "scfg->name". I'm not sure if "share" is right but the first
    was used before commit f390daef475126b4ff5a3d0ffd2babbd87d4c22b.

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

Summary of changes:
 source4/dsdb/samdb/samdb.c               |    4 ++--
 source4/rpc_server/srvsvc/srvsvc_ntvfs.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/samdb.c b/source4/dsdb/samdb/samdb.c
index 2232e43..51e3f73 100644
--- a/source4/dsdb/samdb/samdb.c
+++ b/source4/dsdb/samdb/samdb.c
@@ -144,13 +144,13 @@ NTSTATUS security_token_create(TALLOC_CTX *mem_ctx,
 			       struct loadparm_context *lp_ctx,
 			       struct dom_sid *user_sid,
 			       struct dom_sid *group_sid, 
-			       int n_groupSIDs,
+			       unsigned int n_groupSIDs,
 			       struct dom_sid **groupSIDs, 
 			       bool is_authenticated,
 			       struct security_token **token)
 {
 	struct security_token *ptoken;
-	int i;
+	unsigned int i;
 	NTSTATUS status;
 
 	ptoken = security_token_initialise(mem_ctx);
diff --git a/source4/rpc_server/srvsvc/srvsvc_ntvfs.c b/source4/rpc_server/srvsvc/srvsvc_ntvfs.c
index 17c5f81..d95c307 100644
--- a/source4/rpc_server/srvsvc/srvsvc_ntvfs.c
+++ b/source4/rpc_server/srvsvc/srvsvc_ntvfs.c
@@ -127,7 +127,7 @@ NTSTATUS srvsvc_create_ntvfs_context(struct dcesrv_call_state *dce_call,
 	/* Invoke NTVFS connection hook */
 	tcon.tcon.level = RAW_TCON_TCON;
 	ZERO_STRUCT(tcon.tcon.in);
-	tcon.tcon.in.service = share;
+	tcon.tcon.in.service = scfg->name;
 	status = ntvfs_connect(ntvfs_req, &tcon);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(0,("srvsvc_create_ntvfs_context: NTVFS ntvfs_connect() failed!\n"));


-- 
Samba Shared Repository