diff options
| author | Hans-Joerg Hoexer <hshoexer@cvs.openbsd.org> | 2004-01-06 00:09:20 +0000 |
|---|---|---|
| committer | Hans-Joerg Hoexer <hshoexer@cvs.openbsd.org> | 2004-01-06 00:09:20 +0000 |
| commit | 49e75e1cabd1f40f0e7ffd1813a8a1307769e685 (patch) | |
| tree | d43c030406546ea7a7a137ca800d9bd5a289f6fd /sbin | |
| parent | e310f652602626008a1dcd139e024d02a2f15dd4 (diff) | |
Remove redundant test for file types. Noted by Stefan Paletta.
While around, fix typos in log messages.
Both ok markus@
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/isakmpd/x509.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/sbin/isakmpd/x509.c b/sbin/isakmpd/x509.c index 8d0cfa2b86e..8ced242f989 100644 --- a/sbin/isakmpd/x509.c +++ b/sbin/isakmpd/x509.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509.c,v 1.84 2003/11/07 10:16:44 jmc Exp $ */ +/* $OpenBSD: x509.c,v 1.85 2004/01/06 00:09:19 hshoexer Exp $ */ /* $EOM: x509.c,v 1.54 2001/01/16 18:42:16 ho Exp $ */ /* @@ -675,7 +675,7 @@ x509_read_from_dir (X509_STORE *ctx, char *name, int hash) dir = opendir (name); if (!dir) { - LOG_DBG ((LOG_CRYPTO, 10, "x509_read_from_dir: opendir (\"%s\") failed:" + LOG_DBG ((LOG_CRYPTO, 10, "x509_read_from_dir: opendir (\"%s\") failed: " "%s", name, strerror (errno))); return 0; } @@ -701,9 +701,6 @@ x509_read_from_dir (X509_STORE *ctx, char *name, int hash) continue; } - if (file->d_type != DT_REG && file->d_type != DT_LNK) - continue; - LOG_DBG ((LOG_CRYPTO, 60, "x509_read_from_dir: reading certificate %s", file->d_name)); @@ -773,7 +770,7 @@ x509_read_crls_from_dir (X509_STORE *ctx, char *name) if (strlen (name) >= sizeof fullname - 1) { - log_print ("x509_read_from_dir: directory name too long"); + log_print ("x509_read_crls_from_dir: directory name too long"); return 0; } @@ -809,9 +806,6 @@ x509_read_crls_from_dir (X509_STORE *ctx, char *name) continue; } - if (file->d_type != DT_REG && file->d_type != DT_LNK) - continue; - LOG_DBG ((LOG_CRYPTO, 60, "x509_read_crls_from_dir: reading CRL %s", file->d_name)); @@ -944,7 +938,7 @@ x509_crl_init (void) if (!x509_read_crls_from_dir (x509_cas, dirname)) { - LOG_DBG ((LOG_MISC, 10, "x509_crl_init: x509_read_from_dir failed")); + LOG_DBG ((LOG_MISC, 10, "x509_crl_init: x509_read_crls_from_dir failed")); return 0; } #else |