From: Kevin Coffman <kwc@citi.umich.edu>
Date: Fri, 12 Oct 2007 20:35:05 +0000 (-0400)
Subject: Use nfslib versions of cacheio functions
X-Git-Tag: nfs-utils-1-1-1~5
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=6a6e6526d7c6db42688d5fd32a6b555489b49cae;p=nfs-utils.git

Use nfslib versions of cacheio functions

Now that the nfslib library has all the necessary functions and they
all operate as needed, use them instead of the private versions in
utils/gssd/cacheio.c.
The obsolete private versions are removed in the next patch.

Signed-off-by: Kevin Coffman <kwc@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
---

diff --git a/utils/gssd/Makefile.am b/utils/gssd/Makefile.am
index 7c32597..c0ca8be 100644
--- a/utils/gssd/Makefile.am
+++ b/utils/gssd/Makefile.am
@@ -46,13 +46,11 @@ gssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \
 
 svcgssd_SOURCES = \
 	$(COMMON_SRCS) \
-	cacheio.c \
 	svcgssd.c \
 	svcgssd_main_loop.c \
 	svcgssd_mech2file.c \
 	svcgssd_proc.c \
 	\
-	cacheio.h \
 	svcgssd.h
 
 svcgssd_LDADD = \
diff --git a/utils/gssd/svcgssd_proc.c b/utils/gssd/svcgssd_proc.c
index 2dffa83..794c2f4 100644
--- a/utils/gssd/svcgssd_proc.c
+++ b/utils/gssd/svcgssd_proc.c
@@ -45,12 +45,12 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <nfsidmap.h>
+#include <nfslib.h>
 
 #include "svcgssd.h"
 #include "gss_util.h"
 #include "err_util.h"
 #include "context.h"
-#include "cacheio.h"
 
 extern char * mech2file(gss_OID mech);
 #define SVCGSSD_CONTEXT_CHANNEL "/proc/net/rpc/auth.rpcsec.context/channel"