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

range())
(This used to be commit ec1eaa274b997197ca6996457229c802f1b76d56)

diff --git a/source4/lib/cmdline/popt_common.c b/source4/lib/cmdline/popt_common.c
index d364f4d3bf6c5a438f254b5792d754c4bef19424..7049ce65dfa5270568e6f356f3a6d0b5945fdb5b 100644 (file)
--- a/source4/lib/cmdline/popt_common.c
+++ b/source4/lib/cmdline/popt_common.c
@@ -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

diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c
index 3ee3445ede05379d56958eccc1f66cea94c62018..88b1c54cefd803f72de72330ca0299cd027ce7bb 100644 (file)
--- a/source4/librpc/rpc/dcerpc_util.c
+++ b/source4/librpc/rpc/dcerpc_util.c
@@ -165,6 +165,9 @@ static const struct {
                { 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 },
        },
 };

diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 969711858c83e673a04806a76e72158aa0add3ca..13a848d0b4cbffb0dd495d61c344bf4c65c70c0e 100644 (file)
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -2894,7 +2894,7 @@ static BOOL test_RemoveMemberFromForeignDomain(struct dcerpc_pipe *p,
        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)) {