Merge trunk.
authorJelmer Vernooij <jelmer@samba.org>
Sun, 16 Sep 2007 22:51:40 +0000 (00:51 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 16 Sep 2007 22:51:40 +0000 (00:51 +0200)
1  2 
src/ctrlproxy.h
src/internals.h
src/main.c

diff --cc src/ctrlproxy.h
Simple merge
diff --cc src/internals.h
Simple merge
diff --cc src/main.c
index 4901c268ec406fe4e51958f6b2600463bfd33b12,add6377b11868aa40e33277e7dd5972d5b5eec14..9fe1ad521ac5ece8ff9a9ce0cd0222bd9e481a20
@@@ -102,9 -102,7 +102,8 @@@ static void clean_exit(
                save_configuration(my_global->config, path);
        nickserv_save(my_global, path);
        stop_unix_socket(my_global);
 +      stop_admin_socket(my_global);
        fini_listeners(my_global);
        free_global(my_global);
  
        g_main_loop_unref(main_loop);
@@@ -192,9 -189,9 +191,10 @@@ int main(int argc, char **argv
                {"log", 'l', 0, G_OPTION_ARG_STRING, &logfile, ("Log messages to specified file"), ("FILE")},
                {"config-dir", 'c', 0, G_OPTION_ARG_STRING, &config_dir, ("Override configuration directory"), ("DIR")},
                {"version", 'v', 0, G_OPTION_ARG_NONE, &version, ("Show version information")},
 +              {"admin", 'a', 0, G_OPTION_ARG_NONE, &admin, "Show administration prompt" },
                { NULL }
        };
+       GError *error;
  
        signal(SIGINT, signal_quit);
        signal(SIGTERM, signal_quit);