[rs-commit] r159 - /mod_csr/trunk/mod_csr.c

[rs-commit at redwax.eu]

Author: minfrin at redwax.eu
Date: Sun Dec  8 15:32:38 2019
New Revision: 159

Log:
Fix stray reference to ScepSize. Reorder directives.

Modified:
    mod_csr/trunk/mod_csr.c

Modified: mod_csr/trunk/mod_csr.c
==============================================================================
--- mod_csr/trunk/mod_csr.c	(original)
+++ mod_csr/trunk/mod_csr.c	Sun Dec  8 15:32:38 2019
@@ -132,7 +132,7 @@
 
     if (apr_strtoff(&conf->size, arg, NULL, 10) != APR_SUCCESS
             || conf->size < 4096) {
-        return "ScepSize argument must be an integer representing the max size of a SPKAC request, at least 4096";
+        return "CsrSize argument must be an integer representing the max size of a SPKAC request, at least 4096";
     }
     conf->size_set = 1;
 
@@ -353,33 +353,33 @@
 
 static const command_rec csr_cmds[] =
 {
-    AP_INIT_TAKE1("CsrSize",
-            set_csr_size, NULL, RSRC_CONF | ACCESS_CONF,
-            "Set to the maximum size of the CSR request from the client."),
+    AP_INIT_TAKE12("CsrFreshness",
+            set_csr_freshness, NULL, RSRC_CONF | ACCESS_CONF,
+            "The age of the certificates will be divided by this factor when added as a max-age, set to zero to disable. Defaults to \"2\". An optional maximum value can be specified, defaults to one day."),
+    AP_INIT_TAKE1("CsrLocation",
+            set_location, NULL, RSRC_CONF | ACCESS_CONF,
+            "Set to the location of the csr service."),
     AP_INIT_TAKE1("CsrParamPkcs10",
             set_csr_param_pkcs10, NULL, RSRC_CONF | ACCESS_CONF,
             "Set to the name of the request variable from the client containing the CSR. Defaults to " DEFAULT_CSR_PARAM_PKCS10),
     AP_INIT_TAKE1("CsrParamChallenge",
             set_csr_param_challenge, NULL, RSRC_CONF | ACCESS_CONF,
             "Set to the name of the request variable from the client containing the param_challenge password. If unset, will be taken from the CSR itself."),
-    AP_INIT_TAKE1("CsrLocation",
-            set_location, NULL, RSRC_CONF | ACCESS_CONF,
-            "Set to the location of the csr service."),
+    AP_INIT_TAKE1("CsrSize",
+            set_csr_size, NULL, RSRC_CONF | ACCESS_CONF,
+            "Set to the maximum size of the CSR request from the client."),
+    AP_INIT_TAKE12("CsrSubjectAltNameRequest",
+            set_subjectaltname_request, NULL, RSRC_CONF | ACCESS_CONF,
+            "Specify fields in the certificate request subjectAltName that will be copied over to the certificate, with optional limit to the number of fields that may appear."),
+    AP_INIT_TAKE2("CsrSubjectAltNameSet",
+            set_subjectaltname_set, NULL, RSRC_CONF | ACCESS_CONF,
+            "Specify subjectAltName attribute and value that will be included in the certificate."),
     AP_INIT_TAKE12("CsrSubjectRequest",
             set_subject_request, NULL, RSRC_CONF | ACCESS_CONF,
             "Specify fields in the certificate request subject that will be copied over to the certificate, with optional limit to the number of fields that may appear."),
     AP_INIT_TAKE2("CsrSubjectSet",
             set_subject_set, NULL, RSRC_CONF | ACCESS_CONF,
             "Specify subject attribute and value that will be included in the certificate."),
-    AP_INIT_TAKE12("CsrSubjectAltNameRequest",
-            set_subjectaltname_request, NULL, RSRC_CONF | ACCESS_CONF,
-            "Specify fields in the certificate request subjectAltName that will be copied over to the certificate, with optional limit to the number of fields that may appear."),
-    AP_INIT_TAKE2("CsrSubjectAltNameSet",
-            set_subjectaltname_set, NULL, RSRC_CONF | ACCESS_CONF,
-            "Specify subjectAltName attribute and value that will be included in the certificate."),
-    AP_INIT_TAKE12("CsrFreshness",
-            set_csr_freshness, NULL, RSRC_CONF | ACCESS_CONF,
-            "The age of the certificates will be divided by this factor when added as a max-age, set to zero to disable. Defaults to \"2\". An optional maximum value can be specified, defaults to one day."),
     { NULL }
 };