From 67405dde9ba213331dab1fc46cb18c485070fd5b Mon Sep 17 00:00:00 2001 From: matthew_swift <matthew_swift@localhost> Date: Fri, 05 Jun 2009 09:04:50 +0000 Subject: [PATCH] svn merge -r5333:5417 https://opends.dev.java.net/svn/opends/branches/b2.0 --- opends/src/messages/messages/dsconfig.properties | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/opends/src/messages/messages/dsconfig.properties b/opends/src/messages/messages/dsconfig.properties index 1b07763..888c1b8 100644 --- a/opends/src/messages/messages/dsconfig.properties +++ b/opends/src/messages/messages/dsconfig.properties @@ -471,7 +471,8 @@ SEVERE_ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT_WRONG_PORT_157=Unable to connect to the \ server at %s on port %s. Check this port is an administration port SEVERE_ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT_NOT_TRUSTED_158=Unable to connect to the \ - server at %s on port %s. In non-interactive mode, you must use the '--trustAll' option for remote connections + server at %s on port %s. In non-interactive mode, if the trustStore related parameters are not used, \ + you must use the '--trustAll' option for remote connections SEVERE_ERR_DSCFG_ERROR_VALUE_DOES_NOT_EXIST_159=The value %s for the %s property does not exist SEVERE_ERR_DSCFG_ERROR_NO_AVAILABLE_TYPES_160=Unable to continue since there are \ no available types of %s to choose from -- Gitblit v1.10.0