s3-libnet: better separate headers.
authorGünther Deschner <gd@samba.org>
Thu, 1 Jul 2010 22:14:04 +0000 (00:14 +0200)
committerGünther Deschner <gd@samba.org>
Tue, 13 Jul 2010 20:40:46 +0000 (22:40 +0200)
Guenther

19 files changed:
source3/lib/netapi/joindomain.c
source3/libnet/libnet.h [deleted file]
source3/libnet/libnet_dssync.c
source3/libnet/libnet_dssync.h
source3/libnet/libnet_dssync_keytab.c
source3/libnet/libnet_join.c
source3/libnet/libnet_keytab.c
source3/libnet/libnet_keytab.h
source3/libnet/libnet_proto.h [deleted file]
source3/libnet/libnet_samsync.c
source3/libnet/libnet_samsync.h
source3/libnet/libnet_samsync_display.c
source3/libnet/libnet_samsync_keytab.c
source3/libnet/libnet_samsync_passdb.c
source3/rpc_server/srv_wkssvc_nt.c
source3/utils/net.h
source3/utils/net_ads.c
source3/utils/net_lookup.c
source3/utils/net_rpc_samsync.c

index 4936d772cdaa17bb149a827f453865038a3e9ccd..336f9dc7833787d9314f942e62cb6b2c163b1ace 100644 (file)
@@ -23,7 +23,8 @@
 #include "lib/netapi/netapi.h"
 #include "lib/netapi/netapi_private.h"
 #include "lib/netapi/libnetapi.h"
-#include "libnet/libnet.h"
+#include "librpc/gen_ndr/libnet_join.h"
+#include "libnet/libnet_join.h"
 #include "libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/cli_wkssvc.h"
 
diff --git a/source3/libnet/libnet.h b/source3/libnet/libnet.h
deleted file mode 100644 (file)
index 86eb9d0..0000000
+++ /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
index 1a2b1caceaed76c165674d9ab5103084901feaf7..e9a788b8698be530907a79a14a3871e1f50faec9 100644 (file)
@@ -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"
 
index e05aaa374b92b8e38568bfb885f12694b81c9b35..91f48f5e8511dc0e19ab739b59ac6460e19cfd2d 100644 (file)
@@ -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);
index f7f706d90cd9cba0e9b5aab006c3288c8d0812ab..b0c745d1107ade72e80c866a9d95d2feefe49f87 100644 (file)
 */
 
 #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)
index 7fd7259736b88ee0e4cc943f39e5c4f96badca9b..e2b917966ba9c1fa73eb48f59cdc893087c528bc 100644 (file)
@@ -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"
index 589d4c2525499e47847925740b4ad6cdcd440eb8..f395c975e5cb1c01832d72de8d6484fe75c36d60 100644 (file)
@@ -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
 
index 4d311a48e0ee1d98a9f197eb98661d5cf2cc508d..b82e5433eb4208cf97c4fc893eafec52f4e0930e 100644 (file)
@@ -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 (file)
index 9a193b7..0000000
+++ /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_  */
index cbe4b80b616791e5f6ee20b4d4175b0aab020a8d..5c42aca0a31666ad311a7713afe826ead273cb04 100644 (file)
@@ -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"
index 3a686a7f45581811a22bfb20a109c873ae4b9b9d..c9093ef2f103e41e7167e92c2c11402671a5a5fe 100644 (file)
@@ -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);
index c8d9ec6f096155b583e0ef55e9bb1780ed840b8b..eb891cfc1afc3ff1536edb3dba42009e3a772d3e 100644 (file)
@@ -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)
index 768406314aaaa7c2b7b00c074a0315797ec47100..246bcad0d3744fe54d8ba14f6e2955f3032866e1 100644 (file)
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
-#include "libnet/libnet.h"
+#include "libnet/libnet_samsync.h"
 
 #if defined(HAVE_ADS) && defined(ENCTYPE_ARCFOUR_HMAC)
 
index f90ece5ed9b3168eb9aafa3273366566a434015f..224598a480e7036e98bf99080c06d780c488b863 100644 (file)
@@ -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) ||\
index 4106bc10bc5b3fce45d518b8bdde95243afe77f2..d9f788142d931ef64158ed6392da7e786f8d9f46 100644 (file)
@@ -23,7 +23,8 @@
 /* This is the implementation of the wks interface. */
 
 #include "includes.h"
-#include "libnet/libnet.h"
+#include "librpc/gen_ndr/libnet_join.h"
+#include "libnet/libnet_join.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/srv_wkssvc.h"
 
index 21f393b243ccff0b6b8bfaf7b89d7d36cbfc3812..39a431315e93807d434e9023f492ec86a2fe6406 100644 (file)
@@ -23,7 +23,6 @@
  */
 
 #include "lib/netapi/netapi.h"
-#include "libnet/libnet.h"
 #include "localedir.h"
 
 #ifdef HAVE_LIBINTL_H
index 0571fc8d251a6b9d1198c428348665755895dd5b..ef28fc7008b9a651b3e3f87acd95d55b99fc5016 100644 (file)
 #include "libads/cldap.h"
 #include "libads/dns.h"
 #include "../libds/common/flags.h"
+#include "ads.h"
+#include "librpc/gen_ndr/libnet_join.h"
+#include "libnet/libnet_join.h"
+#include "smb_krb5.h"
 
 #ifdef HAVE_ADS
 
index 1b31b32ff07d2cac8bdaa4c0c195018e1b9ecedd..5ff62398f2918c77e66109c7909dbb36cb2c6425 100644 (file)
@@ -21,6 +21,7 @@
 #include "libads/sitename_cache.h"
 #include "libads/dns.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
+#include "smb_krb5.h"
 
 int net_lookup_usage(struct net_context *c, int argc, const char **argv)
 {
index ae1a71b68954b4ebd9be17968108def6037702f8..8b5a90838ed883309b7585f951c476fffa280521 100644 (file)
@@ -27,6 +27,8 @@
 #include "utils/net.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 #include "../librpc/gen_ndr/ndr_drsuapi.h"
+#include "libnet/libnet_samsync.h"
+#include "libnet/libnet_dssync.h"
 
 static void parse_samsync_partial_replication_objects(TALLOC_CTX *mem_ctx,
                                                      int argc,