diff options
| author | deraadt <> | 2014-04-19 12:22:37 +0000 |
|---|---|---|
| committer | deraadt <> | 2014-04-19 12:22:37 +0000 |
| commit | b92c6bcb136f1266cccf5769ea117ed5e5f190fe (patch) | |
| tree | 4f9e1969dfcdc87e12d0d00ead879aa446902e55 /src | |
| parent | f376030ff7fe24f4ad44a56c2d8ba8796c9ab3f0 (diff) | |
| download | openbsd-b92c6bcb136f1266cccf5769ea117ed5e5f190fe.tar.gz openbsd-b92c6bcb136f1266cccf5769ea117ed5e5f190fe.tar.bz2 openbsd-b92c6bcb136f1266cccf5769ea117ed5e5f190fe.zip | |
unifdef ENOTDIR, everyone has it
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libssl/src/apps/apps.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/src/lib/libssl/src/apps/apps.c b/src/lib/libssl/src/apps/apps.c index 9a731fe75b..2035d51373 100644 --- a/src/lib/libssl/src/apps/apps.c +++ b/src/lib/libssl/src/apps/apps.c | |||
| @@ -1503,11 +1503,7 @@ rotate_serial(char *serialfile, char *new_suffix, char *old_suffix) | |||
| 1503 | BIO_printf(bio_err, "DEBUG: renaming \"%s\" to \"%s\"\n", | 1503 | BIO_printf(bio_err, "DEBUG: renaming \"%s\" to \"%s\"\n", |
| 1504 | serialfile, buf[1]); | 1504 | serialfile, buf[1]); |
| 1505 | #endif | 1505 | #endif |
| 1506 | if (rename(serialfile, buf[1]) < 0 && errno != ENOENT | 1506 | if (rename(serialfile, buf[1]) < 0 && errno != ENOENT && errno != ENOTDIR) { |
| 1507 | #ifdef ENOTDIR | ||
| 1508 | && errno != ENOTDIR | ||
| 1509 | #endif | ||
| 1510 | ) { | ||
| 1511 | BIO_printf(bio_err, | 1507 | BIO_printf(bio_err, |
| 1512 | "unable to rename %s to %s\n", | 1508 | "unable to rename %s to %s\n", |
| 1513 | serialfile, buf[1]); | 1509 | serialfile, buf[1]); |
| @@ -1723,11 +1719,7 @@ rotate_index(const char *dbfile, const char *new_suffix, const char *old_suffix) | |||
| 1723 | BIO_printf(bio_err, "DEBUG: renaming \"%s\" to \"%s\"\n", | 1719 | BIO_printf(bio_err, "DEBUG: renaming \"%s\" to \"%s\"\n", |
| 1724 | dbfile, buf[1]); | 1720 | dbfile, buf[1]); |
| 1725 | #endif | 1721 | #endif |
| 1726 | if (rename(dbfile, buf[1]) < 0 && errno != ENOENT | 1722 | if (rename(dbfile, buf[1]) < 0 && errno != ENOENT && errno != ENOTDIR) { |
| 1727 | #ifdef ENOTDIR | ||
| 1728 | && errno != ENOTDIR | ||
| 1729 | #endif | ||
| 1730 | ) { | ||
| 1731 | BIO_printf(bio_err, | 1723 | BIO_printf(bio_err, |
| 1732 | "unable to rename %s to %s\n", | 1724 | "unable to rename %s to %s\n", |
| 1733 | dbfile, buf[1]); | 1725 | dbfile, buf[1]); |
| @@ -1750,11 +1742,7 @@ rotate_index(const char *dbfile, const char *new_suffix, const char *old_suffix) | |||
| 1750 | BIO_printf(bio_err, "DEBUG: renaming \"%s\" to \"%s\"\n", | 1742 | BIO_printf(bio_err, "DEBUG: renaming \"%s\" to \"%s\"\n", |
| 1751 | buf[4], buf[3]); | 1743 | buf[4], buf[3]); |
| 1752 | #endif | 1744 | #endif |
| 1753 | if (rename(buf[4], buf[3]) < 0 && errno != ENOENT | 1745 | if (rename(buf[4], buf[3]) < 0 && errno != ENOENT && errno != ENOTDIR) { |
| 1754 | #ifdef ENOTDIR | ||
| 1755 | && errno != ENOTDIR | ||
| 1756 | #endif | ||
| 1757 | ) { | ||
| 1758 | BIO_printf(bio_err, | 1746 | BIO_printf(bio_err, |
| 1759 | "unable to rename %s to %s\n", | 1747 | "unable to rename %s to %s\n", |
| 1760 | buf[4], buf[3]); | 1748 | buf[4], buf[3]); |