mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch

Browse Source 
'origin/GP-2986-dragonmacher-component-provider-methods--SQUASHED'
This commit is contained in:
ghidra1
2023-02-03 17:55:23 -05:00
parent 2075df60fb c252e3b905
commit 7143f64c51
174 changed files with 1393 additions and 1455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Ghidra/Framework/FileSystem/src/main/java/ghidra/framework/client/DefaultClientAuthenticator.java
View File

@@ -153,16 +153,17 @@ public class DefaultClientAuthenticator extends PopupKeyStorePasswordProvider
@Override
public void run() {
PasswordDialog pwdDialog;
String choicePrompt = null;
String[] choices = null;
if (choiceCb != null) {
choicePrompt = choiceCb.getPrompt();
choices = choiceCb.getChoices();
}
pwdDialog = new PasswordDialog(title, serverType, serverName, passCb.getPrompt(),
nameCb != null ? nameCb.getPrompt() : null, getDefaultUserName(), choicePrompt,
choices, getDefaultChoice(), anonymousCb != null);
PasswordDialog pwdDialog =
new PasswordDialog(title, serverType, serverName, passCb.getPrompt(),
nameCb != null ? nameCb.getPrompt() : null, getDefaultUserName(), choicePrompt,
choices, getDefaultChoice(), anonymousCb != null);
if (errorMsg != null) {
pwdDialog.setErrorText(errorMsg);
}