diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2021-08-22 02:07:14 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2021-08-22 02:07:14 +0200 |
| commit | 3b378a6535bc8d9942875ba094301274819905e4 (patch) | |
| tree | f6d9cf51c64f56c1b12dd7fb99ca7ba38b79e53c /nfsd | |
| parent | cd10e825fe4b5458c0deaa300449e0cd872570ef (diff) | |
nfs/nfsd: Use libtirpc
Sun RPC is being phased out from glibc.
* configure.ac: Detect libtirpc.pc, subst libtirpc_CFLAGS and libtirpc_LIBS.
* config.make.in: Subst libtirpc_CFLAGS and libtirpc_LIBS.
* nfs/Makefile, nfsd/Makefile: Include libtirpc_CFLAGS and libtirpc_LIBS
* nfs/mount.c: Include <rpc/xdr.h>
* nfsd/main.c: Likewise.
* nfsd/ops.c: Likewise.
* nfsd/cache.c: Undef TRUE/FALSE after including rpc/ headers.
* nfsd/loop.c: Likewise.
Diffstat (limited to 'nfsd')
| -rw-r--r-- | nfsd/Makefile | 3 | ||||
| -rw-r--r-- | nfsd/cache.c | 4 | ||||
| -rw-r--r-- | nfsd/loop.c | 8 | ||||
| -rw-r--r-- | nfsd/main.c | 1 | ||||
| -rw-r--r-- | nfsd/ops.c | 1 |
5 files changed, 11 insertions, 6 deletions
diff --git a/nfsd/Makefile b/nfsd/Makefile index 5dc9a4da..ef75db03 100644 --- a/nfsd/Makefile +++ b/nfsd/Makefile @@ -30,3 +30,6 @@ LDLIBS = -lpthread include ../Makeconf CPPFLAGS += -DLOCALSTATEDIR=\"$(localstatedir)\" + +CFLAGS += $(libtirpc_CFLAGS) +LDLIBS += $(libtirpc_LIBS) diff --git a/nfsd/cache.c b/nfsd/cache.c index 45234d89..d3ee7659 100644 --- a/nfsd/cache.c +++ b/nfsd/cache.c @@ -32,11 +32,11 @@ #include "nfsd.h" -#undef TRUE -#undef FALSE #define malloc spoogie_woogie /* ugh^2. */ #include <rpc/types.h> #include <rpc/auth.h> +#undef TRUE +#undef FALSE #undef malloc #define IDHASH_TABLE_SIZE 1024 diff --git a/nfsd/loop.c b/nfsd/loop.c index f2d6d546..d94c5d10 100644 --- a/nfsd/loop.c +++ b/nfsd/loop.c @@ -23,14 +23,14 @@ #include "nfsd.h" -#include <rpc/pmap_prot.h> #include "../nfs/mount.h" -#undef TRUE -#undef FALSE #define malloc spoogie_woogie /* barf */ -#include <rpc/xdr.h> #include <rpc/types.h> +#include <rpc/xdr.h> +#undef TRUE +#undef FALSE +#include <rpc/pmap_prot.h> #include <rpc/auth.h> #include <rpc/rpc_msg.h> #undef malloc diff --git a/nfsd/main.c b/nfsd/main.c index ee14e240..3f1fa9a5 100644 --- a/nfsd/main.c +++ b/nfsd/main.c @@ -21,6 +21,7 @@ #include "nfsd.h" #include <stdio.h> #include <unistd.h> +#include <rpc/xdr.h> #include <rpc/pmap_prot.h> #include <maptime.h> #include <hurd.h> @@ -31,6 +31,7 @@ #include "nfsd.h" #include "../nfs/mount.h" /* XXX */ +#include <rpc/xdr.h> #include <rpc/pmap_prot.h> static error_t |