yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 19:42:36 +02:00
Code Issues Releases Wiki Activity

Merge branch 'patch'

Browse source 
Conflicts:
	gradleScripts/distribution.gradle
This commit is contained in:
ghidra1 2019-04-25 17:32:19 -04:00
commit 1cae5552f6
23 changed files with 604 additions and 520 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/server/remote/ServerTestUtil.java
View file

@ -40,7 +40,7 @@ import ghidra.framework.store.local.LocalFileSystem;
import ghidra.framework.store.local.LocalFolderItem;
import ghidra.net.*;
import ghidra.program.model.listing.Program;
import ghidra.server.UserAdmin;
import ghidra.server.ServerAdmin;
import ghidra.server.UserManager;
import ghidra.test.ToyProgramBuilder;
import ghidra.util.*;
@ -942,11 +942,12 @@ public class ServerTestUtil {
* @throws Exception
*/
public static void addPKIUser(File serverRoot, String userName, String dn) throws Exception {
ServerAdmin serverAdmin = new ServerAdmin();
if (dn != null) {
UserAdmin.main(new String[] { serverRoot.getAbsolutePath(), "-dn", userName, dn });
serverAdmin.execute(new String[] { serverRoot.getAbsolutePath(), "-dn", userName, dn });
}
else {
UserAdmin.main(new String[] { serverRoot.getAbsolutePath(), "-add", userName });
serverAdmin.execute(new String[] { serverRoot.getAbsolutePath(), "-add", userName });
}
}