[naviserver-commits] naviserver/nsd nsmain.c,1.9,1.10

[Stephen D. <sd...@us...>]

Update of /cvsroot/naviserver/naviserver/nsd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26747/nsd

Modified Files:
	nsmain.c 
Log Message:
Don't assign chroot directory as default server name.
Simplify option parsing error messages.


Index: nsmain.c
===================================================================
RCS file: /cvsroot/naviserver/naviserver/nsd/nsmain.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** nsmain.c	16 Apr 2005 09:20:04 -0000	1.9
--- nsmain.c	30 Apr 2005 09:22:42 -0000	1.10
***************
*** 234,238 ****
                  server = argv[++optind];
              } else {
!                 UsageError("no parameter for -%c option", argv[optind][1]);
              }
              break;
--- 234,238 ----
                  server = argv[++optind];
              } else {
!                 UsageError("no parameter for -s option");
              }
              break;
***************
*** 244,248 ****
                  nsconf.config = argv[++optind];
              } else {
!                 UsageError("no parameter for -%c option", argv[optind][1]);
              }
              break;
--- 244,248 ----
                  nsconf.config = argv[++optind];
              } else {
!                 UsageError("no parameter for -t option");
              }
              break;
***************
*** 256,260 ****
              	bindargs = argv[++optind];
              } else {
!                 UsageError("no parameter for -%c option", argv[optind][1]);
              }
              break;
--- 256,260 ----
              	bindargs = argv[++optind];
              } else {
!                 UsageError("no parameter for -b option");
              }
              break;
***************
*** 263,274 ****
              	bindfile = argv[++optind];
              } else {
!                 UsageError("no parameter for -%c option", argv[optind][1]);
              }
              break;
          case 'r':
              if (optind + 1 < argc) {
!             	root = server = argv[++optind];
              } else {
!                 UsageError("no parameter for -%c option", argv[optind][optind]);
              }
              break;
--- 263,274 ----
              	bindfile = argv[++optind];
              } else {
!                 UsageError("no parameter for -B option");
              }
              break;
          case 'r':
              if (optind + 1 < argc) {
!             	root = argv[++optind];
              } else {
!                 UsageError("no parameter for -r option");
              }
              break;
***************
*** 280,284 ****
                  garg = argv[++optind];
              } else {
!                 UsageError("no parameter for -%c option", argv[optind][1]);
              }
              break;
--- 280,284 ----
                  garg = argv[++optind];
              } else {
!                 UsageError("no parameter for -g option");
              }
              break;
***************
*** 287,291 ****
                  uarg = argv[++optind];
              } else {
!                 UsageError("no parameter for -%c option", argv[optind][1]);
              }
              break;
--- 287,291 ----
                  uarg = argv[++optind];
              } else {
!                 UsageError("no parameter for -u option");
              }
              break;