[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha7-917-g0be30e8
Günther Deschner
gd at samba.org
Wed Apr 8 18:08:32 GMT 2009
The branch, master has been updated
via 0be30e8ced4fd9a3afb72ee211cdcd2a66709f13 (commit)
via 47bda3f3c7095044ae4c9b1535198be6d052060d (commit)
via 98d703a6b7c102db49b6cdc2a57545a90efefabf (commit)
from bed4f8413435c39e37ea04940a18ee78481db48f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0be30e8ced4fd9a3afb72ee211cdcd2a66709f13
Author: Günther Deschner <gd at samba.org>
Date: Wed Apr 8 19:18:49 2009 +0200
s4-smbtorture: fix test_ReportEventLog in RPC-EVENTLOG.
Guenther
commit 47bda3f3c7095044ae4c9b1535198be6d052060d
Author: Günther Deschner <gd at samba.org>
Date: Wed Apr 8 17:15:15 2009 +0200
s3-eventlog: split out evlog_convert_tdb_to_evt().
Guenther
commit 98d703a6b7c102db49b6cdc2a57545a90efefabf
Author: Günther Deschner <gd at samba.org>
Date: Wed Apr 8 14:29:04 2009 +0200
s3-eventlog: move rpc_server/srv_eventlog_lib.c out of rpc_server.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/Makefile.in | 2 +-
source3/include/proto.h | 6 ++-
.../srv_eventlog_lib.c => lib/eventlog/eventlog.c} | 74 ++++++++++++++++++++
source3/utils/net_eventlog.c | 54 +--------------
source4/torture/rpc/eventlog.c | 5 +-
5 files changed, 85 insertions(+), 56 deletions(-)
rename source3/{rpc_server/srv_eventlog_lib.c => lib/eventlog/eventlog.c} (93%)
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 1578abf..8b9bcbf 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -568,7 +568,7 @@ REG_FULL_OBJ = $(REG_SMBCONF_OBJ) \
registry/reg_perfcount.o \
registry/reg_util_legacy.o
-LIB_EVENTLOG_OBJ = rpc_server/srv_eventlog_lib.o
+LIB_EVENTLOG_OBJ = lib/eventlog/eventlog.o
RPC_LSA_OBJ = rpc_server/srv_lsa_nt.o ../librpc/gen_ndr/srv_lsa.o
diff --git a/source3/include/proto.h b/source3/include/proto.h
index f8a28ef..b22bb06 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5844,7 +5844,7 @@ bool smb_io_rpc_auth_schannel_chk(const char *desc, int auth_len,
RPC_AUTH_SCHANNEL_CHK * chk,
prs_struct *ps, int depth);
-/* The following definitions come from rpc_server/srv_eventlog_lib.c */
+/* 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 );
@@ -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/rpc_server/srv_eventlog_lib.c b/source3/lib/eventlog/eventlog.c
similarity index 93%
rename from source3/rpc_server/srv_eventlog_lib.c
rename to source3/lib/eventlog/eventlog.c
index f83c4fc..11cb28a 100644
--- a/source3/rpc_server/srv_eventlog_lib.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 197a7cd..b86be6d 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;
}
diff --git a/source4/torture/rpc/eventlog.c b/source4/torture/rpc/eventlog.c
index 10c4886..865b4e2 100644
--- a/source4/torture/rpc/eventlog.c
+++ b/source4/torture/rpc/eventlog.c
@@ -203,7 +203,6 @@ static bool test_ReadEventLog(struct torture_context *tctx,
static bool test_ReportEventLog(struct torture_context *tctx,
struct dcerpc_pipe *p)
{
- NTSTATUS status;
struct eventlog_ReportEventW r;
struct eventlog_CloseEventLog cr;
struct policy_handle handle;
@@ -237,7 +236,9 @@ static bool test_ReportEventLog(struct torture_context *tctx,
r.out.record_number = &record_number;
r.out.time_written = &time_written;
- status = dcerpc_eventlog_ReportEventW(p, tctx, &r);
+ torture_assert_ntstatus_ok(tctx,
+ dcerpc_eventlog_ReportEventW(p, tctx, &r),
+ "ReportEventW failed");
torture_assert_ntstatus_ok(tctx, r.out.result, "ReportEventW failed");
--
Samba Shared Repository
More information about the samba-cvs
mailing list