]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 189665 via svnmerge from
authorDoug Bailey <dbailey@digium.com>
Tue, 21 Apr 2009 15:58:10 +0000 (15:58 +0000)
committerDoug Bailey <dbailey@digium.com>
Tue, 21 Apr 2009 15:58:10 +0000 (15:58 +0000)
https://origsvn.digium.com/svn/asterisk/trunk

................
  r189665 | dbailey | 2009-04-21 10:54:16 -0500 (Tue, 21 Apr 2009) | 9 lines

  Merged revisions 189664 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r189664 | dbailey | 2009-04-21 10:52:13 -0500 (Tue, 21 Apr 2009) | 2 lines

    Remove daemon call on systems that do not support forking.
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@189667 65c4cc65-6c06-0410-ace0-fbb531ad65f3

utils/muted.c

index b2523b6fce6a983c04424de743dfbdd3ba67a157..4e90da789dcd7dd77c9fe2a18b307bb68aeeb52c 100644 (file)
@@ -684,6 +684,7 @@ int main(int argc, char *argv[])
                fclose(astf);
                exit(1);
        }
+#if HAVE_WORKING_FORK
        if (needfork) {
 #ifndef HAVE_SBIN_LAUNCHD
                if (daemon(0,0) < 0) {
@@ -695,6 +696,7 @@ int main(int argc, char *argv[])
                exit(1);
 #endif
        }
+#endif
        for(;;) {
                if (wait_event()) {
                        fclose(astf);