diff options
| author | Andy Polyakov <appro@openssl.org> | 2018-07-19 15:28:34 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2018-07-20 13:40:30 +0200 |
| commit | f20aa69e33a7b418e052cf210374e2267cb93a5c (patch) | |
| tree | 0842b3385e60fb97eb0faf2ec2ea1653dede1aa8 /crypto/conf | |
| parent | f36e9f1183b4c4947d3c71d4c31a541b96c6e3f8 (diff) | |
| download | openssl-f20aa69e33a7b418e052cf210374e2267cb93a5c.zip openssl-f20aa69e33a7b418e052cf210374e2267cb93a5c.tar.gz openssl-f20aa69e33a7b418e052cf210374e2267cb93a5c.tar.bz2 | |
crypto/*: address standard-compilance nits.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
(Merged from https://github.com/openssl/openssl/pull/6745)
Diffstat (limited to 'crypto/conf')
| -rw-r--r-- | crypto/conf/conf_def.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c index 7340a91..676540c 100644 --- a/crypto/conf/conf_def.c +++ b/crypto/conf/conf_def.c @@ -27,6 +27,10 @@ # endif #endif +#ifndef S_ISDIR +# define S_ISDIR(a) (((a) & S_IFMT) == S_IFDIR) +#endif + /* * The maximum length we can grow a value to after variable expansion. 64k * should be more than enough for all reasonable uses. @@ -656,7 +660,7 @@ static BIO *process_include(char *include, OPENSSL_DIR_CTX **dirctx, return NULL; } - if ((st.st_mode & S_IFDIR) == S_IFDIR) { + if (S_ISDIR(st.st_mode)) { if (*dirctx != NULL) { CONFerr(CONF_F_PROCESS_INCLUDE, CONF_R_RECURSIVE_DIRECTORY_INCLUDE); |