summaryrefslogtreecommitdiff
path: root/src/libunixonacid/dd_commit.c
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2016-10-14 17:07:56 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2016-10-14 17:07:56 +0000
commita1933bd1847951b959016f59ee744d1b18a00142 (patch)
tree42392f2df048defd712fa12d290bf84a7a77df6d /src/libunixonacid/dd_commit.c
parenteaf9404b22bba7be5092672144b867380c602beb (diff)
downloadskalibs-a1933bd1847951b959016f59ee744d1b18a00142.tar.xz
Clean up and modernize librandom.
Correct random number generation has historically been suprisingly painful to achieve. There was no standard, every system behaved in a subtly different way, and there were a few userland initiatives to get decent randomness, all incompatible of course. The situation is a bit better now, we're heading towards some standardization. The arc4random() series of functions is a good API, and available on a lot of systems - unfortunately not Linux, but on Linux the new getrandom() makes using /dev/random obsolete. So I removed the old crap in librandom, dropped EGD support, dropped dynamic backend selection, made a single API series (random_* instead of goodrandom_* and badrandom_*), added an arc4random backend and a getrandom backend, and defaulted to /dev/urandom backed up by SURF in the worst case. This should be much smaller and logical. However, it's a major API break, so the skarnet.org stack will be changed to adapt.
Diffstat (limited to 'src/libunixonacid/dd_commit.c')
-rw-r--r--src/libunixonacid/dd_commit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libunixonacid/dd_commit.c b/src/libunixonacid/dd_commit.c
index 2555d1e..f4a7b06 100644
--- a/src/libunixonacid/dd_commit.c
+++ b/src/libunixonacid/dd_commit.c
@@ -30,7 +30,7 @@ int dd_commit (dirdescriptor_t *dd)
unsigned int lnkbnbase = dd->new.len ;
if (errno != EINVAL) goto fail ;
if (!stralloc_cats(&dd->new, lnkbn)) goto fail ;
- if (random_sauniquename(&dd->new, 8) < 0) goto fail ;
+ if (!random_sauniquename(&dd->new, 8)) goto fail ;
if (!stralloc_0(&dd->new)) goto fail ;
if (rename(dd->lnkfn, dd->new.s + oldbase) < 0) goto fail ;
/* /!\ race condition right here: there's no lnkfn in the fs */
@@ -45,7 +45,7 @@ int dd_commit (dirdescriptor_t *dd)
if (!stralloc_0(&dd->new)) goto fail ;
newlnkbase = dd->new.len ;
if (!stralloc_catb(&dd->new, dd->lnkfn, len)) goto fail ;
- if (random_sauniquename(&dd->new, 8) < 0) goto fail ;
+ if (!random_sauniquename(&dd->new, 8)) goto fail ;
if (!stralloc_0(&dd->new)) goto fail ;
if (symlink(dd->new.s, dd->new.s + newlnkbase) < 0) goto fail ;
if (rename(dd->new.s + newlnkbase, dd->lnkfn) < 0)