X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fconf.h;h=9a9591c22f2c3ff553265699506b24a98adfa539;hb=7d9162c5b470f5b31db9ca76e105bd7ed5de8ec8;hp=463a9433c62c5c7204367f8cec9ffd5a0c3e2be6;hpb=63a04935ffa097bef39ccc1bc6a6efedb47456f7;p=umurmur.git diff --git a/src/conf.h b/src/conf.h index 463a943..9a9591c 100644 --- a/src/conf.h +++ b/src/conf.h @@ -1,5 +1,5 @@ -/* Copyright (C) 2009-2013, Martin Johansson - Copyright (C) 2005-2013, Thorvald Natvig +/* Copyright (C) 2009-2014, Martin Johansson + Copyright (C) 2005-2014, Thorvald Natvig All rights reserved. @@ -32,8 +32,7 @@ #define CONF_H_24564356 #include "messages.h" - -#define DEFAULT_CONFIG "/etc/umurmur.conf" +#include "config.h" typedef enum param { CERTIFICATE, @@ -41,7 +40,9 @@ typedef enum param { PASSPHRASE, CAPATH, BINDPORT, + BINDPORT6, BINDADDR, + BINDADDR6, WELCOMETEXT, MAX_BANDWIDTH, MAX_CLIENTS,