diff options
| -rw-r--r-- | source4/gtk/tools/gwcrontab.c | 22 | ||||
| -rw-r--r-- | source4/librpc/idl/atsvc.idl | 5 | ||||
| -rw-r--r-- | source4/librpc/idl/efs.idl | 3 | ||||
| -rw-r--r-- | source4/torture/rpc/atsvc.c | 8 |
4 files changed, 18 insertions, 20 deletions
diff --git a/source4/gtk/tools/gwcrontab.c b/source4/gtk/tools/gwcrontab.c index fe21248363..8826faa100 100644 --- a/source4/gtk/tools/gwcrontab.c +++ b/source4/gtk/tools/gwcrontab.c @@ -44,14 +44,14 @@ static void update_joblist(void) int i; uint32_t resume_handle = 0; - gtk_list_store_clear(store_jobs); + gtk_list_store_clear(store_jobs); ctr.entries_read = 0; ctr.first_entry = NULL; r.in.servername = dcerpc_server_name(at_pipe); - r.in.ctr = r.out.ctr = &ctr; - r.in.preferred_max_len = 0xffffffff; - r.in.resume_handle = r.out.resume_handle = &resume_handle; + r.in.ctr = ctr; + r.in.preferred_max_len = 0xffffffff; + r.in.resume_handle = r.out.resume_handle = &resume_handle; status = dcerpc_atsvc_JobEnum(at_pipe, mem_ctx, &r); if(!NT_STATUS_IS_OK(status)) { @@ -59,15 +59,15 @@ static void update_joblist(void) return; } - for (i = 0; r.out.ctr && i < r.out.ctr->entries_read; i++) { + for (i = 0; i < r.out.ctr.entries_read; i++) { GtkTreeIter iter; gtk_list_store_append(store_jobs, &iter); gtk_list_store_set (store_jobs, &iter, - 0, r.out.ctr->first_entry[i].flags, - 1, r.out.ctr->first_entry[i].job_id, - 2, r.out.ctr->first_entry[i].days_of_week, /*FIXME: Nicer format */ - 3, r.out.ctr->first_entry[i].job_time, /* FIXME: Nicer format */ - 4, r.out.ctr->first_entry[i].command, + 0, r.out.ctr.first_entry[i].flags, + 1, r.out.ctr.first_entry[i].job_id, + 2, r.out.ctr.first_entry[i].days_of_week, /*FIXME: Nicer format */ + 3, r.out.ctr.first_entry[i].job_time, /* FIXME: Nicer format */ + 4, r.out.ctr.first_entry[i].command, -1); } @@ -122,7 +122,7 @@ void on_new_activate (GtkMenuItem *menuitem, gpointer user_data) job.flags = 0; /* FIXME */ job.command = gtk_entry_get_text(GTK_ENTRY(entry_cmd)); r.in.servername = dcerpc_server_name(at_pipe); - r.in.job_info = &job; + r.in.job_info = job; status = dcerpc_atsvc_JobAdd(at_pipe, mem_ctx, &r); if(!NT_STATUS_IS_OK(status)) { diff --git a/source4/librpc/idl/atsvc.idl b/source4/librpc/idl/atsvc.idl index 3dd5cb6805..d58a719651 100644 --- a/source4/librpc/idl/atsvc.idl +++ b/source4/librpc/idl/atsvc.idl @@ -6,8 +6,7 @@ version(1.0), pointer_default(unique), helpstring("Microsoft AT-Scheduler Service"), - endpoint("ncacn_np:[\\pipe\\atsvc]", "ncalrpc:"), - keepref + endpoint("ncacn_np:[\\pipe\\atsvc]", "ncalrpc:") ] interface atsvc { typedef [bitmap32bit] bitmap { @@ -74,7 +73,7 @@ /* Function: 0x00 */ NTSTATUS atsvc_JobAdd( [in,unique,string,charset(UTF16)] uint16 *servername, - [in,keepref] atsvc_JobInfo *job_info, + [in] atsvc_JobInfo *job_info, [out] uint32 job_id ); diff --git a/source4/librpc/idl/efs.idl b/source4/librpc/idl/efs.idl index 83c6cad19f..75d997a018 100644 --- a/source4/librpc/idl/efs.idl +++ b/source4/librpc/idl/efs.idl @@ -7,8 +7,7 @@ uuid("c681d488-d850-11d0-8c52-00c04fd90f7e"), version(1.0), depends(security), - pointer_default(unique), - keepref + pointer_default(unique) ] interface efs { diff --git a/source4/torture/rpc/atsvc.c b/source4/torture/rpc/atsvc.c index 0381b31169..c1357b53d2 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 = r.out.ctr = &ctr; + r.in.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; r.out.ctr && 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); |