Testing for the 4.4p1 release

[Damien Miller]

On Thu, 31 Aug 2006, santhi wrote:

> /usr/ccs/bin/ld: Unsatisfied symbols:
>    ntohl (first referenced in sshconnect.o) (code)
>    ntohs (first referenced in ssh.o) (code)
>    htonl (first referenced in sshconnect.o) (code)
>    htons (first referenced in
> openbsd-compat//libopenbsd-compat.a(rresvport.o)) (code)
> *** Error exit code 1
> 
> Stop.
> 
> Problem Description:
> ----------------------
> * The ntohl, ntohs, htonl, htons routines are defined as macros instead of
> functions in <netinet/in.h> , linker raises "functions" not found error.
> 
> Fix:
> -----
> Including the <arpa/inet.h> in includes.h file may fix this problem

Thanks for the report - does the following diff help?

Index: openbsd-compat/bindresvport.c
===================================================================
RCS file: /var/cvs/openssh/openbsd-compat/bindresvport.c,v
retrieving revision 1.7
diff -u -p -r1.7 bindresvport.c
--- openbsd-compat/bindresvport.c	24 Jul 2006 04:51:01 -0000	1.7
+++ openbsd-compat/bindresvport.c	1 Sep 2006 05:41:51 -0000
@@ -33,8 +33,10 @@
 #include "includes.h"
 
 #ifndef HAVE_BINDRESVPORT_SA
+#include <sys/types.h>
+#include <sys/socket.h>
 
-#include "includes.h"
+#include <netinet/in.h>
 
 #include <errno.h>
 #include <string.h>
Index: openbsd-compat/rresvport.c
===================================================================
RCS file: /var/cvs/openssh/openbsd-compat/rresvport.c,v
retrieving revision 1.10
diff -u -p -r1.10 rresvport.c
--- openbsd-compat/rresvport.c	24 Aug 2006 09:53:41 -0000	1.10
+++ openbsd-compat/rresvport.c	1 Sep 2006 05:40:41 -0000
@@ -35,6 +35,11 @@
 
 #ifndef HAVE_RRESVPORT_AF
 
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>