geos_one/CASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More changes as a result of project code review.

Browse Source
This commit is contained in:
Juan Carlos Luciani
2007-01-09 05:05:37 +00:00
parent 2f30ab05db
commit 0f58c82603
5 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CASA-auth-token/server-java/Svc/linux/envvars
View File

@@ -14,6 +14,7 @@ fi
CATALINA_BASE="/srv/www/casaats"
CATALINA_HOME="/usr/share/tomcat5"
CATALINA_PID="/var/lib/CASA/authtoken/svc/casaatsd.pid"
JAVA_HOME="/usr/$LIB/jvm/jre-1.5.0"
JAVA_OPTS="-Dcom.novell.casa.authtoksvc.config=/etc/CASA/authtoken/svc"
export CATALINA_BASE CATALINA_HOME JAVA_HOME JAVA_OPTS

14
CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/EnabledSvcsConfig.java
View File

@@ -34,6 +34,7 @@ import java.util.*;
* the services enabled to use Authentication Tokens.
*
*/
@SuppressWarnings({"ALL"})
public final class EnabledSvcsConfig
{
private static final String m_authPolicyFileName = "auth.policy";
@@ -172,7 +173,7 @@ public final class EnabledSvcsConfig
// Now go through the configured hosts. Note that the services config folder
// contains folders for each host for which there are enabled services. The folders
// in the services config folder must match the DNS name of the hosts where
// the enabled services reside.
// the enabled services reside except in the localhost case.
File servicesConfigFolder = new File(svcConfigPath, "enabled_services");
try
{
@@ -296,7 +297,7 @@ public final class EnabledSvcsConfig
}
// Add this hosts enabled services configuration map to the hosts map
m_hostsMap.put(servicesConfigFolderObjs[i], enabledSvcsConfigMap);
m_hostsMap.put(servicesConfigFolderObjs[i].toUpperCase(), enabledSvcsConfigMap);
}
}
else
@@ -372,8 +373,7 @@ public final class EnabledSvcsConfig
byte[] authPolicyData = null;
// First try to obtain the Map of enabled services for the host
// tbd - Should we make this case insensitive?
Map<Object, SvcConfigEntry> enabledSvcsConfigMap = m_hostsMap.get(hostName);
Map<Object, SvcConfigEntry> enabledSvcsConfigMap = m_hostsMap.get(hostName.toUpperCase());
if (enabledSvcsConfigMap != null)
{
// Retrieve SvcConfigEntry for the service from the map for the host
@@ -409,8 +409,7 @@ public final class EnabledSvcsConfig
AuthTokenConfig authTokenConfig = null;
// First try to obtain the Map of enabled services for the host
// tbd - Should we make this case insensitive?
Map<Object, SvcConfigEntry> enabledSvcsConfigMap = m_hostsMap.get(hostName);
Map<Object, SvcConfigEntry> enabledSvcsConfigMap = m_hostsMap.get(hostName.toUpperCase());
if (enabledSvcsConfigMap != null)
{
// Retrieve SvcConfigEntry for the service from the map for the host
@@ -445,8 +444,7 @@ public final class EnabledSvcsConfig
IdenTokenConfig idenTokenConfig = null;
// First try to obtain the Map of enabled services for the host
// tbd - Should we make this case insensitive?
Map<Object, SvcConfigEntry> enabledSvcsConfigMap = m_hostsMap.get(hostName);
Map<Object, SvcConfigEntry> enabledSvcsConfigMap = m_hostsMap.get(hostName.toUpperCase());
if (enabledSvcsConfigMap != null)
{
// Retrieve SvcConfigEntry for the service from the map for the host