From c80b85803b9fbc11cbf77486b847da9f38ba3684 Mon Sep 17 00:00:00 2001 From: Luke Leighton Date: Sat, 27 Nov 1999 22:47:17 +0000 Subject: this one's a handle-based one (missed in the first round). (This used to be commit 4c3556fae73c60693355f95f48ac63834ba4dd10) --- source3/rpcclient/cmd_eventlog.c | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) (limited to 'source3/rpcclient') diff --git a/source3/rpcclient/cmd_eventlog.c b/source3/rpcclient/cmd_eventlog.c index 2a18645196..3e86f5bb28 100644 --- a/source3/rpcclient/cmd_eventlog.c +++ b/source3/rpcclient/cmd_eventlog.c @@ -32,7 +32,6 @@ extern int DEBUGLEVEL; #define DEBUG_TESTING -extern struct cli_state *smb_cli; extern FILE* out_hnd; @@ -40,9 +39,8 @@ extern FILE* out_hnd; ****************************************************************************/ void cmd_eventlog(struct client_info *info, int argc, char *argv[]) { - uint16 nt_pipe_fnum; - BOOL res = True; - BOOL res1 = True; + BOOL res1 = True; + BOOL res = True; POLICY_HND hnd; uint32 number = 0; uint32 flags; @@ -52,43 +50,43 @@ void cmd_eventlog(struct client_info *info, int argc, char *argv[]) char *journal = NULL; - flags=EVENTLOG_READ_SEQUENTIAL|EVENTLOG_READ_BACKWARD; + fstring srv_name; + fstrcpy(srv_name, "\\\\"); + fstrcat(srv_name, info->dest_host); + strupper(srv_name); + + flags = EVENTLOG_READ_SEQUENTIAL|EVENTLOG_READ_BACKWARD; if (argc > 1) { journal = argv[1]; } - /* open scheduler session. */ - res1 = res1 ? cli_nt_session_open(smb_cli, PIPE_EVENTLOG, &nt_pipe_fnum) : False; - - res1 = res1 ? do_event_open(smb_cli, nt_pipe_fnum, journal, &hnd) : False; - - res = res1 ? do_event_numofeventlogrec(smb_cli, nt_pipe_fnum, &hnd, &number) : False; + res = res ? event_open(srv_name, journal, &hnd) : False; + res1 = res ? event_numofeventlogrec(&hnd, &number) : False; fprintf(out_hnd, "Number of events: %d\n", number); display_eventlog_eventrecord(out_hnd, ACTION_HEADER, &ev); - for (offset = 0; offset < number && res; offset++) + for (offset = 0; offset < number && res1; offset++) { num_of_bytes=0; /* try once with a empty buffer */ - res = res ? do_event_readeventlog(smb_cli, nt_pipe_fnum, &hnd, number, - flags, offset, &num_of_bytes, &ev) : False; + res1 = res1 ? event_readeventlog(&hnd, number, + flags, offset, + &num_of_bytes, &ev) : False; /* and try again with the correct size */ - res = res ? do_event_readeventlog(smb_cli, nt_pipe_fnum, &hnd, number, - flags, offset, &num_of_bytes, &ev) : False; + res1 = res1 ? event_readeventlog(&hnd, number, + flags, offset, + &num_of_bytes, &ev) : False; display_eventlog_eventrecord(out_hnd, ACTION_ENUMERATE, &ev); } display_eventlog_eventrecord(out_hnd, ACTION_FOOTER, &ev); - res1 = res1 ? do_event_close(smb_cli, nt_pipe_fnum, &hnd): False; - - /* close the session */ - cli_nt_session_close(smb_cli, nt_pipe_fnum); + res = res ? event_close(&hnd): False; } -- cgit