Prettier, comments from Jelte.

git-svn-id: file:///svn/unbound/trunk@1698 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/daemon/remote.c b/daemon/remote.c
index baf1599ffa0dbc5b694bbb9f3a51b25ec2bb7f6a..9c87a2e7e736530448fd729cdb90feb48f113ff5 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -168,38 +168,27 @@ daemon_remote_create(struct config_file* cfg)
        s_key = fname_after_chroot(cfg->server_key_file, cfg, 1);
        if(!s_cert || !s_key) {
                log_err("out of memory in remote control fname");
-               free(s_cert);
-               free(s_key);
-               daemon_remote_delete(rc);
-               return NULL;
+               goto setup_error;
        }
        verbose(VERB_ALGO, "setup SSL certificates");
        if (!SSL_CTX_use_certificate_file(rc->ctx,s_cert,SSL_FILETYPE_PEM)) {
                log_err("Error for server-cert-file: %s", s_cert);
                log_crypto_err("Error in SSL_CTX use_certificate_file");
-               free(s_cert);
-               free(s_key);
-               daemon_remote_delete(rc);
-               return NULL;
+               goto setup_error;
        }
        if(!SSL_CTX_use_PrivateKey_file(rc->ctx,s_key,SSL_FILETYPE_PEM)) {
                log_err("Error for server-key-file: %s", s_key);
                log_crypto_err("Error in SSL_CTX use_PrivateKey_file");
-               free(s_cert);
-               free(s_key);
-               daemon_remote_delete(rc);
-               return NULL;
+               goto setup_error;
        }
        if(!SSL_CTX_check_private_key(rc->ctx)) {
                log_err("Error for server-key-file: %s", s_key);
                log_crypto_err("Error in SSL_CTX check_private_key");
-               free(s_cert);
-               free(s_key);
-               daemon_remote_delete(rc);
-               return NULL;
+               goto setup_error;
        }
        if(!SSL_CTX_load_verify_locations(rc->ctx, s_cert, NULL)) {
                log_crypto_err("Error setting up SSL_CTX verify locations");
+       setup_error:
                free(s_cert);
                free(s_key);
                daemon_remote_delete(rc);

diff --git a/doc/Changelog b/doc/Changelog
index 9105c8369997754ffdc973d6a7b2b14e2cf63974..f38859da2a5b75e57d65d60fe9f45a4cbe7f70d0 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+6 July 2009: Wouter
+       - prettier error handling in SSL setup.
+
 3 July 2009: Wouter
        - fixup linking when ldnsdir is "".