Remove AI_ADDRCONFIG patch, already upstream

diff --git a/debian/patches/libutil_drop_AI_ADDRCONFIG.patch b/debian/patches/libutil_drop_AI_ADDRCONFIG.patch
deleted file mode 100644 (file)
index acc666e..0000000
--- a/debian/patches/libutil_drop_AI_ADDRCONFIG.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 185cd4c79492a7de5988f9407d764cdb3a0e2e10 Mon Sep 17 00:00:00 2001\r
-From: Simo Sorce <idra@samba.org>\r
-Date: Wed, 11 May 2011 17:50:07 -0400\r
-Subject: [PATCH] libutil: use AI_ADDRCONFIG only when AI_NUMERIC is not defined\r
-\r
-This flag prevents startup w/o ip addresses assigned to any interface.\r
-If AI_NUMERIC is passed it should be safe to avoid it.\r
-\r
-Signed-off-by: Andreas Schneider <asn@samba.org>\r
----\r
- lib/util/util_net.c |   16 +++++++++++-----\r
- 1 files changed, 11 insertions(+), 5 deletions(-)\r
-\r
-Index: samba/lib/util/util_net.c
-===================================================================
---- samba.orig/lib/util/util_net.c
-+++ samba/lib/util/util_net.c
-@@ -64,10 +64,9 @@
-                       ppres);
- 
-       if (ret) {
--              DEBUG(3,("interpret_string_addr_internal: getaddrinfo failed "
--                      "for name %s [%s]\n",
--                      str,
--                      gai_strerror(ret) ));
-+              DEBUG(3, ("interpret_string_addr_internal: "
-+                        "getaddrinfo failed for name %s (flags %d) [%s]\n",
-+                        str, flags, gai_strerror(ret)));
-               return false;
-       }
-       return true;
-@@ -88,6 +87,7 @@
- #if defined(HAVE_IPV6)
-       char addr[INET6_ADDRSTRLEN];
-       unsigned int scope_id = 0;
-+      int int_flags;
- 
-       if (strchr_m(str, ':')) {
-               char *p = strchr_m(str, '%');
-@@ -108,7 +108,13 @@
- 
-       zero_sockaddr(pss);
- 
--      if (!interpret_string_addr_internal(&res, str, flags|AI_ADDRCONFIG)) {
-+      if (flags & AI_NUMERICHOST) {
-+              int_flags = flags;
-+      } else {
-+              int_flags = flags|AI_ADDRCONFIG;
-+      }
-+
-+      if (!interpret_string_addr_internal(&res, str, int_flags)) {
-               return false;
-       }
-       if (!res) {

diff --git a/debian/patches/series b/debian/patches/series
index 7eecc21b1198812c4fd68749a3af27cd4c755d87..0f30f1fbd46112f85c42ba060e730813eeb6c6c0 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,7 +8,6 @@ documentation2.patch
 documentation.patch
 fhs-filespaths.patch
 installswat.sh.patch
-libutil_drop_AI_ADDRCONFIG.patch
 only_export_public_symbols.patch
 pam-examples.patch
 README_nosmbldap-tools.patch