tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[configure.ac openbsd-compat/getrrsetbyname.c] wrap _getshort and 

_getlong in #ifndef
This commit is contained in:
Tim Rice 2003-09-08 06:33:33 -07:00
parent 167bd9cfef
commit 0ac16a4492
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,7 @@
20030908
- (tim) [configure.ac openbsd-compat/getrrsetbyname.c] wrap _getshort and
_getlong in #ifndef
20030907 20030907
- (dtucker) [agent-ptrace.sh dynamic-forward.sh (all regress/)] - (dtucker) [agent-ptrace.sh dynamic-forward.sh (all regress/)]
Put "which" inside quotes. Put "which" inside quotes.
@ -1037,4 +1041,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au Report from murple@murple.net, diagnosis from dtucker@zip.com.au
$Id: ChangeLog,v 1.2969 2003/09/07 02:34:54 dtucker Exp $ $Id: ChangeLog,v 1.2970 2003/09/08 13:33:33 tim Exp $

3
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.145 2003/09/07 02:34:54 dtucker Exp $ # $Id: configure.ac,v 1.146 2003/09/08 13:33:33 tim Exp $
AC_INIT AC_INIT
AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_SRCDIR([ssh.c])
@ -1912,6 +1912,7 @@ AC_ARG_WITH(dns,
# Needed by our getrrsetbyname() # Needed by our getrrsetbyname()
AC_SEARCH_LIBS(res_query, resolv) AC_SEARCH_LIBS(res_query, resolv)
AC_SEARCH_LIBS(dn_expand, resolv) AC_SEARCH_LIBS(dn_expand, resolv)
AC_CHECK_FUNCS(_getshort _getlong)
]) ])
fi fi
] ]

4
openbsd-compat/getrrsetbyname.c
View File

@ -130,6 +130,7 @@ static int count_dns_rr(struct dns_rr *, u_int16_t, u_int16_t);
* Routines to insert/extract short/long's. * Routines to insert/extract short/long's.
*/ */
#ifndef HAVE__GETSHORT
static u_int16_t static u_int16_t
_getshort(msgp) _getshort(msgp)
register const u_char *msgp; register const u_char *msgp;
@ -139,7 +140,9 @@ _getshort(msgp)
GETSHORT(u, msgp); GETSHORT(u, msgp);
return (u); return (u);
} }
#endif
#ifndef HAVE__GETLONG
static u_int32_t static u_int32_t
_getlong(msgp) _getlong(msgp)
register const u_char *msgp; register const u_char *msgp;
@ -149,6 +152,7 @@ _getlong(msgp)
GETLONG(u, msgp); GETLONG(u, msgp);
return (u); return (u);
} }
#endif
int int
getrrsetbyname(const char *hostname, unsigned int rdclass, getrrsetbyname(const char *hostname, unsigned int rdclass,