X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=f435104b49822179ff682fa50bccac954651fd26;hp=6703fabe256bbab611050e12bdd3927b696d16c6;hb=a5709c7d45c644cfdedbe25f6873d65cf7aa2a7b;hpb=a551870e3ac31ff77e1757f226d3e307e4ef83fc diff --git a/server.c b/server.c index 6703fabe..f435104b 100644 --- a/server.c +++ b/server.c @@ -152,8 +152,7 @@ static void shm_init(void) mmd->events = 0; mmd->num_connects = 0; mmd->active_connections = 0; - strcpy(mmd->filename, "(none)"); - mmd->audio_format = -1; + strcpy(mmd->afd.path, "(none)"); mmd->vss_status_flags = VSS_NEXT; mmd->new_vss_status_flags = VSS_NEXT; mmd->sender_cmd_data.cmd_num = -1; @@ -192,7 +191,7 @@ static void parse_config(int override) char *cf; if (conf.config_file_given) - cf = conf.config_file_arg; + cf = para_strdup(conf.config_file_arg); else cf = make_message("%s/.paraslash/server.conf", home); free(user_list_file); @@ -388,8 +387,8 @@ out: prev_events = mmd->events; mmd->vss_status_flags = mmd->new_vss_status_flags; if (ret) { - PARA_DEBUG_LOG("%d events, forcing status update, af = %d\n", - mmd->events, mmd->audio_format); + PARA_DEBUG_LOG("%d events, forcing status update\n", + mmd->events); killpg(0, SIGUSR1); } }