X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=9ee4ec7f6349d81ad595b5209d0fe8dfbe31f6cd;hb=950aea956b32f7c63c6f31c60aaf57dbe9bc1a80;hp=f663ae50f76cc97330c48e518e54b6cd1e03e3e0;hpb=32b161c885d90286f7d4a72b9d05e947c96069e5;p=tpg%2Fopendispense2.git

diff --git a/src/server/server.c b/src/server/server.c
index f663ae5..9ee4ec7 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -152,7 +152,6 @@ void Server_Start(void)
 	// Fork into background
 	if( gbServer_RunInBackground )
 	{
-		int newin, newout, newerr;
 		int pid = fork();
 		if( pid == -1 ) {
 			fprintf(stderr, "ERROR: Unable to fork\n");
@@ -165,12 +164,15 @@ void Server_Start(void)
 		}
 		// In child
 		// - Sort out stdin/stdout
-		newin  = open("/dev/null", O_RDONLY);
-		newout = open(gsServer_LogFile, O_CREAT|O_APPEND, 0644);
-		newerr = open(gsServer_ErrorLog, O_CREAT|O_APPEND, 0644);
-		dup2(newin, 0);
-		dup2(newout, 1);
-		dup2(newerr, 2);
+		#if 0
+		dup2( open("/dev/null", O_RDONLY, 0644), STDIN_FILENO );
+		dup2( open(gsServer_LogFile, O_CREAT|O_APPEND, 0644), STDOUT_FILENO );
+		dup2( open(gsServer_ErrorLog, O_CREAT|O_APPEND, 0644), STDERR_FILENO );
+		#else
+		freopen("/dev/null", "r", stdin);
+		freopen(gsServer_LogFile, "a", stdout);
+		freopen(gsServer_ErrorLog, "a", stderr);
+		#endif
 	}
 
 	// Start the helper thread
@@ -238,12 +240,14 @@ void Server_Start(void)
 			{
 			case 0x7F000001:	// 127.0.0.1	localhost
 		//	case 0x825F0D00:	// 130.95.13.0
+			case 0x825F0D04:	// 130.95.13.4  merlo
+			case 0x825F0D05:	// 130.95.13.5  heathred (MR)
 			case 0x825F0D07:	// 130.95.13.7	motsugo
 			case 0x825F0D11:	// 130.95.13.17	mermaid
 			case 0x825F0D12:	// 130.95.13.18	mussel
 			case 0x825F0D17:	// 130.95.13.23	martello
 			case 0x825F0D2A:	// 130.95.13.42 meersau
-			case 0x825F0D42:	// 130.95.13.66	heathred
+			case 0x825F0D42:	// 130.95.13.66	heathred (Clubroom)
 				bTrusted = 1;
 				break;
 			default: