Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
BIND
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
580
Issues
580
List
Boards
Labels
Service Desk
Milestones
Merge Requests
111
Merge Requests
111
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ISC Open Source Projects
BIND
Commits
1036338a
Commit
1036338a
authored
Jul 24, 2020
by
Evan Hunt
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
report libuv version string in `named -V`
parent
730226b6
Pipeline
#47655
canceled with stages
in 7 minutes and 52 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
4 deletions
+10
-4
bin/named/Makefile.am
bin/named/Makefile.am
+2
-0
bin/named/main.c
bin/named/main.c
+4
-0
bin/named/win32/named.vcxproj.in
bin/named/win32/named.vcxproj.in
+4
-4
No files found.
bin/named/Makefile.am
View file @
1036338a
...
...
@@ -15,6 +15,7 @@ AM_CPPFLAGS += \
$(LMDB_CFLAGS)
\
$(MAXMINDDB_CFLAGS)
\
$(DNSTAP_CFLAGS)
\
$(LIBUV_CFLAGS)
\
$(ZLIB_CFLAGS)
if
HAVE_JSON_C
...
...
@@ -102,6 +103,7 @@ named_LDADD = \
$(LMDB_LIBS)
\
$(MAXMINDDB_LIBS)
\
$(DNSTAP_LIBS)
\
$(LIBUV_LIBS)
\
$(LIBXML2_LIBS)
\
$(ZLIB_LIBS)
...
...
bin/named/main.c
View file @
1036338a
...
...
@@ -16,6 +16,7 @@
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
#include <uv.h>
#include <isc/app.h>
#include <isc/attributes.h>
...
...
@@ -525,6 +526,9 @@ printversion(bool verbose) {
printf
(
"linked to OpenSSL version: %s
\n
"
,
SSLeay_version
(
SSLEAY_VERSION
));
#endif
/* OPENSSL_VERSION_NUMBER >= 0x10100000L */
printf
(
"compiled with libuv version: %d.%d.%d
\n
"
,
UV_VERSION_MAJOR
,
UV_VERSION_MINOR
,
UV_VERSION_PATCH
);
printf
(
"linked to libuv version: %s
\n
"
,
uv_version_string
());
#ifdef HAVE_LIBXML2
printf
(
"compiled with libxml2 version: %s
\n
"
,
LIBXML_DOTTED_VERSION
);
printf
(
"linked to libxml2 version: %s
\n
"
,
xmlParserVersion
);
...
...
bin/named/win32/named.vcxproj.in
View file @
1036338a
...
...
@@ -67,7 +67,7 @@
<ProgramDataBaseFileName>
$(OutDir)$(TargetName).pdb
</ProgramDataBaseFileName>
<BrowseInformation>
true
</BrowseInformation>
<ForcedIncludeFiles>
..\..\..\config.h
</ForcedIncludeFiles>
<AdditionalIncludeDirectories>
@OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@.\;..\..\..\;@LIBXML2_INC@..\win32\include;..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\isccc\include;..\..\..\lib\isccfg\include;..\..\..\lib\bind9\include;..\..\..\lib\ns\include;%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>
@
LIBUV_INC@@
OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@.\;..\..\..\;@LIBXML2_INC@..\win32\include;..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\isccc\include;..\..\..\lib\isccfg\include;..\..\..\lib\bind9\include;..\..\..\lib\ns\include;%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>
<CompileAs>
CompileAsC
</CompileAs>
</ClCompile>
<Link>
...
...
@@ -75,7 +75,7 @@
<GenerateDebugInformation>
true
</GenerateDebugInformation>
<OutputFile>
..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)
</OutputFile>
<AdditionalLibraryDirectories>
..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\ns\win32\$(Configuration);%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<AdditionalDependencies>
@OPENSSL_LIB@@LIBXML2_LIB@@GSSAPI_LIB@@GEOIP_LIB@libisc.lib;libdns.lib;libisccc.lib;libisccfg.lib;libbind9.lib;libns.lib;version.lib;ws2_32.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
@
LIBUV_LIB@@
OPENSSL_LIB@@LIBXML2_LIB@@GSSAPI_LIB@@GEOIP_LIB@libisc.lib;libdns.lib;libisccc.lib;libisccfg.lib;libbind9.lib;libns.lib;version.lib;ws2_32.lib;%(AdditionalDependencies)
</AdditionalDependencies>
</Link>
<PreBuildEvent>
<Command>
cd ..
...
...
@@ -103,7 +103,7 @@ perl -e "print \";\";" >> xsl.c
<ObjectFileName>
.\$(Configuration)\
</ObjectFileName>
<ProgramDataBaseFileName>
$(OutDir)$(TargetName).pdb
</ProgramDataBaseFileName>
<ForcedIncludeFiles>
..\..\..\config.h
</ForcedIncludeFiles>
<AdditionalIncludeDirectories>
@OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@.\;..\..\..\;@LIBXML2_INC@..\win32\include;..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\isccc\include;..\..\..\lib\isccfg\include;..\..\..\lib\bind9\include;..\..\..\lib\ns\include;%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>
@
LIBUV_INC@@
OPENSSL_INC@@GSSAPI_INC@@GEOIP_INC@.\;..\..\..\;@LIBXML2_INC@..\win32\include;..\include;..\..\..\lib\isc\win32;..\..\..\lib\isc\win32\include;..\..\..\lib\isc\include;..\..\..\lib\dns\include;..\..\..\lib\isccc\include;..\..\..\lib\isccfg\include;..\..\..\lib\bind9\include;..\..\..\lib\ns\include;%(AdditionalIncludeDirectories)
</AdditionalIncludeDirectories>
<CompileAs>
CompileAsC
</CompileAs>
</ClCompile>
<Link>
...
...
@@ -114,7 +114,7 @@ perl -e "print \";\";" >> xsl.c
<OutputFile>
..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)
</OutputFile>
<LinkTimeCodeGeneration>
Default
</LinkTimeCodeGeneration>
<AdditionalLibraryDirectories>
..\..\..\lib\isc\win32\$(Configuration);..\..\..\lib\dns\win32\$(Configuration);..\..\..\lib\isccc\win32\$(Configuration);..\..\..\lib\isccfg\win32\$(Configuration);..\..\..\lib\bind9\win32\$(Configuration);..\..\..\lib\ns\win32\$(Configuration);%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<AdditionalDependencies>
@OPENSSL_LIB@@LIBXML2_LIB@@GSSAPI_LIB@@GEOIP_LIB@libisc.lib;libdns.lib;libisccc.lib;libisccfg.lib;libbind9.lib;libns.lib;version.lib;ws2_32.lib;%(AdditionalDependencies)
</AdditionalDependencies>
<AdditionalDependencies>
@
LIBUV_LIB@@
OPENSSL_LIB@@LIBXML2_LIB@@GSSAPI_LIB@@GEOIP_LIB@libisc.lib;libdns.lib;libisccc.lib;libisccfg.lib;libbind9.lib;libns.lib;version.lib;ws2_32.lib;%(AdditionalDependencies)
</AdditionalDependencies>
</Link>
<PreBuildEvent>
<Command>
cd ..
...
...
Evan Hunt
@each
mentioned in commit
bbc739b0
·
Jul 28, 2020
mentioned in commit
bbc739b0
mentioned in commit bbc739b09bafec264fbdf0bb4efd25a4b1846e1e
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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