|
 |
a7203a |
From 41461fc444170ffd9b5459e2f0b2480f3288cc1d Mon Sep 17 00:00:00 2001
|
|
|
a7203a |
From: Tomas Krizek <tkrizek@redhat.com>
|
|
|
a7203a |
Date: Fri, 7 Apr 2017 14:48:32 +0200
|
|
|
a7203a |
Subject: [PATCH 1/2] settings: skip unconfigured values
|
|
|
a7203a |
|
|
|
a7203a |
When a value is not configured in settings map, it is skipped.
|
|
|
a7203a |
If it is the last processed value, the result of ISC_R_NOTFOUND
|
|
|
a7203a |
would cause the cleanup section of the function fail. Since
|
|
|
a7203a |
unconfigured values are allowed and expected, override the result
|
|
|
a7203a |
to ISC_R_SUCCESS in this case to prevent triggerring an error.
|
|
|
a7203a |
|
|
|
a7203a |
https://pagure.io/bind-dyndb-ldap/issue/172
|
|
|
a7203a |
|
|
|
a7203a |
Reviewed-By: Martin Basti <mbasti@redhat.com>
|
|
|
a7203a |
---
|
|
|
a7203a |
src/settings.c | 7 +++++--
|
|
|
a7203a |
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
a7203a |
|
|
|
a7203a |
diff --git a/src/settings.c b/src/settings.c
|
|
|
a7203a |
index 37e6e5ccd751bd176f8dbdd4fd505b7e18ded4f4..8beb0d3cd16479c79bdc104a6a6fd28033f403e7 100644
|
|
|
a7203a |
--- a/src/settings.c
|
|
|
a7203a |
+++ b/src/settings.c
|
|
|
a7203a |
@@ -597,8 +597,11 @@ settings_set_fill(const cfg_obj_t *config, settings_set_t *set)
|
|
|
a7203a |
setting++) {
|
|
|
a7203a |
cfg_value = NULL;
|
|
|
a7203a |
result = cfg_map_get(config, setting->name, &cfg_value);
|
|
|
a7203a |
- if (result == ISC_R_NOTFOUND)
|
|
|
a7203a |
- continue; /* setting not configured in map */
|
|
|
a7203a |
+ if (result == ISC_R_NOTFOUND) {
|
|
|
a7203a |
+ /* setting not configured in map */
|
|
|
a7203a |
+ result = ISC_R_SUCCESS;
|
|
|
a7203a |
+ continue;
|
|
|
a7203a |
+ }
|
|
|
a7203a |
else if (result != ISC_R_SUCCESS)
|
|
|
a7203a |
goto cleanup;
|
|
|
a7203a |
if (cfg_obj_isstring(cfg_value)) {
|
|
|
a7203a |
--
|
|
|
a7203a |
2.9.3
|
|
|
a7203a |
|