r6014: rather large change set....

pulling back all recent rpc changes from trunk into
3.0.  I've tested a compile and so don't think I've missed
any files.  But if so, just mail me and I'll clean backup
in a couple of hours.

Changes include \winreg, \eventlog, \svcctl, and
general parse_misc.c updates.

I am planning on bracketing the event code with an
#ifdef ENABLE_EVENTLOG until I finish merging Marcin's
changes (very soon).
(This used to be commit 4e0ac63c36527cd8c52ef720cae17e84f67e7221)

1 files changed, 35 insertions, 30 deletions

diff --git a/source3/include/rpc_shutdown.h b/source3/include/rpc_shutdown.h
index b8e50b835f..a9d86aec26 100644
--- a/source3/include/rpc_shutdown.h
+++ b/source3/include/rpc_shutdown.h
@@ -1,7 +1,8 @@
 /* 
    Unix SMB/CIFS implementation.
-   SMB parameters and setup
+   
    Copyright (C) Jim McDonough (jmcd@us.ibm.com)      2003.
+   Copyright (C) Gerald (Jerry) Carter                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
@@ -22,49 +23,53 @@
 #define _RPC_SHUTDOWN_H 
 
 
-/* Implemented */
+/* opnums */
+
 #define SHUTDOWN_INIT		0x00
 #define SHUTDOWN_ABORT		0x01
-/* NOT IMPLEMENTED
 #define SHUTDOWN_INIT_EX	0x02
-*/
 
-/* SHUTDOWN_Q_INIT */
-typedef struct q_shutodwn_init_info
-{
-	uint32 ptr_server;
-	uint16 server;
-	uint32 ptr_msg;
-	UNIHDR hdr_msg;		/* shutdown message */
-	UNISTR2 uni_msg;	/* seconds */
-	uint32 timeout;		/* seconds */
+
+/***********************************************/
+ 
+typedef struct {
+	uint16 *server;
+	UNISTR4 *message; 	
+	uint32 timeout;		/* in seconds */
 	uint8 force;		/* boolean: force shutdown */
-	uint8 reboot;		/* boolean: reboot on shutdown */
-		
+	uint8 reboot;		/* boolean: reboot on shutdown */		
 } SHUTDOWN_Q_INIT;
 
-/* SHUTDOWN_R_INIT */
-typedef struct r_shutdown_init_info
-{
-	NTSTATUS status;		/* return status */
-
+typedef struct {
+	WERROR status;		/* return status */
 } SHUTDOWN_R_INIT;
 
-/* SHUTDOWN_Q_ABORT */
-typedef struct q_shutdown_abort_info
-{
-	uint32 ptr_server;
-	uint16 server;
+/***********************************************/
+ 
+typedef struct {
+	uint16 *server;
+	UNISTR4 *message; 	
+	uint32 timeout;		/* in seconds */
+	uint8 force;		/* boolean: force shutdown */
+	uint8 reboot;		/* boolean: reboot on shutdown */
+	uint32 reason;		/* reason - must be defined code */
+} SHUTDOWN_Q_INIT_EX;
 
-} SHUTDOWN_Q_ABORT;
+typedef struct {
+	WERROR status;
+} SHUTDOWN_R_INIT_EX;
 
-/* SHUTDOWN_R_ABORT */
-typedef struct r_shutdown_abort_info
-{ 
-	NTSTATUS status; /* return status */
+/***********************************************/
 
+typedef struct {
+	uint16 *server;
+} SHUTDOWN_Q_ABORT;
+
+typedef struct { 
+	WERROR status; 
 } SHUTDOWN_R_ABORT;
 
 
+
 #endif /* _RPC_SHUTDOWN_H */