diff options
| author | Philip Prindeville <philipp@redfish-solutions.com> | 2018-01-23 11:21:56 -0700 |
|---|---|---|
| committer | Philip Prindeville <philipp@redfish-solutions.com> | 2018-01-23 11:21:56 -0700 |
| commit | d45a2c53061a3db67e25d5997f3dcfda763b3408 (patch) | |
| tree | b8aa4bea9508fc3a315a7e1ac7d12c78d4ca2b8a /libtac/lib | |
| parent | 059e21e01fec0a72d41c8d05a2f52dc3cadcf0a0 (diff) | |
| parent | 81e942c82564e0577e8ecf490b75ed99268a89cc (diff) | |
| download | pam_tacplus-1.5.0-beta.2.tar.gz pam_tacplus-1.5.0-beta.2.zip | |
Merge branch 'master' of github.com:jeroennijhof/pam_tacplus into v1.5.xv1.5.0-beta.2
Diffstat (limited to 'libtac/lib')
| -rw-r--r-- | libtac/lib/author_r.c | 1 | ||||
| -rw-r--r-- | libtac/lib/magic.c | 10 |
2 files changed, 8 insertions, 3 deletions
diff --git a/libtac/lib/author_r.c b/libtac/lib/author_r.c index 148f7ea..fa101e6 100644 --- a/libtac/lib/author_r.c +++ b/libtac/lib/author_r.c @@ -187,6 +187,7 @@ int tac_author_read(int fd, struct areply *re) { /* XXX support optional vs mandatory arguments */ case TAC_PLUS_AUTHOR_STATUS_PASS_REPL: tac_free_attrib(&re->attr); + /*FALLTHRU*/ case TAC_PLUS_AUTHOR_STATUS_PASS_ADD: { u_char *argp; diff --git a/libtac/lib/magic.c b/libtac/lib/magic.c index a320df5..97aa035 100644 --- a/libtac/lib/magic.c +++ b/libtac/lib/magic.c @@ -63,17 +63,21 @@ magic() { u_int32_t num; +#ifdef HAVE_RAND_BYTES + RAND_bytes((unsigned char *)&num, sizeof(num)); +#else RAND_pseudo_bytes((unsigned char *)&num, sizeof(num)); +#endif return num; } #elif defined(HAVE_GETRANDOM) -# if defined(HAVE_LINUX_RANDOM_H) -# include <linux/random.h> -# elif defined(HAVE_SYS_RANDOM_H) +# if defined(HAVE_SYS_RANDOM_H) # include <sys/random.h> +# else +# error no header containing getrandom(2) declaration # endif /* |