Skip to content
Permalink
Browse files

[JENKINS-32599] Ignore misplaced users/config.xml file

  • Loading branch information
daniel-beck committed Feb 27, 2018
1 parent c33f146 commit 35a38f0ce69596f7aff2a4b3de14739d5cb78dbc
Showing with 3 additions and 0 deletions.
  1. +3 −0 core/src/main/java/hudson/model/User.java
@@ -1092,6 +1092,9 @@ public static void scanAll() {
File[] subdirs = getRootDir().listFiles((FileFilter) DirectoryFileFilter.INSTANCE);
if (subdirs != null) {
for (File subdir : subdirs) {
if (subdir.equals(getRootDir())) {
continue; // ignore the parent directory in case of stray config.xml
}
File configFile = new File(subdir, "config.xml");
if (configFile.exists()) {
String name = strategy.idFromFilename(subdir.getName());

0 comments on commit 35a38f0

Please sign in to comment.