Rework decoder handling in simple resolver, add IdP/SP names to decoder API, hook...

[shibboleth/sp.git] / shibd / shibd.cpp

diff --git a/shibd/shibd.cpp b/shibd/shibd.cpp
index 3d0632a..d7083d5 100644 (file)
--- a/shibd/shibd.cpp
+++ b/shibd/shibd.cpp
@@ -119,9 +119,9 @@ int real_main(int preinit)
             (shar_checkonly ? (SPConfig::InProcess | SPConfig::RequestMapping) : SPConfig::Logging)\r
             );\r
         if (!shar_config)\r
-            shar_config=getenv("SHIBCONFIG");\r
+            shar_config=getenv("SHIBSP_CONFIG");\r
         if (!shar_schemadir)\r
-            shar_schemadir=getenv("SHIBSCHEMAS");\r
+            shar_schemadir=getenv("SHIBSP_SCHEMAS");\r
         if (!shar_schemadir)\r
             shar_schemadir=SHIBSP_SCHEMAS;\r
         if (!shar_config)\r
@@ -262,9 +262,9 @@ int main(int argc, char *argv[])
         usage(argv[0]);\r
 \r
     if (!shar_config)\r
-        shar_config=getenv("SHIBCONFIG");\r
+        shar_config=getenv("SHIBSP_CONFIG");\r
     if (!shar_schemadir)\r
-        shar_schemadir=getenv("SHIBSCHEMAS");\r
+        shar_schemadir=getenv("SHIBSP_SCHEMAS");\r
     if (!shar_schemadir)\r
         shar_schemadir=SHIBSP_SCHEMAS;\r
     if (!shar_config)\r