libreplace: add an inet_aton() function that calls inet_pton().

inet_aton() is even needed inside libreplace, in the implementation
of rep_getaddrinfo().

Michael
(cherry picked from commit bcb2f3a880f8da8f9bedb7a8e61d7d7b533f1919)
(This used to be commit 83baff78ce752a9129554a456cc24d043d419cd1)

diff --git a/source3/lib/replace/README b/source3/lib/replace/README
index 268a1b15cf350ae227edef0d8321553e7d7b1b8c..aae1ccb56ff106bf4cbf34364a129f366a2f91b8 100644 (file)
--- a/source3/lib/replace/README
+++ b/source3/lib/replace/README
@@ -52,6 +52,7 @@ readline (the library)
 inet_ntoa
 inet_ntop
 inet_pton
+inet_aton
 strtoll
 strtoull
 socketpair

diff --git a/source3/lib/replace/inet_aton.c b/source3/lib/replace/inet_aton.c
new file mode 100644 (file)
index 0000000..3eb58f0
--- /dev/null
+++ b/source3/lib/replace/inet_aton.c
@@ -0,0 +1,29 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * replacement functions
+ * Copyright (C) Michael Adam <obnox@samba.org> 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/>.
+ */
+
+#include "replace.h"
+#include "system/network.h"
+
+/**
+ * We know that we have inet_pton from earlier libreplace checks.
+ */
+int rep_inet_aton(const char *src, struct in_addr *dst)
+{
+       return (inet_pton(AF_INET, src, dst) > 0) ? 1 : 0;
+}

diff --git a/source3/lib/replace/inet_aton.m4 b/source3/lib/replace/inet_aton.m4
new file mode 100644 (file)
index 0000000..853688e
--- /dev/null
+++ b/source3/lib/replace/inet_aton.m4
@@ -0,0 +1 @@
+AC_CHECK_FUNCS(inet_aton,[],[LIBREPLACEOBJ="${LIBREPLACEOBJ} inet_aton.o"])

diff --git a/source3/lib/replace/libreplace.m4 b/source3/lib/replace/libreplace.m4
index e0cc57f4c80c6cd340ae63d5dd9872516683d29b..e6e7198abf434d84e2e352cbd8378ff6c88f9c74 100644 (file)
--- a/source3/lib/replace/libreplace.m4
+++ b/source3/lib/replace/libreplace.m4
@@ -347,6 +347,7 @@ m4_include(timegm.m4)
 m4_include(socket.m4)
 m4_include(inet_ntop.m4)
 m4_include(inet_pton.m4)
+m4_include(inet_aton.m4)
 m4_include(getaddrinfo.m4)
 m4_include(repdir.m4)
 m4_include(getifaddrs.m4)

diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h
index 0d16f4ffd0a797ad6f959eb07612a6419a1b698b..00c8230e6b1a7bd671f6d103d9a2df630db75c73 100644 (file)
--- a/source3/lib/replace/replace.h
+++ b/source3/lib/replace/replace.h
@@ -340,6 +340,11 @@ ssize_t rep_pwrite(int __fd, const void *__buf, size_t __nbytes, off_t __offset)
 /* prototype is in "system/network.h" */
 #endif
 
+#ifndef HAVE_INET_ATON
+#define inet_aton rep_inet_aton
+/* prototype is in "system/network.h" */
+#endif
+
 #ifndef HAVE_CONNECT
 #define connect rep_connect
 /* prototype is in "system/network.h" */

diff --git a/source3/lib/replace/system/network.h b/source3/lib/replace/system/network.h
index 796df2d1dabf009db21fc9f4fbbb588b3efea9a5..e9e770205de4084e4038c7abd4767f82ddea33ff 100644 (file)
--- a/source3/lib/replace/system/network.h
+++ b/source3/lib/replace/system/network.h
@@ -103,6 +103,11 @@ int rep_inet_pton(int af, const char *src, void *dst);
 const char *rep_inet_ntop(int af, const void *src, char *dst, socklen_t size);
 #endif
 
+#ifndef HAVE_INET_ATON
+/* define is in "replace.h" */
+int rep_inet_aton(const char *src, struct in_addr *dst);
+#endif
+
 #ifndef HAVE_CONNECT
 /* define is in "replace.h" */
 int rep_connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen);