multidomain is required. no use for a static list of allowed services. removed...

git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1567 9efc2488-bf62-4759-914b-345cdb29e865

diff --git a/examples/opensrf_core.xml.example b/examples/opensrf_core.xml.example
index 4284ae6..3e307d3 100644 (file)
--- a/examples/opensrf_core.xml.example
+++ b/examples/opensrf_core.xml.example
@@ -86,18 +86,7 @@ vim:et:ts=2:sw=2:
     <!--  the routers's name on the network -->
     <router_name>router</router_name>
 
-    <!--
-    These are the services that the gateway will serve. 
-    Any other requests will receive an HTTP_NOT_FOUND (404) 
-    DO NOT put any services here that you don't want the internet to have access to
-    This section will be soon deprecated for multi-domain mode... 
-    -->
-    <services>
-      <service>opensrf.math</service>
-    </services>
-
     <!-- jabber login info -->
-
     <!-- The gateway connects to the public domain -->
     <domain>public.localhost</domain>
     <username>opensrf</username>

diff --git a/src/gateway/osrf_json_gateway.c b/src/gateway/osrf_json_gateway.c
index 5bb3f5e..3308028 100644 (file)
--- a/src/gateway/osrf_json_gateway.c
+++ b/src/gateway/osrf_json_gateway.c
@@ -29,7 +29,6 @@ char* osrf_json_default_locale = "en-US";
 char* osrf_json_gateway_config_file = NULL;
 int bootstrapped = 0;
 int numserved = 0;
-osrfStringArray* allowedServices = NULL;
 
 static const char* osrf_json_gateway_set_default_locale(cmd_parms *parms, void *config, const char *arg) {
        if (arg)
@@ -87,15 +86,7 @@ static void osrf_json_gateway_child_init(apr_pool_t *p, server_rec *s) {
        }
 
        bootstrapped = 1;
-       allowedServices = osrfNewStringArray(8);
        osrfLogInfo(OSRF_LOG_MARK, "Bootstrapping gateway child for requests");
-       osrfConfigGetValueList( NULL, allowedServices, "/services/service" );
-
-       int i;
-       for( i = 0; i < allowedServices->size; i++ ) {
-               ap_log_error( APLOG_MARK, APLOG_DEBUG, 0, s, 
-                       "allowed service: %s\n", osrfStringArrayGetString(allowedServices, i));
-       }
 
     // when this pool is cleaned up, it means the child 
     // process is going away.  register some cleanup code
@@ -223,8 +214,7 @@ static int osrf_json_gateway_method_handler (request_rec *r) {
        /* ----------------------------------------------------------------- */
 
 
-       if(!(service && method) || 
-               !osrfStringArrayContains(allowedServices, service)) {
+       if(!(service && method)) {
 
                osrfLogError(OSRF_LOG_MARK, 
                        "Service [%s] not found or not allowed", service);