From 9330eea57e755a4f9f4903894987bf25b2d5cc94 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 9 Apr 2016 16:16:55 +0100
Subject: Tidy up passing of type converter to file server

---
 netfs/daemon/daemonFile.cpp   | 4 ++--
 netfs/daemon/daemonFile.h     | 2 +-
 netfs/daemon/daemonVolume.cpp | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/netfs/daemon/daemonFile.cpp b/netfs/daemon/daemonFile.cpp
index 94aebe6..65a418f 100644
--- a/netfs/daemon/daemonFile.cpp
+++ b/netfs/daemon/daemonFile.cpp
@@ -7,8 +7,8 @@
 #include "daemonFile.h"
 #include <entCache.h>
 
-FileServer::FileServer(int f, const EntryResolver<uid_t> & u, const EntryResolver<gid_t> & g) :
-	TypeConverter(u, g),
+FileServer::FileServer(int f, TypeConverter & t) :
+	TypeConverter(t),
 	fd(f)
 {
 }
diff --git a/netfs/daemon/daemonFile.h b/netfs/daemon/daemonFile.h
index ca5b7ca..1853732 100644
--- a/netfs/daemon/daemonFile.h
+++ b/netfs/daemon/daemonFile.h
@@ -6,7 +6,7 @@
 
 class FileServer : public NetFS::File, TypeConverter {
 	public:
-		FileServer(int fd, const EntryResolver<uid_t> &, const EntryResolver<gid_t> &);
+		FileServer(int fd, TypeConverter &);
 		virtual ~FileServer();
 
 		virtual void close(const Ice::Current&) override;
diff --git a/netfs/daemon/daemonVolume.cpp b/netfs/daemon/daemonVolume.cpp
index 7603691..fef26a1 100644
--- a/netfs/daemon/daemonVolume.cpp
+++ b/netfs/daemon/daemonVolume.cpp
@@ -242,7 +242,7 @@ VolumeServer::open(const NetFS::ReqEnv & re, const std::string & path, Ice::Int
 	if (fd == -1) {
 		throw NetFS::SystemError(errno);
 	}
-	return NetFS::FilePrx::checkedCast(ice.adapter->addWithUUID(new FileServer(fd, userLookup, groupLookup)));
+	return NetFS::FilePrx::checkedCast(ice.adapter->addWithUUID(new FileServer(fd, converter)));
 }
 
 NetFS::FilePrx
@@ -261,7 +261,7 @@ VolumeServer::create(const NetFS::ReqEnv & re, const std::string & path, Ice::In
 		::unlink(p.c_str());
 		throw NetFS::SystemError(errno);
 	}
-	return NetFS::FilePrx::checkedCast(ice.adapter->addWithUUID(new FileServer(fd, userLookup, groupLookup)));
+	return NetFS::FilePrx::checkedCast(ice.adapter->addWithUUID(new FileServer(fd, converter)));
 }
 
 NetFS::DirectoryPrx
-- 
cgit v1.2.3