Merge trunk.

1 files changed, 3 insertions, 2 deletions

diff --git a/conf.h b/conf.h
index e852dbef..d21ec577 100644
--- a/conf.h
+++ b/conf.h
@@ -32,7 +32,7 @@ typedef enum authmode { AUTHMODE_OPEN, AUTHMODE_CLOSED, AUTHMODE_REGISTERED } au
 typedef struct conf
 {
 	char *iface;
-	signed int port;
+	char *port;
 	int nofork;
 	int verbose;
 	runmode_t runmode;
@@ -48,9 +48,10 @@ typedef struct conf
 	char **migrate_storage;
 	int ping_interval;
 	int ping_timeout;
+	char *user;
 } conf_t;
 
-conf_t *conf_load( int argc, char *argv[] );
+G_GNUC_MALLOC conf_t *conf_load( int argc, char *argv[] );
 void conf_loaddefaults( irc_t *irc );
 
 #endif