s3-net: add "net eventlog dump".

This allows to dump a native (non-wrapped) win32 *.evt eventlog file.

Guenther

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 992df5ecee8bc0415d1fae4f6264f83dc066e390..c4a631721c79488a5943b90d6e0f2cd9e31dd0d1 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -530,6 +530,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
 
 RPC_LSA_OBJ = rpc_server/srv_lsa_nt.o ../librpc/gen_ndr/srv_lsa.o
 
@@ -566,7 +567,7 @@ RPC_DFS_OBJ =  ../librpc/gen_ndr/srv_dfs.o rpc_server/srv_dfs_nt.o
 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 ../librpc/gen_ndr/srv_eventlog.o
+                  $(LIB_EVENTLOG_OBJ) ../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
@@ -896,7 +897,8 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \
           $(PASSWD_UTIL_OBJ) utils/net_dns.o utils/net_ads_gpo.o \
           utils/net_conf.o utils/net_join.o utils/net_user.o \
           utils/net_group.o utils/net_file.o utils/net_registry.o \
-          auth/token_util.o utils/net_dom.o utils/net_share.o utils/net_lua.o
+          auth/token_util.o utils/net_dom.o utils/net_share.o utils/net_lua.o \
+          utils/net_eventlog.o
 
 # these are not processed by make proto
 NET_OBJ2 = utils/net_registry_util.o utils/net_help_common.o
@@ -914,7 +916,8 @@ NET_OBJ = $(NET_OBJ1) \
          $(REG_SMBCONF_OBJ) @LIBNETAPI_STATIC@ $(LIBNET_OBJ) \
          $(LIBSMBCONF_OBJ) \
          @LIBWBCLIENT_STATIC@ \
-         $(PRIVILEGES_BASIC_OBJ) @LIBLUA_STATIC@
+         $(PRIVILEGES_BASIC_OBJ) @LIBLUA_STATIC@ \
+         $(LIB_EVENTLOG_OBJ)
 
 CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
          $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
@@ -983,7 +986,7 @@ EVTLOGADM_OBJ0      = utils/eventlogadm.o
 
 EVTLOGADM_OBJ  = $(EVTLOGADM_OBJ0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
                $(LIBSAMBA_OBJ) \
-               registry/reg_eventlog.o rpc_server/srv_eventlog_lib.o \
+               registry/reg_eventlog.o $(LIB_EVENTLOG_OBJ) \
                ../librpc/gen_ndr/ndr_eventlog.o \
                ../librpc/gen_ndr/ndr_lsa.o
 

diff --git a/source3/utils/net.c b/source3/utils/net.c
index c9525ab2eb725c1428858064cb4adac217b8fd4b..d483198a9ed5807d43ef8a541d2f7d2bcddff09f 100644 (file)
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -589,6 +589,14 @@ static struct functable net_func[] = {
                "  Use 'net help lua' to get more information about 'net "
                "lua' commands."
        },
+       {       "eventlog",
+               net_eventlog,
+               NET_TRANSPORT_LOCAL,
+               "Dump Win32 *.evt eventlog files",
+               "  Use 'net help eventlog' to get more information about 'net "
+               "eventlog' commands."
+       },
+
 #ifdef WITH_FAKE_KASERVER
        {       "afs",
                net_afs,

diff --git a/source3/utils/net_eventlog.c b/source3/utils/net_eventlog.c
new file mode 100644 (file)
index 0000000..79f04c5
--- /dev/null
+++ b/source3/utils/net_eventlog.c
@@ -0,0 +1,100 @@
+/*
+ * Samba Unix/Linux SMB client library
+ * Distributed SMB/CIFS Server Management Utility
+ * Local win32 eventlog interface
+ *
+ * Copyright (C) Guenther Deschner 2009
+ *
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "includes.h"
+#include "utils/net.h"
+
+/**
+ * Dump an *evt win32 eventlog file
+ *
+ * @param argc  Standard main() style argc.
+ * @param argv  Standard main() style argv. Initial components are already
+ *              stripped.
+ *
+ * @return A shell status integer (0 for success).
+ **/
+
+static int net_eventlog_dump(struct net_context *c, int argc,
+                            const char **argv)
+{
+       int ret = -1;
+       TALLOC_CTX *ctx = talloc_stackframe();
+       enum ndr_err_code ndr_err;
+       DATA_BLOB blob;
+       struct EVENTLOG_EVT_FILE evt;
+       char *s;
+
+       if (argc < 1 || c->display_usage) {
+               d_fprintf(stderr, "usage: net eventlog dump <file.evt>\n");
+               goto done;
+       }
+
+       blob.data = (uint8_t *)file_load(argv[0], &blob.length, 0, ctx);
+       if (!blob.data) {
+               d_fprintf(stderr, "failed to load evt file: %s\n", argv[0]);
+               goto done;
+       }
+
+       ndr_err = ndr_pull_struct_blob(&blob, ctx, NULL, &evt,
+                  (ndr_pull_flags_fn_t)ndr_pull_EVENTLOG_EVT_FILE);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               d_fprintf(stderr, "evt pull failed: %s\n", ndr_errstr(ndr_err));
+               goto done;
+       }
+
+       s = NDR_PRINT_STRUCT_STRING(ctx, EVENTLOG_EVT_FILE, &evt);
+       if (s) {
+               printf("%s\n", s);
+       }
+
+       ret = 0;
+ done:
+       TALLOC_FREE(ctx);
+       return ret;
+}
+
+/**
+ * 'net rpc eventlog' entrypoint.
+ * @param argc  Standard main() style argc.
+ * @param argv  Standard main() style argv. Initial components are already
+ *              stripped.
+ **/
+
+int net_eventlog(struct net_context *c, int argc, const char **argv)
+{
+       int ret = -1;
+
+       struct functable func[] = {
+               {
+                       "dump",
+                       net_eventlog_dump,
+                       NET_TRANSPORT_LOCAL,
+                       "Dump eventlog",
+                       "net eventlog dump\n"
+                       "    Dump win32 *.evt eventlog file"
+               },
+       { NULL, NULL, 0, NULL, NULL }
+       };
+
+       ret = net_run_function(c, argc, argv, "net eventlog", func);
+
+       return ret;
+}

diff --git a/source3/utils/net_proto.h b/source3/utils/net_proto.h
index a65fbbb6eb1e9a00b3432eaa865cfc8ec01eacea..75ac032db92c8c6bf67f87201224c12ec9132f88 100644 (file)
--- a/source3/utils/net_proto.h
+++ b/source3/utils/net_proto.h
@@ -427,6 +427,9 @@ int net_usershare(struct net_context *c, int argc, const char **argv);
 
 int net_lua(struct net_context *c, int argc, const char **argv);
 
+/* The following definitions come from utils/net_eventlog.c  */
+
+int net_eventlog(struct net_context *c, int argc, const char **argv);
 
 /* The following definitions come from utils/net_util.c  */