From 7a20b6ea002d595e1b329f0eee49886dd8cb69b3 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Fri, 11 Sep 2015 16:13:52 +0100 Subject: 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 (cherry picked from commit 03706afa30aeb4407287171a9d6f9a765395d0a2) --- apps/apps.c | 6 +++++- doc/apps/x509.pod | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/apps.c b/apps/apps.c index 7478fc3..68287b1 100644 --- a/apps/apps.c +++ b/apps/apps.c @@ -1352,7 +1352,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) diff --git a/doc/apps/x509.pod b/doc/apps/x509.pod index a1326ed..26f71c8 100644 --- a/doc/apps/x509.pod +++ b/doc/apps/x509.pod @@ -539,7 +539,8 @@ very rare and their use is discouraged). The options ending in "space" additionally place a space after the separator to make it more readable. The B uses a linefeed character for the RDN separator and a spaced B<+> for the AVA separator. It also -indents the fields by four characters. +indents the fields by four characters. If no field separator is specified +then B is used by default. =item B -- 1.7.12.1