[asterisk-commits] dbailey: branch 1.6.1 r189667 - in /branches/1.6.1: ./ utils/muted.c

[SVN commits to the Asterisk project]

Author: dbailey
Date: Tue Apr 21 10:58:10 2009
New Revision: 189667

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=189667
Log:
Merged revisions 189665 via svnmerge from 
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.
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/utils/muted.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/utils/muted.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/utils/muted.c?view=diff&rev=189667&r1=189666&r2=189667
==============================================================================
--- branches/1.6.1/utils/muted.c (original)
+++ branches/1.6.1/utils/muted.c Tue Apr 21 10:58:10 2009
@@ -684,6 +684,7 @@
 		fclose(astf);
 		exit(1);
 	}
+#if HAVE_WORKING_FORK
 	if (needfork) {
 #ifndef HAVE_SBIN_LAUNCHD
 		if (daemon(0,0) < 0) {
@@ -695,6 +696,7 @@
 		exit(1);
 #endif
 	}
+#endif
 	for(;;) {
 		if (wait_event()) {
 			fclose(astf);