diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-03-22 22:11:50 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:11:11 -0500 |
| commit | 7c55d0ffa5af6d372ce63ba369a20d9a46fa6454 (patch) | |
| tree | e1a63d676047ad4a7760a2382295aa9321829de5 | |
| parent | 88a5f8b26f4ba2c4d0a01354339a670a5b1c8f3e (diff) | |
| download | samba-7c55d0ffa5af6d372ce63ba369a20d9a46fa6454.tar.gz samba-7c55d0ffa5af6d372ce63ba369a20d9a46fa6454.tar.bz2 samba-7c55d0ffa5af6d372ce63ba369a20d9a46fa6454.zip | |
r5976: SIDs can't have more then 5 subauths (caught by [validate] and
range())
(This used to be commit ec1eaa274b997197ca6996457229c802f1b76d56)
| -rw-r--r-- | source4/lib/cmdline/popt_common.c | 2 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc_util.c | 3 | ||||
| -rw-r--r-- | source4/torture/rpc/samr.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/source4/lib/cmdline/popt_common.c b/source4/lib/cmdline/popt_common.c index d364f4d3bf..7049ce65df 100644 --- 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 3ee3445ede..88b1c54cef 100644 --- 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 969711858c..13a848d0b4 100644 --- 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)) { |