[SCM] GNU shishi branch, master, updated. shishi-1-0-1-10-g5709657

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU shishi".

http://git.savannah.gnu.org/cgit/shishi.git/commit/?id=570965775f9d71df4c77f43916425d76571a362c

The branch, master has been updated
       via  570965775f9d71df4c77f43916425d76571a362c (commit)
      from  63023d749f4f75a67e2445e8ede88854b952bebc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 570965775f9d71df4c77f43916425d76571a362c
Author: Simon Josefsson <address@hidden>
Date:   Fri Aug 10 09:38:27 2012 +0200

    Improve res_query detection.
    
    Reported by Eray Aslan <address@hidden>.

-----------------------------------------------------------------------

Summary of changes:
 configure.ac    |   10 ++++++----
 doc/Makefile.am |    2 ++
 lib/Makefile.am |    2 +-
 lib/internal.h  |    7 -------
 lib/resolv.c    |    6 +++++-
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index 40d8a3c..7c38731 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,8 +42,6 @@ gl2_EARLY
 gl3_EARLY
 AC_HEADER_STDC
 AC_CHECK_HEADERS(termios.h pwd.h syslog.h arpa/nameser.h netinet/in6.h)
-AC_CHECK_HEADERS(resolv.h, , , [#include <sys/types.h>
-#include <netinet/in.h>])
 
 # Used when creating libshishi-XX.def.
 SOVERSION=`expr ${LT_CURRENT} - ${LT_AGE}`
@@ -83,10 +81,14 @@ if test "$ac_cv_libgcrypt" != yes; then
 fi
 
 # Checks for library functions.
-AC_CHECK_FUNCS(signal select ngettext gethostbyname getpwnam getuid res_query)
-AC_CHECK_LIB(resolv, res_query,, AC_MSG_WARN([[no libresolv, SRV RRs not 
used]]))
+AC_CHECK_FUNCS(signal select ngettext gethostbyname getpwnam getuid)
 AC_SEARCH_LIBS(socket, socket)
 AC_SEARCH_LIBS(gethostbyname, nsl)
+AC_LIB_HAVE_LINKFLAGS(resolv,, [
+  #include <netinet/in.h>
+  #include <arpa/nameser.h>
+  #include <resolv.h>
+], [res_query (0, 0, 0, 0, 0);])
 
 # Shishid needs a logging mechanism, and right now there is no
 # alternative to syslog.  A 'fprintf(stderr,...)' mechanism may be
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3d42c42..241019a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -253,6 +253,8 @@ gdoc_MANS += man/shishi_authenticator_set_subkey.3
 gdoc_MANS += man/shishi_authenticator_add_random_subkey.3
 gdoc_MANS += man/shishi_authenticator_add_random_subkey_etype.3
 gdoc_MANS += man/shishi_authenticator_add_subkey.3
+gdoc_MANS += man/shishi_authorize_strcmp.3
+gdoc_MANS += man/shishi_authorize_k5login.3
 gdoc_MANS += man/shishi_authorization_parse.3
 gdoc_MANS += man/shishi_authorized_p.3
 gdoc_MANS += man/shishi_cfg.3
diff --git a/lib/Makefile.am b/lib/Makefile.am
index aa9d1d3..b94c21b 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -82,7 +82,7 @@ libshishi_la_SOURCES += starttls.c starttls.h
 endif
 libshishi_la_LIBADD = ../gl/libgnu.la $(LIB_CLOCK_GETTIME)     \
        $(LTLIBTASN1) $(LTLIBGNUTLS) $(LTLIBGCRYPT) $(LTLIBIDN) \
-       $(LTLIBINTL) $(LIBSOCKET)
+       $(LTLIBINTL) $(LTLIBRESOLV) $(LIBSOCKET)
 libshishi_la_LDFLAGS = -no-undefined \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
diff --git a/lib/internal.h b/lib/internal.h
index 8a6eb93..71a5b7e 100644
--- a/lib/internal.h
+++ b/lib/internal.h
@@ -63,13 +63,6 @@
 #endif
 #include <arpa/inet.h>
 
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-#ifdef HAVE_RESOLV_H
-#include <resolv.h>
-#endif
-
 #ifdef HAVE_SYSLOG_H
 #include <syslog.h>
 #endif
diff --git a/lib/resolv.c b/lib/resolv.c
index 61062b4..57d4824 100644
--- a/lib/resolv.c
+++ b/lib/resolv.c
@@ -30,7 +30,11 @@
 
 #include "internal.h"
 
-#if defined HAVE_LIBRESOLV || defined HAVE_RES_QUERY
+#ifdef HAVE_LIBRESOLV
+
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
 
 /* the largest packet we'll send and receive */
 #if PACKETSZ > 1024


hooks/post-receive
-- 
GNU shishi