svn commit: samba r5976 - in branches/SAMBA_4_0/source: lib/cmdline librpc/rpc torture/rpc

[jelmer at samba.org]

Author: jelmer
Date: 2005-03-22 22:11:50 +0000 (Tue, 22 Mar 2005)
New Revision: 5976

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5976

Log:
SIDs can't have more then 5 subauths (caught by [validate] and 
range())

Modified:
   branches/SAMBA_4_0/source/lib/cmdline/popt_common.c
   branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c
   branches/SAMBA_4_0/source/torture/rpc/samr.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/cmdline/popt_common.c
===================================================================
--- branches/SAMBA_4_0/source/lib/cmdline/popt_common.c	2005-03-22 22:04:01 UTC (rev 5975)
+++ branches/SAMBA_4_0/source/lib/cmdline/popt_common.c	2005-03-22 22:11:50 UTC (rev 5976)
@@ -3,7 +3,7 @@
    Common popt routines
 
    Copyright (C) Tim Potter 2001,2002
-   Copyright (C) Jelmer Vernooij 2002,2003
+   Copyright (C) Jelmer Vernooij 2002,2003,2005
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c	2005-03-22 22:04:01 UTC (rev 5975)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c	2005-03-22 22:11:50 UTC (rev 5976)
@@ -165,6 +165,9 @@
 		{ EPM_PROTOCOL_NCADG, EPM_PROTOCOL_IPX },
 	},
 	{ "ncacn_spx", NCACN_SPX, 3,
+		/* I guess some MS programmer confused the identifier for 
+		 * EPM_PROTOCOL_UUID (0x0D or 13) with the one for 
+		 * EPM_PROTOCOL_SPX (0x13) here. -- jelmer*/
 		{ EPM_PROTOCOL_NCACN, EPM_PROTOCOL_NCALRPC, EPM_PROTOCOL_UUID },
 	},
 };

Modified: branches/SAMBA_4_0/source/torture/rpc/samr.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/samr.c	2005-03-22 22:04:01 UTC (rev 5975)
+++ branches/SAMBA_4_0/source/torture/rpc/samr.c	2005-03-22 22:11:50 UTC (rev 5976)
@@ -2894,7 +2894,7 @@
 	struct samr_RemoveMemberFromForeignDomain r;
 
 	r.in.domain_handle = domain_handle;
-	r.in.sid = dom_sid_parse_talloc(mem_ctx, "S-1-5-32-12-34-56-78-9");
+	r.in.sid = dom_sid_parse_talloc(mem_ctx, "S-1-5-32-12-34-56-78");
 
 	status = dcerpc_samr_RemoveMemberFromForeignDomain(p, mem_ctx, &r);
 	if (!NT_STATUS_IS_OK(status)) {