From f84b5859ba9bbeff2ca3f9ed9dcafc35859be1c6 Mon Sep 17 00:00:00 2001
From: cantor <cantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Date: Fri, 8 Jun 2007 22:02:17 +0000
Subject: [PATCH] On second thought...and rename catalog parameters.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@2296 cb58f699-b61c-0410-a6fe-9272a202ed29
---
 shibd/shibd.cpp       | 6 +++---
 shibd/shibd_win32.cpp | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/shibd/shibd.cpp b/shibd/shibd.cpp
index 973645a..bf8a95f 100644
--- a/shibd/shibd.cpp
+++ b/shibd/shibd.cpp
@@ -218,7 +218,7 @@ static void usage(char* whoami)
 {
     fprintf(stderr, "usage: %s [-fcdt]\n", whoami);
     fprintf(stderr, "  -c\tconfig file to use.\n");
-    fprintf(stderr, "  -d\tschema directory to use.\n");
+    fprintf(stderr, "  -x\tXML schema catalogs to use.\n");
     fprintf(stderr, "  -t\tcheck configuration file for problems.\n");
     fprintf(stderr, "  -f\tforce removal of listener socket.\n");
     fprintf(stderr, "  -p\tpid file to use.\n");
@@ -230,12 +230,12 @@ static int parse_args(int argc, char* argv[])
 {
     int opt;
 
-    while ((opt = getopt(argc, argv, "c:d:p:fth")) > 0) {
+    while ((opt = getopt(argc, argv, "c:x:p:fth")) > 0) {
         switch (opt) {
             case 'c':
                 shar_config=optarg;
                 break;
-            case 'd':
+            case 'x':
                 shar_schemadir=optarg;
                 break;
             case 'f':
diff --git a/shibd/shibd_win32.cpp b/shibd/shibd_win32.cpp
index de27057..20eb442 100644
--- a/shibd/shibd_win32.cpp
+++ b/shibd/shibd_win32.cpp
@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
             if (argc > ++i)
                 shar_config = argv[i++];
         }
-        else if (_stricmp( "schemadir", argv[i]+1) == 0)
+        else if (_stricmp( "catalogs", argv[i]+1) == 0)
         {
             if (argc > ++i)
                 shar_schemadir = argv[i++];
@@ -153,7 +153,7 @@ int main(int argc, char *argv[])
         printf("%s -console          to run as a console app for debugging\n", argv[0]);
         printf("%s -check            to run as a console app and check configuration\n", argv[0]);
         printf("\t-config <file> to specify the config file to use\n");
-        printf("\t-schemadir <dir> to specify where schemas are\n");
+        printf("\t-catalogs <dir> to specify schema catalogs\n");
         printf("\nService starting.\nThis may take several seconds. Please wait.\n" );
 
     SERVICE_TABLE_ENTRY dispatchTable[] =
@@ -354,7 +354,7 @@ void CmdInstallService(LPCSTR name)
     }
     
     sprintf(dispName,"Shibboleth %s Daemon (%s)",PACKAGE_VERSION,name);
-    sprintf(realName,"shibd2_%s",name);
+    sprintf(realName,"shibd_%s",name);
     if (shar_config && shar_schemadir)
         sprintf(cmd,"%s -config %s -schemadir %s",szPath,shar_config,shar_schemadir);
     else if (shar_config)
@@ -410,7 +410,7 @@ void CmdRemoveService(LPCSTR name)
     SC_HANDLE   schSCManager;
     char        realName[512];
 
-    sprintf(realName,"shibd2_%s",name);
+    sprintf(realName,"shibd_%s",name);
 
     schSCManager = OpenSCManager(
                         NULL,                   // machine (NULL == local)
-- 
2.1.4