s3-libnet: better separate headers.

Guenther

13 files changed, 50 insertions, 123 deletions

diff --git a/source3/libnet/libnet.h b/source3/libnet/libnet.h
deleted file mode 100644
index 86eb9d050c..0000000000
--- a/source3/libnet/libnet.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  Unix SMB/CIFS implementation.
- *  libnet 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 __LIBNET_H__
-#define __LIBNET_H__
-
-#include "smb_krb5.h"
-#include "libnet/libnet_keytab.h"
-#include "libnet/libnet_samsync.h"
-#include "libnet/libnet_dssync.h"
-#include "librpc/gen_ndr/libnet_join.h"
-#include "libnet/libnet_proto.h"
-
-#endif
diff --git a/source3/libnet/libnet_dssync.c b/source3/libnet/libnet_dssync.c
index 1a2b1cacea..e9a788b869 100644
--- a/source3/libnet/libnet_dssync.c
+++ b/source3/libnet/libnet_dssync.c
@@ -21,7 +21,7 @@
 
 
 #include "includes.h"
-#include "libnet/libnet.h"
+#include "libnet/libnet_dssync.h"
 #include "../libcli/drsuapi/drsuapi.h"
 #include "../librpc/gen_ndr/cli_drsuapi.h"
 
diff --git a/source3/libnet/libnet_dssync.h b/source3/libnet/libnet_dssync.h
index e05aaa374b..91f48f5e85 100644
--- a/source3/libnet/libnet_dssync.h
+++ b/source3/libnet/libnet_dssync.h
@@ -58,3 +58,10 @@ struct dssync_context {
 };
 
 extern const struct dssync_ops libnet_dssync_keytab_ops;
+
+/* The following definitions come from libnet/libnet_dssync.c  */
+
+NTSTATUS libnet_dssync_init_context(TALLOC_CTX *mem_ctx,
+				    struct dssync_context **ctx_p);
+NTSTATUS libnet_dssync(TALLOC_CTX *mem_ctx,
+		       struct dssync_context *ctx);
diff --git a/source3/libnet/libnet_dssync_keytab.c b/source3/libnet/libnet_dssync_keytab.c
index f7f706d90c..b0c745d110 100644
--- a/source3/libnet/libnet_dssync_keytab.c
+++ b/source3/libnet/libnet_dssync_keytab.c
@@ -19,7 +19,10 @@
 */
 
 #include "includes.h"
-#include "libnet/libnet.h"
+#include "smb_krb5.h"
+#include "ads.h"
+#include "libnet/libnet_dssync.h"
+#include "libnet/libnet_keytab.h"
 #include "librpc/gen_ndr/ndr_drsblobs.h"
 
 #if defined(HAVE_ADS) && defined(ENCTYPE_ARCFOUR_HMAC)
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 7fd7259736..e2b917966b 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -19,7 +19,8 @@
  */
 
 #include "includes.h"
-#include "libnet/libnet.h"
+#include "librpc/gen_ndr/ndr_libnet_join.h"
+#include "libnet/libnet_join.h"
 #include "libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/cli_samr.h"
 #include "rpc_client/init_samr.h"
diff --git a/source3/libnet/libnet_keytab.c b/source3/libnet/libnet_keytab.c
index 589d4c2525..f395c975e5 100644
--- a/source3/libnet/libnet_keytab.c
+++ b/source3/libnet/libnet_keytab.c
@@ -20,7 +20,9 @@
 */
 
 #include "includes.h"
-#include "libnet/libnet.h"
+#include "smb_krb5.h"
+#include "ads.h"
+#include "libnet/libnet_keytab.h"
 
 #ifdef HAVE_KRB5
 
diff --git a/source3/libnet/libnet_keytab.h b/source3/libnet/libnet_keytab.h
index 4d311a48e0..b82e5433eb 100644
--- a/source3/libnet/libnet_keytab.h
+++ b/source3/libnet/libnet_keytab.h
@@ -39,4 +39,22 @@ struct libnet_keytab_context {
 	bool clean_old_entries;
 };
 
+/* The following definitions come from libnet/libnet_keytab.c  */
+
+krb5_error_code libnet_keytab_init(TALLOC_CTX *mem_ctx,
+				   const char *keytab_name,
+				   struct libnet_keytab_context **ctx);
+krb5_error_code libnet_keytab_add(struct libnet_keytab_context *ctx);
+
+struct libnet_keytab_entry *libnet_keytab_search(struct libnet_keytab_context *ctx,
+						 const char *principal, int kvno,
+						 const krb5_enctype enctype,
+						 TALLOC_CTX *mem_ctx);
+NTSTATUS libnet_keytab_add_to_keytab_entries(TALLOC_CTX *mem_ctx,
+					     struct libnet_keytab_context *ctx,
+					     uint32_t kvno,
+					     const char *name,
+					     const char *prefix,
+					     const krb5_enctype enctype,
+					     DATA_BLOB blob);
 #endif /* HAVE_KRB5 */
diff --git a/source3/libnet/libnet_proto.h b/source3/libnet/libnet_proto.h
deleted file mode 100644
index 9a193b724d..0000000000
--- a/source3/libnet/libnet_proto.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Unix SMB/CIFS implementation.
- * collected prototypes header
- *
- * frozen from "make proto" in May 2008
- *
- * Copyright (C) Michael Adam 2008
- *
- * 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 _LIBNET_PROTO_H_
-#define _LIBNET_PROTO_H_
-
-
-/* The following definitions come from libnet/libnet_join.c  */
-
-NTSTATUS libnet_join_ok(const char *netbios_domain_name,
-			const char *machine_name,
-			const char *dc_name);
-WERROR libnet_init_JoinCtx(TALLOC_CTX *mem_ctx,
-			   struct libnet_JoinCtx **r);
-WERROR libnet_init_UnjoinCtx(TALLOC_CTX *mem_ctx,
-			     struct libnet_UnjoinCtx **r);
-WERROR libnet_Join(TALLOC_CTX *mem_ctx,
-		   struct libnet_JoinCtx *r);
-WERROR libnet_Unjoin(TALLOC_CTX *mem_ctx,
-		     struct libnet_UnjoinCtx *r);
-
-/* The following definitions come from librpc/gen_ndr/ndr_libnet_join.c  */
-
-_PUBLIC_ void ndr_print_libnet_JoinCtx(struct ndr_print *ndr, const char *name, int flags, const struct libnet_JoinCtx *r);
-_PUBLIC_ void ndr_print_libnet_UnjoinCtx(struct ndr_print *ndr, const char *name, int flags, const struct libnet_UnjoinCtx *r);
-
-/* The following definitions come from libnet/libnet_keytab.c  */
-
-#ifdef HAVE_KRB5
-krb5_error_code libnet_keytab_init(TALLOC_CTX *mem_ctx,
-				   const char *keytab_name,
-				   struct libnet_keytab_context **ctx);
-krb5_error_code libnet_keytab_add(struct libnet_keytab_context *ctx);
-
-struct libnet_keytab_entry *libnet_keytab_search(struct libnet_keytab_context *ctx,
-						 const char *principal, int kvno,
-						 const krb5_enctype enctype,
-						 TALLOC_CTX *mem_ctx);
-NTSTATUS libnet_keytab_add_to_keytab_entries(TALLOC_CTX *mem_ctx,
-					     struct libnet_keytab_context *ctx,
-					     uint32_t kvno,
-					     const char *name,
-					     const char *prefix,
-					     const krb5_enctype enctype,
-					     DATA_BLOB blob);
-#endif
-
-/* The following definitions come from libnet/libnet_samsync.c  */
-
-NTSTATUS libnet_samsync_init_context(TALLOC_CTX *mem_ctx,
-				     const struct dom_sid *domain_sid,
-				     struct samsync_context **ctx_p);
-NTSTATUS libnet_samsync(enum netr_SamDatabaseID database_id,
-			struct samsync_context *ctx);
-NTSTATUS pull_netr_AcctLockStr(TALLOC_CTX *mem_ctx,
-			       struct lsa_BinaryString *r,
-			       struct netr_AcctLockStr **str_p);
-
-/* The following definitions come from libnet/libnet_dssync.c  */
-
-NTSTATUS libnet_dssync_init_context(TALLOC_CTX *mem_ctx,
-				    struct dssync_context **ctx_p);
-NTSTATUS libnet_dssync(TALLOC_CTX *mem_ctx,
-		       struct dssync_context *ctx);
-
-#endif /*  _LIBNET_PROTO_H_  */
diff --git a/source3/libnet/libnet_samsync.c b/source3/libnet/libnet_samsync.c
index cbe4b80b61..5c42aca0a3 100644
--- a/source3/libnet/libnet_samsync.c
+++ b/source3/libnet/libnet_samsync.c
@@ -22,7 +22,7 @@
 
 
 #include "includes.h"
-#include "libnet/libnet.h"
+#include "libnet/libnet_samsync.h"
 #include "../lib/crypto/crypto.h"
 #include "../libcli/samsync/samsync.h"
 #include "../libcli/auth/libcli_auth.h"
diff --git a/source3/libnet/libnet_samsync.h b/source3/libnet/libnet_samsync.h
index 3a686a7f45..c9093ef2f1 100644
--- a/source3/libnet/libnet_samsync.h
+++ b/source3/libnet/libnet_samsync.h
@@ -84,3 +84,14 @@ extern const struct samsync_ops libnet_samsync_ldif_ops;
 extern const struct samsync_ops libnet_samsync_keytab_ops;
 extern const struct samsync_ops libnet_samsync_display_ops;
 extern const struct samsync_ops libnet_samsync_passdb_ops;
+
+/* The following definitions come from libnet/libnet_samsync.c  */
+
+NTSTATUS libnet_samsync_init_context(TALLOC_CTX *mem_ctx,
+				     const struct dom_sid *domain_sid,
+				     struct samsync_context **ctx_p);
+NTSTATUS libnet_samsync(enum netr_SamDatabaseID database_id,
+			struct samsync_context *ctx);
+NTSTATUS pull_netr_AcctLockStr(TALLOC_CTX *mem_ctx,
+			       struct lsa_BinaryString *r,
+			       struct netr_AcctLockStr **str_p);
diff --git a/source3/libnet/libnet_samsync_display.c b/source3/libnet/libnet_samsync_display.c
index c8d9ec6f09..eb891cfc1a 100644
--- a/source3/libnet/libnet_samsync_display.c
+++ b/source3/libnet/libnet_samsync_display.c
@@ -24,7 +24,7 @@
 */
 
 #include "includes.h"
-#include "libnet/libnet.h"
+#include "libnet/libnet_samsync.h"
 
 static void display_group_mem_info(uint32_t rid,
 				   struct netr_DELTA_GROUP_MEMBER *r)
diff --git a/source3/libnet/libnet_samsync_keytab.c b/source3/libnet/libnet_samsync_keytab.c
index 768406314a..246bcad0d3 100644
--- a/source3/libnet/libnet_samsync_keytab.c
+++ b/source3/libnet/libnet_samsync_keytab.c
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
-#include "libnet/libnet.h"
+#include "libnet/libnet_samsync.h"
 
 #if defined(HAVE_ADS) && defined(ENCTYPE_ARCFOUR_HMAC)
 
diff --git a/source3/libnet/libnet_samsync_passdb.c b/source3/libnet/libnet_samsync_passdb.c
index f90ece5ed9..224598a480 100644
--- a/source3/libnet/libnet_samsync_passdb.c
+++ b/source3/libnet/libnet_samsync_passdb.c
@@ -24,7 +24,7 @@
 */
 
 #include "includes.h"
-#include "libnet/libnet.h"
+#include "libnet/libnet_samsync.h"
 
 /* Convert a struct samu_DELTA to a struct samu. */
 #define STRING_CHANGED (old_string && !new_string) ||\