summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-10-23 20:43:11 +0200
committerGünther Deschner <gd@samba.org>2008-10-24 00:06:07 +0200
commit78a85f9e96e4c1d5a99e328e8ca07b1f75a79467 (patch)
tree42c85b8638c1c5ec9622c97964e36c20af53b631
parent25988f13696547e70b5e3155cb5bcea2f0786312 (diff)
downloadsamba-78a85f9e96e4c1d5a99e328e8ca07b1f75a79467.tar.gz
samba-78a85f9e96e4c1d5a99e328e8ca07b1f75a79467.tar.bz2
samba-78a85f9e96e4c1d5a99e328e8ca07b1f75a79467.zip
svcctl: move some non-rpc related bits out of rpc_svcctl.h.
Guenther
-rw-r--r--source3/include/includes.h1
-rw-r--r--source3/include/rpc_svcctl.h23
-rw-r--r--source3/include/services.h48
3 files changed, 49 insertions, 23 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 035d46fe0a..24e33c1720 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -659,6 +659,7 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
#include "async_req.h"
#include "async_smb.h"
#include "async_sock.h"
+#include "services.h"
#include "lib/smbconf/smbconf.h"
diff --git a/source3/include/rpc_svcctl.h b/source3/include/rpc_svcctl.h
index 0e31a53e32..27858405e7 100644
--- a/source3/include/rpc_svcctl.h
+++ b/source3/include/rpc_svcctl.h
@@ -117,9 +117,6 @@
#define SVC_STATUS_PROCESS_INFO 0x00000000
-/* where we assume the location of the service control scripts */
-#define SVCCTL_SCRIPT_DIR "svcctl"
-
/* utility structures for RPCs */
/*
@@ -159,26 +156,6 @@ typedef struct {
SC_ACTION *actions;
} SERVICE_FAILURE_ACTIONS;
-/*
- * dispatch table of functions to handle the =ServiceControl API
- */
-
-typedef struct {
- /* functions for enumerating subkeys and values */
- WERROR (*stop_service)( const char *service, SERVICE_STATUS *status );
- WERROR (*start_service) ( const char *service );
- WERROR (*service_status)( const char *service, SERVICE_STATUS *status );
-} SERVICE_CONTROL_OPS;
-
-/* structure to store the service handle information */
-
-typedef struct _ServiceInfo {
- uint8 type;
- char *name;
- uint32 access_granted;
- SERVICE_CONTROL_OPS *ops;
-} SERVICE_INFO;
-
/* rpc structures */
diff --git a/source3/include/services.h b/source3/include/services.h
new file mode 100644
index 0000000000..8c2a0ccfba
--- /dev/null
+++ b/source3/include/services.h
@@ -0,0 +1,48 @@
+/*
+ Unix SMB/CIFS implementation.
+ SMB parameters and setup
+ Copyright (C) Andrew Tridgell 1992-1997,
+ 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
+ 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 _SERVICES_H /* _SERVICES_H */
+#define _SERVICES_H
+
+/* where we assume the location of the service control scripts */
+#define SVCCTL_SCRIPT_DIR "svcctl"
+
+/*
+ * dispatch table of functions to handle the =ServiceControl API
+ */
+
+typedef struct {
+ /* functions for enumerating subkeys and values */
+ WERROR (*stop_service)( const char *service, SERVICE_STATUS *status );
+ WERROR (*start_service) ( const char *service );
+ WERROR (*service_status)( const char *service, SERVICE_STATUS *status );
+} SERVICE_CONTROL_OPS;
+
+/* structure to store the service handle information */
+
+typedef struct _ServiceInfo {
+ uint8 type;
+ char *name;
+ uint32 access_granted;
+ SERVICE_CONTROL_OPS *ops;
+} SERVICE_INFO;
+
+#endif /* _SERICES_H */
+