RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [acconfig.h configure.ac dns.c openbsd-compat/getrrsetbyname.c 

openbsd-compat/getrrsetbyname.h] DNS fingerprint support is now always
   compiled in but disabled in config.
This commit is contained in:
Darren Tucker 2003-10-15 16:57:57 +10:00
parent 072a7b178c
commit 5f88d3440e
5 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -39,6 +39,9 @@
- markus@cvs.openbsd.org 2003/10/14 19:54:39 - markus@cvs.openbsd.org 2003/10/14 19:54:39
[session.c ssh-agent.c] [session.c ssh-agent.c]
10X for mkdtemp; djm@ 10X for mkdtemp; djm@
- (dtucker) [acconfig.h configure.ac dns.c openbsd-compat/getrrsetbyname.c
openbsd-compat/getrrsetbyname.h] DNS fingerprint support is now always
compiled in but disabled in config.
20031009 20031009
- (dtucker) [sshd_config.5] UsePAM defaults to "no". ok djm@ - (dtucker) [sshd_config.5] UsePAM defaults to "no". ok djm@
@ -1356,4 +1359,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.3079 2003/10/15 06:10:25 dtucker Exp $ $Id: ChangeLog,v 1.3080 2003/10/15 06:57:57 dtucker Exp $

5
acconfig.h
View File

@ -1,4 +1,4 @@
/* $Id: acconfig.h,v 1.167 2003/09/19 11:25:24 dtucker Exp $ */ /* $Id: acconfig.h,v 1.168 2003/10/15 06:57:57 dtucker Exp $ */
/* /*
* Copyright (c) 1999-2003 Damien Miller. All rights reserved. * Copyright (c) 1999-2003 Damien Miller. All rights reserved.
@ -418,9 +418,6 @@
#undef LOCKED_PASSWD_PREFIX #undef LOCKED_PASSWD_PREFIX
#undef LOCKED_PASSWD_SUBSTR #undef LOCKED_PASSWD_SUBSTR
/* Define if DNS support is to be activated */
#undef DNS
/* Define if getrrsetbyname() exists */ /* Define if getrrsetbyname() exists */
#undef HAVE_GETRRSETBYNAME #undef HAVE_GETRRSETBYNAME

34
configure.ac
View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.172 2003/10/07 10:35:57 dtucker Exp $ # $Id: configure.ac,v 1.173 2003/10/15 06:57:57 dtucker Exp $
AC_INIT AC_INIT
AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_SRCDIR([ssh.c])
@ -1961,28 +1961,18 @@ if test x$opensc_config_prefix != x ; then
fi fi
fi fi
# Check whether user wants DNS support # Check libraries needed by DNS fingerprint support
DNS_MSG="no" AC_SEARCH_LIBS(getrrsetbyname, resolv,
AC_ARG_WITH(dns, [AC_DEFINE(HAVE_GETRRSETBYNAME)],
[ --with-dns Support for fetching keys from DNS (experimental)],
[ [
if test "x$withval" != "xno" ; then # Needed by our getrrsetbyname()
DNS_MSG="yes" AC_SEARCH_LIBS(res_query, resolv)
AC_DEFINE(DNS) AC_SEARCH_LIBS(dn_expand, resolv)
AC_SEARCH_LIBS(getrrsetbyname, resolv, AC_CHECK_FUNCS(_getshort _getlong)
[AC_DEFINE(HAVE_GETRRSETBYNAME)], AC_CHECK_MEMBER(HEADER.ad,
[ [AC_DEFINE(HAVE_HEADER_AD)],,
# Needed by our getrrsetbyname() [#include <arpa/nameser.h>])
AC_SEARCH_LIBS(res_query, resolv) ])
AC_SEARCH_LIBS(dn_expand, resolv)
AC_CHECK_FUNCS(_getshort _getlong)
AC_CHECK_MEMBER(HEADER.ad,
[AC_DEFINE(HAVE_HEADER_AD)],,
[#include <arpa/nameser.h>])
])
fi
]
)
# Check whether user wants Kerberos 5 support # Check whether user wants Kerberos 5 support
KRB5_MSG="no" KRB5_MSG="no"

2
openbsd-compat/getrrsetbyname.c
View File

@ -45,7 +45,7 @@
#include "includes.h" #include "includes.h"
#if defined(DNS) && !defined(HAVE_GETRRSETBYNAME) #ifndef HAVE_GETRRSETBYNAME
#include "getrrsetbyname.h" #include "getrrsetbyname.h"

2
openbsd-compat/getrrsetbyname.h
View File

@ -48,7 +48,7 @@
#include "includes.h" #include "includes.h"
#if defined(DNS) && !defined(HAVE_GETRRSETBYNAME) #ifndef HAVE_GETRRSETBYNAME
#include <sys/types.h> #include <sys/types.h>
#include <netinet/in.h> #include <netinet/in.h>