db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ti...@apache.org
Subject svn commit: r1130743 - in /db/derby/code/trunk/java/drda/org/apache/derby: impl/drda/NetworkServerControlImpl.java loc/drda/messages_en.properties
Date Thu, 02 Jun 2011 19:11:07 GMT
Author: tiago
Date: Thu Jun  2 19:11:07 2011
New Revision: 1130743

URL: http://svn.apache.org/viewvc?rev=1130743&view=rev
Log:
Fixes silently taking -ssl without arguments whilst keeping SSL mode disabled.

After this patch, with the -ssl switch a mode must be specified. Otherwise an error is shown.

Contributed by Siddharth Srivastava <akssps011@gmail.com>


Modified:
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_en.properties

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java?rev=1130743&r1=1130742&r2=1130743&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
(original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
Thu Jun  2 19:11:07 2011
@@ -2489,7 +2489,7 @@ public final class NetworkServerControlI
 				if (pos < args.length) {
 					setSSLMode(getSSLModeValue(args[pos]));
 				} else {
-					setSSLMode(SSL_OFF);
+					consolePropertyMessage("DRDA_MissingValue.U", "DRDA_SslMode.I");
 				}
 				break;
 

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_en.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_en.properties?rev=1130743&r1=1130742&r2=1130743&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_en.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_en.properties Thu Jun
 2 19:11:07 2011
@@ -86,6 +86,7 @@ DRDA_MissingLocale.I=Resources not found
 DRDA_MissingNetworkJar.S=Cannot find derbynet.jar on the classpath.
 DRDA_NoAuthentication.S=Network Server startup failed. User authentication must be enabled
before the Network Server installs a security manager. You must either enable user authentication
or disable the installation of a security manager. For information on enabling user authentication,
see the section of the Derby Developer''s Guide entitled "Working with user authentication".
Disabling the installation of a security manager is strongly discouraged in a client/server
environment. However, if you must do this, you can disable the installation of a security
manager by specifying the "-noSecurityManager" command line option when you bring up the Network
Server.
 DRDA_SecurityInstalled.I=Security manager installed using the Basic server security policy.
+DRDA_SslMode.I=sslmode
 
 # Derby Network Server SYSINFO stuff
 #



Mime
View raw message