s3-net: move out some prototypes to net_dns.h.

Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit a294a6d2fdbbd9fe54882a365cb54c1f49b900bc)

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 2f80ab1cddbda90367f938e08fa7cd5f5c945517..b18f9ccef951fe69ce906bd44a53a2b44612692c 100644 (file)
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -37,6 +37,7 @@
 #include "krb5_env.h"
 #include "../libcli/security/security.h"
 #include "libsmb/libsmb.h"
+#include "utils/net_dns.h"
 
 #ifdef HAVE_ADS
 
@@ -1123,10 +1124,6 @@ static WERROR check_ads_config( void )
 
 #if defined(WITH_DNS_UPDATES)
 #include "../lib/addns/dns.h"
-DNS_ERROR DoDNSUpdate(char *pszServerName,
-                     const char *pszDomainName, const char *pszHostName,
-                     const struct sockaddr_storage *sslist,
-                     size_t num_addrs );
 
 static NTSTATUS net_update_dns_internal(struct net_context *c,
                                        TALLOC_CTX *ctx, ADS_STRUCT *ads,
@@ -1607,10 +1604,6 @@ static int net_ads_dns_register(struct net_context *c, int argc, const char **ar
 #endif
 }
 
-#if defined(WITH_DNS_UPDATES)
-DNS_ERROR do_gethostbyname(const char *server, const char *host);
-#endif
-
 static int net_ads_dns_gethostbyname(struct net_context *c, int argc, const char **argv)
 {
 #if defined(WITH_DNS_UPDATES)

diff --git a/source3/utils/net_dns.c b/source3/utils/net_dns.c
index 5fbdc0a70f35632af39117189149bdd0e8256e74..b4425d19851fd0fdea51221f4b2720a0560148f2 100644 (file)
--- a/source3/utils/net_dns.c
+++ b/source3/utils/net_dns.c
@@ -22,16 +22,9 @@
 #include "includes.h"
 #include "utils/net.h"
 #include "../lib/addns/dns.h"
+#include "utils/net_dns.h"
 
 #if defined(WITH_DNS_UPDATES)
-/*
- * Silly prototype to get rid of a warning
- */
-
-DNS_ERROR DoDNSUpdate(char *pszServerName,
-                     const char *pszDomainName, const char *pszHostName,
-                     const struct sockaddr_storage *sslist,
-                     size_t num_addrs );
 
 /*********************************************************************
 *********************************************************************/
@@ -177,12 +170,6 @@ int get_my_ip_address( struct sockaddr_storage **pp_ss )
        return count;
 }
 
-/*
- * Silly prototype to get rid of a warning
- */
-
-DNS_ERROR do_gethostbyname(const char *server, const char *host);
-
 DNS_ERROR do_gethostbyname(const char *server, const char *host)
 {
        struct dns_connection *conn;

diff --git a/source3/utils/net_dns.h b/source3/utils/net_dns.h
new file mode 100644 (file)
index 0000000..83d2922
--- /dev/null
+++ b/source3/utils/net_dns.h
@@ -0,0 +1,32 @@
+/*
+   Samba Unix/Linux Dynamic DNS Update
+   net ads commands
+
+   Copyright (C) Krishna Ganugapati (krishnag@centeris.com)         2006
+   Copyright (C) Gerald Carter                                      2006
+
+   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/>.
+*/
+
+#if defined(WITH_DNS_UPDATES)
+
+#include "../lib/addns/dns.h"
+
+DNS_ERROR DoDNSUpdate(char *pszServerName,
+                     const char *pszDomainName, const char *pszHostName,
+                     const struct sockaddr_storage *sslist,
+                     size_t num_addrs );
+DNS_ERROR do_gethostbyname(const char *server, const char *host);
+
+#endif /* defined(WITH_DNS_UPDATES) */