Merge branch 'master' of ssh://git.samba.org/data/git/samba

4 files changed, 50 insertions, 24 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/proto.h b/source3/include/proto.h
index 7a5cd3b07e..83cd740a78 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1507,7 +1507,7 @@ char *print_sockaddr(char *dest,
 			const struct sockaddr_storage *psa);
 char *print_canonical_sockaddr(TALLOC_CTX *ctx,
 			const struct sockaddr_storage *pss);
-void set_sockaddr_port(struct sockaddr_storage *psa, uint16 port);
+void set_sockaddr_port(struct sockaddr *psa, uint16_t port);
 const char *client_name(int fd);
 const char *client_addr(int fd, char *addr, size_t addrlen);
 const char *client_socket_addr(int fd, char *addr, size_t addr_len);
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 */
+