[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  6653cc4... Fix bug #7036 - net rpc getsid fails in hardened windows environments.
      from  33a4739... s4-torture: Migrate ntp_signd test to tsocket.

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


- Log -----------------------------------------------------------------
commit 6653cc43233381a941cdd85550f04b087fe880ff
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Jan 14 15:39:30 2010 -0800

    Fix bug #7036 - net rpc getsid fails in hardened windows environments.
    
    Fix suggested by Dave.Daugherty at Centrify.com.

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

Summary of changes:
 source3/utils/net_rpc.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 762af71..3b72506 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -607,6 +607,12 @@ static NTSTATUS rpc_getsid_internals(struct net_context *c,
 
 int net_rpc_getsid(struct net_context *c, int argc, const char **argv)
 {
+	int conn_flags = NET_FLAGS_PDC;
+
+	if (!c->opt_user_specified) {
+		conn_flags |= NET_FLAGS_ANONYMOUS;
+	}
+
 	if (c->display_usage) {
 		d_printf(_("Usage:\n"
 			   "net rpc getsid\n"
@@ -615,7 +621,7 @@ int net_rpc_getsid(struct net_context *c, int argc, const char **argv)
 	}
 
 	return run_rpc_command(c, NULL, &ndr_table_samr.syntax_id,
-			       NET_FLAGS_ANONYMOUS | NET_FLAGS_PDC,
+			       conn_flags,
 			       rpc_getsid_internals,
 			       argc, argv);
 }


-- 
Samba Shared Repository