From: Jonatan Schlag <jonatan.schlag@ipfire.org>
To: network@lists.ipfire.org
Subject: [PATCH 2/3] zone: fix zone_new
Date: Wed, 19 Jul 2017 16:10:21 +0200 [thread overview]
Message-ID: <1500473422-24614-2-git-send-email-jonatan.schlag@ipfire.org> (raw)
In-Reply-To: <1500473422-24614-1-git-send-email-jonatan.schlag@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 817 bytes --]
Everytime somethings goes wrong when we call hook_new we wannt to call zone_destroy.
Not only when we get an EXIT_ERROR also when we get an EXIT_CONF_ERROR and so on.
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
---
src/functions/functions.zone | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/functions/functions.zone b/src/functions/functions.zone
index 11a8dc2..91ce629 100644
--- a/src/functions/functions.zone
+++ b/src/functions/functions.zone
@@ -243,7 +243,7 @@ zone_new() {
# Maybe the zone new hook did not exit correctly.
# If this is the case we remove the created zone immediately.
- if [ "${ret}" = "${EXIT_ERROR}" ]; then
+ if [ "${ret}" != "${EXIT_OK}" ]; then
zone_destroy_now "${zone}"
return ${EXIT_ERROR}
fi
--
2.6.3
next prev parent reply other threads:[~2017-07-19 14:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-19 14:10 [PATCH 1/3] header-zone: refactor hook_edit nad hook_new Jonatan Schlag
2017-07-19 14:10 ` Jonatan Schlag [this message]
2017-07-19 14:10 ` [PATCH 3/3] hook: return error codes to previos functions Jonatan Schlag
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1500473422-24614-2-git-send-email-jonatan.schlag@ipfire.org \
--to=jonatan.schlag@ipfire.org \
--cc=network@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox