[Pkg-samba-maint] [SCM] Debian packaging for Samba branch, wheezy, updated. 9b646bf8484b9f88b064937d6174b05370c4b3c6

[Christian Perrier]

The following commit has been merged in the wheezy branch:
commit ec7ccc57625fa76bf061671434359f1b58e5170e
Author: Christian Perrier <bubulle at debian.org>
Date:   Sun Jun 9 16:09:35 2013 +0200

    Fix net rpc share allowedusers to work with 2008r2 Closes: #711011

diff --git a/debian/changelog b/debian/changelog
index eece75c..426a7ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ samba (2:3.6.6-6+deb7u1) UNRELEASED; urgency=low
   * Stable update for fix important bugs.
   * Fix RAW printing for unprivileged users (regression from squeeze)
     Closes: #709613
+  * Fix net rpc share allowedusers to work with 2008r2
+    Closes: #711011
 
  -- Christian Perrier <bubulle at debian.org>  Sun, 09 Jun 2013 15:01:42 +0200
 
diff --git a/debian/patches/bug_711011_upstream_8966_net-rpc-share-allowedusers-with-2008r2.patch b/debian/patches/bug_711011_upstream_8966_net-rpc-share-allowedusers-with-2008r2.patch
new file mode 100644
index 0000000..d7ef168
--- /dev/null
+++ b/debian/patches/bug_711011_upstream_8966_net-rpc-share-allowedusers-with-2008r2.patch
@@ -0,0 +1,133 @@
+Description: Fix net rpc share allowedusers to work with 2008r2
+ The RAP NetShareEnum command was removed in 2008r2, so use the RPC equivalent
+ instead.
+Bug: https://bugzilla.samba.org/show_bug.cgi?id=8966
+Author: Jeremy Allison <jra at samba.org>
+
+Index: samba/source3/utils/net_rpc.c
+===================================================================
+--- samba.orig/source3/utils/net_rpc.c
++++ samba/source3/utils/net_rpc.c
+@@ -4902,28 +4902,6 @@
+ 	return;
+ }
+ 
+-struct share_list {
+-	int num_shares;
+-	char **shares;
+-};
+-
+-static void collect_share(const char *name, uint32 m,
+-			  const char *comment, void *state)
+-{
+-	struct share_list *share_list = (struct share_list *)state;
+-
+-	if (m != STYPE_DISKTREE)
+-		return;
+-
+-	share_list->num_shares += 1;
+-	share_list->shares = SMB_REALLOC_ARRAY(share_list->shares, char *, share_list->num_shares);
+-	if (!share_list->shares) {
+-		share_list->num_shares = 0;
+-		return;
+-	}
+-	share_list->shares[share_list->num_shares-1] = SMB_STRDUP(name);
+-}
+-
+ /**
+  * List shares on a remote RPC server, including the security descriptors.
+  *
+@@ -4949,16 +4927,21 @@
+ 						int argc,
+ 						const char **argv)
+ {
+-	int ret;
+ 	bool r;
+-	uint32 i;
+ 	FILE *f;
++	NTSTATUS nt_status = NT_STATUS_OK;
++	uint32_t total_entries = 0;
++	uint32_t resume_handle = 0;
++	uint32_t preferred_len = 0xffffffff;
++	uint32_t i;
++	struct dcerpc_binding_handle *b = NULL;
++	struct srvsvc_NetShareInfoCtr info_ctr;
++	struct srvsvc_NetShareCtr1 ctr1;
++	WERROR result;
+ 
+ 	struct user_token *tokens = NULL;
+ 	int num_tokens = 0;
+ 
+-	struct share_list share_list;
+-
+ 	if (argc == 0) {
+ 		f = stdin;
+ 	} else {
+@@ -4983,22 +4966,47 @@
+ 	for (i=0; i<num_tokens; i++)
+ 		collect_alias_memberships(&tokens[i].token);
+ 
+-	share_list.num_shares = 0;
+-	share_list.shares = NULL;
++	ZERO_STRUCT(info_ctr);
++	ZERO_STRUCT(ctr1);
+ 
+-	ret = cli_RNetShareEnum(cli, collect_share, &share_list);
++	info_ctr.level = 1;
++	info_ctr.ctr.ctr1 = &ctr1;
++
++	b = pipe_hnd->binding_handle;
++
++	/* Issue the NetShareEnum RPC call and retrieve the response */
++	nt_status = dcerpc_srvsvc_NetShareEnumAll(b,
++					talloc_tos(),
++					pipe_hnd->desthost,
++					&info_ctr,
++					preferred_len,
++					&total_entries,
++					&resume_handle,
++					&result);
++
++	/* Was it successful? */
++	if (!NT_STATUS_IS_OK(nt_status)) {
++		/*  Nope.  Go clean up. */
++		goto done;
++	}
++
++	if (!W_ERROR_IS_OK(result)) {
++		/*  Nope.  Go clean up. */
++		nt_status = werror_to_ntstatus(result);
++		goto done;
++	}
+ 
+-	if (ret == -1) {
+-		DEBUG(0, ("Error returning browse list: %s\n",
+-			  cli_errstr(cli)));
++	if (total_entries == 0) {
+ 		goto done;
+ 	}
+ 
+-	for (i = 0; i < share_list.num_shares; i++) {
+-		char *netname = share_list.shares[i];
++        /* For each returned entry... */
++	for (i = 0; i < info_ctr.ctr.ctr1->count; i++) {
++		const char *netname = info_ctr.ctr.ctr1->array[i].name;
+ 
+-		if (netname[strlen(netname)-1] == '$')
++		if (info_ctr.ctr.ctr1->array[i].type != STYPE_DISKTREE) {
+ 			continue;
++		}
+ 
+ 		d_printf("%s\n", netname);
+ 
+@@ -5010,9 +5018,8 @@
+ 		free_user_token(&tokens[i].token);
+ 	}
+ 	SAFE_FREE(tokens);
+-	SAFE_FREE(share_list.shares);
+ 
+-	return NT_STATUS_OK;
++	return nt_status;
+ }
+ 
+ static int rpc_share_allowedusers(struct net_context *c, int argc,
diff --git a/debian/patches/series b/debian/patches/series
index f0d39db..1b95831 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,3 +25,4 @@ only_export_public_symbols.patch
 security-CVE-2013-0213.patch
 security-CVE-2013-0214.patch
 bug_709613_upstream_8769_s3fs-printing-Fix-RAW-printing-for-normal-users.patch
+bug_711011_upstream_8966_net-rpc-share-allowedusers-with-2008r2.patch

-- 
Debian packaging for Samba