From fae84f98e37e99e41b23739305e7331b3a34ae48 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 26 Mar 2010 17:36:02 +1100
Subject: libutil: moved the networking defines to util_net.h

These were causing thousands of warnings on solaris8
---
 lib/util/util.h     | 27 ---------------------------
 lib/util/util_net.c |  1 +
 lib/util/util_net.h | 28 ++++++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 27 deletions(-)

(limited to 'lib')

diff --git a/lib/util/util.h b/lib/util/util.h
index 2d4a02549f..b89a7d6050 100644
--- a/lib/util/util.h
+++ b/lib/util/util.h
@@ -662,33 +662,6 @@ _PUBLIC_ void msleep(unsigned int t);
 **/
 _PUBLIC_ char* get_myname(TALLOC_CTX *mem_ctx);
 
-/**
- Return true if a string could be a pure IP address.
-**/
-_PUBLIC_ bool is_ipaddress(const char *str);
-
-/**
- Interpret an internet address or name into an IP address in 4 byte form.
-**/
-_PUBLIC_ uint32_t interpret_addr(const char *str);
-
-/**
- A convenient addition to interpret_addr().
-**/
-_PUBLIC_ struct in_addr interpret_addr2(const char *str);
-
-/**
- Check if an IP is the 0.0.0.0.
-**/
-_PUBLIC_ bool is_zero_ip_v4(struct in_addr ip);
-
-/**
- Are two IPs on the same subnet?
-**/
-_PUBLIC_ bool same_net_v4(struct in_addr ip1,struct in_addr ip2,struct in_addr mask);
-
-_PUBLIC_ bool is_ipaddress_v4(const char *str);
-
 /**
  Check if a process exists. Does this work on all unixes?
 **/
diff --git a/lib/util/util_net.c b/lib/util/util_net.c
index 9e47f51764..00a5ee4ced 100644
--- a/lib/util/util_net.c
+++ b/lib/util/util_net.c
@@ -27,6 +27,7 @@
 #include "system/network.h"
 #include "system/locale.h"
 #include "system/filesys.h"
+#include "lib/util/util_net.h"
 #undef strcasecmp
 
 /*******************************************************************
diff --git a/lib/util/util_net.h b/lib/util/util_net.h
index 5dc4df5e12..530311e5c8 100644
--- a/lib/util/util_net.h
+++ b/lib/util/util_net.h
@@ -45,4 +45,32 @@ bool interpret_string_addr_prefer_ipv4(struct sockaddr_storage *pss,
 
 void set_sockaddr_port(struct sockaddr *psa, uint16_t port);
 
+/**
+ Check if an IP is the 0.0.0.0.
+**/
+_PUBLIC_ bool is_zero_ip_v4(struct in_addr ip);
+
+/**
+ Are two IPs on the same subnet?
+**/
+_PUBLIC_ bool same_net_v4(struct in_addr ip1,struct in_addr ip2,struct in_addr mask);
+
+/**
+ Return true if a string could be a pure IP address.
+**/
+_PUBLIC_ bool is_ipaddress(const char *str);
+
+/**
+ Interpret an internet address or name into an IP address in 4 byte form.
+**/
+_PUBLIC_ uint32_t interpret_addr(const char *str);
+
+/**
+ A convenient addition to interpret_addr().
+**/
+_PUBLIC_ struct in_addr interpret_addr2(const char *str);
+
+_PUBLIC_ bool is_ipaddress_v4(const char *str);
+
+
 #endif /* _SAMBA_UTIL_NET_H_ */
-- 
cgit