libsmb: Give namequery.c its own header
authorVolker Lendecke <vl@samba.org>
Sat, 10 Mar 2018 14:31:11 +0000 (15:31 +0100)
committerJeremy Allison <jra@samba.org>
Tue, 10 Apr 2018 23:06:39 +0000 (01:06 +0200)
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
28 files changed:
source3/include/proto.h
source3/libads/kerberos.c
source3/libads/ldap.c
source3/libnet/libnet_join.c
source3/libsmb/cliconnect.c
source3/libsmb/dsgetdcname.c
source3/libsmb/libsmb_dir.c
source3/libsmb/namequery.c
source3/libsmb/namequery.h [new file with mode: 0644]
source3/libsmb/namequery_dc.c
source3/rpc_client/cli_pipe.c
source3/rpc_server/spoolss/srv_spoolss_nt.c
source3/smbd/reply.c
source3/torture/torture.c
source3/utils/net_ads.c
source3/utils/net_lookup.c
source3/utils/net_rpc.c
source3/utils/net_time.c
source3/utils/net_util.c
source3/utils/nmblookup.c
source3/utils/smbfilter.c
source3/utils/smbtree.c
source3/winbindd/idmap_ad.c
source3/winbindd/winbindd_ads.c
source3/winbindd/winbindd_cm.c
source3/winbindd/winbindd_pam.c
source3/winbindd/winbindd_wins_byip.c
source3/winbindd/winbindd_wins_byname.c

index 778107a4d846d77bf12ec5a0e09d14bbe11af416..3dab5d7ade6e98e0700c94ad961df0cc934b5643 100644 (file)
@@ -713,96 +713,6 @@ bool namecache_status_fetch(const char *keyname,
                                const struct sockaddr_storage *keyip,
                                char *srvname_out);
 
-/* The following definitions come from libsmb/namequery.c  */
-
-bool saf_store( const char *domain, const char *servername );
-bool saf_join_store( const char *domain, const char *servername );
-bool saf_delete( const char *domain );
-char *saf_fetch(TALLOC_CTX *mem_ctx, const char *domain );
-struct tevent_req *node_status_query_send(TALLOC_CTX *mem_ctx,
-                                         struct tevent_context *ev,
-                                         struct nmb_name *name,
-                                         const struct sockaddr_storage *addr);
-NTSTATUS node_status_query_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
-                               struct node_status **pnode_status,
-                               int *pnum_names,
-                               struct node_status_extra *extra);
-NTSTATUS node_status_query(TALLOC_CTX *mem_ctx, struct nmb_name *name,
-                          const struct sockaddr_storage *addr,
-                          struct node_status **pnode_status,
-                          int *pnum_names,
-                          struct node_status_extra *extra);
-bool name_status_find(const char *q_name,
-                       int q_type,
-                       int type,
-                       const struct sockaddr_storage *to_ss,
-                       fstring name);
-int remove_duplicate_addrs2(struct ip_service *iplist, int count );
-struct tevent_req *name_query_send(TALLOC_CTX *mem_ctx,
-                                  struct tevent_context *ev,
-                                  const char *name, int name_type,
-                                  bool bcast, bool recurse,
-                                  const struct sockaddr_storage *addr);
-NTSTATUS name_query_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
-                        struct sockaddr_storage **addrs, int *num_addrs,
-                        uint8_t *flags);
-NTSTATUS name_query(const char *name, int name_type,
-                   bool bcast, bool recurse,
-                   const struct sockaddr_storage *to_ss,
-                   TALLOC_CTX *mem_ctx,
-                   struct sockaddr_storage **addrs,
-                   int *num_addrs, uint8_t *flags);
-struct tevent_req *name_resolve_bcast_send(TALLOC_CTX *mem_ctx,
-                                          struct tevent_context *ev,
-                                          const char *name,
-                                          int name_type);
-NTSTATUS name_resolve_bcast_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
-                                struct sockaddr_storage **addrs,
-                                int *num_addrs);
-NTSTATUS name_resolve_bcast(const char *name,
-                       int name_type,
-                       TALLOC_CTX *mem_ctx,
-                       struct sockaddr_storage **return_iplist,
-                       int *return_count);
-struct tevent_req *resolve_wins_send(TALLOC_CTX *mem_ctx,
-                                    struct tevent_context *ev,
-                                    const char *name,
-                                    int name_type);
-NTSTATUS resolve_wins_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
-                          struct sockaddr_storage **addrs,
-                          int *num_addrs, uint8_t *flags);
-NTSTATUS resolve_wins(const char *name,
-               int name_type,
-               TALLOC_CTX *mem_ctx,
-               struct sockaddr_storage **return_iplist,
-               int *return_count);
-NTSTATUS internal_resolve_name(const char *name,
-                               int name_type,
-                               const char *sitename,
-                               struct ip_service **return_iplist,
-                               int *return_count,
-                               const char **resolve_order);
-bool resolve_name(const char *name,
-               struct sockaddr_storage *return_ss,
-               int name_type,
-               bool prefer_ipv4);
-NTSTATUS resolve_name_list(TALLOC_CTX *ctx,
-               const char *name,
-               int name_type,
-               struct sockaddr_storage **return_ss_arr,
-               unsigned int *p_num_entries);
-bool find_master_ip(const char *group, struct sockaddr_storage *master_ss);
-bool get_pdc_ip(const char *domain, struct sockaddr_storage *pss);
-NTSTATUS get_sorted_dc_list( const char *domain,
-                       const char *sitename,
-                       struct ip_service **ip_list,
-                       int *count,
-                       bool ads_only );
-NTSTATUS get_kdc_list( const char *realm,
-                       const char *sitename,
-                       struct ip_service **ip_list,
-                       int *count);
-
 /* The following definitions come from libsmb/namequery_dc.c  */
 
 bool get_dc_name(const char *domain,
index 82f118a021e48e6e3f75fc1d235065db2c5007ab..e623f2456a842080ecd71db34ae24902d236c71f 100644 (file)
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "libsmb/namequery.h"
 #include "system/filesys.h"
 #include "smb_krb5.h"
 #include "../librpc/gen_ndr/ndr_misc.h"
index f9463043cc8f2deb53e71bee0dbdf93b39758043..e8dcd1baa5712db741b09a6ea753cfd8d0abd00c 100644 (file)
@@ -31,6 +31,7 @@
 #include "../libcli/security/security.h"
 #include "../librpc/gen_ndr/netlogon.h"
 #include "lib/param/loadparm.h"
+#include "libsmb/namequery.h"
 
 #ifdef HAVE_LDAP
 
index bbe604b729ee2688fe9ec076f9ae859714712bd3..5bf0b7fff2df9b370a3c7274a586fe1003dc9fc9 100644 (file)
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "ads.h"
+#include "libsmb/namequery.h"
 #include "librpc/gen_ndr/ndr_libnet_join.h"
 #include "libnet/libnet_join.h"
 #include "libcli/auth/libcli_auth.h"
index 7689910fae9f226266458e96a8700f1fe4bc6867..837299d922022ed310fb53a0a3d470dca4196a1a 100644 (file)
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "libsmb/libsmb.h"
+#include "libsmb/namequery.h"
 #include "auth_info.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../libcli/auth/spnego.h"
index a7fe5a1e7486f3ec30c7905b8803fb31329efb60..9864900632400dddb7320cdff41fe0701dd58926 100644 (file)
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "libsmb/namequery.h"
 #include "libads/sitename_cache.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 #include "libads/cldap.h"
index 72441c4673649cbe1289a2b56f0d77808733e4b1..8c3fed672f8a70b2bfa816592a80cd69e6046bed 100644 (file)
@@ -23,6 +23,7 @@
 */
 
 #include "includes.h"
+#include "libsmb/namequery.h"
 #include "libsmb/libsmb.h"
 #include "auth_info.h"
 #include "libsmbclient.h"
index b616a64b896c5731af8ebeae289b7c1a797a3cf8..8c23f09f44241f0e9651ecb787e440c769a9b859 100644 (file)
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "libsmb/namequery.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "libads/sitename_cache.h"
 #include "../lib/addns/dnsquery.h"
diff --git a/source3/libsmb/namequery.h b/source3/libsmb/namequery.h
new file mode 100644 (file)
index 0000000..d7bd4d3
--- /dev/null
@@ -0,0 +1,115 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * Copyright (C) Volker Lendecke 2018
+ *
+ * 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 __LIBSMB_NAMEQUERY_H__
+#define __LIBSMB_NAMEQUERY_H__
+
+#include "includes.h"
+#include <tevent.h>
+
+/* The following definitions come from libsmb/namequery.c  */
+
+bool saf_store( const char *domain, const char *servername );
+bool saf_join_store( const char *domain, const char *servername );
+bool saf_delete( const char *domain );
+char *saf_fetch(TALLOC_CTX *mem_ctx, const char *domain );
+struct tevent_req *node_status_query_send(TALLOC_CTX *mem_ctx,
+                                         struct tevent_context *ev,
+                                         struct nmb_name *name,
+                                         const struct sockaddr_storage *addr);
+NTSTATUS node_status_query_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
+                               struct node_status **pnode_status,
+                               int *pnum_names,
+                               struct node_status_extra *extra);
+NTSTATUS node_status_query(TALLOC_CTX *mem_ctx, struct nmb_name *name,
+                          const struct sockaddr_storage *addr,
+                          struct node_status **pnode_status,
+                          int *pnum_names,
+                          struct node_status_extra *extra);
+bool name_status_find(const char *q_name,
+                       int q_type,
+                       int type,
+                       const struct sockaddr_storage *to_ss,
+                       fstring name);
+int remove_duplicate_addrs2(struct ip_service *iplist, int count );
+struct tevent_req *name_query_send(TALLOC_CTX *mem_ctx,
+                                  struct tevent_context *ev,
+                                  const char *name, int name_type,
+                                  bool bcast, bool recurse,
+                                  const struct sockaddr_storage *addr);
+NTSTATUS name_query_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
+                        struct sockaddr_storage **addrs, int *num_addrs,
+                        uint8_t *flags);
+NTSTATUS name_query(const char *name, int name_type,
+                   bool bcast, bool recurse,
+                   const struct sockaddr_storage *to_ss,
+                   TALLOC_CTX *mem_ctx,
+                   struct sockaddr_storage **addrs,
+                   int *num_addrs, uint8_t *flags);
+struct tevent_req *name_resolve_bcast_send(TALLOC_CTX *mem_ctx,
+                                          struct tevent_context *ev,
+                                          const char *name,
+                                          int name_type);
+NTSTATUS name_resolve_bcast_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
+                                struct sockaddr_storage **addrs,
+                                int *num_addrs);
+NTSTATUS name_resolve_bcast(const char *name,
+                       int name_type,
+                       TALLOC_CTX *mem_ctx,
+                       struct sockaddr_storage **return_iplist,
+                       int *return_count);
+struct tevent_req *resolve_wins_send(TALLOC_CTX *mem_ctx,
+                                    struct tevent_context *ev,
+                                    const char *name,
+                                    int name_type);
+NTSTATUS resolve_wins_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
+                          struct sockaddr_storage **addrs,
+                          int *num_addrs, uint8_t *flags);
+NTSTATUS resolve_wins(const char *name,
+               int name_type,
+               TALLOC_CTX *mem_ctx,
+               struct sockaddr_storage **return_iplist,
+               int *return_count);
+NTSTATUS internal_resolve_name(const char *name,
+                               int name_type,
+                               const char *sitename,
+                               struct ip_service **return_iplist,
+                               int *return_count,
+                               const char **resolve_order);
+bool resolve_name(const char *name,
+               struct sockaddr_storage *return_ss,
+               int name_type,
+               bool prefer_ipv4);
+NTSTATUS resolve_name_list(TALLOC_CTX *ctx,
+               const char *name,
+               int name_type,
+               struct sockaddr_storage **return_ss_arr,
+               unsigned int *p_num_entries);
+bool find_master_ip(const char *group, struct sockaddr_storage *master_ss);
+bool get_pdc_ip(const char *domain, struct sockaddr_storage *pss);
+NTSTATUS get_sorted_dc_list( const char *domain,
+                       const char *sitename,
+                       struct ip_service **ip_list,
+                       int *count,
+                       bool ads_only );
+NTSTATUS get_kdc_list( const char *realm,
+                       const char *sitename,
+                       struct ip_service **ip_list,
+                       int *count);
+
+#endif
index d08456590f6d38be4149c5e62fc6eb39c6eaafd7..4ee5b5278e443d482d91cf94f0fa4883169c15b8 100644 (file)
@@ -23,6 +23,7 @@
 
 
 #include "includes.h"
+#include "libsmb/namequery.h"
 #include "libads/sitename_cache.h"
 #include "ads.h"
 #include "../librpc/gen_ndr/nbt.h"
index d449a828b5a5a9a75c53a8d6c20e72958da51012..81b6bfb75bf5f522083f73d3215c3dd2846b44fb 100644 (file)
@@ -20,6 +20,7 @@
  */
 
 #include "includes.h"
+#include "libsmb/namequery.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "librpc/gen_ndr/ndr_epmapper_c.h"
 #include "../librpc/gen_ndr/ndr_dssetup.h"
index 9e492d5a396cbdcc9a174b04b8d49de521e7a74b..f9a89194cc573cc8e789b04a80022aa41cb80211 100644 (file)
@@ -28,6 +28,7 @@
    up, all the errors returned are DOS errors, not NT status codes. */
 
 #include "includes.h"
+#include "libsmb/namequery.h"
 #include "ntdomain.h"
 #include "nt_printing.h"
 #include "srv_spoolss_util.h"
index 881667a6b44a27b31a3e207ceece9c379c2af08e..92a65f5b90b850d82925442632cb7f4724df228d 100644 (file)
@@ -25,6 +25,7 @@
 */
 
 #include "includes.h"
+#include "libsmb/namequery.h"
 #include "system/filesys.h"
 #include "printing.h"
 #include "smbd/smbd.h"
index df6604de9fe219e504a8ef604d918d32c63a99fd..56cc6ff3628d42a1cf9b511b4e25240b5ba2f8d6 100644 (file)
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "system/shmem.h"
+#include "libsmb/namequery.h"
 #include "wbc_async.h"
 #include "torture/proto.h"
 #include "libcli/security/security.h"
index c4c1a0d40512f19f52fcb3c8e3b3110559293ad1..ffa67d8f5254aadc96c85b147146b3a8ee72a633 100644 (file)
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "utils/net.h"
+#include "libsmb/namequery.h"
 #include "rpc_client/cli_pipe.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"
 #include "../librpc/gen_ndr/ndr_spoolss.h"
index 597e098e2e1887b11d6a76ab2c32e5a97dc78b0b..4e7a74d1e004aefb627fd0c2c5a57aa6951f2848 100644 (file)
@@ -18,6 +18,7 @@
 
 #include "includes.h"
 #include "utils/net.h"
+#include "libsmb/namequery.h"
 #include "libads/sitename_cache.h"
 #include "../lib/addns/dnsquery.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
index 8a989d790f29b9620e7040a82784792475e5b84f..52d313edfaae7d91458679c58fa82bb172f6b731 100644 (file)
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "utils/net.h"
+#include "libsmb/namequery.h"
 #include "rpc_client/cli_pipe.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/ndr_samr_c.h"
index 595d903c0be5f05471cc20bb28d8cb5316e201fc..0091fc86333fbd3fe9eb7ef0d13c0ffff11c3bef 100644 (file)
@@ -19,6 +19,7 @@
 #include "includes.h"
 #include "utils/net.h"
 #include "libsmb/nmblib.h"
+#include "libsmb/namequery.h"
 #include "libsmb/libsmb.h"
 #include "../libcli/smb/smbXcli_base.h"
 
index 86a46672f56afed4cef5ff86cb91019ba2506b97..a84b4f5500e61e1af0cd2adf23907ba42b1e37ab 100644 (file)
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "utils/net.h"
+#include "libsmb/namequery.h"
 #include "rpc_client/cli_pipe.h"
 #include "../librpc/gen_ndr/ndr_lsa_c.h"
 #include "rpc_client/cli_lsarpc.h"
index dadd30fdb74e7459a36fe2279783b1ff9cc7d266..602f3cd4624d3546a0d3b9c713a3069bfe797d48 100644 (file)
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "popt_common.h"
 #include "libsmb/nmblib.h"
+#include "libsmb/namequery.h"
 
 static bool give_flags = false;
 static bool use_bcast = true;
index 85aca4f9334c200ddbb261ce2b2b046d6e869e64..35fb7521384fd1ada862bc879cf10f52c524fe3f 100644 (file)
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "system/select.h"
+#include "libsmb/namequery.h"
 #include "../lib/util/select.h"
 #include "libsmb/nmblib.h"
 #include "lib/util/sys_rw_data.h"
index fb0c130d350f5638b72b8d8556863944148c8e9e..3b539ef104553d8bfec1bbb8e3f643ae2185e283 100644 (file)
@@ -24,6 +24,7 @@
 #include "rpc_client/cli_pipe.h"
 #include "../librpc/gen_ndr/ndr_srvsvc_c.h"
 #include "libsmb/libsmb.h"
+#include "libsmb/namequery.h"
 #include "libsmb/clirap.h"
 
 static int use_bcast;
index 15304109a2d610864f8ed30526b793e907c63093..8f1cb375dfb46e8f73701d2546bc77d378868f82 100644 (file)
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
+#include "libsmb/namequery.h"
 #include "idmap.h"
 #include "tldap_gensec_bind.h"
 #include "tldap_util.h"
index 725fa4ff97776a5dccb7a6ca3425b65b109f0756..76d6a304366c871bb2190e4e448646dccf585a62 100644 (file)
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "winbindd.h"
 #include "winbindd_ads.h"
+#include "libsmb/namequery.h"
 #include "rpc_client/rpc_client.h"
 #include "../librpc/gen_ndr/ndr_netlogon_c.h"
 #include "../libds/common/flags.h"
index bf5a2b4d7b1c06b85c2af8728145451be66952e8..30f65c66bc42a47bb8d66a16ba97a4fc7283dfda 100644 (file)
@@ -60,6 +60,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
+#include "libsmb/namequery.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/ndr_netlogon_c.h"
 #include "rpc_client/cli_pipe.h"
index 8403d7d57b67aeb8aab2e397ff4b0fda9ae2a6cb..e273ab3b8bee8f1ebe10e04ace8536908c652af7 100644 (file)
@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
+#include "libsmb/namequery.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/ndr_samr_c.h"
 #include "rpc_client/cli_pipe.h"
index c995dd1b0dc51f689cd34e2289c31a04d8de6995..4d3dddf08649e3eb000a53056278b5e4dcb441c7 100644 (file)
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
+#include "libsmb/namequery.h"
 #include "librpc/gen_ndr/ndr_winbind_c.h"
 #include "libsmb/nmblib.h"
 
index db6a04d4ecbb1323d39e18a0808ca6659a5ebbc8..8661401331a52531749f83e47a8e9b755c23b694 100644 (file)
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
+#include "libsmb/namequery.h"
 #include "librpc/gen_ndr/ndr_winbind_c.h"
 #include "libsmb/nmblib.h"
 #include "lib/util/string_wrappers.h"