static int nfs_umount_do_umnt(struct mount_options *options,
char **hostname, char **dirname)
{
- struct sockaddr_storage address;
- struct sockaddr *sap = (struct sockaddr *)&address;
+ union {
+ struct sockaddr sa;
+ struct sockaddr_in s4;
+ struct sockaddr_in6 s6;
+ } address;
+ struct sockaddr *sap = &address.sa;
socklen_t salen = sizeof(address);
struct pmap nfs_pmap, mnt_pmap;
+ sa_family_t family;
- nfs_options2pmap(options, &nfs_pmap, &mnt_pmap);
+ if (!nfs_options2pmap(options, &nfs_pmap, &mnt_pmap)) {
+ nfs_error(_("%s: bad mount options"), progname);
+ return EX_FAIL;
+ }
+
+ /* Skip UMNT call for vers=4 mounts */
+ if (nfs_pmap.pm_vers == 4)
+ return EX_SUCCESS;
*hostname = nfs_umount_hostname(options, *hostname);
if (!*hostname) {
return EX_FAIL;
}
- if (nfs_name_to_address(*hostname, AF_UNSPEC, sap, &salen)) {
- if (nfs_advise_umount(sap, salen, &mnt_pmap, dirname) != 0)
- return EX_SUCCESS;
- else
- nfs_error(_("%s: Server failed to unmount '%s:%s'"),
- progname, *hostname, *dirname);
- }
- return EX_FAIL;
+ if (!nfs_mount_proto_family(options, &family))
+ return 0;
+ if (!nfs_lookup(*hostname, family, sap, &salen))
+ /* nfs_lookup reports any errors */
+ return EX_FAIL;
+
+ if (nfs_advise_umount(sap, salen, &mnt_pmap, dirname) == 0)
+ /* nfs_advise_umount reports any errors */
+ return EX_FAIL;
+
+ return EX_SUCCESS;
}
/*
return result;
}
-/*
- * Pick up certain mount options used during the original mount
- * from /etc/mtab. The basics include the server's IP address and
- * the server pathname of the share to unregister.
- *
- * These options might also describe the mount port, mount protocol
- * version, and transport protocol used to punch through a firewall.
- * We will need this information to get through the firewall again
- * to do the umount.
- */
-static int do_nfs_umount23(const char *spec, char *opts)
-{
- char *hostname;
- char *dirname;
- clnt_addr_t mnt_server = { &hostname, };
- struct mntent mnt = { .mnt_opts = opts };
- struct pmap *pmap = &mnt_server.pmap;
- char *p;
- int result = EX_USAGE;
-
- if (!nfs_parse_devname(spec, &hostname, &dirname))
- return result;
-
-#ifdef NFS_MOUNT_DEBUG
- printf(_("host: %s, directory: %s\n"), hostname, dirname);
-#endif
-
- if (opts && (p = strstr(opts, "addr="))) {
- char *q;
-
- free(hostname);
- p += 5;
- q = p;
- while (*q && *q != ',') q++;
- hostname = xstrndup(p,q-p);
- }
-
- if (opts && (p = strstr(opts, "mounthost="))) {
- char *q;
-
- free(hostname);
- p += 10;
- q = p;
- while (*q && *q != ',') q++;
- hostname = xstrndup(p,q-p);
- }
-
- pmap->pm_prog = MOUNTPROG;
- pmap->pm_vers = 0; /* unknown */
- if (opts && (p = strstr(opts, "mountprog=")) && isdigit(*(p+10)))
- pmap->pm_prog = atoi(p+10);
- if (opts && (p = strstr(opts, "mountport=")) && isdigit(*(p+10)))
- pmap->pm_port = atoi(p+10);
- if (opts && hasmntopt(&mnt, "v2"))
- pmap->pm_vers = nfsvers_to_mnt(2);
- if (opts && hasmntopt(&mnt, "v3"))
- pmap->pm_vers = nfsvers_to_mnt(3);
- if (opts && (p = strstr(opts, "vers=")) && isdigit(*(p+5)))
- pmap->pm_vers = nfsvers_to_mnt(atoi(p+5));
- if (opts && (p = strstr(opts, "mountvers=")) && isdigit(*(p+10)))
- pmap->pm_vers = atoi(p+10);
- if (opts && (hasmntopt(&mnt, "udp")
- || hasmntopt(&mnt, "proto=udp")
- || hasmntopt(&mnt, "mountproto=udp")
- ))
- pmap->pm_prot = IPPROTO_UDP;
- if (opts && (hasmntopt(&mnt, "tcp")
- || hasmntopt(&mnt, "proto=tcp")
- || hasmntopt(&mnt, "mountproto=tcp")
- ))
- pmap->pm_prot = IPPROTO_TCP;
-
- if (!nfs_gethostbyname(hostname, &mnt_server.saddr)) {
- nfs_error(_("%s: DNS resolution of '%s' failed"),
- progname, hostname);
- goto out;
- }
-
- if (!nfs_call_umount(&mnt_server, &dirname)) {
- nfs_error(_("%s: Server failed to unmount '%s'"),
- progname, spec);
- result = EX_FAIL;
- goto out;
- }
-
- result = EX_SUCCESS;
-
-out:
- free(hostname);
- free(dirname);
- return result;
-}
-
static struct option umount_longopts[] =
{
{ "force", 0, 0, 'f' },
char *opt = hasmntopt(&mc->m, "user");
struct passwd *pw;
char *comma;
- int len;
+ size_t len;
if (!opt)
goto only_root;
if (opt[4] != '=')