On second thought...and rename catalog parameters.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@2296 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/shibd/shibd.cpp b/shibd/shibd.cpp
index 973645a..bf8a95f 100644 (file)
--- a/shibd/shibd.cpp
+++ b/shibd/shibd.cpp
@@ -218,7 +218,7 @@ static void usage(char* whoami)
 {\r
     fprintf(stderr, "usage: %s [-fcdt]\n", whoami);\r
     fprintf(stderr, "  -c\tconfig file to use.\n");\r
-    fprintf(stderr, "  -d\tschema directory to use.\n");\r
+    fprintf(stderr, "  -x\tXML schema catalogs to use.\n");\r
     fprintf(stderr, "  -t\tcheck configuration file for problems.\n");\r
     fprintf(stderr, "  -f\tforce removal of listener socket.\n");\r
     fprintf(stderr, "  -p\tpid file to use.\n");\r
@@ -230,12 +230,12 @@ static int parse_args(int argc, char* argv[])
 {\r
     int opt;\r
 \r
-    while ((opt = getopt(argc, argv, "c:d:p:fth")) > 0) {\r
+    while ((opt = getopt(argc, argv, "c:x:p:fth")) > 0) {\r
         switch (opt) {\r
             case 'c':\r
                 shar_config=optarg;\r
                 break;\r
-            case 'd':\r
+            case 'x':\r
                 shar_schemadir=optarg;\r
                 break;\r
             case 'f':\r

diff --git a/shibd/shibd_win32.cpp b/shibd/shibd_win32.cpp
index de27057..20eb442 100644 (file)
--- a/shibd/shibd_win32.cpp
+++ b/shibd/shibd_win32.cpp
@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
             if (argc > ++i)\r
                 shar_config = argv[i++];\r
         }\r
-        else if (_stricmp( "schemadir", argv[i]+1) == 0)\r
+        else if (_stricmp( "catalogs", argv[i]+1) == 0)\r
         {\r
             if (argc > ++i)\r
                 shar_schemadir = argv[i++];\r
@@ -153,7 +153,7 @@ int main(int argc, char *argv[])
         printf("%s -console          to run as a console app for debugging\n", argv[0]);\r
         printf("%s -check            to run as a console app and check configuration\n", argv[0]);\r
         printf("\t-config <file> to specify the config file to use\n");\r
-        printf("\t-schemadir <dir> to specify where schemas are\n");\r
+        printf("\t-catalogs <dir> to specify schema catalogs\n");\r
         printf("\nService starting.\nThis may take several seconds. Please wait.\n" );\r
 \r
     SERVICE_TABLE_ENTRY dispatchTable[] =\r
@@ -354,7 +354,7 @@ void CmdInstallService(LPCSTR name)
     }\r
     \r
     sprintf(dispName,"Shibboleth %s Daemon (%s)",PACKAGE_VERSION,name);\r
-    sprintf(realName,"shibd2_%s",name);\r
+    sprintf(realName,"shibd_%s",name);\r
     if (shar_config && shar_schemadir)\r
         sprintf(cmd,"%s -config %s -schemadir %s",szPath,shar_config,shar_schemadir);\r
     else if (shar_config)\r
@@ -410,7 +410,7 @@ void CmdRemoveService(LPCSTR name)
     SC_HANDLE   schSCManager;\r
     char        realName[512];\r
 \r
-    sprintf(realName,"shibd2_%s",name);\r
+    sprintf(realName,"shibd_%s",name);\r
 \r
     schSCManager = OpenSCManager(\r
                         NULL,                   // machine (NULL == local)\r