summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobbie Harwood <rharwood@redhat.com>2015-09-11 18:19:37 -0400
committerSimo Sorce <simo@redhat.com>2015-09-14 15:05:03 -0400
commit37b160e668b4861bab888abdc5547a96dc327d32 (patch)
tree4500f0b14f0bfbe8be515b98660c9bc9bcece4d7
parent78228b158ab45d2150ce47fdda363ff268810df0 (diff)
downloadgss-proxy-37b160e668b4861bab888abdc5547a96dc327d32.tar.gz
gss-proxy-37b160e668b4861bab888abdc5547a96dc327d32.tar.xz
gss-proxy-37b160e668b4861bab888abdc5547a96dc327d32.zip
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>
-rw-r--r--proxy/src/gssproxy.c7
1 files changed, 0 insertions, 7 deletions
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;
}