diff options
author | Darren Tucker <dtucker@zip.com.au> | 2003-10-15 16:57:57 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2003-10-15 16:57:57 +1000 |
commit | 5f88d3440efc4364b8d3f4c5efec0dccb3c2e21c (patch) | |
tree | adc272c7d4d195274cf0f813a31ff7a9c5823aef | |
parent | 072a7b178c5fc52fd249d12519804c60c26da253 (diff) |
- (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.
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | acconfig.h | 5 | ||||
-rw-r--r-- | configure.ac | 34 | ||||
-rw-r--r-- | openbsd-compat/getrrsetbyname.c | 2 | ||||
-rw-r--r-- | openbsd-compat/getrrsetbyname.h | 2 |
5 files changed, 19 insertions, 29 deletions
@@ -39,6 +39,9 @@ | |||
39 | - markus@cvs.openbsd.org 2003/10/14 19:54:39 | 39 | - markus@cvs.openbsd.org 2003/10/14 19:54:39 |
40 | [session.c ssh-agent.c] | 40 | [session.c ssh-agent.c] |
41 | 10X for mkdtemp; djm@ | 41 | 10X for mkdtemp; djm@ |
42 | - (dtucker) [acconfig.h configure.ac dns.c openbsd-compat/getrrsetbyname.c | ||
43 | openbsd-compat/getrrsetbyname.h] DNS fingerprint support is now always | ||
44 | compiled in but disabled in config. | ||
42 | 45 | ||
43 | 20031009 | 46 | 20031009 |
44 | - (dtucker) [sshd_config.5] UsePAM defaults to "no". ok djm@ | 47 | - (dtucker) [sshd_config.5] UsePAM defaults to "no". ok djm@ |
@@ -1356,4 +1359,4 @@ | |||
1356 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1359 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1357 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1360 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1358 | 1361 | ||
1359 | $Id: ChangeLog,v 1.3079 2003/10/15 06:10:25 dtucker Exp $ | 1362 | $Id: ChangeLog,v 1.3080 2003/10/15 06:57:57 dtucker Exp $ |
diff --git a/acconfig.h b/acconfig.h index d0897d6b6..80907f0dc 100644 --- a/acconfig.h +++ b/acconfig.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: acconfig.h,v 1.167 2003/09/19 11:25:24 dtucker Exp $ */ | 1 | /* $Id: acconfig.h,v 1.168 2003/10/15 06:57:57 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. | 4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. |
@@ -418,9 +418,6 @@ | |||
418 | #undef LOCKED_PASSWD_PREFIX | 418 | #undef LOCKED_PASSWD_PREFIX |
419 | #undef LOCKED_PASSWD_SUBSTR | 419 | #undef LOCKED_PASSWD_SUBSTR |
420 | 420 | ||
421 | /* Define if DNS support is to be activated */ | ||
422 | #undef DNS | ||
423 | |||
424 | /* Define if getrrsetbyname() exists */ | 421 | /* Define if getrrsetbyname() exists */ |
425 | #undef HAVE_GETRRSETBYNAME | 422 | #undef HAVE_GETRRSETBYNAME |
426 | 423 | ||
diff --git a/configure.ac b/configure.ac index 44808f7e5..3d230a6e9 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.172 2003/10/07 10:35:57 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.173 2003/10/15 06:57:57 dtucker Exp $ |
2 | 2 | ||
3 | AC_INIT | 3 | AC_INIT |
4 | AC_CONFIG_SRCDIR([ssh.c]) | 4 | AC_CONFIG_SRCDIR([ssh.c]) |
@@ -1961,28 +1961,18 @@ if test x$opensc_config_prefix != x ; then | |||
1961 | fi | 1961 | fi |
1962 | fi | 1962 | fi |
1963 | 1963 | ||
1964 | # Check whether user wants DNS support | 1964 | # Check libraries needed by DNS fingerprint support |
1965 | DNS_MSG="no" | 1965 | AC_SEARCH_LIBS(getrrsetbyname, resolv, |
1966 | AC_ARG_WITH(dns, | 1966 | [AC_DEFINE(HAVE_GETRRSETBYNAME)], |
1967 | [ --with-dns Support for fetching keys from DNS (experimental)], | ||
1968 | [ | 1967 | [ |
1969 | if test "x$withval" != "xno" ; then | 1968 | # Needed by our getrrsetbyname() |
1970 | DNS_MSG="yes" | 1969 | AC_SEARCH_LIBS(res_query, resolv) |
1971 | AC_DEFINE(DNS) | 1970 | AC_SEARCH_LIBS(dn_expand, resolv) |
1972 | AC_SEARCH_LIBS(getrrsetbyname, resolv, | 1971 | AC_CHECK_FUNCS(_getshort _getlong) |
1973 | [AC_DEFINE(HAVE_GETRRSETBYNAME)], | 1972 | AC_CHECK_MEMBER(HEADER.ad, |
1974 | [ | 1973 | [AC_DEFINE(HAVE_HEADER_AD)],, |
1975 | # Needed by our getrrsetbyname() | 1974 | [#include <arpa/nameser.h>]) |
1976 | AC_SEARCH_LIBS(res_query, resolv) | 1975 | ]) |
1977 | AC_SEARCH_LIBS(dn_expand, resolv) | ||
1978 | AC_CHECK_FUNCS(_getshort _getlong) | ||
1979 | AC_CHECK_MEMBER(HEADER.ad, | ||
1980 | [AC_DEFINE(HAVE_HEADER_AD)],, | ||
1981 | [#include <arpa/nameser.h>]) | ||
1982 | ]) | ||
1983 | fi | ||
1984 | ] | ||
1985 | ) | ||
1986 | 1976 | ||
1987 | # Check whether user wants Kerberos 5 support | 1977 | # Check whether user wants Kerberos 5 support |
1988 | KRB5_MSG="no" | 1978 | KRB5_MSG="no" |
diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c index 44fa2755b..1478654d8 100644 --- a/openbsd-compat/getrrsetbyname.c +++ b/openbsd-compat/getrrsetbyname.c | |||
@@ -45,7 +45,7 @@ | |||
45 | 45 | ||
46 | #include "includes.h" | 46 | #include "includes.h" |
47 | 47 | ||
48 | #if defined(DNS) && !defined(HAVE_GETRRSETBYNAME) | 48 | #ifndef HAVE_GETRRSETBYNAME |
49 | 49 | ||
50 | #include "getrrsetbyname.h" | 50 | #include "getrrsetbyname.h" |
51 | 51 | ||
diff --git a/openbsd-compat/getrrsetbyname.h b/openbsd-compat/getrrsetbyname.h index 6466a54d6..bdc6a4d3a 100644 --- a/openbsd-compat/getrrsetbyname.h +++ b/openbsd-compat/getrrsetbyname.h | |||
@@ -48,7 +48,7 @@ | |||
48 | 48 | ||
49 | #include "includes.h" | 49 | #include "includes.h" |
50 | 50 | ||
51 | #if defined(DNS) && !defined(HAVE_GETRRSETBYNAME) | 51 | #ifndef HAVE_GETRRSETBYNAME |
52 | 52 | ||
53 | #include <sys/types.h> | 53 | #include <sys/types.h> |
54 | #include <netinet/in.h> | 54 | #include <netinet/in.h> |