From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 8 May 2015 19:01:11 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
X-Git-Tag: v1.8.9~10
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=9963925e6e11279aa5ca4653e4278f4e47564e8d;hp=e50562e4bd1288868a08d67574dac6f22edfcf07;p=metaproxy-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
---

diff --git a/doc/book.xml b/doc/book.xml
index 86c2886..6f265ca 100644
--- a/doc/book.xml
+++ b/doc/book.xml
@@ -26,7 +26,7 @@
   </authorgroup>
   <releaseinfo>&version;</releaseinfo>
   <copyright>
-   <year>2005-2014</year>
+   <year>2005-2015</year>
    <holder>Index Data</holder>
   </copyright>
   <abstract>
diff --git a/src/metaproxy_prog.cpp b/src/metaproxy_prog.cpp
index 943c3e0..c470b90 100644
--- a/src/metaproxy_prog.cpp
+++ b/src/metaproxy_prog.cpp
@@ -266,7 +266,7 @@ static int sc_main(
             yaz_sc_running(s);
 
             yaz_daemon("metaproxy", mode | YAZ_DAEMON_LOG_REOPEN,
-                       mode == YAZ_DAEMON_DEBUG ? work_debug : work_normal,
+                       (mode & YAZ_DAEMON_FORK) ? work_normal : work_debug,
                        router, pidfile, uid);
         }
         delete router;