From c2d6ef46c7aec239550d3dd858761381a5947b23 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 22 Nov 2018 11:15:16 +0100
Subject: [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.
---
 src/main/java/org/openslx/taskmanager/tasks/CreateLdapConfig.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 );
 						}
 					}
-- 
cgit v1.2.3-55-g7522