[Firebird-checkins] CVS: firebird2/src/remote inet.cpp,1.13,1.14 inet_server.cpp,1.5,1.6

[Mark O. <sky...@us...>]

Build Version :  T2.0.0.510 Firebird2 Dev1

(writeBuildNum.sh,v 1.489 2002/07/29 15:37:56 skywalker Exp )

Update of /cvsroot/firebird/firebird2/src/remote
In directory usw-pr-cvs1:/tmp/cvs-serv2933/remote

Modified Files:
	inet.cpp inet_server.cpp 
Log Message:
Changes to make fb2 compile super version for linux


Index: inet.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/remote/inet.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -b -U3 -r1.13 -r1.14
--- inet.cpp	29 Jun 2002 08:48:31 -0000	1.13
+++ inet.cpp	29 Jul 2002 15:37:55 -0000	1.14
@@ -266,7 +266,7 @@
 
 
 #ifdef SET_TCP_NO_DELAY
-USHORT INET_no_nagle;
+SLONG INET_no_nagle;
 
 static struct ipccfg INET_tcp_delay[] =
 {

Index: inet_server.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/remote/inet_server.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -U3 -r1.5 -r1.6
--- inet_server.cpp	29 Jun 2002 08:48:31 -0000	1.5
+++ inet_server.cpp	29 Jul 2002 15:37:55 -0000	1.6
@@ -270,7 +270,7 @@
 					break;
 #endif /* SUPERSERVER */
 
-				case 'H':
+				case 'E':
 					if (ISC_get_prefix(p) == -1)
 						ib_printf("Invalid argument Ignored\n");
 					else
@@ -283,6 +283,32 @@
 					sprintf(protocol, "/%s", *argv++);
 					break;
 
+                case 'H':
+				case '?':
+					ib_printf("Firebird TCP/IP server options are:\n");
+					ib_printf("  -d           : debug on\n");
+                   
+#ifdef SUPERSERVER
+                    // These options only applicable to super server
+					ib_printf("  -m           : multiclient - on\n");
+					ib_printf("  -s           : standalone - true\n");
+					ib_printf("  -i           : standalone - false\n");
+
+					ib_printf("  -t           : multithread - true  (non pc only)\n");
+					ib_printf("  -u           : multithread - false (pc only)\n");
+					ib_printf("  -t           : multithread (non pc only\n");
+#endif
+
+					ib_printf("  -p<protocol> : specify protocol\n");
+					ib_printf("  -h|? : print this help\n");
+                    ib_printf("\n");
+                    ib_printf("  (The following -e options used to be -h options)\n");
+					ib_printf("  -e<firebird_root_dir>   : set firebird_root path\n");            
+					ib_printf("  -el<firebird_lock_dir>   : set runtime firebird_lock dir\n");            
+					ib_printf("  -em<firebird_msg_dir>   : set firebird_msg dir path\n");            
+					ib_printf("  -z   : print version\n");            
+
+					exit(FINI_OK);
 				case 'Z':
 					ib_printf("Firebird TCP/IP server version %s\n",
 							  GDS_VERSION);
@@ -322,6 +348,10 @@
 	if (standalone) {
 		if (multi_client) {
 #ifdef SUPERSERVER
+
+            // Remove restriction on username, for DEV builds
+            // restrict only for production builds.  MOD 21-July-2002
+#ifndef DEV_BUILD
 			TEXT user_name[256];	/* holds the user name */
 			/* check user id */
 			ISC_get_user(user_name, NULL, NULL, NULL, NULL, NULL, NULL);
@@ -337,6 +367,7 @@
 						   INTERBASE_USER_NAME, INTERBASE_USER_SHORT);
 				exit(STARTUP_ERROR);
 			}
+#endif
 #else
 			if (setreuid(0, 0) < 0)
 				ib_printf("Inet_server: couldn't set uid to superuser.\n");