Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make rec_control respect include-dir; closes #6536 #6557

Merged
merged 1 commit into from May 1, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 1 addition & 4 deletions pdns/rec_control.cc
Expand Up @@ -66,10 +66,7 @@ static void initArguments(int argc, char** argv)

cleanSlashes(configname);

if(!::arg().preParseFile(configname.c_str(), "socket-dir", ""))
cerr<<"Warning: unable to parse configuration file '"<<configname<<"'"<<endl;
if(!::arg().preParseFile(configname.c_str(), "chroot", ""))
cerr<<"Warning: unable to parse configuration file '"<<configname<<"'"<<endl;
arg().laxFile(configname.c_str());

arg().laxParse(argc,argv); // make sure the commandline wins

Expand Down