mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-12-01 12:27:58 +00:00
Code Issues Projects Releases Wiki Activity

[SPARK-1022] Linux Tray Icon not appearing

Browse Source 
Thanks to Hawke for the following:
Allows the login dialog to set whichever of username, servername is set, if only one of them is (previously it would only display them if both were set). 
Fixes a crash if the LoginContext gets an exception when the ssoMethod is set to DNS.  
Corrects two typos, one in a displayed error message, the other in a logged error.  
Makes it so that turning on SSO doesn't automatically turn on autologin.

git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@10594 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Andrew Seymour
2008-06-26 17:15:04 +00:00
committed by andrew.seymour
parent 7b053da45f
commit 5362b16e62
4 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/java/org/jivesoftware/LoginDialog.java
View File

@ -374,8 +374,10 @@ public final class LoginDialog {
String userProp = localPref.getUsername();
String serverProp = localPref.getServer();
if (userProp != null && serverProp != null) {
if (userProp != null) {
usernameField.setText(StringUtils.unescapeNode(userProp));
}
if (serverProp != null) {
serverField.setText(serverProp);
serverNameLabel.setText(serverProp);
}
@ -664,13 +666,6 @@ public final class LoginDialog {
headerLabel.setVisible(true);
String server = localPref.getServer();
if (ModelUtil.hasLength(server)) {
serverNameLabel.setText(localPref.getServer());
serverField.setText(localPref.getServer());
}
if(localPref.getDebug()) {
System.setProperty("java.security.krb5.debug","true");
System.setProperty("sun.security.krb5.debug","true");
@ -717,16 +712,19 @@ public final class LoginDialog {
String ssoKdc;
if(ssoMethod.equals("dns")) {
ssoKdc = getDnsKdc(princRealm);
System.setProperty("java.security.krb5.realm",princRealm);
System.setProperty("java.security.krb5.kdc",ssoKdc);
if (princRealm != null) { //princRealm is null if we got a LoginException above.
ssoKdc = getDnsKdc(princRealm);
System.setProperty("java.security.krb5.realm",princRealm);
System.setProperty("java.security.krb5.kdc",ssoKdc);
}
} else if(ssoMethod.equals("manual")) {
princRealm = localPref.getSSORealm();
ssoKdc = localPref.getSSOKDC();
System.setProperty("java.security.krb5.realm",princRealm);
System.setProperty("java.security.krb5.kdc",ssoKdc);
} else {
//else do nothing, java takes care of it for us. Unset the props if they are set
//Assume "file" method. We don't have to do anything special,
//java takes care of it for us. Unset the props if they are set
System.clearProperty("java.security.krb5.realm");
System.clearProperty("java.security.krb5.kdc");
}
@ -909,7 +907,7 @@ public final class LoginDialog {
JOptionPane.ERROR_MESSAGE);
}
else {
JOptionPane.showMessageDialog(loginDialog, "Unabled to connect using Single Sign-On. Please check your principal and server settings.", Res.getString("title.login.error"),
JOptionPane.showMessageDialog(loginDialog, "Unable to connect using Single Sign-On. Please check your principal and server settings.", Res.getString("title.login.error"),
JOptionPane.ERROR_MESSAGE);
//useSSO(false);
//localPref.setSSOEnabled(false);
@ -943,9 +941,9 @@ public final class LoginDialog {
localPref.setSavePassword(savePasswordBox.isSelected());
localPref.setAutoLogin(autoLoginBox.isSelected());
if (localPref.isSSOEnabled()) {
localPref.setAutoLogin(true);
}
// if (localPref.isSSOEnabled()) {
// localPref.setAutoLogin(true);
// }
localPref.setServer(serverField.getText());
@ -964,7 +962,7 @@ public final class LoginDialog {
PasswordCallback pcb = (PasswordCallback) callback;
pcb.setPassword(getPassword().toCharArray());
} else {
Log.error("Uknown callback requested: " + callback.getClass().getSimpleName());
Log.error("Unknown callback requested: " + callback.getClass().getSimpleName());
}
}
}