From ded03004a21a317783b06c6141430007641af7c6 Mon Sep 17 00:00:00 2001 From: Dave Olszewski Date: Mon, 9 Feb 2015 17:49:21 -0800 Subject: [PATCH] FS-7284 allow -base to satisfy "You must specify all or none of -conf, -log, and -db" --- src/switch.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/switch.c b/src/switch.c index 2433535152..f3998501f1 100644 --- a/src/switch.c +++ b/src/switch.c @@ -519,7 +519,7 @@ int main(int argc, char *argv[]) char *local_argv[1024] = { 0 }; int local_argc = argc; char *arg_argv[128] = { 0 }; - int alt_dirs = 0, log_set = 0, run_set = 0, do_kill = 0; + int alt_dirs = 0, alt_base = 0, log_set = 0, run_set = 0, do_kill = 0; int priority = 0; #ifdef __sun switch_core_flag_t flags = SCF_USE_SQL; @@ -898,6 +898,7 @@ int main(int argc, char *argv[]) return 255; } strcpy(SWITCH_GLOBAL_dirs.base_dir, local_argv[x]); + alt_base = 1; } else if (!strcmp(local_argv[x], "-temp")) { @@ -1046,7 +1047,7 @@ int main(int argc, char *argv[]) return 255; } - if (alt_dirs && alt_dirs != 3) { + if (alt_dirs && alt_dirs != 3 && !alt_base) { fprintf(stderr, "You must specify all or none of -conf, -log, and -db\n"); return 255; }