@@ -261,10 +261,11 @@
 #  define filed_log_msg_debug(x, ...) /**/
 #  define filed_log_msg(x, ...) /**/
 #  define filed_log_entry(x) /**/
 #  define filed_log_ip(x, ...) NULL
 #  define filed_log_new(x) &local_dummy_log
+#  define filed_log_open(x) stdout
 #else
 #  ifdef FILED_DEBUG
 #    define filed_log_msg_debug(x, ...) { fprintf(stderr, x, __VA_ARGS__); fprintf(stderr, "\n"); fflush(stderr); }
 #  else
 #    define filed_log_msg_debug(x, ...) /**/
@@ -425,10 +426,22 @@
 			break;
 		case AF_INET6:
 			retval = inet_ntop(AF_INET6, &addr_v6->sin6_addr, buffer, bufferlen);
 			break;
 	}
+
+	return(retval);
+}
+
+static FILE *filed_log_open(const char *file) {
+	FILE *retval;
+
+	if (strcmp(file, "-") == 0) {
+		retval = stdout;
+	} else {
+		retval = fopen(file, "a+");
+	}
 
 	return(retval);
 }
 
 static int filed_logging_thread_init(FILE *logfp) {
@@ -1273,19 +1286,15 @@
 				return(0);
 		}
 	}
 
 	/* Open log file */
-	if (strcmp(log_file, "-") == 0) {
-		log_fp = stdout;
-	} else {
-		log_fp = fopen(log_file, "a+");
-		if (log_fp == NULL) {
-			perror("fopen");
-
-			return(4);
-		}
+	log_fp = filed_log_open(log_file);
+	if (log_fp == NULL) {
+		perror("filed_log_open");
+
+		return(4);
 	}
 
 	/* Create listening socket */
 	fd = filed_listen(bind_addr, port);
 	if (fd < 0) {