X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=utils%2Fmount%2Fnetwork.c;h=72f4b845da4bf6f578eeb2cadd30fa0c31812621;hb=c88c4091db87c0fc23ed67e76d63439b59a82369;hp=b41388ed8a1e6cb12a71527abf8d4bcb616036d8;hpb=20618b27acf6ff52f2654740ebf32516eb1ab1e0;p=nfs-utils.git diff --git a/utils/mount/network.c b/utils/mount/network.c index b41388e..72f4b84 100644 --- a/utils/mount/network.c +++ b/utils/mount/network.c @@ -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); } /*