- * Returns a pointer to a string that the caller must free, on
- * success; otherwise NULL is returned.
- */
-static char *nfs_umount_hostname(struct mount_options *options,
- char *hostname)
-{
- char *option;
-
- option = po_get(options, "mountaddr");
- if (option)
- goto out;
- option = po_get(options, "mounthost");
- if (option)
- goto out;
- option = po_get(options, "addr");
- if (option)
- goto out;
-
- return hostname;
-
-out:
- free(hostname);
- return strdup(option);
-}
-
-/*
- * Returns EX_SUCCESS if mount options and device name have been
- * parsed successfully; otherwise EX_FAIL.
- */
-static int nfs_umount_do_umnt(struct mount_options *options,
- char **hostname, char **dirname)
-{
- struct sockaddr_storage address;
- struct sockaddr *sap = (struct sockaddr *)&address;
- socklen_t salen = sizeof(address);
- struct pmap nfs_pmap, mnt_pmap;
-
- nfs_options2pmap(options, &nfs_pmap, &mnt_pmap);
-
- *hostname = nfs_umount_hostname(options, *hostname);
- if (!*hostname) {
- nfs_error(_("%s: out of memory"), progname);
- return EX_FAIL;
- }
-
- if (nfs_name_to_address(*hostname, sap, &salen) == 0)
- /* nfs_name_to_address 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;
-}
-
-/*
- * 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.