errno not be set on RPC errors

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

diff --git a/utils/mount/network.c b/utils/mount/network.c
index 11c71623aa3b1a0f4ce1030ebae0144762e0bde1..f6fa5fd340ec353d4e9cc8155569babdaeef8806 100644 (file)
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -255,7 +255,6 @@ int nfs_gethostbyname(const char *hostname, struct sockaddr_in *sin)
 /**
  * nfs_string_to_sockaddr - convert string address to sockaddr
  * @address:   pointer to presentation format address to convert
- * @addrlen:   length of presentation address
  * @sap:       pointer to socket address buffer to fill in
  * @salen:     IN: length of address buffer
  *             OUT: length of converted socket address
@@ -269,8 +268,8 @@ int nfs_gethostbyname(const char *hostname, struct sockaddr_in *sin)
  * See RFC 4038 section 5.1 or RFC 3513 section 2.2 for more details
  * on presenting IPv6 addresses as text strings.
  */
-int nfs_string_to_sockaddr(const char *address, const size_t addrlen,
-                          struct sockaddr *sap, socklen_t *salen)
+int nfs_string_to_sockaddr(const char *address, struct sockaddr *sap,
+                          socklen_t *salen)
 {
        struct addrinfo *gai_results;
        struct addrinfo gai_hint = {
@@ -849,10 +848,14 @@ int nfs_advise_umount(const struct sockaddr *sap, const socklen_t salen,
                        (xdrproc_t)xdr_dirpath, (caddr_t)argp,
                        (xdrproc_t)xdr_void, NULL,
                        timeout);
-       if (verbose && res != RPC_SUCCESS)
-               nfs_error(_("%s: UMNT call failed: %s"),
-                       progname, clnt_sperrno(res));
+       if (res != RPC_SUCCESS) {
+               rpc_createerr.cf_stat = res;
+               CLNT_GETERR(client, &rpc_createerr.cf_error);
+               if (verbose)
+                       nfs_error(_("%s: UMNT call failed: %s"),
+                               progname, clnt_sperrno(res));
 
+       }
        auth_destroy(client->cl_auth);
        CLNT_DESTROY(client);