summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2018-11-22 11:15:16 +0100
committerSimon Rettberg2018-11-22 11:15:16 +0100
commitc2d6ef46c7aec239550d3dd858761381a5947b23 (patch)
treeb6b58bed63228d40841a2ca86df8212597592879
parent[CreateLdapConfig] Support ldadp genuid feature (diff)
downloadtmlite-bwlp-c2d6ef46c7aec239550d3dd858761381a5947b23.tar.gz
tmlite-bwlp-c2d6ef46c7aec239550d3dd858761381a5947b23.tar.xz
tmlite-bwlp-c2d6ef46c7aec239550d3dd858761381a5947b23.zip
[CreateLdapConfig] Fix detection of valid CN
openssl output changed so we didn't properly detect a certificate that still has the proper CN set and instead always regenerated the cert/key.
-rw-r--r--src/main/java/org/openslx/taskmanager/tasks/CreateLdapConfig.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/openslx/taskmanager/tasks/CreateLdapConfig.java b/src/main/java/org/openslx/taskmanager/tasks/CreateLdapConfig.java
index 300fd01..fcb8190 100644
--- a/src/main/java/org/openslx/taskmanager/tasks/CreateLdapConfig.java
+++ b/src/main/java/org/openslx/taskmanager/tasks/CreateLdapConfig.java
@@ -163,7 +163,7 @@ public class CreateLdapConfig extends AbstractTask
@Override
public void processStdOut( String line )
{
- if ( line.trim().endsWith( subject ) ) {
+ if ( line.matches( "subject\\s*=.*CN\\s*=\\s*" + proxyip + "($|\\s)" ) ) {
subjectStillGood.set( true );
}
}