r23274: merge CloseEventlog() pidl conversion from 3.0.26 && fix a few init call renames for svcctl in the previous commit

(This used to be commit ebcae48ec10fefa74efcc3563cff50e3b9c2388c)

3 files changed, 1 insertions, 23 deletions

diff --git a/source3/include/includes.h b/source3/include/includes.h
index e3e24eff07..d1cd27585e 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -782,6 +782,7 @@ enum flush_reason_enum {
 #include "librpc/gen_ndr/srv_echo.h"
 #include "librpc/gen_ndr/srv_svcctl.h"
 #include "librpc/gen_ndr/srv_lsa.h"
+#include "librpc/gen_ndr/srv_eventlog.h"
 
 /***** automatically generated prototypes *****/
 #ifndef NO_PROTO_H
diff --git a/source3/include/rpc_eventlog.h b/source3/include/rpc_eventlog.h
index 94a5915292..547568e93b 100644
--- a/source3/include/rpc_eventlog.h
+++ b/source3/include/rpc_eventlog.h
@@ -84,18 +84,6 @@ typedef struct {
 
 typedef struct {
 	POLICY_HND handle;
-} EVENTLOG_Q_CLOSE_EVENTLOG;
-
-typedef struct {
-	POLICY_HND handle;
-	NTSTATUS status;
-} EVENTLOG_R_CLOSE_EVENTLOG;
-
-
-/***********************************/
-
-typedef struct {
-	POLICY_HND handle;
 } EVENTLOG_Q_GET_NUM_RECORDS;
 
 typedef struct {
diff --git a/source3/include/rpc_svcctl.h b/source3/include/rpc_svcctl.h
index 8ca5e1772b..f4bf509f7c 100644
--- a/source3/include/rpc_svcctl.h
+++ b/source3/include/rpc_svcctl.h
@@ -202,17 +202,6 @@ typedef struct _ServiceInfo {
 /**************************/
 
 typedef struct {
-	POLICY_HND handle;
-} SVCCTL_Q_CLOSE_SERVICE;
-
-typedef struct {
-        POLICY_HND handle;
-	WERROR status;
-} SVCCTL_R_CLOSE_SERVICE;
-
-/**************************/
-
-typedef struct {
 	UNISTR2 *servername;
 	UNISTR2 *database; 
 	uint32 access;