From 88db52f6c286dda10519440b47d66ec9bc404d9a Mon Sep 17 00:00:00 2001 From: Juan Carlos Luciani Date: Wed, 6 Dec 2006 05:38:04 +0000 Subject: [PATCH] Added option to command for importing eDir cert in the CasaBasicATSSetup script so that it does not prompt the user. This allows the script to work correctly when invoked from our Yast module. --- .../server-java/Svc/linux/CasaBasicATSSetup.sh | 4 ++-- .../server-java/package/linux/CASA_auth_token_svc.changes | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CASA-auth-token/server-java/Svc/linux/CasaBasicATSSetup.sh b/CASA-auth-token/server-java/Svc/linux/CasaBasicATSSetup.sh index bc7dbb26..d7b96a1c 100755 --- a/CASA-auth-token/server-java/Svc/linux/CasaBasicATSSetup.sh +++ b/CASA-auth-token/server-java/Svc/linux/CasaBasicATSSetup.sh @@ -91,9 +91,9 @@ function java_1_5_oes_workaround fi # Now import the cert into java's keystore - $JAVA_HOME/bin/keytool -import\ + $JAVA_HOME/bin/keytool -import -noprompt\ -trustcacerts\ - -alias edit_root_ca\ + -alias edir_root_ca\ -keystore $JAVA_KEY_STORE_PATH\ -storepass changeit\ -file $CERT_FILE_PATH diff --git a/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.changes b/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.changes index 56b9d6a3..730998e0 100644 --- a/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.changes +++ b/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Dec 6 10:29:15 MST 2006 - jluciani@novell.com + +- Added option to the command being used to import + certificate from the CasaBasicATSSetup script so + that it works correctly in conjunction with our + Yast module. This addresses BUG225428. + ------------------------------------------------------------------- Mon Dec 4 17:21:00 MST 2006 - jluciani@novell.com