[rs-commit] r46 - /mod_spkac/trunk/mod_spkac.c
rs-commit at redwax.eu
rs-commit at redwax.eu
Fri Apr 19 23:54:41 CEST 2019
Author: minfrin at redwax.eu
Date: Fri Apr 19 23:54:40 2019
New Revision: 46
Log:
Tab to space.
Modified:
mod_spkac/trunk/mod_spkac.c
Modified: mod_spkac/trunk/mod_spkac.c
==============================================================================
--- mod_spkac/trunk/mod_spkac.c (original)
+++ mod_spkac/trunk/mod_spkac.c Fri Apr 19 23:54:40 2019
@@ -199,13 +199,13 @@
arg1);
}
else {
- const char *expr_err = NULL;
- name->expr = ap_expr_parse_cmd(cmd, arg2, AP_EXPR_FLAG_STRING_RESULT,
- &expr_err, NULL);
- if (expr_err) {
- return apr_pstrcat(cmd->temp_pool, "Cannot parse expression '",
- arg2, "': ", expr_err, NULL);
- }
+ const char *expr_err = NULL;
+ name->expr = ap_expr_parse_cmd(cmd, arg2, AP_EXPR_FLAG_STRING_RESULT,
+ &expr_err, NULL);
+ if (expr_err) {
+ return apr_pstrcat(cmd->temp_pool, "Cannot parse expression '",
+ arg2, "': ", expr_err, NULL);
+ }
}
conf->subject_set = 1;
@@ -297,14 +297,14 @@
arg1);
}
else {
- const char *expr_err = NULL;
- name->expr = ap_expr_parse_cmd(cmd, arg2, AP_EXPR_FLAG_STRING_RESULT,
- &expr_err, NULL);
- if (expr_err) {
- return apr_pstrcat(cmd->temp_pool, "Cannot parse expression '",
- arg2, "': ", expr_err, NULL);
- }
- }
+ const char *expr_err = NULL;
+ name->expr = ap_expr_parse_cmd(cmd, arg2, AP_EXPR_FLAG_STRING_RESULT,
+ &expr_err, NULL);
+ if (expr_err) {
+ return apr_pstrcat(cmd->temp_pool, "Cannot parse expression '",
+ arg2, "': ", expr_err, NULL);
+ }
+ }
conf->subjectaltname_set = 1;
@@ -473,12 +473,12 @@
}
if (!X509_NAME_add_entry_by_NID(subject, name->nid,
MBSTRING_UTF8, (unsigned char *) arg, -1, -1, 0)) {
- log_message(r, APR_SUCCESS,
- apr_psprintf(r->pool,
- "Expression with value '%s' could not be added to the certificate subject as '%s'.",
- arg, name->name));
-
- return HTTP_INTERNAL_SERVER_ERROR;
+ log_message(r, APR_SUCCESS,
+ apr_psprintf(r->pool,
+ "Expression with value '%s' could not be added to the certificate subject as '%s'.",
+ arg, name->name));
+
+ return HTTP_INTERNAL_SERVER_ERROR;
}
}
@@ -571,10 +571,10 @@
GENERAL_NAME *gen = a2i_GENERAL_NAME(NULL, NULL, NULL, name->nid,
(char *) arg, 0);
if (!gen) {
- log_message(r, APR_SUCCESS,
- apr_psprintf(r->pool,
- "Expression with value '%s' could not be added to the certificate subjectAltName as '%s'.",
- arg, name->name));
+ log_message(r, APR_SUCCESS,
+ apr_psprintf(r->pool,
+ "Expression with value '%s' could not be added to the certificate subjectAltName as '%s'.",
+ arg, name->name));
return HTTP_INTERNAL_SERVER_ERROR;
}
@@ -1052,8 +1052,8 @@
static int spkac_pre_config(apr_pool_t *pconf, apr_pool_t *plog,
apr_pool_t *ptemp)
{
- EVP_PKEY_CTX *ctx;
- int rv;
+ EVP_PKEY_CTX *ctx;
+ int rv;
OpenSSL_add_all_algorithms();
ERR_load_crypto_strings();
@@ -1098,10 +1098,11 @@
}
module AP_MODULE_DECLARE_DATA spkac_module =
-{ STANDARD20_MODULE_STUFF, create_spkac_dir_config, /* dir config creater */
-merge_spkac_dir_config, /* dir merger --- default is to override */
-NULL, /* server config */
-NULL, /* merge server config */
-spkac_cmds, /* command apr_table_t */
-register_hooks /* register hooks */
+{
+ STANDARD20_MODULE_STUFF, create_spkac_dir_config, /* dir config creater */
+ merge_spkac_dir_config, /* dir merger --- default is to override */
+ NULL, /* server config */
+ NULL, /* merge server config */
+ spkac_cmds, /* command apr_table_t */
+ register_hooks /* register hooks */
};
More information about the rs-commit
mailing list