Skip to contentSkip to conversation

mountd: Fix compilation for --disable-uuid

PATCH In review Petr Vorel 2 participants 2 messages Nov 18, 2019

Subsystems (2)
lore
Share & tools
lore

Petr Vorel

author
#0 lore raw

PATCH 1/1 mountd: Fix compilation for --disable-uuid

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.")
---
 utils/mountd/cache.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
utils/mountd/cache.c +1 -1
index 31e9507d..e5186c78 100644
@@ -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
Signature · 1 line
2.23.0
#1 lore raw
Quoted 9 lines · Petr Vorel

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.")

Committed! Thanks!! (tag: nfs-utils-2-4-3-rc1)

steved.

Quoted 18 lines
---
 utils/mountd/cache.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
utils/mountd/cache.c +1 -1
index 31e9507d..e5186c78 100644
@@ -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