[cpp-sp COMMIT] in /branches/REL_2: .gitignore apache/mod_shib.cpp shibsp/SPConfig.cpp shibsp/base.h shibsp/impl/XMLS...

[noreply at shibboleth.net]

Author: scantor
Date: Fri May  4 21:50:52 2012
New Revision: 3643

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3643&view=rev
Log:
Rework Apache and logging init/term to fix native.log perms

Modified:
    branches/REL_2/.gitignore
    branches/REL_2/apache/mod_shib.cpp
    branches/REL_2/shibsp/SPConfig.cpp
    branches/REL_2/shibsp/base.h
    branches/REL_2/shibsp/impl/XMLServiceProvider.cpp
    branches/REL_2/shibsp/paths.h.in

Modified: branches/REL_2/.gitignore
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/.gitignore?rev=3643&r1=3642&r2=3643&view=diff
==============================================================================
--- branches/REL_2/.gitignore (original)
+++ branches/REL_2/.gitignore Fri May  4 21:50:52 2012
@@ -45,14 +45,13 @@
 /adfs/.deps
 /adfs/Makefile.in
 /adfs/Makefile
+/adfs/.libs
 
 # /apache/
 /apache/Makefile.in
 /apache/Makefile
 /apache/.libs
 /apache/.deps
-/apache/*.lo
-/apache/*.la
 /apache/Debug
 /apache/*.plg
 /apache/Release
@@ -75,14 +74,13 @@
 /configs/apache2.config
 /configs/apache22.config
 /configs/apache24.config
-/configs/shar.logger
-/configs/shire.logger
-/configs/shibboleth.ini
-/configs/shibboleth.xml
-/configs/creds.xml
-/configs/AAP.xml
-/configs/IQ-sites.xml
-/configs/IQ-trust.xml
+/configs/native.logger
+/configs/shibd.logger
+/configs/shibboleth2.xml
+/configs/shibd-redhat
+/configs/shibd-debian
+/configs/shibd-suse
+/configs/shibd-osx.plist
 
 # /doc/
 /doc/Makefile
@@ -90,6 +88,8 @@
 
 # /fastcgi/
 /fastcgi/*.user
+/fastcgi/shibauthorizer
+/fastcgi/shibresponder
 /fastcgi/shibauthorizer-Release
 /fastcgi/shibresponder-Release
 /fastcgi/shibresponder-Debug
@@ -98,6 +98,7 @@
 /fastcgi/.deps
 /fastcgi/Makefile.in
 /fastcgi/Makefile
+/fastcgi/.libs
 
 # /isapi_shib/
 /isapi_shib/*.plg
@@ -123,6 +124,7 @@
 /memcache-store/Makefile.in
 /memcache-store/Makefile
 /memcache-store/x64
+/memcache-store/.libs
 
 # /msi/
 /msi/*.msi
@@ -149,6 +151,7 @@
 /odbc-store/.deps
 /odbc-store/Makefile.in
 /odbc-store/Makefile
+/odbc-store/.libs
 
 # /plugins/
 /plugins/Makefile
@@ -158,6 +161,7 @@
 /plugins/Release
 /plugins/x64
 /plugins/.deps
+/plugins/.libs
 
 # /schemas/
 /schemas/aclocal.m4
@@ -174,6 +178,7 @@
 /schemas/depcomp
 /schemas/configure
 /schemas/libtool
+/schemas/catalog.xml
 
 # /selinux/
 /selinux/Makefile.in
@@ -210,6 +215,9 @@
 /shibsp/Makefile
 /shibsp/paths.h
 /shibsp/x64
+/shibsp/.libs
+/shibsp/stamp*
+/shibsp/config_pub.h
 
 # /util/
 /util/Debug
@@ -219,3 +227,6 @@
 /util/.deps
 /util/Makefile.in
 /util/Makefile
+/util/.libs
+/util/resolvertest
+/util/mdquery

Modified: branches/REL_2/apache/mod_shib.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/apache/mod_shib.cpp?rev=3643&r1=3642&r2=3643&view=diff
==============================================================================
--- branches/REL_2/apache/mod_shib.cpp (original)
+++ branches/REL_2/apache/mod_shib.cpp Fri May  4 21:50:52 2012
@@ -308,10 +308,10 @@
 // create a request record
 static shib_request_config* init_request_config(request_rec *r)
 {
+    ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, SH_AP_R(r), "init_request_config");
     shib_request_config* rc = (shib_request_config*)ap_pcalloc(r->pool,sizeof(shib_request_config));
     memset(rc, 0, sizeof(shib_request_config));
     ap_set_module_config(r->request_config, &mod_shib, rc);
-    ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, SH_AP_R(r), "shib_init_rc");
     return rc;
 }
 
@@ -695,7 +695,7 @@
     if (((shib_dir_config*)ap_get_module_config(r->per_dir_config, &mod_shib))->bOff == 1)
         return DECLINED;
 
-    ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, SH_AP_R(r), "shib_check_user(%d): ENTER", (int)getpid());
+    ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, SH_AP_R(r), "shib_check_user entered in pid (%d)", (int)getpid());
 
     string threadid("[");
     threadid += lexical_cast<string>(getpid()) + "] shib_check_user";
@@ -722,7 +722,7 @@
         pair<bool,long> res = psta->getServiceProvider().doAuthentication(*psta, true);
         apr_pool_userdata_setn((const void*)42,g_UserDataKey,nullptr,r->pool);
         // If directed, install a spoof key to recognize when we've already cleared headers.
-        if (!g_spoofKey.empty() && (((shib_dir_config*)ap_get_module_config(r->per_dir_config, &mod_shib))->bUseHeaders==1))
+        if (!g_spoofKey.empty() && (((shib_dir_config*)ap_get_module_config(r->per_dir_config, &mod_shib))->bUseHeaders == 1))
             ap_table_set(r->headers_in, "Shib-Spoof-Check", g_spoofKey.c_str());
         if (res.first) {
 #ifdef SHIB_APACHE_24
@@ -784,12 +784,12 @@
     void* data;
     apr_pool_userdata_get(&data,g_UserDataKey,r->pool);
     if (data==(const void*)42) {
-        ap_log_rerror(APLOG_MARK,APLOG_DEBUG|APLOG_NOERRNO,SH_AP_R(r),"shib_handler skipped since check_user ran");
+        ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, SH_AP_R(r), "shib_handler skipped since check_user ran");
         return DECLINED;
     }
 #endif
 

[... 406 lines stripped ...]