mount.nfs: If port= specifies an unregistered port, retry, then fail

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

diff --git a/utils/mount/network.c b/utils/mount/network.c
index d93e98d03b6a906b281a9f2aef42bb018840d9c1..73d64a2b8782221b601f132cdb18aac450efc4f0 100644 (file)
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -509,6 +509,21 @@ static void nfs_pp_debug(const struct sockaddr *sap, const socklen_t salen,
                        port);
 }
 
+static void nfs_pp_debug2(const char *str)
+{
+       if (!verbose)
+               return;
+
+       if (rpc_createerr.cf_error.re_status == RPC_CANTRECV ||
+           rpc_createerr.cf_error.re_status == RPC_CANTSEND)
+               nfs_error(_("%s: portmap query %s%s - %s"),
+                               progname, str, clnt_spcreateerror(""),
+                               strerror(rpc_createerr.cf_error.re_errno));
+       else
+               nfs_error(_("%s: portmap query %s%s"),
+                               progname, str, clnt_spcreateerror(""));
+}
+
 /*
  * Use the portmapper to discover whether or not the service we want is
  * available. The lists 'versions' and 'protos' define ordered sequences
@@ -538,9 +553,11 @@ static int nfs_probe_port(const struct sockaddr *sap, const socklen_t salen,
        memcpy(saddr, sap, salen);
        p_prot = prot ? &prot : protos;
        p_vers = vers ? &vers : versions;
-       rpc_createerr.cf_stat = 0;
 
        for (;;) {
+               if (verbose)
+                       printf(_("%s: prog %lu, trying vers=%lu, prot=%u\n"),
+                               progname, prog, *p_vers, *p_prot);
                p_port = nfs_getport(saddr, salen, prog, *p_vers, *p_prot);
                if (p_port) {
                        if (!port || port == p_port) {
@@ -550,28 +567,31 @@ static int nfs_probe_port(const struct sockaddr *sap, const socklen_t salen,
                                if (nfs_rpc_ping(saddr, salen, prog,
                                                        *p_vers, *p_prot, NULL))
                                        goto out_ok;
-                       }
+                       } else
+                               rpc_createerr.cf_stat = RPC_PROGNOTREGISTERED;
                }
                if (rpc_createerr.cf_stat != RPC_PROGNOTREGISTERED &&
                    rpc_createerr.cf_stat != RPC_TIMEDOUT &&
                    rpc_createerr.cf_stat != RPC_CANTRECV &&
                    rpc_createerr.cf_stat != RPC_PROGVERSMISMATCH)
-                       goto out_bad;
+                       break;
 
                if (!prot) {
-                       if (*++p_prot)
+                       if (*++p_prot) {
+                               nfs_pp_debug2("retrying");
                                continue;
+                       }
                        p_prot = protos;
                }
                if (rpc_createerr.cf_stat == RPC_TIMEDOUT ||
                    rpc_createerr.cf_stat == RPC_CANTRECV)
-                       goto out_bad;
+                       break;
 
                if (vers || !*++p_vers)
                        break;
        }
 
-out_bad:
+       nfs_pp_debug2("failed");
        return 0;
 
 out_ok:
@@ -581,7 +601,7 @@ out_ok:
                pmap->pm_prot = *p_prot;
        if (!port)
                pmap->pm_port = p_port;
-       rpc_createerr.cf_stat = 0;
+       nfs_clear_rpc_createerr();
        return 1;
 }
 
@@ -819,17 +839,24 @@ int nfs_advise_umount(const struct sockaddr *sap, const socklen_t salen,
        CLIENT *client;
        enum clnt_stat res = 0;
 
-       if (nfs_probe_mntport(sap, salen, &mnt_pmap) == 0)
-               return 0;
-
        memcpy(saddr, sap, salen);
+       if (nfs_probe_mntport(saddr, salen, &mnt_pmap) == 0) {
+               if (verbose)
+                       nfs_error(_("%s: Failed to discover mountd port%s"),
+                               progname, clnt_spcreateerror(""));
+               return 0;
+       }
        nfs_set_port(saddr, mnt_pmap.pm_port);
 
        client = nfs_get_priv_rpcclient(saddr, salen, mnt_pmap.pm_prot,
                                        mnt_pmap.pm_prog, mnt_pmap.pm_vers,
                                        &timeout);
-       if (client == NULL)
+       if (client == NULL) {
+               if (verbose)
+                       nfs_error(_("%s: Failed to create RPC client%s"),
+                               progname, clnt_spcreateerror(""));
                return 0;
+       }
 
        client->cl_auth = authunix_create_default();
 
@@ -837,13 +864,15 @@ 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));
 
        auth_destroy(client->cl_auth);
        CLNT_DESTROY(client);
 
        if (res != RPC_SUCCESS)
                return 0;
-
        return 1;
 }