Add CRL support

1 files changed, 67 insertions, 19 deletions

diff --git a/src/ldapcontrollerconfigbase.ui b/src/ldapcontrollerconfigbase.ui
index 85a4a00..8fa2cde 100644
--- a/src/ldapcontrollerconfigbase.ui
+++ b/src/ldapcontrollerconfigbase.ui
@@ -215,15 +215,36 @@
 									<cstring>unnamed</cstring>
 								</property>
 								<property name="text">
-									<cstring>Certificate Authority:</cstring>
+									<cstring>Certificate Revocation List:</cstring>
 								</property>
 							</widget>
 							<widget class="TQLabel" row="2" column="0" colspan="1">
 								<property name="name">
+									<cstring>crlExpiryString</cstring>
+								</property>
+							</widget>
+							<widget class="TQPushButton" row="1" column="3" colspan="2" rowspan="2">
+								<property name="name">
+									<cstring>crlRegenerate</cstring>
+								</property>
+								<property name="text">
+									<cstring>Regenerate</cstring>
+								</property>
+							</widget>
+							<widget class="TQLabel" row="3" column="0" colspan="1">
+								<property name="name">
+									<cstring>unnamed</cstring>
+								</property>
+								<property name="text">
+									<cstring>Certificate Authority:</cstring>
+								</property>
+							</widget>
+							<widget class="TQLabel" row="4" column="0" colspan="1">
+								<property name="name">
 									<cstring>caExpiryString</cstring>
 								</property>
 							</widget>
-							<widget class="TQPushButton" row="1" column="2" colspan="1" rowspan="2">
+							<widget class="TQPushButton" row="3" column="2" colspan="1" rowspan="2">
 								<property name="name">
 									<cstring>caRegenerate</cstring>
 								</property>
@@ -231,7 +252,7 @@
 									<cstring>Regenerate Certificate</cstring>
 								</property>
 							</widget>
-							<widget class="TQPushButton" row="1" column="3" colspan="1" rowspan="2">
+							<widget class="TQPushButton" row="3" column="3" colspan="1" rowspan="2">
 								<property name="name">
 									<cstring>caExportKey</cstring>
 								</property>
@@ -239,7 +260,7 @@
 									<cstring>Export Private Key</cstring>
 								</property>
 							</widget>
-							<widget class="TQPushButton" row="1" column="4" colspan="1" rowspan="2">
+							<widget class="TQPushButton" row="3" column="4" colspan="1" rowspan="2">
 								<property name="name">
 									<cstring>caExportCert</cstring>
 								</property>
@@ -247,7 +268,7 @@
 									<cstring>Export Public Certificate</cstring>
 								</property>
 							</widget>
-							<widget class="TQLabel" row="3" column="0" colspan="1">
+							<widget class="TQLabel" row="5" column="0" colspan="1">
 								<property name="name">
 									<cstring>unnamed</cstring>
 								</property>
@@ -255,12 +276,12 @@
 									<cstring>Kerberos:</cstring>
 								</property>
 							</widget>
-							<widget class="TQLabel" row="4" column="0" colspan="1">
+							<widget class="TQLabel" row="6" column="0" colspan="1">
 								<property name="name">
 									<cstring>krbExpiryString</cstring>
 								</property>
 							</widget>
-							<widget class="TQPushButton" row="3" column="2" colspan="1" rowspan="2">
+							<widget class="TQPushButton" row="5" column="2" colspan="1" rowspan="2">
 								<property name="name">
 									<cstring>krbRegenerate</cstring>
 								</property>
@@ -268,7 +289,7 @@
 									<cstring>Regenerate Certificate</cstring>
 								</property>
 							</widget>
-							<widget class="TQPushButton" row="3" column="3" colspan="1" rowspan="2">
+							<widget class="TQPushButton" row="5" column="3" colspan="1" rowspan="2">
 								<property name="name">
 									<cstring>krbExportKey</cstring>
 								</property>
@@ -276,7 +297,7 @@
 									<cstring>Export Private Key</cstring>
 								</property>
 							</widget>
-							<widget class="TQPushButton" row="3" column="4" colspan="1" rowspan="2">
+							<widget class="TQPushButton" row="5" column="4" colspan="1" rowspan="2">
 								<property name="name">
 									<cstring>krbExportCert</cstring>
 								</property>
@@ -284,7 +305,7 @@
 									<cstring>Export Public Certificate</cstring>
 								</property>
 							</widget>
-							<widget class="TQLabel" row="5" column="0" colspan="1">
+							<widget class="TQLabel" row="7" column="0" colspan="1">
 								<property name="name">
 									<cstring>unnamed</cstring>
 								</property>
@@ -292,12 +313,12 @@
 									<cstring>LDAP TLS:</cstring>
 								</property>
 							</widget>
-							<widget class="TQLabel" row="6" column="0" colspan="1">
+							<widget class="TQLabel" row="8" column="0" colspan="1">
 								<property name="name">
 									<cstring>ldapExpiryString</cstring>
 								</property>
 							</widget>
-							<widget class="TQPushButton" row="5" column="2" colspan="1" rowspan="2">
+							<widget class="TQPushButton" row="7" column="2" colspan="1" rowspan="2">
 								<property name="name">
 									<cstring>ldapRegenerate</cstring>
 								</property>
@@ -305,7 +326,7 @@
 									<cstring>Regenerate Certificate</cstring>
 								</property>
 							</widget>
-							<widget class="TQPushButton" row="5" column="3" colspan="1" rowspan="2">
+							<widget class="TQPushButton" row="7" column="3" colspan="1" rowspan="2">
 								<property name="name">
 									<cstring>ldapExportKey</cstring>
 								</property>
@@ -313,7 +334,7 @@
 									<cstring>Export Private Key</cstring>
 								</property>
 							</widget>
-							<widget class="TQPushButton" row="5" column="4" colspan="1" rowspan="2">
+							<widget class="TQPushButton" row="7" column="4" colspan="1" rowspan="2">
 								<property name="name">
 									<cstring>ldapExportCert</cstring>
 								</property>
@@ -468,12 +489,12 @@
 									<cstring>unnamed</cstring>
 								</property>
 								<property name="text">
-									<string>Certificate Authority:</string>
+									<string>Certificate Revocation List:</string>
 								</property>
 							</widget>
 							<widget class="KIntNumInput" row="0" column="1" >
 								<property name="name">
-									<cstring>advancedCaCertExpiry</cstring>
+									<cstring>advancedCaCrlExpiry</cstring>
 								</property>
 								<property name="minValue">
 									<number>1</number>
@@ -495,12 +516,12 @@
 									<cstring>unnamed</cstring>
 								</property>
 								<property name="text">
-									<string>Kerberos:</string>
+									<string>Certificate Authority:</string>
 								</property>
 							</widget>
 							<widget class="KIntNumInput" row="1" column="1" >
 								<property name="name">
-									<cstring>advancedKerberosCertExpiry</cstring>
+									<cstring>advancedCaCertExpiry</cstring>
 								</property>
 								<property name="minValue">
 									<number>1</number>
@@ -522,11 +543,38 @@
 									<cstring>unnamed</cstring>
 								</property>
 								<property name="text">
-									<string>LDAP TLS:</string>
+									<string>Kerberos:</string>
 								</property>
 							</widget>
 							<widget class="KIntNumInput" row="2" column="1" >
 								<property name="name">
+									<cstring>advancedKerberosCertExpiry</cstring>
+								</property>
+								<property name="minValue">
+									<number>1</number>
+								</property>
+								<property name="maxValue">
+									<number>7200</number>
+								</property>
+								<property name="sizePolicy">
+									<sizepolicy>
+										<hsizetype>0</hsizetype>
+										<vsizetype>0</vsizetype>
+										<horstretch>0</horstretch>
+										<verstretch>0</verstretch>
+									</sizepolicy>
+								</property>
+							</widget>
+							<widget class="TQLabel" row="3" column="0">
+								<property name="name">
+									<cstring>unnamed</cstring>
+								</property>
+								<property name="text">
+									<string>LDAP TLS:</string>
+								</property>
+							</widget>
+							<widget class="KIntNumInput" row="3" column="1" >
+								<property name="name">
 									<cstring>advancedLdapCertExpiry</cstring>
 								</property>
 								<property name="minValue">