diff --git a/auth_token/server/AuthTokenSvc/README b/auth_token/server/AuthTokenSvc/README
index 2fd7774d..b3b564c9 100644
--- a/auth_token/server/AuthTokenSvc/README
+++ b/auth_token/server/AuthTokenSvc/README
@@ -64,10 +64,10 @@ Thhe following is an example svc.settings file:
-720
-10
-/home/jluciani/jakarta-tomcat-5.0.28/webapps/CasaAuthTokenSvc/WEB-INF/conf/iaRealms.xml
-o=novell
+ 43200
+ 10
+ /home/jluciani/jakarta-tomcat-5.0.28/webapps/CasaAuthTokenSvc/WEB-INF/conf/iaRealms.xml
+ o=novell
Note the following about the sample svc.settings file:
@@ -77,7 +77,7 @@ Note the following about the sample svc.settings file:
- The SessionTokenLifetime setting specifies the number of seconds for which a
session token is good for after being issued. The default value for this setting
- is 360 seconds. Note that a larger value reduces overhead.
+ is 43200 seconds. Note that a larger value reduces overhead.
- The LifetimeShorter setting specifies the number of seconds that should be substracted
from the SessionTokenLifetime when calculating the number of seconds that clients are
@@ -122,16 +122,16 @@ The following is an example auth.policy file:
-
-CorpTree
-Krb5Authenticate
-host@tokenserver.company.novell.com
-
-
-CorpTree
-PwdAuthenticate
-
-
+
+ CorpTree
+ Krb5Authenticate
+ host@tokenserver.company.novell.com
+
+
+ CorpTree
+ PwdAuthenticate
+
+
Note the following about the sample auth.policy file:
@@ -165,9 +165,9 @@ The following is an example authtoken.settings file:
-720
-10
-CasaIdentityToken
+ 3600
+ 10
+ CasaIdentityToken
Note the following about the sample authtoken.settings file:
@@ -177,7 +177,7 @@ Note the following about the sample authtoken.settings file:
its default value is utilized.
- The TokenLifetime setting specifies the number of seconds for which a token is good
- for after being issued. The default value for this setting is 360 seconds. Note that
+ for after being issued. The default value for this setting is 3600 seconds. Note that
a larger value reduces overhead, but it also gives more time for an intruder to
utilize the token if it becomes compromized.
@@ -196,9 +196,9 @@ The following is an example identoken.settings file:
-sn,groupMembership,guid
-false
-Base64 encoded certificate
+ sn,groupMembership,guid
+ false
+ Base64 encoded certificate
Note the following about the sample identoken.settings file:
@@ -251,9 +251,9 @@ mechanism:
-com.novell.casa.authtoksvc.Krb5Authenticate
-WEB-INF/classes
-host@tokenserver.company.novell.com
+ com.novell.casa.authtoksvc.Krb5Authenticate
+ WEB-INF/classes
+ host@authtokenserver.company.com
The base AuthTokenSvc package contains two authentication mechanisms, these are
diff --git a/auth_token/server/AuthTokenSvc/authtoken.settings b/auth_token/server/AuthTokenSvc/authtoken.settings
index 4f10c209..75f4b75c 100644
--- a/auth_token/server/AuthTokenSvc/authtoken.settings
+++ b/auth_token/server/AuthTokenSvc/authtoken.settings
@@ -1,4 +1,4 @@
-3600
+ 3600
diff --git a/auth_token/server/AuthTokenSvc/identoken.settings b/auth_token/server/AuthTokenSvc/identoken.settings
index 20209b9c..ac54afb5 100644
--- a/auth_token/server/AuthTokenSvc/identoken.settings
+++ b/auth_token/server/AuthTokenSvc/identoken.settings
@@ -1,6 +1,6 @@
-false
-sn
+ false
+ sn
diff --git a/auth_token/server/AuthTokenSvc/sampleConf/auth.policy b/auth_token/server/AuthTokenSvc/sampleConf/auth.policy
index fb0341f9..d688b944 100644
--- a/auth_token/server/AuthTokenSvc/sampleConf/auth.policy
+++ b/auth_token/server/AuthTokenSvc/sampleConf/auth.policy
@@ -1,13 +1,13 @@
-
-CorpTree
-Krb5Authenticate
-host@tokenserver.company.novell.com
-
-
-CorpTree
-PwdAuthenticate
-
-
+
+ CorpTree
+ Krb5Authenticate
+ host@authtokenserver.company.com
+
+
+ CorpTree
+ PwdAuthenticate
+
+
diff --git a/auth_token/server/AuthTokenSvc/sampleConf/auth_mechanisms/Krb5Authenticate/mechanism.settings b/auth_token/server/AuthTokenSvc/sampleConf/auth_mechanisms/Krb5Authenticate/mechanism.settings
index fadbab68..56110b52 100644
--- a/auth_token/server/AuthTokenSvc/sampleConf/auth_mechanisms/Krb5Authenticate/mechanism.settings
+++ b/auth_token/server/AuthTokenSvc/sampleConf/auth_mechanisms/Krb5Authenticate/mechanism.settings
@@ -1,6 +1,6 @@
-com.novell.casa.authtoksvc.Krb5Authenticate
-WEB-INF/classes
-host@tokenserver.company.novell.com
+ com.novell.casa.authtoksvc.Krb5Authenticate
+ WEB-INF/classes
+ host@tokenserver.company.novell.com
diff --git a/auth_token/server/AuthTokenSvc/sampleConf/auth_mechanisms/PwdAuthenticate/mechanism.settings b/auth_token/server/AuthTokenSvc/sampleConf/auth_mechanisms/PwdAuthenticate/mechanism.settings
index d3c8aa83..2a5f60f0 100644
--- a/auth_token/server/AuthTokenSvc/sampleConf/auth_mechanisms/PwdAuthenticate/mechanism.settings
+++ b/auth_token/server/AuthTokenSvc/sampleConf/auth_mechanisms/PwdAuthenticate/mechanism.settings
@@ -1,5 +1,5 @@
-com.novell.casa.authtoksvc.PwdAuthenticate
-WEB-INF/classes
+ com.novell.casa.authtoksvc.PwdAuthenticate
+ WEB-INF/classes
diff --git a/auth_token/server/AuthTokenSvc/sampleConf/authtoken.settings b/auth_token/server/AuthTokenSvc/sampleConf/authtoken.settings
index 47017fbf..75f4b75c 100644
--- a/auth_token/server/AuthTokenSvc/sampleConf/authtoken.settings
+++ b/auth_token/server/AuthTokenSvc/sampleConf/authtoken.settings
@@ -1,4 +1,4 @@
-720
+ 3600
diff --git a/auth_token/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/auth.policy b/auth_token/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/auth.policy
index fb0341f9..0f7de72b 100644
--- a/auth_token/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/auth.policy
+++ b/auth_token/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/auth.policy
@@ -1,13 +1,13 @@
-
-CorpTree
-Krb5Authenticate
-host@tokenserver.company.novell.com
-
-
-CorpTree
-PwdAuthenticate
-
-
+
+ CorpTree
+ Krb5Authenticate
+ host@tokenserver.company.novell.com
+
+
+ CorpTree
+ PwdAuthenticate
+
+
diff --git a/auth_token/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/authtoken.settings b/auth_token/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/authtoken.settings
index 47017fbf..75f4b75c 100644
--- a/auth_token/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/authtoken.settings
+++ b/auth_token/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/authtoken.settings
@@ -1,4 +1,4 @@
-720
+ 3600
diff --git a/auth_token/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/identoken.settings b/auth_token/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/identoken.settings
index 8fa462c4..b1d40db3 100644
--- a/auth_token/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/identoken.settings
+++ b/auth_token/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/identoken.settings
@@ -1,6 +1,6 @@
-false
-sn,groupMembership
+ false
+ sn,groupMembership
diff --git a/auth_token/server/AuthTokenSvc/sampleConf/iaRealms.xml b/auth_token/server/AuthTokenSvc/sampleConf/iaRealms.xml
index ae621a18..bc49eb2b 100644
--- a/auth_token/server/AuthTokenSvc/sampleConf/iaRealms.xml
+++ b/auth_token/server/AuthTokenSvc/sampleConf/iaRealms.xml
@@ -1,21 +1,25 @@
-
-
+
-
- ldap://dirserver.companyname.com:389
-
- simple
- cn=admin,o=companyname
- password
-
-
-
-
-
- CorpTree
-
-
-
+ id="jctree">
+
+ ldap://dirserver.companyname.com:389
+
+ simple
+ cn=admin,o=companyname
+ password
+
+
+
+
+
+ CorpTree
+
+
+
+
diff --git a/auth_token/server/AuthTokenSvc/sampleConf/identoken.settings b/auth_token/server/AuthTokenSvc/sampleConf/identoken.settings
index 20209b9c..ac54afb5 100644
--- a/auth_token/server/AuthTokenSvc/sampleConf/identoken.settings
+++ b/auth_token/server/AuthTokenSvc/sampleConf/identoken.settings
@@ -1,6 +1,6 @@
-false
-sn
+ false
+ sn
diff --git a/auth_token/server/AuthTokenSvc/sampleConf/svc.settings b/auth_token/server/AuthTokenSvc/sampleConf/svc.settings
index 8e892e41..c1465cc0 100644
--- a/auth_token/server/AuthTokenSvc/sampleConf/svc.settings
+++ b/auth_token/server/AuthTokenSvc/sampleConf/svc.settings
@@ -1,5 +1,5 @@
-/home/jluciani/jakarta-tomcat-5.0.28/webapps/CasaAuthTokenSvc/WEB-INF/conf/iaRealms.xml
-o=novell
+ /home/jluciani/jakarta-tomcat-5.0.28/webapps/CasaAuthTokenSvc/WEB-INF/conf/iaRealms.xml
+ 43200
diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/CasaIdentityToken.java b/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/CasaIdentityToken.java
index 75996278..311884e7 100644
--- a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/CasaIdentityToken.java
+++ b/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/CasaIdentityToken.java
@@ -493,12 +493,9 @@ public class CasaIdentityToken implements IdentityToken
else
{
// The data is base64 encoded
- System.err.println("CasaIdentityToken SAXHandler.characters()- encodedChars = " + length);
char[] encodedChars = new char[length];
System.arraycopy(ch, start, encodedChars, 0, length);
- System.err.println("CasaIdentityToken SAXHandler.characters()- encodedChars copied to new array");
m_casaIdentToken.m_attributes.put(m_currAttribute, Base64Coder.decode(encodedChars));
- System.err.println("CasaIdentityToken SAXHandler.characters()- encodedChars decoded");
}
// Advance to the next state
diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Krb5_mechanism.settings b/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Krb5_mechanism.settings
index 900f0603..6aa16259 100644
--- a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Krb5_mechanism.settings
+++ b/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Krb5_mechanism.settings
@@ -1,7 +1,7 @@
-This is the authentication mechanism for the Krb5Authenticate scheme. The Krb5Authenticate scheme authenticates entities using Kerberos-V tokens.
-com.novell.casa.authtoksvc.Krb5Authenticate
-WEB-INF/classes
-Specify the service's kerberos principal name
+ This is the authentication mechanism for the Krb5Authenticate scheme. The Krb5Authenticate scheme authenticates entities using Kerberos-V tokens.
+ com.novell.casa.authtoksvc.Krb5Authenticate
+ WEB-INF/classes
+ Specify the service's kerberos principal name
diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Pwd_mechanism.settings b/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Pwd_mechanism.settings
index 147ed6f6..5532e361 100644
--- a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Pwd_mechanism.settings
+++ b/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/Pwd_mechanism.settings
@@ -1,6 +1,6 @@
-This is the authentication mechanism for the PwdAuthenticate scheme. The PwdAuthenticate scheme authenticates entities using username/password tokens.
-com.novell.casa.authtoksvc.PwdAuthenticate
-WEB-INF/classes
+ This is the authentication mechanism for the PwdAuthenticate scheme. The PwdAuthenticate scheme authenticates entities using username/password tokens.
+ com.novell.casa.authtoksvc.PwdAuthenticate
+ WEB-INF/classes
diff --git a/auth_token/server/AuthTokenSvc/svc.settings b/auth_token/server/AuthTokenSvc/svc.settings
index bfa391e9..f028fef5 100644
--- a/auth_token/server/AuthTokenSvc/svc.settings
+++ b/auth_token/server/AuthTokenSvc/svc.settings
@@ -1,5 +1,5 @@
-Replace with path to the Identity Abstraction Realms Configuration File.
-43200
+ Replace with path to the Identity Abstraction Realms Configuration File.
+ 43200