Merge branch 'upstream' into debian

Conflicts:
	shibsp/paths.h

diff --cc configs/Makefile.am
Simple merge

diff --cc configs/Makefile.in
Simple merge

diff --cc configs/keygen.sh
Simple merge

diff --cc configs/shibd-debian.in
Simple merge

diff --cc schemas/Makefile.am
Simple merge

diff --cc shibsp/paths.h
index 6ad2036,2f9ac99..c319ac6
--- 1/shibsp/paths.h
--- 2/shibsp/paths.h
+++ b/shibsp/paths.h
@@@ -1,53 -1,53 +1,53 @@@
- /*\r
-  *  Copyright 2001-2009 Internet2\r
-  * \r
-  * Licensed under the Apache License, Version 2.0 (the "License");\r
-  * you may not use this file except in compliance with the License.\r
-  * You may obtain a copy of the License at\r
-  *\r
-  *     http://www.apache.org/licenses/LICENSE-2.0\r
-  *\r
-  * Unless required by applicable law or agreed to in writing, software\r
-  * distributed under the License is distributed on an "AS IS" BASIS,\r
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-  * See the License for the specific language governing permissions and\r
-  * limitations under the License.\r
-  */\r
- \r
- /**\r
-  * @file shibsp/paths.h\r
-  * \r
-  * Default configuration paths.\r
-  */\r
- \r
- #ifndef __shibsp_paths_h__\r
- #define __shibsp_paths_h__\r
- \r
- /** Default schema catalogs. */\r
- #define SHIBSP_SCHEMAS "/usr/share/xml/xmltooling/catalog.xml:/usr/share/xml/opensaml/saml20-catalog.xml:/usr/share/xml/opensaml/saml11-catalog.xml:/usr/share/xml/shibboleth/catalog.xml"\r
- \r
- /** Default name of SP configuration file. */\r
- #define SHIBSP_CONFIG "shibboleth2.xml"\r
- \r
- /** Default name of SP console tool logging file. */\r
- #define SHIBSP_LOGGING "console.logger"\r
- \r
- /** Default prefix for installation (used to resolve relative paths). */\r
- #define SHIBSP_PREFIX  "/usr"\r
- \r
- /** Library directory for installation (used to resolve relative paths). */\r
- #define SHIBSP_LIBDIR  "/usr/lib"\r
- \r
- /** Log directory for installation (used to resolve relative paths). */\r
- #define SHIBSP_LOGDIR  "/var/log/shibboleth"\r
- \r
- /** Configuration directory for installation (used to resolve relative paths). */\r
- #define SHIBSP_CFGDIR  "/etc/shibboleth"\r
- \r
- /** Runtime state directory for installation (used to resolve relative paths). */\r
- #define SHIBSP_RUNDIR  "/var/run/shibboleth"\r
- \r
- /** XML directory for installation (used to resolve relative paths). */\r
- #define SHIBSP_XMLDIR  "/usr/share/xml/shibboleth"\r
- \r
- #endif /* __shibsp_paths_h__ */\r
+ /*
+  *  Copyright 2001-2009 Internet2
+  * 
+  * Licensed under the Apache License, Version 2.0 (the "License");
+  * you may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at
+  *
+  *     http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+ 
+ /**
+  * @file shibsp/paths.h
+  * 
+  * Default configuration paths.
+  */
+ 
+ #ifndef __shibsp_paths_h__
+ #define __shibsp_paths_h__
+ 
+ /** Default schema catalogs. */
 -#define SHIBSP_SCHEMAS "/opt/shibboleth-sp/share/xml/xmltooling/catalog.xml:/opt/shibboleth-sp/share/xml/opensaml/saml20-catalog.xml:/opt/shibboleth-sp/share/xml/opensaml/saml11-catalog.xml:/opt/shibboleth-sp/share/xml/shibboleth/catalog.xml"
++#define SHIBSP_SCHEMAS "/usr/share/xml/xmltooling/catalog.xml:/usr/share/xml/opensaml/saml20-catalog.xml:/usr/share/xml/opensaml/saml11-catalog.xml:/usr/share/xml/shibboleth/catalog.xml"
+ 
+ /** Default name of SP configuration file. */
+ #define SHIBSP_CONFIG "shibboleth2.xml"
+ 
+ /** Default name of SP console tool logging file. */
+ #define SHIBSP_LOGGING "console.logger"
+ 
+ /** Default prefix for installation (used to resolve relative paths). */
 -#define SHIBSP_PREFIX  "/opt/shibboleth-sp"
++#define SHIBSP_PREFIX  "/usr"
+ 
+ /** Library directory for installation (used to resolve relative paths). */
 -#define SHIBSP_LIBDIR  "/opt/shibboleth-sp/lib"
++#define SHIBSP_LIBDIR  "/usr/lib"
+ 
+ /** Log directory for installation (used to resolve relative paths). */
 -#define SHIBSP_LOGDIR  "/opt/shibboleth-sp/var/log"
++#define SHIBSP_LOGDIR  "/var/log/shibboleth"
+ 
+ /** Configuration directory for installation (used to resolve relative paths). */
 -#define SHIBSP_CFGDIR  "/opt/shibboleth-sp/etc"
++#define SHIBSP_CFGDIR  "/etc/shibboleth"
+ 
+ /** Runtime state directory for installation (used to resolve relative paths). */
 -#define SHIBSP_RUNDIR  "/opt/shibboleth-sp/var/run"
++#define SHIBSP_RUNDIR  "/var/run/shibboleth"
+ 
+ /** XML directory for installation (used to resolve relative paths). */
 -#define SHIBSP_XMLDIR  "/opt/shibboleth-sp/share/xml"
++#define SHIBSP_XMLDIR  "/usr/share/xml/shibboleth"
+ 
+ #endif /* __shibsp_paths_h__ */