- (dtucker) [configure.ac openbsd-compat/getrrsetbyname.c] Bug #1033: Provide

   templates for _getshort and _getlong if missing to prevent compiler warnings
   on Linux.

diff --git a/ChangeLog b/ChangeLog
index fda1a5e1202f27a54d3f119e801fc1b0220d1201..5efd96cd6d174fee6ccbe6921e18d1d0953f59cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -98,9 +98,12 @@
  - (dtucker) [regress/reexec.sh] Add ${EXEEXT} so this test also works on
    Cygwin.
  - (dtucker) [auth-pam.c] Bug #1033: Fix warnings building with PAM on Linux:
-  warning: dereferencing type-punned pointer will break strict-aliasing rules
-  warning: passing arg 3 of `pam_get_item' from incompatible pointer type
-  The type-punned pointer fix is based on a patch from SuSE's rpm.  ok djm@
+   warning: dereferencing type-punned pointer will break strict-aliasing rules
+   warning: passing arg 3 of `pam_get_item' from incompatible pointer type
+   The type-punned pointer fix is based on a patch from SuSE's rpm.  ok djm@
+ - (dtucker) [configure.ac openbsd-compat/getrrsetbyname.c] Bug #1033: Provide
+   templates for _getshort and _getlong if missing to prevent compiler warnings
+   on Linux.
 
 20050524
  - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]

diff --git a/configure.ac b/configure.ac
index 3a96fd3f9f91a9585e51e8fa73df3af40bb35977..057d26ca1bf8c5b6c7d1e3ee26cc860cca9836ca 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2402,6 +2402,7 @@ int main()
                         AC_MSG_RESULT(no)])
                    ])
                AC_CHECK_FUNCS(_getshort _getlong)
+               AC_CHECK_DECLS([_getshort, _getlong])
                AC_CHECK_MEMBER(HEADER.ad,
                        [AC_DEFINE(HAVE_HEADER_AD)],,
                        [#include <arpa/nameser.h>])

diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c
index 4e869c4dfd853ddfc68499e5631d09ae7fc04c4f..2016ffe312f37adfcf3fa58e81138ccfdc8256fa 100644 (file)
--- a/openbsd-compat/getrrsetbyname.c
+++ b/openbsd-compat/getrrsetbyname.c
@@ -144,6 +144,8 @@ _getshort(msgp)
        GETSHORT(u, msgp);
        return (u);
 }
+#elif defined(HAVE_DECL__GETSHORT) && (HAVE_DECL__GETSHORT == 0)
+u_int16_t _getshort(register const u_char *);
 #endif
 
 #ifndef HAVE__GETLONG
@@ -156,6 +158,8 @@ _getlong(msgp)
        GETLONG(u, msgp);
        return (u);
 }
+#elif defined(HAVE_DECL__GETLONG) && (HAVE_DECL__GETLONG == 0)
+u_int32_t _getlong(register const u_char *);
 #endif
 
 int