diff options
| -rw-r--r-- | source3/include/includes.h | 1 | ||||
| -rw-r--r-- | source3/include/proto.h | 36 | ||||
| -rw-r--r-- | source3/lib/eventlog/eventlog.c | 1 | ||||
| -rw-r--r-- | source3/lib/eventlog/eventlog.h (renamed from source3/include/eventlog.h) | 4 | ||||
| -rw-r--r-- | source3/lib/eventlog/proto.h | 35 | ||||
| -rw-r--r-- | source3/rpc_server/srv_eventlog_nt.c | 1 | ||||
| -rw-r--r-- | source3/utils/eventlogadm.c | 1 | ||||
| -rw-r--r-- | source3/utils/net_eventlog.c | 1 |
8 files changed, 42 insertions, 38 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 5b682bb4e3..9ab25569a4 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -686,7 +686,6 @@ struct ntlmssp_state; #include "../lib/async_req/async_sock.h" #include "talloc_dict.h" #include "services.h" -#include "eventlog.h" #include "../lib/util/smb_threads.h" #include "../lib/util/smb_threads_internal.h" #include "tldap.h" diff --git a/source3/include/proto.h b/source3/include/proto.h index 9c169ed11c..43de9e5b33 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -2107,7 +2107,6 @@ WERROR reg_apply_registry_entry(TALLOC_CTX *mem_ctx, uint32_t flags); -#include "librpc/gen_ndr/ndr_eventlog.h" #include "librpc/gen_ndr/ndr_krb5pac.h" #include "librpc/gen_ndr/ndr_spoolss.h" @@ -5760,41 +5759,6 @@ void init_rpc_hdr_auth(RPC_HDR_AUTH *rai, uint32 auth_context_id); bool smb_io_rpc_hdr_auth(const char *desc, RPC_HDR_AUTH *rai, prs_struct *ps, int depth); -/* The following definitions come from lib/eventlog/eventlog.c */ - -TDB_CONTEXT *elog_init_tdb( char *tdbfilename ); -char *elog_tdbname(TALLOC_CTX *ctx, const char *name ); -int elog_tdb_size( TDB_CONTEXT * tdb, int *MaxSize, int *Retention ); -bool prune_eventlog( TDB_CONTEXT * tdb ); -ELOG_TDB *elog_open_tdb( const char *logname, bool force_clear, bool read_only ); -int elog_close_tdb( ELOG_TDB *etdb, bool force_close ); -bool parse_logentry( TALLOC_CTX *mem_ctx, char *line, struct eventlog_Record_tdb *entry, bool * eor ); -size_t fixup_eventlog_record_tdb(struct eventlog_Record_tdb *r); -struct eventlog_Record_tdb *evlog_pull_record_tdb(TALLOC_CTX *mem_ctx, - TDB_CONTEXT *tdb, - uint32_t record_number); -NTSTATUS evlog_push_record_tdb(TALLOC_CTX *mem_ctx, - TDB_CONTEXT *tdb, - struct eventlog_Record_tdb *r, - uint32_t *record_number); -NTSTATUS evlog_push_record(TALLOC_CTX *mem_ctx, - TDB_CONTEXT *tdb, - struct EVENTLOGRECORD *r, - uint32_t *record_number); -struct EVENTLOGRECORD *evlog_pull_record(TALLOC_CTX *mem_ctx, - TDB_CONTEXT *tdb, - uint32_t record_number); -NTSTATUS evlog_evt_entry_to_tdb_entry(TALLOC_CTX *mem_ctx, - const struct EVENTLOGRECORD *e, - struct eventlog_Record_tdb *t); -NTSTATUS evlog_tdb_entry_to_evt_entry(TALLOC_CTX *mem_ctx, - const struct eventlog_Record_tdb *t, - struct EVENTLOGRECORD *e); -NTSTATUS evlog_convert_tdb_to_evt(TALLOC_CTX *mem_ctx, - ELOG_TDB *etdb, - DATA_BLOB *blob_p, - uint32_t *num_records_p); - /* The following definitions come from rpc_server/srv_eventlog_nt.c */ /* The following definitions come from rpc_server/srv_lsa_hnd.c */ diff --git a/source3/lib/eventlog/eventlog.c b/source3/lib/eventlog/eventlog.c index dc14214e36..c218467c47 100644 --- a/source3/lib/eventlog/eventlog.c +++ b/source3/lib/eventlog/eventlog.c @@ -21,6 +21,7 @@ */ #include "includes.h" +#include "lib/eventlog/eventlog.h" /* maintain a list of open eventlog tdbs with reference counts */ diff --git a/source3/include/eventlog.h b/source3/lib/eventlog/eventlog.h index 16affe3313..29c25c3122 100644 --- a/source3/include/eventlog.h +++ b/source3/lib/eventlog/eventlog.h @@ -37,5 +37,7 @@ typedef struct elog_tdb { #define ELOG_TDB_CTX(x) ((x)->tdb) - #define EVENTLOG_DATABASE_VERSION_V1 1 + +#include "../librpc/gen_ndr/ndr_eventlog.h" +#include "lib/eventlog/proto.h" diff --git a/source3/lib/eventlog/proto.h b/source3/lib/eventlog/proto.h new file mode 100644 index 0000000000..21790d0795 --- /dev/null +++ b/source3/lib/eventlog/proto.h @@ -0,0 +1,35 @@ + +/* The following definitions come from lib/eventlog/eventlog.c */ + +TDB_CONTEXT *elog_init_tdb( char *tdbfilename ); +char *elog_tdbname(TALLOC_CTX *ctx, const char *name ); +int elog_tdb_size( TDB_CONTEXT * tdb, int *MaxSize, int *Retention ); +bool prune_eventlog( TDB_CONTEXT * tdb ); +ELOG_TDB *elog_open_tdb( const char *logname, bool force_clear, bool read_only ); +int elog_close_tdb( ELOG_TDB *etdb, bool force_close ); +bool parse_logentry( TALLOC_CTX *mem_ctx, char *line, struct eventlog_Record_tdb *entry, bool * eor ); +size_t fixup_eventlog_record_tdb(struct eventlog_Record_tdb *r); +struct eventlog_Record_tdb *evlog_pull_record_tdb(TALLOC_CTX *mem_ctx, + TDB_CONTEXT *tdb, + uint32_t record_number); +NTSTATUS evlog_push_record_tdb(TALLOC_CTX *mem_ctx, + TDB_CONTEXT *tdb, + struct eventlog_Record_tdb *r, + uint32_t *record_number); +NTSTATUS evlog_push_record(TALLOC_CTX *mem_ctx, + TDB_CONTEXT *tdb, + struct EVENTLOGRECORD *r, + uint32_t *record_number); +struct EVENTLOGRECORD *evlog_pull_record(TALLOC_CTX *mem_ctx, + TDB_CONTEXT *tdb, + uint32_t record_number); +NTSTATUS evlog_evt_entry_to_tdb_entry(TALLOC_CTX *mem_ctx, + const struct EVENTLOGRECORD *e, + struct eventlog_Record_tdb *t); +NTSTATUS evlog_tdb_entry_to_evt_entry(TALLOC_CTX *mem_ctx, + const struct eventlog_Record_tdb *t, + struct EVENTLOGRECORD *e); +NTSTATUS evlog_convert_tdb_to_evt(TALLOC_CTX *mem_ctx, + ELOG_TDB *etdb, + DATA_BLOB *blob_p, + uint32_t *num_records_p); diff --git a/source3/rpc_server/srv_eventlog_nt.c b/source3/rpc_server/srv_eventlog_nt.c index 52ecc89112..3b109558f0 100644 --- a/source3/rpc_server/srv_eventlog_nt.c +++ b/source3/rpc_server/srv_eventlog_nt.c @@ -22,6 +22,7 @@ #include "includes.h" #include "../librpc/gen_ndr/srv_eventlog.h" +#include "lib/eventlog/eventlog.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_RPC_SRV diff --git a/source3/utils/eventlogadm.c b/source3/utils/eventlogadm.c index d94f25b42d..73d851db6f 100644 --- a/source3/utils/eventlogadm.c +++ b/source3/utils/eventlogadm.c @@ -23,6 +23,7 @@ #include "includes.h" +#include "lib/eventlog/eventlog.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_UTIL_EVENTLOG diff --git a/source3/utils/net_eventlog.c b/source3/utils/net_eventlog.c index c889efbf95..28a010c5a7 100644 --- a/source3/utils/net_eventlog.c +++ b/source3/utils/net_eventlog.c @@ -21,6 +21,7 @@ #include "includes.h" #include "utils/net.h" +#include "lib/eventlog/eventlog.h" /** * Dump an *evt win32 eventlog file |