summaryrefslogtreecommitdiffstats
path: root/sys/nfsclient
diff options
context:
space:
mode:
Diffstat (limited to 'sys/nfsclient')
-rw-r--r--sys/nfsclient/nfs_nfsiod.c12
-rw-r--r--sys/nfsclient/nfs_subs.c18
2 files changed, 0 insertions, 30 deletions
diff --git a/sys/nfsclient/nfs_nfsiod.c b/sys/nfsclient/nfs_nfsiod.c
index 15c6231..14ff8d1 100644
--- a/sys/nfsclient/nfs_nfsiod.c
+++ b/sys/nfsclient/nfs_nfsiod.c
@@ -59,9 +59,6 @@
#include <netinet/in.h>
#include <netinet/tcp.h>
-#ifdef ISO
-#include <netiso/iso.h>
-#endif
#include <nfs/xdr_subs.h>
#include <nfs/rpcv2.h>
#include <nfs/nfsproto.h>
@@ -339,15 +336,6 @@ nfssvc_addsock(fp, mynam, p)
FREE(mynam, M_SONAME);
return (EPERM);
}
-#ifdef ISO
- } else if (so->so_proto->pr_protocol == ISOPROTO_CLTP) {
- tslp = nfs_cltpsock;
- if (tslp->ns_flag & SLP_VALID) {
- if (mynam != NULL)
- FREE(mynam, M_SONAME);
- return (EPERM);
- }
-#endif /* ISO */
}
#endif
if (so->so_type == SOCK_STREAM)
diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c
index 28fce31..2e19721 100644
--- a/sys/nfsclient/nfs_subs.c
+++ b/sys/nfsclient/nfs_subs.c
@@ -74,9 +74,6 @@
#include <nfs/nfsrtt.h>
#include <netinet/in.h>
-#ifdef ISO
-#include <netiso/iso.h>
-#endif
/*
* Data items converted to xdr at startup, since they are constant
@@ -2027,21 +2024,6 @@ netaddr_match(family, haddr, nam)
inetaddr->sin_addr.s_addr == haddr->had_inetaddr)
return (1);
break;
-#ifdef ISO
- case AF_ISO:
- {
- register struct sockaddr_iso *isoaddr1, *isoaddr2;
-
- isoaddr1 = (struct sockaddr_iso *)nam;
- isoaddr2 = (struct sockaddr_iso *)haddr->had_nam;
- if (isoaddr1->siso_family == AF_ISO &&
- isoaddr1->siso_nlen > 0 &&
- isoaddr1->siso_nlen == isoaddr2->siso_nlen &&
- SAME_ISOADDR(isoaddr1, isoaddr2))
- return (1);
- break;
- }
-#endif /* ISO */
default:
break;
};
OpenPOWER on IntegriCloud