diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-02-21 19:00:02 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-02-21 19:00:02 +0000 |
| commit | a9fbe3eb5e5fac05b4f7120f3a8dc0a6ab8a1ec0 (patch) | |
| tree | 15e217575b04bc1ae6cd85f5dd7df9e458248417 /sbin/umount/umount.c | |
| parent | 53ad902eb700de578566f6e9044c11b20928cb12 (diff) | |
Permit building without portmap/mountd rpc calls in the fallback nfs path
ok guenther
Diffstat (limited to 'sbin/umount/umount.c')
| -rw-r--r-- | sbin/umount/umount.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sbin/umount/umount.c b/sbin/umount/umount.c index ffd3d521fdb..2ba169ca7d5 100644 --- a/sbin/umount/umount.c +++ b/sbin/umount/umount.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umount.c,v 1.24 2013/07/21 21:07:10 millert Exp $ */ +/* $OpenBSD: umount.c,v 1.25 2014/02/21 19:00:01 deraadt Exp $ */ /* $NetBSD: umount.c,v 1.16 1996/05/11 14:13:55 mycroft Exp $ */ /*- @@ -144,7 +144,6 @@ umountall(void) int umountfs(char *oname) { - enum clnt_stat clnt_stat; struct hostent *hp; struct sockaddr_in saddr; struct stat sb; @@ -219,8 +218,11 @@ umountfs(char *oname) return (1); } +#ifndef NO_NFS if (!strncmp(type, MOUNT_NFS, MFSNAMELEN) && (hp != NULL) && !(fflag & MNT_FORCE)) { + enum clnt_stat clnt_stat; + *delimp = '\0'; memset(&saddr, 0, sizeof(saddr)); saddr.sin_family = AF_INET; @@ -246,6 +248,7 @@ umountfs(char *oname) auth_destroy(clp->cl_auth); clnt_destroy(clp); } +#endif return (0); } @@ -359,6 +362,7 @@ namematch(struct hostent *hp) return (0); } +#ifndef NO_NFS /* * xdr routines for mount rpc's */ @@ -367,6 +371,7 @@ xdr_dir(XDR *xdrsp, char *dirp) { return (xdr_string(xdrsp, &dirp, RPCMNT_PATHLEN)); } +#endif void usage(void) |