summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-02-04 21:50:51 +0100
committerGünther Deschner <gd@samba.org>2009-02-04 22:51:47 +0100
commit8450e6677bfc2b42d7fe54fbf24c9f8ff07b40e1 (patch)
treec63be3130e26006a6b2f21a09ed1d10ef9fda4db
parenta63d4c5ed1d6fc6dd253d5bf99edbef7d9d0341b (diff)
downloadsamba-8450e6677bfc2b42d7fe54fbf24c9f8ff07b40e1.tar.gz
samba-8450e6677bfc2b42d7fe54fbf24c9f8ff07b40e1.tar.bz2
samba-8450e6677bfc2b42d7fe54fbf24c9f8ff07b40e1.zip
s3-eventlog: w00t! remove last traces of old eventlog rpc marshalling.
spoolss, I'm coming! Guenther
-rw-r--r--source3/Makefile.in2
-rw-r--r--source3/include/includes.h1
-rw-r--r--source3/include/proto.h2
-rw-r--r--source3/include/rpc_eventlog.h81
-rw-r--r--source3/rpc_parse/parse_eventlog.c27
5 files changed, 1 insertions, 112 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 19df505cc2..c1b51db571 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -578,7 +578,7 @@ RPC_SERVER_OBJ = @RPC_STATIC@ $(RPC_PIPE_OBJ)
RPC_PARSE_OBJ = $(RPC_PARSE_OBJ2) \
rpc_parse/parse_spoolss.o \
- rpc_parse/parse_eventlog.o rpc_parse/parse_buffer.o
+ rpc_parse/parse_buffer.o
RPC_CLIENT_OBJ = rpc_client/cli_pipe.o rpc_client/rpc_transport_np.o \
rpc_client/rpc_transport_sock.o rpc_client/rpc_transport_smbd.o
diff --git a/source3/include/includes.h b/source3/include/includes.h
index ebd8923769..a20a17c33d 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -623,7 +623,6 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
#include "reg_objects.h"
#include "reg_db.h"
#include "rpc_spoolss.h"
-#include "rpc_eventlog.h"
#include "rpc_perfcount.h"
#include "rpc_perfcount_defs.h"
#include "librpc/gen_ndr/notify.h"
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 6987e9968b..88742c451d 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5675,8 +5675,6 @@ bool smb_io_relarraystr(const char *desc, RPC_BUFFER *buffer, int depth, uint16
bool smb_io_relsecdesc(const char *desc, RPC_BUFFER *buffer, int depth, SEC_DESC **secdesc);
uint32 size_of_relative_string(UNISTR *string);
-/* The following definitions come from rpc_parse/parse_eventlog.c */
-
/* The following definitions come from rpc_parse/parse_misc.c */
bool smb_io_time(const char *desc, NTTIME *nttime, prs_struct *ps, int depth);
diff --git a/source3/include/rpc_eventlog.h b/source3/include/rpc_eventlog.h
deleted file mode 100644
index 43bbc18285..0000000000
--- a/source3/include/rpc_eventlog.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Unix SMB/CIFS implementation.
- * RPC Pipe client / server routines
- * Copyright (C) Marcin Krzysztof Porwit 2005.
- *
- * 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/>.
- */
-
-#ifndef _RPC_EVENTLOG_H /* _RPC_EVENTLOG_H */
-#define _RPC_EVENTLOG_H
-
-/* opcodes */
-
-#define EVENTLOG_CLEAREVENTLOG 0x00
-#define EVENTLOG_CLOSEEVENTLOG 0x02
-#define EVENTLOG_GETNUMRECORDS 0x04
-#define EVENTLOG_GETOLDESTENTRY 0x05
-#define EVENTLOG_OPENEVENTLOG 0x07
-#define EVENTLOG_READEVENTLOG 0x0a
-
-/* Eventlog read flags */
-/* defined in librpc/gen_ndr/eventlog.h */
-
-/* Event types */
-/* defined in librpc/gen_ndr/eventlog.h */
-
-/***********************************/
-
-typedef struct {
- uint32 length;
- uint32 reserved1;
- uint32 record_number;
- uint32 time_generated;
- uint32 time_written;
- uint32 event_id;
- uint16 event_type;
- uint16 num_strings;
- uint16 event_category;
- uint16 reserved2;
- uint32 closing_record_number;
- uint32 string_offset;
- uint32 user_sid_length;
- uint32 user_sid_offset;
- uint32 data_length;
- uint32 data_offset;
-} Eventlog_record;
-
-typedef struct {
- uint32 source_name_len;
- smb_ucs2_t *source_name;
- uint32 computer_name_len;
- smb_ucs2_t *computer_name;
- uint32 sid_padding;
- smb_ucs2_t *sid;
- uint32 strings_len;
- smb_ucs2_t *strings;
- uint32 user_data_len;
- char *user_data;
- uint32 data_padding;
-} Eventlog_data_record;
-
-typedef struct eventlog_entry {
- Eventlog_record record;
- Eventlog_data_record data_record;
- uint8 *data;
- uint8 *end_of_data_padding;
- struct eventlog_entry *next;
-} Eventlog_entry;
-
-#endif /* _RPC_EVENTLOG_H */
diff --git a/source3/rpc_parse/parse_eventlog.c b/source3/rpc_parse/parse_eventlog.c
deleted file mode 100644
index 45bd4b591e..0000000000
--- a/source3/rpc_parse/parse_eventlog.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Unix SMB/CIFS implementation.
- * RPC Pipe client / server routines
- * Copyright (C) Marcin Krzysztof Porwit 2005.
- *
- * 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"
-
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_RPC_PARSE
-
-/********************************************************************
-********************************************************************/
-