summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2015-09-11 16:13:52 +0100
committerDr. Stephen Henson <steve@openssl.org>2015-09-11 20:50:48 +0100
commit03706afa30aeb4407287171a9d6f9a765395d0a2 (patch)
tree50c81cdf8d4ea9ec8aea9f2c560dbb53795f10a1 /apps
parent8cf2782399c449ecf91f2d292f483e7999a40f6d (diff)
Use default field separator.
If the field separator isn't specified through -nameopt then use XN_FLAG_SEP_CPLUS_SPC instead of printing nothing and returing an error. PR#2397 Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'apps')
-rw-r--r--apps/apps.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/apps.c b/apps/apps.c
index 5c36a374f5..5b6a605dfd 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -1074,7 +1074,11 @@ int set_name_ex(unsigned long *flags, const char *arg)
{"ca_default", XN_FLAG_MULTILINE, 0xffffffffL},
{NULL, 0, 0}
};
- return set_multi_opts(flags, arg, ex_tbl);
+ if (set_multi_opts(flags, arg, ex_tbl) == 0)
+ return 0;
+ if ((*flags & XN_FLAG_SEP_MASK) == 0)
+ *flags |= XN_FLAG_SEP_CPLUS_SPC;
+ return 1;
}
int set_ext_copy(int *copy_type, const char *arg)