X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fconf.h;h=32531f8653ed2874322a36802fc09f826aae0d9f;hb=4a60669fa1d85ec4644acaed84bad7ac8f79fdba;hp=5b08c39c721fa1047de1d9e72837287e32867b75;hpb=5191e1cb38d24ebf5c180ac7911893ca8bc4031f;p=umurmur.git

diff --git a/src/conf.h b/src/conf.h
index 5b08c39..32531f8 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 2010, Martin Johansson <martin@fatbob.nu>
-   Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2011, Martin Johansson <martin@fatbob.nu>
+   Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.com>
 
    All rights reserved.
 
@@ -33,6 +33,8 @@
 
 #include "messages.h"
 
+#define DEFAULT_CONFIG "/etc/umurmur.conf"
+
 typedef enum param {
 	CERTIFICATE,
 	KEY,
@@ -42,21 +44,25 @@ typedef enum param {
 	WELCOMETEXT,
 	MAX_BANDWIDTH,
 	MAX_CLIENTS,
-	DEAFULT_CHANNEL,
+	DEFAULT_CHANNEL,
+	USERNAME,
+	GROUPNAME,
+	LOGFILE,
 } param_t;
 
 typedef struct {
-	char parent[MAX_TEXT];
-	char name[MAX_TEXT];
-	char description[MAX_TEXT];
+	const char *parent;
+	const char *name;
+	const char *description;
+	bool_t noenter;
 } conf_channel_t;
 
 typedef struct {
-	char source[MAX_TEXT];
-	char destination[MAX_TEXT];
+	const char *source;
+	const char *destination;
 } conf_channel_link_t;
 
-int Conf_init(const char *conffile);
+void Conf_init(const char *conffile);
 void Conf_deinit();
 
 const char *getStrConf(param_t param);