diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-09-11 22:14:33 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-09-11 22:14:33 +1000 |
| commit | 668fd97e53d6853345604a7c0472a9bcfd5d2b9b (patch) | |
| tree | 8e44d7aa5e879a1ab6b69e0d1c4c8bb09a387330 /source4 | |
| parent | 0d6bc14225d910150dc9949b35e587aafe9922c7 (diff) | |
| parent | 61facf426691cc896ec61fde1c4cb7d947adb07b (diff) | |
| download | samba-668fd97e53d6853345604a7c0472a9bcfd5d2b9b.tar.gz samba-668fd97e53d6853345604a7c0472a9bcfd5d2b9b.tar.bz2 samba-668fd97e53d6853345604a7c0472a9bcfd5d2b9b.zip | |
Merge branch 'master' of /home/tridge/samba/git/combined
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/rpc_server/lsa/lsa_lookup.c | 8 | ||||
| -rw-r--r-- | source4/torture/rpc/lsa.c | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/source4/rpc_server/lsa/lsa_lookup.c b/source4/rpc_server/lsa/lsa_lookup.c index 005c7d4f06..fc45c8bc0f 100644 --- a/source4/rpc_server/lsa/lsa_lookup.c +++ b/source4/rpc_server/lsa/lsa_lookup.c @@ -658,8 +658,8 @@ NTSTATUS dcesrv_lsa_LookupSids3(struct dcesrv_call_state *dce_call, r2.in.names = r->in.names; r2.in.level = r->in.level; r2.in.count = r->in.count; - r2.in.unknown1 = r->in.unknown1; - r2.in.unknown2 = r->in.unknown2; + r2.in.lookup_options = r->in.lookup_options; + r2.in.client_revision = r->in.client_revision; r2.out.count = r->out.count; r2.out.names = r->out.names; r2.out.domains = r->out.domains; @@ -691,8 +691,8 @@ NTSTATUS dcesrv_lsa_LookupSids(struct dcesrv_call_state *dce_call, TALLOC_CTX *m r2.in.names = NULL; r2.in.level = r->in.level; r2.in.count = r->in.count; - r2.in.unknown1 = 0; - r2.in.unknown2 = 0; + r2.in.lookup_options = 0; + r2.in.client_revision = 0; r2.out.count = r->out.count; r2.out.names = NULL; r2.out.domains = r->out.domains; diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c index b45b565452..e4234c7f47 100644 --- a/source4/torture/rpc/lsa.c +++ b/source4/torture/rpc/lsa.c @@ -543,8 +543,8 @@ static bool test_LookupSids2(struct dcerpc_pipe *p, r.in.names = &names; r.in.level = 1; r.in.count = &count; - r.in.unknown1 = 0; - r.in.unknown2 = 0; + r.in.lookup_options = 0; + r.in.client_revision = 0; r.out.count = &count; r.out.names = &names; r.out.domains = &domains; @@ -587,8 +587,8 @@ static bool test_LookupSids3(struct dcerpc_pipe *p, r.in.names = &names; r.in.level = 1; r.in.count = &count; - r.in.unknown1 = 0; - r.in.unknown2 = 0; + r.in.lookup_options = 0; + r.in.client_revision = 0; r.out.domains = &domains; r.out.count = &count; r.out.names = &names; @@ -678,8 +678,8 @@ bool test_many_LookupSids(struct dcerpc_pipe *p, r.in.names = &names; r.in.level = 1; r.in.count = &count; - r.in.unknown1 = 0; - r.in.unknown2 = 0; + r.in.lookup_options = 0; + r.in.client_revision = 0; r.out.count = &count; r.out.names = &names; r.out.domains = &domains; |