sslproc: Add missing break, still allowing zlib when ssl cannot be set up.

[solanum.git] / src / sslproc.c

diff --git a/src/sslproc.c b/src/sslproc.c
index 832b37a50e71b733c00d8d67d5c521517fa26926..9ec6a792e11424a4822327de7cb45bec7d59d122 100644 (file)
--- a/src/sslproc.c
+++ b/src/sslproc.c
@@ -261,7 +261,7 @@ start_ssldaemon(int count, const char *ssl_cert, const char *ssl_private_key, co
 
        if(ssld_path == NULL)
        {
-               rb_snprintf(fullpath, sizeof(fullpath), "%s/ssld%s", BINPATH, suffix);
+               rb_snprintf(fullpath, sizeof(fullpath), "%s/ssld%s", PKGLIBEXECDIR, suffix);
 
                if(access(fullpath, X_OK) == -1)
                {
@@ -270,8 +270,8 @@ start_ssldaemon(int count, const char *ssl_cert, const char *ssl_private_key, co
                        if(access(fullpath, X_OK) == -1)
                        {
                                ilog(L_MAIN,
-                                    "Unable to execute ssld%s in %s/bin or %s",
-                                    ConfigFileEntry.dpath, suffix, BINPATH);
+                                    "Unable to execute ssld%s in %s or %s/bin",
+                                    suffix, PKGLIBEXECDIR, ConfigFileEntry.dpath);
                                return 0;
                        }
                }
@@ -456,12 +456,13 @@ ssl_process_cmd_recv(ssl_ctl_t * ctl)
                case 'I':
                        ssl_ok = 0;
                        ilog(L_MAIN, "%s", cannot_setup_ssl);
-                       sendto_realops_snomask(SNO_GENERAL, L_ALL, cannot_setup_ssl);
+                       sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s", cannot_setup_ssl);
+                       break;
                case 'U':
                        zlib_ok = 0;
                        ssl_ok = 0;
                        ilog(L_MAIN, "%s", no_ssl_or_zlib);
-                       sendto_realops_snomask(SNO_GENERAL, L_ALL, no_ssl_or_zlib);
+                       sendto_realops_snomask(SNO_GENERAL, L_ALL, "%s", no_ssl_or_zlib);
                        ssl_killall();
                        break;
                case 'z':