stop breaking the get_options() abstraction in config.c

svn:r2715

diff --git a/src/or/config.c b/src/or/config.c
index e5916f1f49bd1cfe0dbbc66c811cc593b8e1036d..6ca23e8371a740773e1eb5b65294ebee7c730706 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1231,15 +1231,14 @@ getconfig(int argc, char **argv)
   static char **backup_argv;
   static int backup_argc;
 
-  /* we don't use get_options() here, since it's null on the first call */
-  oldoptions = global_options;
-
   if (argv) { /* first time we're called. save commandline args */
     backup_argv = argv;
     backup_argc = argc;
+    oldoptions = NULL;
   } else { /* we're reloading. need to clean up old options first. */
     argv = backup_argv;
     argc = backup_argc;
+    oldoptions = get_options();
   }
   if (argc > 1 && (!strcmp(argv[1], "-h") || !strcmp(argv[1],"--help"))) {
     print_usage();