diff options
Diffstat (limited to 'base/console/src/com/netscape/admin/certsrv/Console.java')
-rw-r--r-- | base/console/src/com/netscape/admin/certsrv/Console.java | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/base/console/src/com/netscape/admin/certsrv/Console.java b/base/console/src/com/netscape/admin/certsrv/Console.java index c9684583a..ca0bfcb2e 100644 --- a/base/console/src/com/netscape/admin/certsrv/Console.java +++ b/base/console/src/com/netscape/admin/certsrv/Console.java @@ -327,21 +327,21 @@ public class Console implements CommClient { * Called by createPerInstanceUI(). */ private String serverIDtoDN(String id) { - + LDAPConnection ldc = _info.getLDAPConnection(); Vector instances = new Vector(); - + try { LDAPSearchResults res = ldc.search( - "o=netscapeRoot", + "o=netscapeRoot", LDAPConnection.SCOPE_SUB, "(nsServerID=" + id + ")", new String[]{"dn"}, false); - + while (res.hasMoreElements()) { LDAPEntry hostEntry = res.next(); instances.addElement(hostEntry.getDN()); - } + } if (instances.size() == 0) { System.err.println("Server instance " + id + " does not exist."); @@ -351,11 +351,11 @@ public class Console implements CommClient { id = (String) instances.elementAt(0); } else { - + if (_splashScreen != null) { _splashScreen.setVisible(false); } - + int idx = -1; while (idx == -1) { System.out.println("\nThere are multiple instances of server \"" + id + "\":\n"); @@ -374,7 +374,7 @@ public class Console implements CommClient { } catch (Exception ignore) {} } - + if (idx >=1 && idx <= instances.size()) { idx = idx - 1; } @@ -398,11 +398,11 @@ public class Console implements CommClient { } protected void createPerInstanceUI(String host) { - + if (!DN.isDN(host)) { host = serverIDtoDN(host); } - + LDAPConnection ldc = _info.getLDAPConnection(); String configDN = "cn=configuration," + host; try { @@ -499,7 +499,7 @@ public class Console implements CommClient { common_init(language); String userid = uid; String password = passwd; - + if (userid == null) { userid = _preferences.getString(PREFERENCE_UID); } @@ -508,10 +508,10 @@ public class Console implements CommClient { if(lastUsedURL != null) { recentURLs.addElement(lastUsedURL); if(adminURL == null) { - adminURL = lastUsedURL; + adminURL = lastUsedURL; } } - + if(adminURL == null) { adminURL = localAdminURL; } @@ -621,7 +621,7 @@ public class Console implements CommClient { if (rememberUserid) { _preferences.set(PREFERENCE_UID, userid); _preferences.set(PREFERENCE_URL, adminURL); - + String recentlyUsedURL; int count = 1; Enumeration urlEnum = recentURLs.elements(); @@ -630,7 +630,7 @@ public class Console implements CommClient { if(!recentlyUsedURL.equals(adminURL)) _preferences.set(PREFERENCE_URL+Integer.toString(count++), recentlyUsedURL); } - + for(; count < MAX_RECENT_URLS; count++) { _preferences.remove(PREFERENCE_URL+Integer.toString(count)); } @@ -659,7 +659,7 @@ public class Console implements CommClient { _splashScreen.dispose(); com.netscape.management.client.console.SplashScreen.removeInstance(); _splashScreen = null; - + break; } } @@ -1531,7 +1531,7 @@ public class Console implements CommClient { static public void main(String argv[]) { GetOpt opt = new GetOpt("h:a:A:f:l:u:w:s:D:x:", argv); - + if (opt.hasOption('f')) { String outFile = opt.getOptionParam('f'); try { @@ -1573,7 +1573,7 @@ public class Console implements CommClient { Debug.println(0, "Management-Console/" + - _resource.getString("console","displayVersion") + + _resource.getString("console","displayVersion") + " B" + VersionInfo.getBuildNumber()); if (opt.hasOption('x')) { @@ -1614,7 +1614,7 @@ public class Console implements CommClient { System.exit(0); } - // bug 353403: -a option intended for end-user to + // bug 353403: -a option intended for end-user to // specify default admin url. This option overrides // -A option. String sAdminURL = null; @@ -1782,7 +1782,7 @@ class TeeStream extends PrintStream { /** * An internal class used to wrap the parameters of an * authentication request. - * + * * @author David Tompkins, 12/13/97 */ class Response { |