| Message ID | 20191118143147.26015-1-petr.vorel@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [nfs-utils,1/1] mountd: Fix compilation for --disable-uuid | expand |
On 11/18/19 9:31 AM, Petr Vorel wrote: > Although code in configure.ac pretends to set USE_BLKID as 0 > via AC_DEFINE_UNQUOTED, it's actually not defined > support/include/config.h.in > support/include/config.h > /* #undef USE_BLKID */ > > Fixes: 8e643554 ("Allow disabling of libblkid usage.") > > Signed-off-by: Petr Vorel <petr.vorel@gmail.com> Committed! Thanks!! (tag: nfs-utils-2-4-3-rc1) steved. > --- > utils/mountd/cache.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c > index 31e9507d..e5186c78 100644 > --- a/utils/mountd/cache.c > +++ b/utils/mountd/cache.c > @@ -221,7 +221,7 @@ static void auth_unix_gid(int f) > xlog(L_ERROR, "auth_unix_gid: error writing reply"); > } > > -#if USE_BLKID > +#ifdef USE_BLKID > static const char *get_uuid_blkdev(char *path) > { > /* We set *safe if we know that we need the >
diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c index 31e9507d..e5186c78 100644 --- a/utils/mountd/cache.c +++ b/utils/mountd/cache.c @@ -221,7 +221,7 @@ static void auth_unix_gid(int f) xlog(L_ERROR, "auth_unix_gid: error writing reply"); } -#if USE_BLKID +#ifdef USE_BLKID static const char *get_uuid_blkdev(char *path) { /* We set *safe if we know that we need the
Although code in configure.ac pretends to set USE_BLKID as 0 via AC_DEFINE_UNQUOTED, it's actually not defined support/include/config.h.in support/include/config.h /* #undef USE_BLKID */ Fixes: 8e643554 ("Allow disabling of libblkid usage.") Signed-off-by: Petr Vorel <petr.vorel@gmail.com> --- utils/mountd/cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)