From 37b160e668b4861bab888abdc5547a96dc327d32 Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood@redhat.com>
Date: Fri, 11 Sep 2015 18:19:37 -0400
Subject: Allow configdir and configfile to be specified together

Not being able to do this is a relic of a previous design.

Signed-off-by: Robbie Harwood <rharwood@redhat.com>
Reviewed-by: Simo Sorce <simo@redhat.com>
---
 proxy/src/gssproxy.c | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'proxy/src/gssproxy.c')

diff --git a/proxy/src/gssproxy.c b/proxy/src/gssproxy.c
index 845b05a..f025aa2 100644
--- a/proxy/src/gssproxy.c
+++ b/proxy/src/gssproxy.c
@@ -70,13 +70,6 @@ int main(int argc, const char *argv[])
         return 1;
     }
 
-    if (opt_config_file && opt_config_dir) {
-        fprintf(stderr, "Option -C|--configdir is not allowed together with"
-                        " -c|--config\n");
-        poptPrintUsage(pc, stderr, 0);
-        return 1;
-    }
-
     if (opt_interactive) {
         opt_daemon = 2;
     }
-- 
cgit