Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
BIND
Commits
643935ac
Commit
643935ac
authored
Dec 22, 2010
by
Mark Andrews
Browse files
2997. [func] named -V now reports the OpenSSL and libxml2 verions
it was compiled against. [RT #22687]
parent
687baa4f
Changes
5
Hide whitespace changes
Inline
Side-by-side
CHANGES
View file @
643935ac
2997. [func] named -V now reports the OpenSSL and libxml2 verions
it was compiled against. [RT #22687]
2996. [security] Temporarily disable SO_ACCEPTFILTER support.
[RT #22589]
...
...
bin/named/Makefile.in
View file @
643935ac
...
...
@@ -13,7 +13,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: Makefile.in,v 1.11
2
2010/1
1/18 23:20:15
marka Exp $
# $Id: Makefile.in,v 1.11
3
2010/1
2/22 03:59:02
marka Exp $
srcdir
=
@srcdir@
VPATH
=
@srcdir@
...
...
@@ -43,9 +43,9 @@ DLZDRIVER_LIBS = @DLZ_DRIVER_LIBS@
CINCLUDES
=
-I
${srcdir}
/include
-I
${srcdir}
/unix/include
-I
.
\
${LWRES_INCLUDES}
${DNS_INCLUDES}
${BIND9_INCLUDES}
\
${ISCCFG_INCLUDES}
${ISCCC_INCLUDES}
${ISC_INCLUDES}
\
${DLZDRIVER_INCLUDES}
${DBDRIVER_INCLUDES}
${DLZDRIVER_INCLUDES}
${DBDRIVER_INCLUDES}
@ISC_OPENSSL_INC@
CDEFINES
=
@USE_DLZ@ @USE_PKCS11@
CDEFINES
=
@USE_DLZ@ @USE_PKCS11@
@USE_OPENSSL@
CWARNINGS
=
...
...
bin/named/main.c
View file @
643935ac
...
...
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: main.c,v 1.1
79
2010/
09/15 12:07:55
marka Exp $ */
/* $Id: main.c,v 1.1
80
2010/
12/22 03:59:02
marka Exp $ */
/*! \file */
...
...
@@ -70,6 +70,12 @@
#include
<named/ns_smf_globals.h>
#endif
#ifdef OPENSSL
#include
<openssl/opensslv.h>
#endif
#ifdef HAVE_LIBXML2
#include
<libxml/xmlversion.h>
#endif
/*
* Include header files for database drivers here.
*/
...
...
@@ -528,6 +534,14 @@ parse_command_line(int argc, char *argv[]) {
case
'V'
:
printf
(
"BIND %s built with %s
\n
"
,
ns_g_version
,
ns_g_configargs
);
#ifdef OPENSSL
printf
(
"using OpenSSL version: %s
\n
"
,
OPENSSL_VERSION_TEXT
);
#endif
#ifdef HAVE_LIBXML2
printf
(
"using libxml2 version: %s
\n
"
,
LIBXML_DOTTED_VERSION
);
#endif
exit
(
0
);
case
'F'
:
/* Reserved for FIPS mode */
...
...
bin/named/win32/named.dsp
View file @
643935ac
...
...
@@ -42,7 +42,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /O2 /I
"../../../../../openssl-0.9.8l/inc32/openssl/include" /I
"./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D
"OPENSSL" /D
"WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
...
...
@@ -67,7 +67,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I
"../../../../../openssl-0.9.8l/inc32/openssl/include" /I
"./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../win32/include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isccc/include" /I "../../../lib/lwres/win32/include" /I "../../../lib/lwres/include" /I "../../../lib/isccfg/include" /I "../../../lib/bind9/include" /D
"OPENSSL" /D
"WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c
# SUBTRACT CPP /X /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
...
...
bin/named/win32/named.mak
View file @
643935ac
...
...
@@ -162,7 +162,7 @@ CLEAN :
"$(OUTDIR)"
:
if
not
exist
"$(OUTDIR)/$(NULL)"
mkdir
"$(OUTDIR)"
CPP_PROJ
=
/nologo /MD /W3 /GX /O2 /I
"./"
/I
"../../../"
/I
"../../../../libxml2-2.7.3/include"
/I
"../win32/include"
/I
"../include"
/I
"../../../lib/isc/win32"
/I
"../../../lib/isc/win32/include"
/I
"../../../lib/isc/include"
/I
"../../../lib/isc/noatomic/include"
/I
"../../../lib/dns/win32/include"
/I
"../../../lib/dns/include"
/I
"../../../lib/isccc/include"
/I
"../../../lib/lwres/win32/include"
/I
"../../../lib/lwres/include"
/I
"../../../lib/isccfg/include"
/I
"../../../lib/bind9/include"
/D
"WIN32"
/D
"NDEBUG"
/D
"__STDC__"
/D
"_CONSOLE"
/D
"_MBCS"
/Fp
"
$(INTDIR)
\n
amed.pch"
/YX /Fo
"
$(INTDIR)
\\
"
/Fd
"
$(INTDIR)
\\
"
/FD /c
CPP_PROJ
=
/nologo /MD /W3 /GX /O2 /I
"../../../../../openssl-0.9.8l/inc32/openssl/include"
/I
"./"
/I
"../../../"
/I
"../../../../libxml2-2.7.3/include"
/I
"../win32/include"
/I
"../include"
/I
"../../../lib/isc/win32"
/I
"../../../lib/isc/win32/include"
/I
"../../../lib/isc/include"
/I
"../../../lib/isc/noatomic/include"
/I
"../../../lib/dns/win32/include"
/I
"../../../lib/dns/include"
/I
"../../../lib/isccc/include"
/I
"../../../lib/lwres/win32/include"
/I
"../../../lib/lwres/include"
/I
"../../../lib/isccfg/include"
/I
"../../../lib/bind9/include"
/D
"OPENSSL"
/D
"WIN32"
/D
"NDEBUG"
/D
"__STDC__"
/D
"_CONSOLE"
/D
"_MBCS"
/Fp
"
$(INTDIR)
\n
amed.pch"
/YX /Fo
"
$(INTDIR)
\\
"
/Fd
"
$(INTDIR)
\\
"
/FD /c
BSC32
=
bscmake.exe
BSC32_FLAGS
=
/nologo /o
"
$(OUTDIR)
\n
amed.bsc"
BSC32_SBRS
=
\
...
...
@@ -311,7 +311,7 @@ CLEAN :
"$(OUTDIR)"
:
if
not
exist
"$(OUTDIR)/$(NULL)"
mkdir
"$(OUTDIR)"
CPP_PROJ
=
/nologo /MDd /W3 /Gm /GX /ZI /Od /I
"./"
/I
"../../../"
/I
"../../../../libxml2-2.7.3/include"
/I
"../win32/include"
/I
"../include"
/I
"../../../lib/isc/win32"
/I
"../../../lib/isc/win32/include"
/I
"../../../lib/isc/include"
/I
"../../../lib/isc/noatomic/include"
/I
"../../../lib/dns/win32/include"
/I
"../../../lib/dns/include"
/I
"../../../lib/isccc/include"
/I
"../../../lib/lwres/win32/include"
/I
"../../../lib/lwres/include"
/I
"../../../lib/isccfg/include"
/I
"../../../lib/bind9/include"
/D
"WIN32"
/D
"_DEBUG"
/D
"_CONSOLE"
/D
"_MBCS"
/D
"i386"
/FR
"
$(INTDIR)
\\
"
/Fo
"
$(INTDIR)
\\
"
/Fd
"
$(INTDIR)
\\
"
/FD /GZ /c
CPP_PROJ
=
/nologo /MDd /W3 /Gm /GX /ZI /Od /I
"../../../../../openssl-0.9.8l/inc32/openssl/include"
/I
"./"
/I
"../../../"
/I
"../../../../libxml2-2.7.3/include"
/I
"../win32/include"
/I
"../include"
/I
"../../../lib/isc/win32"
/I
"../../../lib/isc/win32/include"
/I
"../../../lib/isc/include"
/I
"../../../lib/isc/noatomic/include"
/I
"../../../lib/dns/win32/include"
/I
"../../../lib/dns/include"
/I
"../../../lib/isccc/include"
/I
"../../../lib/lwres/win32/include"
/I
"../../../lib/lwres/include"
/I
"../../../lib/isccfg/include"
/I
"../../../lib/bind9/include"
/D
"OPENSSL"
/D
"WIN32"
/D
"_DEBUG"
/D
"_CONSOLE"
/D
"_MBCS"
/D
"i386"
/FR
"
$(INTDIR)
\\
"
/Fo
"
$(INTDIR)
\\
"
/Fd
"
$(INTDIR)
\\
"
/FD /GZ /c
BSC32
=
bscmake.exe
BSC32_FLAGS
=
/nologo /o
"
$(OUTDIR)
\n
amed.bsc"
BSC32_SBRS
=
\
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment