Merge pull request #430 from pi-hole/fix/no-daemon-mode

Fix no-daemon mode forking dnsmasq and not logging
pi-hole · Dec 12, 2018 · 3634704 · 3634704
2 parents 88bad8c + 9b03470
commit 3634704
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/args.c b/args.c
@@ -35,6 +35,7 @@ void parse_args(int argc, char* argv[])
  strcmp(argv[i], "debug") == 0)
  {
  debug = true;
+ daemonmode = false;
  ok = true;
 
  // Replace "-k" by "-d" (debug mode implies nofork)

diff --git a/dnsmasq_interface.c b/dnsmasq_interface.c
@@ -863,7 +863,7 @@ pthread_t DNSclientthread;
 
 void FTL_fork_and_bind_sockets(struct passwd *ent_pw)
 {
- if(!debug && daemonmode)
+ if(daemonmode)
  go_daemon();
  else
  savepid();

diff --git a/log.c b/log.c
@@ -71,7 +71,7 @@ void logg(const char *format, ...)
  get_timestr(timestring);
 
  // Print to stdout before writing to file
- if(debug)
+ if(!daemonmode)
  {
  printf("[%s] ", timestring);
  va_start(args, format);