diff options
| author | Renato Botelho <renato@netgate.com> | 2015-12-10 17:01:14 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-12-10 17:01:14 -0200 |
| commit | a7ed3b08bcfc9de3d1e75679fe9292e5b09aea82 (patch) | |
| tree | 71acee51f11c433be4c4a51635ce1ea4302ca4b6 /crypto/openssl/apps/apps.c | |
| parent | 54cf5d1b6607c1e6f2cbf32784c33720517bce49 (diff) | |
| parent | 3bc7f4d78d27696df85e118c07aa5a2630188922 (diff) | |
| download | FreeBSD-src-a7ed3b08bcfc9de3d1e75679fe9292e5b09aea82.zip FreeBSD-src-a7ed3b08bcfc9de3d1e75679fe9292e5b09aea82.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'crypto/openssl/apps/apps.c')
| -rw-r--r-- | crypto/openssl/apps/apps.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crypto/openssl/apps/apps.c b/crypto/openssl/apps/apps.c index 6801238..8ab4833 100644 --- a/crypto/openssl/apps/apps.c +++ b/crypto/openssl/apps/apps.c @@ -119,9 +119,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#if !defined(OPENSSL_SYSNAME_WIN32) && !defined(NETWARE_CLIB) -# include <strings.h> -#endif #include <sys/types.h> #include <ctype.h> #include <errno.h> @@ -1247,7 +1244,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) |
