X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fconf.h;h=9a9591c22f2c3ff553265699506b24a98adfa539;hb=3fa329a43141b80ea9ca1271d8a3439e39623942;hp=9cab3d149b56ae98fdcb201c4440f014c459f7b5;hpb=36601a5de5f90e16188deadd271b70595b4cc237;p=umurmur.git

diff --git a/src/conf.h b/src/conf.h
index 9cab3d1..9a9591c 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2009-2013, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2013, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2014, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2014, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -32,15 +32,17 @@
 #define CONF_H_24564356
 
 #include "messages.h"
-
-#define DEFAULT_CONFIG "/etc/umurmur.conf"
+#include "config.h"
 
 typedef enum param {
 	CERTIFICATE,
 	KEY,
 	PASSPHRASE,
+	CAPATH,
 	BINDPORT,
+	BINDPORT6,
 	BINDADDR,
+	BINDADDR6,
 	WELCOMETEXT,
 	MAX_BANDWIDTH,
 	MAX_CLIENTS,