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

Removed work-arounds from SPEC files and BasicATSSetup script.

Browse Source
This commit is contained in:
Juan Carlos Luciani
2007-05-10 16:57:58 +00:00
parent ad9e7958b5
commit 44e38c771d
4 changed files with 11 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
CASA-auth-token/server-java/Svc/linux/CasaBasicATSSetup.sh
View File

@@ -64,44 +64,6 @@ function display_usage
} }
function java_1_5_oes_workaround
{
#
# Notice, this function is here temporarily to support
# OES before it starts dealing with IBM's 1.5 JVM.
#
# Determine the file and folder names
CERT_FOLDER=/etc/opt/novell/certs
ALT_CERT_FOLDER=/etc/opt/novell
CERT_FILE_NAME=SSCert.der
JAVA_KEY_STORE_PATH=$JAVA_HOME/lib/security/cacerts
# Determine the path to the eDir cert file
if [ ! -f $CERT_FOLDER/$CERT_FILE_NAME ]; then
if [ ! -f $ALT_CERT_FOLDER/$CERT_FILE_NAME ]; then
echo "eDir CA Cert not found!"
echo "Verify that Java_1_5 will be able to accept certificates from configured LDAP server."
return 2
else
CERT_FILE_PATH=$ALT_CERT_FOLDER/$CERT_FILE_NAME
fi
else
CERT_FILE_PATH=$CERT_FOLDER/$CERT_FILE_NAME
fi
# Now import the cert into java's keystore
$JAVA_HOME/bin/keytool -import -noprompt\
-trustcacerts\
-alias edir_root_ca\
-keystore $JAVA_KEY_STORE_PATH\
-storepass changeit\
-file $CERT_FILE_PATH
return 0
}
function setup_jaas_file function setup_jaas_file
{ {
# Determine the file names # Determine the file names
@@ -260,7 +222,6 @@ fi
. /etc/CASA/authtoken/svc/envvars . /etc/CASA/authtoken/svc/envvars
# Setup the configuration files # Setup the configuration files
java_1_5_oes_workaround
setup_jaas_file setup_jaas_file
setup_iaRealms_file setup_iaRealms_file
RETVAL=$? RETVAL=$?

9
CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.changes
View File

@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu May 10 10:55:22 MDT 2007 - jluciani@novell.com
- Removed the temporary work around made to the SPEC files
which was allowing the user casaatsd to have a shell.
- Removed the OES workaround from the CasaBasicATSSetup script
since it is no longer needed.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 9 16:38:14 MDT 2007 - jluciani@novell.com Wed May 9 16:38:14 MDT 2007 - jluciani@novell.com

3
CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.spec.in
View File

@@ -221,8 +221,7 @@ fi
user_present=`getent passwd | grep ^casaatsd` user_present=`getent passwd | grep ^casaatsd`
if [ -z "$user_present" ] ; then if [ -z "$user_present" ] ; then
# /usr/sbin/useradd -c "casaatsd System User" -s /bin/false -r -d /var/lib/CASA/authtoken/svc -g casaauth casaatsd 2> /dev/null || : /usr/sbin/useradd -c "casaatsd System User" -s /bin/false -r -d /var/lib/CASA/authtoken/svc -g casaauth casaatsd 2> /dev/null || :
/usr/sbin/useradd -c "casaatsd System User" -s /bin/bash -r -d /var/lib/CASA/authtoken/svc -g casaauth casaatsd 2> /dev/null || :
fi fi

3
CASA-auth-token/server-java/package/linux/CASA_auth_token_svc_4zen.spec.in
View File

@@ -221,8 +221,7 @@ fi
user_present=`getent passwd | grep ^casaatsd` user_present=`getent passwd | grep ^casaatsd`
if [ -z "$user_present" ] ; then if [ -z "$user_present" ] ; then
# /usr/sbin/useradd -c "casaatsd System User" -s /bin/false -r -d /var/lib/CASA/authtoken/svc -g casaauth casaatsd 2> /dev/null || : /usr/sbin/useradd -c "casaatsd System User" -s /bin/false -r -d /var/lib/CASA/authtoken/svc -g casaauth casaatsd 2> /dev/null || :
/usr/sbin/useradd -c "casaatsd System User" -s /bin/bash -r -d /var/lib/CASA/authtoken/svc -g casaauth casaatsd 2> /dev/null || :
fi fi