4 files changed, 1 insertions, 55 deletions
diff --git a/support/include/Makefile.am b/support/include/Makefile.am
index a99882c..69c4503 100644
--- a/support/include/Makefile.am
+++ b/support/include/Makefile.am
@@ -3,7 +3,6 @@
 SUBDIRS = nfs rpcsvc sys
 
 noinst_HEADERS = \
-	conn.h \
 	exportfs.h \
 	fstab.h \
 	ha-callout.h \
diff --git a/support/include/conn.h b/support/include/conn.h
deleted file mode 100644
index 2b1f07d..0000000
--- a/support/include/conn.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* 
- * conn.h -- Connection routines for NFS mount / umount code.
- *
- * 2006-06-06 Amit Gud <agud@redhat.com>
- * - Moved code snippets here from util-linux/mount
- */
-
-#ifndef _CONN_H
-#define _CONN_H
-
-#ifdef HAVE_RPCSVC_NFS_PROT_H
-#include <rpcsvc/nfs_prot.h>
-#else
-#include <linux/nfs.h>
-#define nfsstat nfs_stat
-#endif
-
-#include <rpc/pmap_prot.h>
-#include <rpc/clnt.h>
-
-typedef struct {
-	char **hostname;
-	struct sockaddr_in saddr;
-	struct pmap pmap;
-} clnt_addr_t;
-
-/* RPC call timeout values */
-static const struct timeval TIMEOUT = { 20, 0 };
-static const struct timeval RETRY_TIMEOUT = { 3, 0 };
-
-#endif /* _CONN_H */
-
diff --git a/support/nfs/Makefile.am b/support/nfs/Makefile.am
index 6006df6..82353a9 100644
--- a/support/nfs/Makefile.am
+++ b/support/nfs/Makefile.am
@@ -4,7 +4,7 @@ noinst_LIBRARIES = libnfs.a
 libnfs_a_SOURCES = exports.c rmtab.c xio.c rpcmisc.c rpcdispatch.c \
 		   xlog.c xcommon.c wildmat.c nfssvc.c nfsclient.c \
 		   nfsexport.c getfh.c nfsctl.c \
-		   svc_socket.c cacheio.c closeall.c conn.c fstab.c nfs_mntent.c
+		   svc_socket.c cacheio.c closeall.c fstab.c nfs_mntent.c
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/support/nfs/conn.c b/support/nfs/conn.c
deleted file mode 100644
index db9185d..0000000
--- a/support/nfs/conn.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * conn.c -- NFS client mount / umount connection code support functions
- *
- * 2006-06-06 Amit Gud <agud@redhat.com>
- * - Moved code snippets to nfs-utils/support/nfs from util-linux/mount/nfsmount.c
- *
- */
-
-#include "config.h"
-#include <errno.h>
-#include <unistd.h>
-#include <rpc/rpc.h>
-#include <rpc/pmap_prot.h>
-#include <rpc/pmap_clnt.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include "conn.h"
-