The branch, master has been updated
via fce9dec Bump version to 1.1.7
via d95ad4b rwrap: Turn some errors into warnings
from 6220259 gitlab-ci: Add Ubuntu runner
https://git.samba.org/?p=resolv_wrapper.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit fce9dec5543e4ce17e56cf2b8b6384589aeb916f
Author: Andreas Schneider <a...@samba.org>
Date: Mon Aug 24 16:48:03 2020 +0200
Bump version to 1.1.7
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Guenther Deschner <g...@samba.org>
commit d95ad4b1dd51ca1a49bdb8b42866913549c8f861
Author: Andreas Schneider <a...@samba.org>
Date: Mon Aug 24 16:44:58 2020 +0200
rwrap: Turn some errors into warnings
This fixes some Samba tests which redirect stderr to stdout and then get
more messages than expected.
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Guenther Deschner <g...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
CHANGELOG | 3 +++
CMakeLists.txt | 4 ++--
src/resolv_wrapper.c | 4 ++--
3 files changed, 7 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/CHANGELOG b/CHANGELOG
index 9df9b6e..d62dc99 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
CHANGELOG
=========
+version 1.1.7 (released 2020-08-25)
+ * Move debug messages from error to warning
+
version 1.1.6 (released 2020-03-23)
* Added support for running with Sanitizers
* Added fake resolving of TXT records
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1275076..9399bf9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND CMAKE_MODULE_PATH
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
include(DefineCMakeDefaults)
include(DefineCompilerFlags)
-project(resolv_wrapper VERSION 1.1.6 LANGUAGES C)
+project(resolv_wrapper VERSION 1.1.7 LANGUAGES C)
# global needed variables
set(APPLICATION_NAME ${PROJECT_NAME})
@@ -25,7 +25,7 @@ set(APPLICATION_NAME ${PROJECT_NAME})
# Increment PATCH.
set(LIBRARY_VERSION_MAJOR 0)
set(LIBRARY_VERSION_MINOR 0)
-set(LIBRARY_VERSION_PATCH 6)
+set(LIBRARY_VERSION_PATCH 7)
set(LIBRARY_VERSION
"${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}.${LIBRARY_VERSION_PATCH}")
set(LIBRARY_SOVERSION ${LIBRARY_VERSION_MAJOR})
diff --git a/src/resolv_wrapper.c b/src/resolv_wrapper.c
index 0d3f34c..b69a55a 100644
--- a/src/resolv_wrapper.c
+++ b/src/resolv_wrapper.c
@@ -1844,7 +1844,7 @@ static int rwrap_parse_resolv_conf(struct __res_state
*state,
fp = fopen(resolv_conf, "r");
if (fp == NULL) {
- RWRAP_LOG(RWRAP_LOG_ERROR,
+ RWRAP_LOG(RWRAP_LOG_WARN,
"Opening %s failed: %s",
resolv_conf, strerror(errno));
return -1;
@@ -1930,7 +1930,7 @@ static int rwrap_parse_resolv_conf(struct __res_state
*state,
fclose(fp);
if (nserv == 0) {
- RWRAP_LOG(RWRAP_LOG_ERROR,
+ RWRAP_LOG(RWRAP_LOG_WARN,
"No usable nameservers found in %s",
resolv_conf);
errno = ESRCH;
--
Resolv Wrapper Repository
