Changeset 421ef1c in mod_gnutls

Timestamp:

Jan 29, 2013, 8:05:42 PM (9 years ago)

Author:

Daniel Kahn Gillmor <dkg@…>

Branches:

asyncio, debian/master, debian/stretch-backports, jessie-backports, master, msva, proxy-ticket, upstream

Children:

cb5188f

Parents:

929d313

git-author:

Daniel Kahn Gillmor <dkg@…> (01/28/13 23:10:41)

git-committer:

Daniel Kahn Gillmor <dkg@…> (01/29/13 20:05:42)

Message:

deal responsibly with grave failures in pre_config hook

If a pre_config hook returns anything other than OK or DECLINED,
pre-configuration will fail and the server will clean itself up
properly.

I'm using DONE here as a third option so that fatal errors in module
initialization will be caught appropriately. It is a bad idea to just
exit(-1) from within a shared module -- better to let apache decide
how to clean up properly.

File:

• src/gnutls_hooks.c (modified) (3 diffs)

src/gnutls_hooks.c

@@ -78 +78 @@
                 ap_log_perror(APLOG_MARK, APLOG_DEBUG, 0, plog, "gnutls_check_version() failed. Required: "
                                         "gnutls-%s Found: gnutls-%s\n", LIBGNUTLS_VERSION, gnutls_check_version(NULL));
-                exit(-1);
+        return DONE;
     }
 
@@ -85 +85 @@
     if (ret < 0) {
                 ap_log_perror(APLOG_MARK, APLOG_DEBUG, 0, plog, "gnutls_global_init: %s\n", gnutls_strerror(ret));
-                exit(-1);
+                return DONE;
     }
 
@@ -92 +92 @@
     if (ret < 0) {
                 ap_log_perror(APLOG_MARK, APLOG_DEBUG, 0, plog, "gnutls_session_ticket_key_generate: %s\n", gnutls_strerror(ret));
-                exit(-1);
+                return DONE;
     }
 
         /* Register a pool clean-up function */
-    apr_pool_cleanup_register(pconf, NULL, mgs_cleanup_pre_config, apr_pool_cleanup_null);\
+    apr_pool_cleanup_register(pconf, NULL, mgs_cleanup_pre_config, apr_pool_cleanup_null);
 
     return OK;