Attachment 160254 Details for Bug 250137 – CVS Diffs

[patch] CVS Diffs

diffs.txt (text/plain), 10.31 KB, created by Nathan Kinder on 2007-07-30 16:47:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan Kinder

Created: 2007-07-30 16:47:50 UTC

Size: 10.31 KB

patch

obsolete

>Index: src/com/netscape/admin/dirserv/DSAdmin.java
>===================================================================
>RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/DSAdmin.java,v
>retrieving revision 1.5
>diff -u -5 -t -r1.5 DSAdmin.java
>--- src/com/netscape/admin/dirserv/DSAdmin.java	11 Jul 2007 01:26:23 -0000	1.5
>+++ src/com/netscape/admin/dirserv/DSAdmin.java	30 Jul 2007 16:42:23 -0000
>@@ -1265,11 +1265,11 @@
>         static public int SECURITY_UNKNOWN = 0;
>         static public int SECURITY_DISABLE = 1;
>         static public int SECURITY_ENABLE  = 2;
> 
>         // Minimum required console version
>-        private static final float MINIMUM_VERSION = 1.0f;
>+        private static final float MINIMUM_VERSION = 1.1f;
> 
>         // Icon for the console
>         private static final String _imageName = "directory.gif";
>         private static final String AUTH_ICON = "face.gif";
>         private static final String AUTHUP = "authup.gif";
>Index: src/com/netscape/admin/dirserv/about.properties
>===================================================================
>RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/about.properties,v
>retrieving revision 1.4
>diff -u -5 -t -r1.4 about.properties
>--- src/com/netscape/admin/dirserv/about.properties	29 Sep 2006 17:17:26 -0000	1.4
>+++ src/com/netscape/admin/dirserv/about.properties	30 Jul 2007 16:42:23 -0000
>@@ -17,11 +17,11 @@
> # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
> # END COPYRIGHT BLOCK
> #
> # Strings and logos used by the DSAboutDialog
> 
>-aboutDialog-dialogTitle=Fedora Directory Server 1.0.3
>+aboutDialog-dialogTitle=Fedora Directory Server 1.1.0
> aboutDialog-productLogo=com/netscape/management/client/images/logo32.gif
> aboutDialog-productCopyright=Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.\nCopyright (C) 2005 Red Hat, Inc.\nAll rights reserved.
> aboutDialog-productLicense=Fedora is a trademark of Red Hat, Inc. in the United States and other countries and is used by permission.
> aboutDialog-vendorsList=sun
> aboutDialog-vendor-sun-license=Java is a trademark or registered trademark of Sun Microsystems, Inc in the United States and other countries.\n\nJavaScript is a trademark of Sun Microsystems, Inc. used under license for technology invented and implemented by Netscape.
>Index: src/com/netscape/admin/dirserv/dirserv.properties
>===================================================================
>RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/dirserv.properties,v
>retrieving revision 1.6
>diff -u -5 -t -r1.6 dirserv.properties
>--- src/com/netscape/admin/dirserv/dirserv.properties	2 Jul 2007 19:44:08 -0000	1.6
>+++ src/com/netscape/admin/dirserv/dirserv.properties	30 Jul 2007 16:42:23 -0000
>@@ -162,13 +162,13 @@
> #
> # ?
> #
> dialog-configtitle=Fedora Directory Server
> dsAdmin-title=Fedora Directory Server
>-dsAdmin-version=Version 1.0.3
>+dsAdmin-version=Version 1.1.0
> dsAdmin-nsServerPort=Port
>-dsAdmin-framework-description=Fedora Directory Server Console 1.0.3
>+dsAdmin-framework-description=Fedora Directory Server Console 1.1.0
> dsAdmin-remove-server-cgi-failed=ds_remove failure
> 
> #
> # Status bar
> #
>@@ -1734,16 +1734,16 @@
> encryption-nocertificate-msg=A certificate must be specified to enable SSL
> encryption-nocertificate-title=Invalid SSL settings
> encryption-nosslfamily-msg=At least one cipher family must be selected to enable SSL
> encryption-nosslfamily-title=Invalid SSL settings
> encryption-preferences-title=Encryption Preferences
>-encryption-consoleSSL-label=Use SSL in Fedora Console
>-encryption-consoleSSL-ttip=Use SSL for connections from Fedora Console to this server
>+encryption-consoleSSL-label=Use SSL in Console
>+encryption-consoleSSL-ttip=Use SSL for connections from Console to this server
> encryption-SSLCheckHostName-label=Check hostname against name in certificate for outbound SSL connections
> encryption-SSLCheckHostName-ttip=Check the hostname used for outbound SSL connections against the name in the destination server's certificate
> encryption-confirm-clientauth-title=Require Client Authentication
>-encryption-confirm-clientauth-msg=When the server is configured to require SSL client authentication,\nFedora Console cannot use SSL to manage the server.\nIt will use a regular LDAP connection.
>+encryption-confirm-clientauth-msg=When the server is configured to require SSL client authentication,\nConsole cannot use SSL to manage the server.\nIt will use a regular LDAP connection.
> encryption-confirm-sslport-title=Encrypted Port Checking
> encryption-confirm-sslport-msg=The encrypted port is %0. On Unix, using a port\nbelow 1024 requires the server to be installed as root.\n\nBefore restarting the server, make sure it was installed\nas root or set a port above 1024 using the Settings tab.
> 
> # Cipher suites
> ciphers-title=Encryption Preferences
>@@ -2388,11 +2388,11 @@
> general-ldap-error-dn-msg=%0; %1; matched DN = %2
> general-ldap-error-msg=%0; %1
> general-ldapv2quoting-title=Using Deprecated LDAPv2 Style Quoting
> general-ldapv2quoting-msg=The field %0 has the value %1 which uses the deprecated\nLDAPv2 style quoting.  It will be converted to use LDAPv3 escapes.
> general-neednewconsole-title=Console Version Mismatch
>-general-neednewconsole-msg=This Directory Server Console is not compatible with Admin Console version %0.\nPlease install the latest Admin Console or download the components from the Fedora web server.
>+general-neednewconsole-msg=This Directory Server is not compatible with the Console version you are running (%0).\nPlease install the latest Console.
> general-notyetimplemented=Not Yet Implemented!
> general-backendname-exist-msg=Database named %0 already exists
> general-backendname-exist-title=Error on creation
> general-backendname-can-create-msg=Cannot create database, error: %0
> general-backendname-can-create-title=Server Error on Creation
>@@ -2684,11 +2684,11 @@
> mappingtree-referral-update-error-title=Failed to Update Referrals Info
> mappingtree-referral-update-error-msg=Error updating :%1 \n %2
> mappingtree-referral-LDAPUrl-no-good-title=Confirmation Needed
> mappingtree-referral-LDAPUrl-no-good-msg=This URL is not compliant with the Standard LDAP URL format.\nIf your LDAP client understands a non standard format,\nclick YES to add it to the list.
> mappingtree-multiple-db-title=Warning
>-mappingtree-multiple-db-msg= You have chosen to distribute a single suffix across multiple databases.\n This requires configuring distribution logic with Fedora Professional Services.\n In addition, you cannot replicate a suffix distributed across multiple databases.\n Do you want to continue?
>+mappingtree-multiple-db-msg= You have chosen to distribute a single suffix across multiple databases.\n This requires a custom distribution logic plugin.\n In addition, you cannot replicate a suffix distributed across multiple databases.\n Do you want to continue?
> mappingtree-reload-suffix-title=Error Reading Suffix
> mappingtree-reload-suffix-msg=Failed to read %0\n Error: %1
> mappingtree-del-warning-title=Database Successfully Deleted
> mappingtree-del-warning-msg=Database(s) configuration has been successfully deleted.\nNOTICE: The database files have been removed from:\n%0
> #
>Index: src/com/netscape/admin/dirserv/panel/MappingUtils.java
>===================================================================
>RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/panel/MappingUtils.java,v
>retrieving revision 1.1.1.1
>diff -u -5 -t -r1.1.1.1 MappingUtils.java
>--- src/com/netscape/admin/dirserv/panel/MappingUtils.java	18 Jul 2005 00:56:00 -0000	1.1.1.1
>+++ src/com/netscape/admin/dirserv/panel/MappingUtils.java	30 Jul 2007 16:42:24 -0000
>@@ -491,13 +491,13 @@
> 
> 
>     /**
>      * Returns the suffix of the backend that is naming context and parent of the entry.
> 
>-     * For example if we have 2 backends with suffixes 'o=fedora.com' and 'ou=people, o=fedora.com'
>-     * For 'cn=Michael, o=fedora.com' it will return 'o=fedora.com'
>-     * For 'cn=Michael, ou=people, o=fedora.com' it will return 'o=fedora.com' ('ou=people, o=fedora.com' is not a naming context)
>+     * For example if we have 2 backends with suffixes 'o=example.com' and 'ou=people, o=example.com'
>+     * For 'cn=Michael, o=example.com' it will return 'o=example.com'
>+     * For 'cn=Michael, ou=people, o=example.com' it will return 'o=example.com' ('ou=people, o=example.com' is not a naming context)
>      * For 'cn=plugins, cn=config' (not in a regular backend) it will return null
>      */
>     public static String getTopSuffixForEntry(LDAPConnection ldc, String dn) {
>         if ((ldc == null) || (dn==null)) {
>             return null;
>@@ -520,13 +520,13 @@
>     }
> 
>     /**
>      * This method gets the shortest suffix which is superior of the given dn from the given suffix list .
> 
>-     * For example if we have a list with 2 suffixes 'o=fedora.com' and 'ou=people, o=fedora.com'
>-     * For 'cn=Michael, o=fedora.com' it will return 'o=fedora.com'
>-     * For 'cn=Michael, ou=people, o=fedora.com' it will return 'o=fedora.com'
>+     * For example if we have a list with 2 suffixes 'o=example.com' and 'ou=people, o=example.com'
>+     * For 'cn=Michael, o=example.com' it will return 'o=example.com'
>+     * For 'cn=Michael, ou=people, o=example.com' it will return 'o=example.com'
>      * For 'cn=plugins, cn=config' (not in the list of suffixes) it will return null
>          *
>          * @param dn of the entry we want to handle
>          * @param suffixes the String[] with the suffixes
>          * @returns the shortest suffix corresponding to the given dn.  Null if no suffix was found.
>@@ -553,13 +553,13 @@
>         }
> 
>     /**
>      * Returns the suffix of the backend to which this entry belongs.
> 
>-     * For example if we have 2 backends with suffixes 'o=fedora.com' and 'ou=people, o=fedora.com'
>-     * For 'cn=Michael, o=fedora.com' it will return 'o=fedora.com'
>-     * For 'cn=Michael, ou=people, o=fedora.com' it will return 'ou=people, o=fedora.com'
>+     * For example if we have 2 backends with suffixes 'o=example.com' and 'ou=people, o=example.com'
>+     * For 'cn=Michael, o=example.com' it will return 'o=example.com'
>+     * For 'cn=Michael, ou=people, o=example.com' it will return 'ou=people, o=example.com'
>      * For 'cn=plugins, cn=config' (not in a regular backend) it will return null
>      */
>         
>     public static String getSuffixForEntry(LDAPConnection ldc, String dn) {
>         if ((ldc == null) || (dn==null)) {

Actions: View | Diff

Attachments on bug 250137: 160254