merge in upstream changes

1 files changed, 5 insertions, 2 deletions

diff --git a/unix.c b/unix.c
index 63ef7fae..07cb709f 100644
--- a/unix.c
+++ b/unix.c
@@ -47,7 +47,7 @@ int main( int argc, char *argv[], char **envp )
 	struct sigaction sig, old;
 	
 	log_init();
-	CONF_FILE = g_strdup( CONF_FILE_DEF );
+	global.conf_file = g_strdup( CONF_FILE_DEF );
 	global.conf = conf_load( argc, argv );
 	if( global.conf == NULL )
 		return( 1 );
@@ -125,11 +125,14 @@ int main( int argc, char *argv[], char **envp )
 	
 	if( !getuid() || !geteuid() )
 		log_message( LOGLVL_WARNING, "BitlBee is running with root privileges. Why?" );
-	if( help_init( &(global.help), global.helpfile ) == NULL )
+	if( help_init( &global.help, global.helpfile ) == NULL )
 		log_message( LOGLVL_WARNING, "Error opening helpfile %s.", HELP_FILE );
 	
 	b_main_run();
 	
+	/* Mainly good for restarting, to make sure we close the help.txt fd. */
+	help_free( &global.help );
+	
 	if( global.restart )
 	{
 		char *fn = ipc_master_save_state();