[SCM] Samba Shared Repository - branch master updated

[Christian Ambach]

The branch, master has been updated
       via  6c5158e s3:rpc_server/srvsvc check access before doing work
       via  1cd2044 torture: Remove some unused code
       via  11f467d tdb: include information about hash function being used in tdbtool info output
      from  7d8a1b1 smbd: Remove a pointless variable

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


- Log -----------------------------------------------------------------
commit 6c5158e3de26cd6e911f740a1c36789d77ea1c70
Author: Shekhar Amlekar <samlekar at in.ibm.com>
Date:   Tue May 7 17:58:16 2013 +0530

    s3:rpc_server/srvsvc check access before doing work
    
    Before doing the (potentially) costly enumerations,
    check if the user has necessary privileges first
    
    Signed-off-by: Shekhar Amlekar <samlekar at in.ibm.com>
    Reviewed-by: Christian Ambach <ambi at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Christian Ambach <ambi at samba.org>
    Autobuild-Date(master): Tue May 14 16:22:24 CEST 2013 on sn-devel-104

commit 1cd20441a76bde78196124b925a67183614103d8
Author: Volker Lendecke <vl at samba.org>
Date:   Sat May 11 10:51:22 2013 +0200

    torture: Remove some unused code
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Christian Ambach <ambi at samba.org>

commit 11f467d0bd8e2264f311d82f3299443b99526bb3
Author: Christian Ambach <ambi at samba.org>
Date:   Sat May 11 00:45:15 2013 +0200

    tdb: include information about hash function being used in tdbtool info output
    
    makes it possible to easily determine if the tdb under examination
    uses jenkins hash or not
    
    Signed-off-by: Christian Ambach <ambi at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>

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

Summary of changes:
 lib/tdb/common/summary.c                  |    2 ++
 source3/rpc_server/srvsvc/srv_srvsvc_nt.c |   20 ++++++++++----------
 source3/torture/test_idmap_tdb_common.c   |    5 -----
 3 files changed, 12 insertions(+), 15 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tdb/common/summary.c b/lib/tdb/common/summary.c
index f4e6d2c..ef2c49a 100644
--- a/lib/tdb/common/summary.c
+++ b/lib/tdb/common/summary.c
@@ -20,6 +20,7 @@
 #define SUMMARY_FORMAT \
 	"Size of file/data: %u/%zu\n" \
 	"Number of records: %zu\n" \
+	"Incompatible hash: %s\n" \
 	"Smallest/average/largest keys: %zu/%zu/%zu\n" \
 	"Smallest/average/largest data: %zu/%zu/%zu\n" \
 	"Smallest/average/largest padding: %zu/%zu/%zu\n" \
@@ -171,6 +172,7 @@ _PUBLIC_ char *tdb_summary(struct tdb_context *tdb)
 	snprintf(ret, len, SUMMARY_FORMAT,
 		 tdb->map_size, keys.total+data.total,
 		 keys.num,
+		 (tdb->hash_fn == tdb_jenkins_hash)?"yes":"no",
 		 keys.min, tally_mean(&keys), keys.max,
 		 data.min, tally_mean(&data), data.max,
 		 extra.min, tally_mean(&extra), extra.max,
diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index 2d58466..011d41f 100644
--- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
@@ -1226,16 +1226,6 @@ WERROR _srvsvc_NetSessDel(struct pipes_struct *p,
 	bool not_root = False;
 	WERROR werr;
 
-	username = r->in.user;
-	machine = r->in.client;
-
-	/* strip leading backslashes if any */
-	if (machine && machine[0] == '\\' && machine[1] == '\\') {
-		machine += 2;
-	}
-
-	num_sessions = list_sessions(p->mem_ctx, &session_list);
-
 	DEBUG(5,("_srvsvc_NetSessDel: %d\n", __LINE__));
 
 	werr = WERR_ACCESS_DENIED;
@@ -1249,6 +1239,16 @@ WERROR _srvsvc_NetSessDel(struct pipes_struct *p,
 		goto done;
 	}
 
+	username = r->in.user;
+	machine = r->in.client;
+
+	/* strip leading backslashes if any */
+	if (machine && machine[0] == '\\' && machine[1] == '\\') {
+		machine += 2;
+	}
+
+	num_sessions = list_sessions(p->mem_ctx, &session_list);
+
 	for (snum = 0; snum < num_sessions; snum++) {
 
 		if ((strequal(session_list[snum].username, username) || username[0] == '\0' ) &&
diff --git a/source3/torture/test_idmap_tdb_common.c b/source3/torture/test_idmap_tdb_common.c
index 5681eef..6f5f3c5 100644
--- a/source3/torture/test_idmap_tdb_common.c
+++ b/source3/torture/test_idmap_tdb_common.c
@@ -62,11 +62,6 @@ bool idmap_is_online(void)
 	return true;
 }
 
-NTSTATUS idmap_backends_sid_to_unixid(const char *domain, struct id_map *id)
-{
-	return NT_STATUS_OK;
-}
-
 NTSTATUS idmap_backends_unixid_to_sid(const char *domname, struct id_map *id)
 {
 	return NT_STATUS_OK;


-- 
Samba Shared Repository