Coding style is religion
This commit is contained in:
@@ -33,6 +33,7 @@ static void* servlet(void *args) /* Serve the connection -- threadable */
|
||||
log_ssl();
|
||||
} else {
|
||||
int queue_id = start_msg_queue();
|
||||
|
||||
if (queue_id == FAIL)
|
||||
goto exit;
|
||||
do {
|
||||
@@ -75,6 +76,7 @@ exit:
|
||||
static void send_reject_msg(SSL *ssl)
|
||||
{
|
||||
char *reply = "FAILURE - The connection queue is full!\n";
|
||||
|
||||
SSL_write(ssl, reply, strlen(reply));
|
||||
}
|
||||
|
||||
@@ -101,6 +103,7 @@ void* client_pool(void *args)
|
||||
socklen_t len = sizeof(addr);
|
||||
SSL *ssl;
|
||||
int agent = accept(pool->srv, (struct sockaddr *)&addr, &len);
|
||||
|
||||
log(INFO,
|
||||
"Connection: %s:%d",
|
||||
inet_ntop(AF_INET, &addr.sin_addr, address, sizeof(address)),
|
||||
|
||||
16
confparser.c
16
confparser.c
@@ -111,7 +111,7 @@ static int fopen_and_mkdir(const char *dir)
|
||||
for (p = tmp + 1; *p; p++)
|
||||
if (*p == '/') {
|
||||
*p = 0;
|
||||
if (mkdir(tmp, S_IRWXU) == -1 && errno != EEXIST) {
|
||||
if (mkdir(tmp, 0700) == -1 && errno != EEXIST) {
|
||||
log(ERROR,
|
||||
"Permission denied to create directory: %s",
|
||||
tmp);
|
||||
@@ -147,8 +147,8 @@ static int test_conf_perms(void)
|
||||
log(ERROR, confresult);
|
||||
return 1;
|
||||
}
|
||||
if (!(S_IRUSR & s.st_mode) ||
|
||||
!(S_IXUSR & s.st_mode)) {
|
||||
if (!(0400 & s.st_mode) ||
|
||||
!(0100 & s.st_mode)) {
|
||||
enumtostr(confresult, CONF_DIR_PERM);
|
||||
log(ERROR, confresult);
|
||||
return 1;
|
||||
@@ -159,8 +159,8 @@ static int test_conf_perms(void)
|
||||
} else if (s.st_gid != 0) {
|
||||
enumtostr(confresult, CONF_DIR_GID_INSECURE);
|
||||
log(WARNING, confresult);
|
||||
} else if ((S_IROTH & s.st_mode) ||
|
||||
(S_IWOTH & s.st_mode)) {
|
||||
} else if ((0004 & s.st_mode) ||
|
||||
(0002 & s.st_mode)) {
|
||||
enumtostr(confresult, CONF_DIR_PERM_INSECURE);
|
||||
log(WARNING, confresult);
|
||||
}
|
||||
@@ -180,7 +180,7 @@ static int test_conf_perms(void)
|
||||
log(ERROR, confresult);
|
||||
return 1;
|
||||
}
|
||||
if (!(S_IRUSR & s.st_mode)) {
|
||||
if (!(0400 & s.st_mode)) {
|
||||
enumtostr(confresult, CONF_PERM);
|
||||
log(ERROR, confresult);
|
||||
return 1;
|
||||
@@ -191,8 +191,8 @@ static int test_conf_perms(void)
|
||||
} else if (s.st_gid != 0) {
|
||||
enumtostr(confresult, CONF_FILE_GID_INSECURE);
|
||||
log(WARNING, confresult);
|
||||
} else if ((S_IROTH & s.st_mode) ||
|
||||
(S_IWOTH & s.st_mode)) {
|
||||
} else if ((0004 & s.st_mode) ||
|
||||
(0002 & s.st_mode)) {
|
||||
enumtostr(confresult, CONF_FILE_PERM_INSECURE);
|
||||
log(WARNING, confresult);
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include "job_queue.h"
|
||||
|
||||
struct msg_t **slot;
|
||||
int total_queues = 0;
|
||||
int total_queues;
|
||||
|
||||
int start_msg_queue(void)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user