umount.nfs: Fix return value of nfs_mount_protocol()

[nfs-utils.git] / utils / mount / network.c

diff --git a/utils/mount/network.c b/utils/mount/network.c
index 92f75b4a5e03d74c2ba2d00bb5de849f8734c9ac..72f4b845da4bf6f578eeb2cadd30fa0c31812621 100644 (file)
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -291,7 +291,7 @@ int nfs_name_to_address(const char *hostname,
        }
 
        memcpy(&sin->sin_addr, hp->h_addr, hp->h_length);
-       *salen = hp->h_length;
+       *salen = sizeof(struct sockaddr_in);
        return 1;
 }
 #endif /* HAVE_DECL_AI_ADDRCONFIG */
@@ -546,8 +546,9 @@ static void nfs_pp_debug(const struct sockaddr *sap, const socklen_t salen,
                strcat(buf, "unknown host");
        }
 
-       fprintf(stderr, _("%s: trying %s prog %ld vers %ld prot %s port %d\n"),
-                       progname, buf, program, version,
+       fprintf(stderr, _("%s: trying %s prog %lu vers %lu prot %s port %d\n"),
+                       progname, buf, (unsigned long)program,
+                       (unsigned long)version,
                        (protocol == IPPROTO_UDP ? _("UDP") : _("TCP")),
                        port);
 }
@@ -868,7 +869,7 @@ int nfs_advise_umount(const struct sockaddr *sap, const socklen_t salen,
        memcpy(saddr, sap, salen);
        nfs_set_port(saddr, mnt_pmap.pm_port);
 
-       client = nfs_get_rpcclient(saddr, salen, mnt_pmap.pm_prot,
+       client = nfs_get_priv_rpcclient(saddr, salen, mnt_pmap.pm_prot,
                                        mnt_pmap.pm_prog, mnt_pmap.pm_vers,
                                        &timeout);
        if (client == NULL)
@@ -1336,7 +1337,7 @@ static unsigned short nfs_mount_protocol(struct mount_options *options)
                        return IPPROTO_UDP;
        }
 
-       return nfs_nfs_version(options);
+       return nfs_nfs_protocol(options);
 }
 
 /*