Merge all headers into libnetapi.h.

Guenther
(This used to be commit a2c5beda2ec98dea8951fb3a37774f5f325410ef)

3 files changed, 22 insertions, 69 deletions

diff --git a/source3/lib/netapi/joindomain.h b/source3/lib/netapi/joindomain.h
deleted file mode 100644
index b72bc9aecb..0000000000
--- a/source3/lib/netapi/joindomain.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  Unix SMB/CIFS implementation.
- *  NetApi Support
- *  Copyright (C) Guenther Deschner 2007
- *
- *  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 __LIB_NETAPI_JOINDOMAIN_H__
-#define __LIB_NETAPI_JOINDOMAIN_H__
-
-NET_API_STATUS NetJoinDomain(const char *server,
-			     const char *domain,
-			     const char *account_ou,
-			     const char *account,
-			     const char *password,
-			     uint32_t join_options);
-NET_API_STATUS NetUnjoinDomain(const char *server_name,
-			       const char *account,
-			       const char *password,
-			       uint32_t unjoin_flags);
-NET_API_STATUS NetGetJoinInformation(const char *server_name,
-				     const char **name_buffer,
-				     uint16_t *name_type);
-
-#endif
diff --git a/source3/lib/netapi/netapi.h b/source3/lib/netapi/netapi.h
index a1137b45ee..bbd2282a77 100644
--- a/source3/lib/netapi/netapi.h
+++ b/source3/lib/netapi/netapi.h
@@ -39,7 +39,27 @@ NET_API_STATUS libnetapi_set_password(struct libnetapi_ctx *ctx, const char *pas
 NET_API_STATUS libnetapi_set_workgroup(struct libnetapi_ctx *ctx, const char *workgroup);
 const char *libnetapi_errstr(struct libnetapi_ctx *ctx, NET_API_STATUS status);
 
-#include "joindomain.h"
-#include "serverinfo.h"
+/* wkssvc */
+NET_API_STATUS NetJoinDomain(const char *server,
+			     const char *domain,
+			     const char *account_ou,
+			     const char *account,
+			     const char *password,
+			     uint32_t join_options);
+NET_API_STATUS NetUnjoinDomain(const char *server_name,
+			       const char *account,
+			       const char *password,
+			       uint32_t unjoin_flags);
+NET_API_STATUS NetGetJoinInformation(const char *server_name,
+				     const char **name_buffer,
+				     uint16_t *name_type);
 
+/* srvsvc */
+NET_API_STATUS NetServerGetInfo(const char *server_name,
+				uint32_t level,
+				uint8_t **buffer);
+NET_API_STATUS NetServerSetInfo(const char *server_name,
+				uint32_t level,
+				uint8_t *buffer,
+				uint32_t *parm_error);
 #endif
diff --git a/source3/lib/netapi/serverinfo.h b/source3/lib/netapi/serverinfo.h
deleted file mode 100644
index 66c406657a..0000000000
--- a/source3/lib/netapi/serverinfo.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  Unix SMB/CIFS implementation.
- *  NetApi Support
- *  Copyright (C) Guenther Deschner 2007
- *
- *  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 __LIB_NETAPI_SERVERINFO_H__
-#define __LIB_NETAPI_SERVERINFO_H__
-
-NET_API_STATUS NetServerGetInfo(const char *server_name,
-				uint32_t level,
-				uint8_t **buffer);
-NET_API_STATUS NetServerSetInfo(const char *server_name,
-				uint32_t level,
-				uint8_t *buffer,
-				uint32_t *parm_error);
-#endif