aboutsummaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 6295bf0d6..ef0f3e55f 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -645,9 +645,10 @@ int main(int argc, char *argv[]) {
signal (SIGUSR1, catch); /* to dump stats to stdout */
signal (SIGHUP, catch); /* to reload directory */
- if ( getoptions(argc,argv,&options) ) exit(1);
+ if(getconfig(argc,argv,&options))
+ exit(1);
log(options.loglevel,NULL); /* assign logging severity level from options */
- global_role = options.Role; /* assign global_role from options. FIX: remove from global namespace later. */
+ global_role = options.Role; /* assign global_role from options. FIXME: remove from global namespace later. */
crypto_global_init();
retval = do_main_loop();