summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-09-18 21:52:00 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:18:59 -0500
commitcd9057a0bb90bef6d31051f176849b6a3543a376 (patch)
tree5deb7506c215502436c89239a460066e8cb82b2c /source4/torture
parenta27d4335f2dd0733b8aec2a230cd5186961e4d07 (diff)
downloadsamba-cd9057a0bb90bef6d31051f176849b6a3543a376.tar.gz
samba-cd9057a0bb90bef6d31051f176849b6a3543a376.tar.bz2
samba-cd9057a0bb90bef6d31051f176849b6a3543a376.zip
r18639: Get rid of the keepref support
(This used to be commit d1364ef0cd8f1a64f44476476323ab390ac4de48)
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/rpc/atsvc.c8
-rw-r--r--source4/torture/rpc/oxidresolve.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/source4/torture/rpc/atsvc.c b/source4/torture/rpc/atsvc.c
index c1357b53d2..e586a1e98f 100644
--- a/source4/torture/rpc/atsvc.c
+++ b/source4/torture/rpc/atsvc.c
@@ -75,7 +75,7 @@ static BOOL test_JobEnum(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
r.in.servername = dcerpc_server_name(p);
ctr.entries_read = 0;
ctr.first_entry = NULL;
- r.in.ctr = ctr;
+ r.in.ctr = r.out.ctr = &ctr;
r.in.preferred_max_len = 0xffffffff;
r.in.resume_handle = r.out.resume_handle = &resume_handle;
@@ -86,8 +86,8 @@ static BOOL test_JobEnum(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
return False;
}
- for (i = 0; i < r.out.ctr.entries_read; i++) {
- if (!test_JobGetInfo(p, mem_ctx, r.out.ctr.first_entry[i].job_id)) {
+ for (i = 0; i < r.out.ctr->entries_read; i++) {
+ if (!test_JobGetInfo(p, mem_ctx, r.out.ctr->first_entry[i].job_id)) {
ret = False;
}
}
@@ -109,7 +109,7 @@ static BOOL test_JobAdd(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
info.days_of_week = 0x02; /* Tuesday */
info.flags = 0x11; /* periodic, non-interactive */
info.command = "foo.exe";
- r.in.job_info = info;
+ r.in.job_info = &info;
status = dcerpc_atsvc_JobAdd(p, mem_ctx, &r);
diff --git a/source4/torture/rpc/oxidresolve.c b/source4/torture/rpc/oxidresolve.c
index 11ec5f2749..3643a85485 100644
--- a/source4/torture/rpc/oxidresolve.c
+++ b/source4/torture/rpc/oxidresolve.c
@@ -47,6 +47,8 @@ static int test_RemoteActivation(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uin
r.in.Interfaces = 1;
iids[0] = dcerpc_table_IUnknown.syntax_id.uuid;
r.in.pIIDs = iids;
+ r.out.pOxid = oxid;
+ r.out.ipidRemUnknown = oid;
status = dcerpc_RemoteActivation(p, mem_ctx, &r);
if(NT_STATUS_IS_ERR(status)) {
@@ -60,7 +62,7 @@ static int test_RemoteActivation(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uin
}
if(!W_ERROR_IS_OK(r.out.hr)) {
- fprintf(stderr, "RemoteActivation: %s\n", win_errstr(r.out.hr));
+ fprintf(stderr, "RemoteActivation: %s\n", win_errstr(*r.out.hr));
return 0;
}
@@ -69,8 +71,6 @@ static int test_RemoteActivation(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uin
return 0;
}
- *oid = r.out.ipidRemUnknown;
- *oxid = r.out.pOxid;
return 1;
}
@@ -189,7 +189,7 @@ static int test_ResolveOxid2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint64_
return 0;
}
- printf("Remote server versions: %d, %d\n", r.out.ComVersion.MajorVersion, r.out.ComVersion.MinorVersion);
+ printf("Remote server versions: %d, %d\n", r.out.ComVersion->MajorVersion, r.out.ComVersion->MinorVersion);
return 1;
}