summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-04-08 17:15:15 +0200
committerGünther Deschner <gd@samba.org>2009-04-08 19:45:58 +0200
commit47bda3f3c7095044ae4c9b1535198be6d052060d (patch)
tree87fc80ab5d5873be3a00cc666f17cf62ecc3cfa7
parent98d703a6b7c102db49b6cdc2a57545a90efefabf (diff)
downloadsamba-47bda3f3c7095044ae4c9b1535198be6d052060d.tar.gz
samba-47bda3f3c7095044ae4c9b1535198be6d052060d.tar.bz2
samba-47bda3f3c7095044ae4c9b1535198be6d052060d.zip
s3-eventlog: split out evlog_convert_tdb_to_evt().
Guenther
-rw-r--r--source3/include/proto.h4
-rw-r--r--source3/lib/eventlog/eventlog.c74
-rw-r--r--source3/utils/net_eventlog.c54
3 files changed, 80 insertions, 52 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index c8c2ece968..b22bb06512 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5874,6 +5874,10 @@ NTSTATUS evlog_evt_entry_to_tdb_entry(TALLOC_CTX *mem_ctx,
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 */
diff --git a/source3/lib/eventlog/eventlog.c b/source3/lib/eventlog/eventlog.c
index f83c4fc3b8..11cb28a120 100644
--- a/source3/lib/eventlog/eventlog.c
+++ b/source3/lib/eventlog/eventlog.c
@@ -958,3 +958,77 @@ NTSTATUS evlog_tdb_entry_to_evt_entry(TALLOC_CTX *mem_ctx,
return NT_STATUS_OK;
}
+
+/********************************************************************
+ ********************************************************************/
+
+NTSTATUS evlog_convert_tdb_to_evt(TALLOC_CTX *mem_ctx,
+ ELOG_TDB *etdb,
+ DATA_BLOB *blob_p,
+ uint32_t *num_records_p)
+{
+ NTSTATUS status = NT_STATUS_OK;
+ enum ndr_err_code ndr_err;
+ DATA_BLOB blob;
+ uint32_t num_records = 0;
+ struct EVENTLOG_EVT_FILE evt;
+ uint32_t count = 1;
+ size_t endoffset = 0;
+
+ ZERO_STRUCT(evt);
+
+ while (1) {
+
+ struct eventlog_Record_tdb *r;
+ struct EVENTLOGRECORD e;
+
+ r = evlog_pull_record_tdb(mem_ctx, etdb->tdb, count);
+ if (!r) {
+ break;
+ }
+
+ status = evlog_tdb_entry_to_evt_entry(mem_ctx, r, &e);
+ if (!NT_STATUS_IS_OK(status)) {
+ goto done;
+ }
+
+ endoffset += ndr_size_EVENTLOGRECORD(&e, NULL, 0);
+
+ ADD_TO_ARRAY(mem_ctx, struct EVENTLOGRECORD, e, &evt.records, &num_records);
+ count++;
+ }
+
+ evt.hdr.StartOffset = 0x30;
+ evt.hdr.EndOffset = evt.hdr.StartOffset + endoffset;
+ evt.hdr.CurrentRecordNumber = count;
+ evt.hdr.OldestRecordNumber = 1;
+ evt.hdr.MaxSize = tdb_fetch_int32(etdb->tdb, EVT_MAXSIZE);
+ evt.hdr.Flags = 0;
+ evt.hdr.Retention = tdb_fetch_int32(etdb->tdb, EVT_RETENTION);
+
+ if (DEBUGLEVEL >= 10) {
+ NDR_PRINT_DEBUG(EVENTLOGHEADER, &evt.hdr);
+ }
+
+ evt.eof.BeginRecord = 0x30;
+ evt.eof.EndRecord = evt.hdr.StartOffset + endoffset;
+ evt.eof.CurrentRecordNumber = evt.hdr.CurrentRecordNumber;
+ evt.eof.OldestRecordNumber = evt.hdr.OldestRecordNumber;
+
+ if (DEBUGLEVEL >= 10) {
+ NDR_PRINT_DEBUG(EVENTLOGEOF, &evt.eof);
+ }
+
+ ndr_err = ndr_push_struct_blob(&blob, mem_ctx, NULL, &evt,
+ (ndr_push_flags_fn_t)ndr_push_EVENTLOG_EVT_FILE);
+ if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+ status = ndr_map_error2ntstatus(ndr_err);
+ goto done;
+ }
+
+ *blob_p = blob;
+ *num_records_p = num_records;
+
+ done:
+ return status;
+}
diff --git a/source3/utils/net_eventlog.c b/source3/utils/net_eventlog.c
index 197a7cd330..b86be6d48b 100644
--- a/source3/utils/net_eventlog.c
+++ b/source3/utils/net_eventlog.c
@@ -182,13 +182,9 @@ static int net_eventlog_export(struct net_context *c, int argc,
int ret = -1;
NTSTATUS status;
TALLOC_CTX *ctx = talloc_stackframe();
- enum ndr_err_code ndr_err;
DATA_BLOB blob;
uint32_t num_records = 0;
- struct EVENTLOG_EVT_FILE evt;
ELOG_TDB *etdb = NULL;
- uint32_t count = 1;
- size_t endoffset = 0;
if (argc < 2 || c->display_usage) {
d_fprintf(stderr, "usage: net eventlog export <file> <eventlog>\n");
@@ -201,54 +197,8 @@ static int net_eventlog_export(struct net_context *c, int argc,
goto done;
}
- ZERO_STRUCT(evt);
-
- while (1) {
-
- struct eventlog_Record_tdb *r;
- struct EVENTLOGRECORD e;
-
- r = evlog_pull_record_tdb(ctx, etdb->tdb, count);
- if (!r) {
- break;
- }
-
- status = evlog_tdb_entry_to_evt_entry(ctx, r, &e);
- if (!NT_STATUS_IS_OK(status)) {
- goto done;
- }
-
- endoffset += ndr_size_EVENTLOGRECORD(&e, NULL, 0);
-
- ADD_TO_ARRAY(ctx, struct EVENTLOGRECORD, e, &evt.records, &num_records);
- count++;
- }
-
- evt.hdr.StartOffset = 0x30;
- evt.hdr.EndOffset = evt.hdr.StartOffset + endoffset;
- evt.hdr.CurrentRecordNumber = count;
- evt.hdr.OldestRecordNumber = 1;
- evt.hdr.MaxSize = tdb_fetch_int32(etdb->tdb, EVT_MAXSIZE);
- evt.hdr.Flags = 0;
- evt.hdr.Retention = tdb_fetch_int32(etdb->tdb, EVT_RETENTION);
-
- if (DEBUGLEVEL >= 10) {
- NDR_PRINT_DEBUG(EVENTLOGHEADER, &evt.hdr);
- }
-
- evt.eof.BeginRecord = 0x30;
- evt.eof.EndRecord = evt.hdr.StartOffset + endoffset;
- evt.eof.CurrentRecordNumber = evt.hdr.CurrentRecordNumber;
- evt.eof.OldestRecordNumber = evt.hdr.OldestRecordNumber;
-
- if (DEBUGLEVEL >= 10) {
- NDR_PRINT_DEBUG(EVENTLOGEOF, &evt.eof);
- }
-
- ndr_err = ndr_push_struct_blob(&blob, ctx, NULL, &evt,
- (ndr_push_flags_fn_t)ndr_push_EVENTLOG_EVT_FILE);
- if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
- d_fprintf(stderr, "evt push failed: %s\n", ndr_errstr(ndr_err));
+ status = evlog_convert_tdb_to_evt(ctx, etdb, &blob, &num_records);
+ if (!NT_STATUS_IS_OK(status)) {
goto done;
}