Author: jerry Date: 2007-05-31 17:33:47 +0000 (Thu, 31 May 2007) New Revision: 23273
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23273 Log: Replace hand written CloseEventlog() with pidl generated stub Modified: branches/SAMBA_3_0_26/source/Makefile.in branches/SAMBA_3_0_26/source/configure.in branches/SAMBA_3_0_26/source/include/includes.h branches/SAMBA_3_0_26/source/include/rpc_client.h branches/SAMBA_3_0_26/source/include/rpc_eventlog.h branches/SAMBA_3_0_26/source/include/smb.h branches/SAMBA_3_0_26/source/rpc_parse/parse_eventlog.c branches/SAMBA_3_0_26/source/rpc_server/srv_eventlog.c branches/SAMBA_3_0_26/source/rpc_server/srv_eventlog_nt.c branches/SAMBA_3_0_26/source/rpc_server/srv_pipe.c Changeset: Modified: branches/SAMBA_3_0_26/source/Makefile.in =================================================================== --- branches/SAMBA_3_0_26/source/Makefile.in 2007-05-31 17:26:30 UTC (rev 23272) +++ branches/SAMBA_3_0_26/source/Makefile.in 2007-05-31 17:33:47 UTC (rev 23273) @@ -233,7 +233,7 @@ LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o librpc/gen_ndr/ndr_notify.o \ librpc/gen_ndr/ndr_lsa.o librpc/gen_ndr/ndr_echo.o \ - librpc/gen_ndr/ndr_svcctl.o + librpc/gen_ndr/ndr_svcctl.o librpc/gen_ndr/ndr_eventlog.o RPC_PARSE_OBJ0 = rpc_parse/parse_prs.o rpc_parse/parse_misc.o @@ -338,6 +338,7 @@ LIBMSRPC_GEN_OBJ = librpc/gen_ndr/cli_wkssvc.o librpc/gen_ndr/cli_lsa.o \ librpc/gen_ndr/cli_echo.o librpc/gen_ndr/cli_svcctl.o \ + librpc/gen_ndr/cli_eventlog.o \ $(LIBNDR_GEN_OBJ) $(RPCCLIENT_NDR_OBJ) REGOBJS_OBJ = registry/reg_objects.o @@ -375,7 +376,8 @@ RPC_SPOOLSS_OBJ = rpc_server/srv_spoolss.o rpc_server/srv_spoolss_nt.o -RPC_EVENTLOG_OBJ = rpc_server/srv_eventlog.o rpc_server/srv_eventlog_nt.o rpc_server/srv_eventlog_lib.o +RPC_EVENTLOG_OBJ = rpc_server/srv_eventlog.o rpc_server/srv_eventlog_nt.o \ + rpc_server/srv_eventlog_lib.o librpc/gen_ndr/srv_eventlog.o RPC_PIPE_OBJ = rpc_server/srv_pipe_hnd.o \ rpc_server/srv_pipe.o rpc_server/srv_lsa_hnd.o Modified: branches/SAMBA_3_0_26/source/configure.in =================================================================== --- branches/SAMBA_3_0_26/source/configure.in 2007-05-31 17:26:30 UTC (rev 23272) +++ branches/SAMBA_3_0_26/source/configure.in 2007-05-31 17:33:47 UTC (rev 23273) @@ -610,7 +610,7 @@ dnl Add modules that have to be built by default here dnl These have to be built static: -default_static_modules="pdb_smbpasswd pdb_tdbsam rpc_lsa rpc_samr rpc_reg rpc_shutdown rpc_lsa_ds rpc_wkssvc rpc_svcctl2 rpc_ntsvcs rpc_net rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog rpc_rpcecho auth_sam auth_unix auth_winbind auth_server auth_domain auth_builtin vfs_default nss_info_template" +default_static_modules="pdb_smbpasswd pdb_tdbsam rpc_lsa rpc_samr rpc_reg rpc_shutdown rpc_lsa_ds rpc_wkssvc rpc_svcctl2 rpc_ntsvcs rpc_net rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog2 rpc_rpcecho auth_sam auth_unix auth_winbind auth_server auth_domain auth_builtin vfs_default nss_info_template" dnl These are preferably build shared, and static if dlopen() is not available default_shared_modules="vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy charset_CP850 charset_CP437 auth_script vfs_readahead" @@ -6131,7 +6131,7 @@ SMB_MODULE(rpc_netdfs, \$(RPC_DFS_OBJ), "bin/librpc_netdfs.$SHLIBEXT", RPC) SMB_MODULE(rpc_srv, \$(RPC_SVC_OBJ), "bin/librpc_svc.$SHLIBEXT", RPC) SMB_MODULE(rpc_spoolss, \$(RPC_SPOOLSS_OBJ), "bin/librpc_spoolss.$SHLIBEXT", RPC) -SMB_MODULE(rpc_eventlog, \$(RPC_EVENTLOG_OBJ), "bin/librpc_eventlog.$SHLIBEXT", RPC) +SMB_MODULE(rpc_eventlog2, \$(RPC_EVENTLOG_OBJ), "bin/librpc_eventlog2.$SHLIBEXT", RPC) SMB_MODULE(rpc_samr, \$(RPC_SAMR_OBJ), "bin/librpc_samr.$SHLIBEXT", RPC) SMB_MODULE(rpc_rpcecho, \$(RPC_ECHO_OBJ), "bin/librpc_rpcecho.$SHLIBEXT", RPC) SMB_SUBSYSTEM(RPC,smbd/server.o) Modified: branches/SAMBA_3_0_26/source/include/includes.h =================================================================== --- branches/SAMBA_3_0_26/source/include/includes.h 2007-05-31 17:26:30 UTC (rev 23272) +++ branches/SAMBA_3_0_26/source/include/includes.h 2007-05-31 17:33:47 UTC (rev 23273) @@ -786,6 +786,7 @@ #include "librpc/gen_ndr/srv_echo.h" #include "librpc/gen_ndr/srv_svcctl.h" #include "librpc/gen_ndr/srv_lsa.h" +#include "librpc/gen_ndr/srv_eventlog.h" /***** automatically generated prototypes *****/ #ifndef NO_PROTO_H Modified: branches/SAMBA_3_0_26/source/include/rpc_client.h =================================================================== --- branches/SAMBA_3_0_26/source/include/rpc_client.h 2007-05-31 17:26:30 UTC (rev 23272) +++ branches/SAMBA_3_0_26/source/include/rpc_client.h 2007-05-31 17:33:47 UTC (rev 23273) @@ -27,6 +27,7 @@ #include "librpc/gen_ndr/cli_lsa.h" #include "librpc/gen_ndr/cli_svcctl.h" #include "librpc/gen_ndr/cli_wkssvc.h" +#include "librpc/gen_ndr/cli_eventlog.h" /* macro to expand cookie-cutter code in cli_xxx() using rpc_api_pipe_req() */ Modified: branches/SAMBA_3_0_26/source/include/rpc_eventlog.h =================================================================== --- branches/SAMBA_3_0_26/source/include/rpc_eventlog.h 2007-05-31 17:26:30 UTC (rev 23272) +++ branches/SAMBA_3_0_26/source/include/rpc_eventlog.h 2007-05-31 17:33:47 UTC (rev 23273) @@ -31,21 +31,11 @@ #define EVENTLOG_READEVENTLOG 0x0a /* Eventlog read flags */ +/* defined in librpc/gen_ndr/eventlog.h */ -#define EVENTLOG_SEQUENTIAL_READ 0x0001 -#define EVENTLOG_SEEK_READ 0x0002 -#define EVENTLOG_FORWARDS_READ 0x0004 -#define EVENTLOG_BACKWARDS_READ 0x0008 - /* Event types */ +/* defined in librpc/gen_ndr/eventlog.h */ -#define EVENTLOG_SUCCESS 0x0000 -#define EVENTLOG_ERROR_TYPE 0x0001 -#define EVENTLOG_WARNING_TYPE 0x0002 -#define EVENTLOG_INFORMATION_TYPE 0x0004 -#define EVENTLOG_AUDIT_SUCCESS 0x0008 -#define EVENTLOG_AUDIT_FAILURE 0x0010 - /* Defines for TDB keys */ #define EVT_OLDEST_ENTRY "INFO/oldest_entry" #define EVT_NEXT_RECORD "INFO/next_record" @@ -94,18 +84,6 @@ typedef struct { POLICY_HND handle; -} EVENTLOG_Q_CLOSE_EVENTLOG; - -typedef struct { - POLICY_HND handle; - NTSTATUS status; -} EVENTLOG_R_CLOSE_EVENTLOG; - - -/***********************************/ - -typedef struct { - POLICY_HND handle; } EVENTLOG_Q_GET_NUM_RECORDS; typedef struct { Modified: branches/SAMBA_3_0_26/source/include/smb.h =================================================================== --- branches/SAMBA_3_0_26/source/include/smb.h 2007-05-31 17:26:30 UTC (rev 23272) +++ branches/SAMBA_3_0_26/source/include/smb.h 2007-05-31 17:33:47 UTC (rev 23273) @@ -305,6 +305,7 @@ #include "librpc/gen_ndr/wkssvc.h" #include "librpc/gen_ndr/echo.h" #include "librpc/gen_ndr/svcctl.h" +#include "librpc/gen_ndr/eventlog.h" struct lsa_dom_info { BOOL valid; Modified: branches/SAMBA_3_0_26/source/rpc_parse/parse_eventlog.c =================================================================== --- branches/SAMBA_3_0_26/source/rpc_parse/parse_eventlog.c 2007-05-31 17:26:30 UTC (rev 23272) +++ branches/SAMBA_3_0_26/source/rpc_parse/parse_eventlog.c 2007-05-31 17:33:47 UTC (rev 23273) @@ -174,45 +174,6 @@ return True; } -BOOL eventlog_io_q_close_eventlog(const char *desc, EVENTLOG_Q_CLOSE_EVENTLOG *q_u, - prs_struct *ps, int depth) -{ - if(q_u == NULL) - return False; - - prs_debug(ps, depth, desc, "eventlog_io_q_close_eventlog"); - depth++; - - if(!(prs_align(ps))) - return False; - - if(!(smb_io_pol_hnd("log handle", &(q_u->handle), ps, depth))) - return False; - - return True; -} - -BOOL eventlog_io_r_close_eventlog(const char *desc, EVENTLOG_R_CLOSE_EVENTLOG *r_u, - prs_struct *ps, int depth) -{ - if(r_u == NULL) - return False; - - prs_debug(ps, depth, desc, "eventlog_io_r_close_eventlog"); - depth++; - - if(!(prs_align(ps))) - return False; - - if(!(smb_io_pol_hnd("log handle", &(r_u->handle), ps, depth))) - return False; - - if(!(prs_ntstatus("status code", ps, depth, &r_u->status))) - return False; - - return True; -} - BOOL eventlog_io_q_read_eventlog(const char *desc, EVENTLOG_Q_READ_EVENTLOG *q_u, prs_struct *ps, int depth) { Modified: branches/SAMBA_3_0_26/source/rpc_server/srv_eventlog.c =================================================================== --- branches/SAMBA_3_0_26/source/rpc_server/srv_eventlog.c 2007-05-31 17:26:30 UTC (rev 23272) +++ branches/SAMBA_3_0_26/source/rpc_server/srv_eventlog.c 2007-05-31 17:33:47 UTC (rev 23273) @@ -1,7 +1,8 @@ /* * Unix SMB/CIFS implementation. * RPC Pipe client / server routines - * Copyright (C) Marcin Krzysztof Porwit 2005. + * Copyright (C) Marcin Krzysztof Porwit 2005. + * Copyright (C) Gerald Carter 2005 - 2007 * * 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 @@ -23,6 +24,23 @@ #undef DBGC_CLASS #define DBGC_CLASS DBGC_RPC_SRV +static BOOL proxy_eventlog_call(pipes_struct *p, uint8 opnum) +{ + struct api_struct *fns; + int n_fns; + + eventlog_get_pipe_fns(&fns, &n_fns); + + if (opnum >= n_fns) + return False; + + if (fns[opnum].opnum != opnum) { + smb_panic("EVENTLOG function table not sorted\n"); + } + + return fns[opnum].fn(p); +} + static BOOL api_eventlog_open_eventlog(pipes_struct *p) { EVENTLOG_Q_OPEN_EVENTLOG q_u; @@ -50,27 +68,7 @@ static BOOL api_eventlog_close_eventlog(pipes_struct *p) { - EVENTLOG_Q_CLOSE_EVENTLOG q_u; - EVENTLOG_R_CLOSE_EVENTLOG r_u; - prs_struct *data = &p->in_data.data; - prs_struct *rdata = &p->out_data.rdata; - - ZERO_STRUCT(q_u); - ZERO_STRUCT(r_u); - - if (!(eventlog_io_q_close_eventlog("", &q_u, data, 0))) { - DEBUG(0, ("eventlog_io_q_close_eventlog: unable to unmarshall EVENTLOG_Q_CLOSE_EVENTLOG.\n")); - return False; - } - - r_u.status = _eventlog_close_eventlog(p, &q_u, &r_u); - - if (!(eventlog_io_r_close_eventlog("", &r_u, rdata, 0))) { - DEBUG(0, ("eventlog_io_r_close_eventlog: unable to marshall EVENTLOG_R_CLOSE_EVENTLOG.\n")); - return False; - } - - return True; + return proxy_eventlog_call( p, DCERPC_EVENTLOG_CLOSEEVENTLOG ); } static BOOL api_eventlog_get_num_records(pipes_struct *p) @@ -186,14 +184,14 @@ {"EVENTLOG_CLEAREVENTLOG", EVENTLOG_CLEAREVENTLOG, api_eventlog_clear_eventlog } }; -NTSTATUS rpc_eventlog_init(void) +NTSTATUS rpc_eventlog2_init(void) { return rpc_pipe_register_commands(SMB_RPC_INTERFACE_VERSION, "eventlog", "eventlog", api_eventlog_cmds, sizeof(api_eventlog_cmds)/sizeof(struct api_struct)); } -void eventlog_get_pipe_fns(struct api_struct **fns, int *n_fns) +void eventlog2_get_pipe_fns(struct api_struct **fns, int *n_fns) { *fns = api_eventlog_cmds; *n_fns = sizeof(api_eventlog_cmds) / sizeof(struct api_struct); Modified: branches/SAMBA_3_0_26/source/rpc_server/srv_eventlog_nt.c =================================================================== --- branches/SAMBA_3_0_26/source/rpc_server/srv_eventlog_nt.c 2007-05-31 17:26:30 UTC (rev 23272) +++ branches/SAMBA_3_0_26/source/rpc_server/srv_eventlog_nt.c 2007-05-31 17:33:47 UTC (rev 23273) @@ -405,7 +405,7 @@ uiRetention = 604800; /* the general idea is to internally open the registry - key and retreive the values. That way we can continue + key and retrieve the values. That way we can continue to use the same fetch/store api that we use in srv_reg_nt.c */ @@ -659,11 +659,9 @@ /******************************************************************** ********************************************************************/ -NTSTATUS _eventlog_close_eventlog( pipes_struct * p, - EVENTLOG_Q_CLOSE_EVENTLOG * q_u, - EVENTLOG_R_CLOSE_EVENTLOG * r_u ) +NTSTATUS _eventlog_CloseEventLog( pipes_struct * p, struct eventlog_CloseEventLog *r ) { - return elog_close( p, &q_u->handle ); + return elog_close( p, r->in.handle ); } /******************************************************************** @@ -802,3 +800,142 @@ return NT_STATUS_OK; } + +NTSTATUS _eventlog_ClearEventLogW(pipes_struct *p, struct eventlog_ClearEventLogW *r) +{ + p->rng_fault_state = True; + return NT_STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS _eventlog_BackupEventLogW(pipes_struct *p, struct eventlog_BackupEventLogW *r) +{ + p->rng_fault_state = True; + return NT_STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS _eventlog_DeregisterEventSource(pipes_struct *p, struct eventlog_DeregisterEventSource *r) +{ + p->rng_fault_state = True; + return NT_STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS _eventlog_GetNumRecords(pipes_struct *p, struct eventlog_GetNumRecords *r) +{ + p->rng_fault_state = True; + return NT_STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS _eventlog_GetOldestRecord(pipes_struct *p, struct eventlog_GetOldestRecord *r) +{ + p->rng_fault_state = True; + return NT_STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS _eventlog_ChangeNotify(pipes_struct *p, struct eventlog_ChangeNotify *r) +{ + p->rng_fault_state = True; + return NT_STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS _eventlog_OpenEventLogW(pipes_struct *p, struct eventlog_OpenEventLogW *r) +{ + p->rng_fault_state = True; + return NT_STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS _eventlog_RegisterEventSourceW(pipes_struct *p, struct eventlog_RegisterEventSourceW *r) +{ + p->rng_fault_state = True; + return NT_STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS _eventlog_OpenBackupEventLogW(pipes_struct *p, struct eventlog_OpenBackupEventLogW *r) +{ + p->rng_fault_state = True; + return NT_STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS _eventlog_ReadEventLogW(pipes_struct *p, struct eventlog_ReadEventLogW *r) +{ + p->rng_fault_state = True; + return NT_STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS _eventlog_ReportEventW(pipes_struct *p, struct eventlog_ReportEventW *r) +{ + p->rng_fault_state = True; + return NT_STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS _eventlog_ClearEventLogA(pipes_struct *p, struct eventlog_ClearEventLogA *r) +{ + p->rng_fault_state = True; + return NT_STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS _eventlog_BackupEventLogA(pipes_struct *p, struct eventlog_BackupEventLogA *r) +{ + p->rng_fault_state = True; + return NT_STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS _eventlog_OpenEventLogA(pipes_struct *p, struct eventlog_OpenEventLogA *r) +{ + p->rng_fault_state = True; + return NT_STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS _eventlog_RegisterEventSourceA(pipes_struct *p, struct eventlog_RegisterEventSourceA *r) +{ + p->rng_fault_state = True; + return NT_STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS _eventlog_OpenBackupEventLogA(pipes_struct *p, struct eventlog_OpenBackupEventLogA *r) +{ + p->rng_fault_state = True; + return NT_STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS _eventlog_ReadEventLogA(pipes_struct *p, struct eventlog_ReadEventLogA *r) +{ + p->rng_fault_state = True; + return NT_STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS _eventlog_ReportEventA(pipes_struct *p, struct eventlog_ReportEventA *r) +{ + p->rng_fault_state = True; + return NT_STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS _eventlog_RegisterClusterSvc(pipes_struct *p, struct eventlog_RegisterClusterSvc *r) +{ + p->rng_fault_state = True; + return NT_STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS _eventlog_DeregisterClusterSvc(pipes_struct *p, struct eventlog_DeregisterClusterSvc *r) +{ + p->rng_fault_state = True; + return NT_STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS _eventlog_WriteClusterEvents(pipes_struct *p, struct eventlog_WriteClusterEvents *r) +{ + p->rng_fault_state = True; + return NT_STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS _eventlog_GetLogIntormation(pipes_struct *p, struct eventlog_GetLogIntormation *r) +{ + p->rng_fault_state = True; + return NT_STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS _eventlog_FlushEventLog(pipes_struct *p, struct eventlog_FlushEventLog *r) +{ + p->rng_fault_state = True; + return NT_STATUS_NOT_IMPLEMENTED; +} + Modified: branches/SAMBA_3_0_26/source/rpc_server/srv_pipe.c =================================================================== --- branches/SAMBA_3_0_26/source/rpc_server/srv_pipe.c 2007-05-31 17:26:30 UTC (rev 23272) +++ branches/SAMBA_3_0_26/source/rpc_server/srv_pipe.c 2007-05-31 17:33:47 UTC (rev 23273) @@ -2369,7 +2369,7 @@ svcctl2_get_pipe_fns( &cmds, &n_cmds ); break; case PI_EVENTLOG: - eventlog_get_pipe_fns( &cmds, &n_cmds ); + eventlog2_get_pipe_fns( &cmds, &n_cmds ); break; case PI_NTSVCS: ntsvcs_get_pipe_fns( &cmds, &n_cmds );
