Fix error reporting when probe_bothports() fails while rewriting mount

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

diff --git a/utils/mount/error.c b/utils/mount/error.c
index 3f7458c96ed0574ff3237ba0ac77a077642b3606..147e919bd56fdd29649ed205f7233ba66e6681b4 100644 (file)
--- a/utils/mount/error.c
+++ b/utils/mount/error.c
@@ -23,7 +23,10 @@
  *  + Proper support for internationalization
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <unistd.h>
 #include <sys/types.h>
 #include <stdio.h>
@@ -130,7 +133,62 @@ void rpc_mount_errors(char *server, int will_retry, int bg)
                fprintf(stderr, "%s\n", errbuf);
 }
 
-/*
+/**
+ * sys_mount_errors - log an error that occurred during a mount system call
+ * @server: C string containing name of server we are attempting to mount
+ * @error: errno value to report
+ * @will_retry: one indicates mount will retry at some later point
+ * @bg: one indicates this is a background mount
+ *
+ * Passed an errno value generated by a mount system call, and reports it
+ * on stderr (fg mount) or in the system log (bg mount).
+ */
+void sys_mount_errors(char *server, int error, int will_retry, int bg)
+{
+       int pos = 0;
+       char *tmp;
+       static int onlyonce = 0;
+
+       tmp = &errbuf[pos];
+       if (bg)
+               pos = snprintf(tmp, (erreob - tmp),
+                               _("mount to NFS server '%s' failed: "),
+                                       server);
+       else
+               pos = snprintf(tmp, (erreob - tmp),
+                               _("%s: mount to NFS server '%s' failed: "),
+                                       progname, server);
+
+       tmp = &errbuf[pos];
+       if (error == ETIMEDOUT) {
+               if (will_retry)
+                       pos = snprintf(tmp, (erreob - tmp),
+                                       _("timed out, retrying"));
+               else
+                       pos = snprintf(tmp, (erreob - tmp),
+                                       _("timed out, giving up"));
+       } else {
+               if (bg) {
+                       if (will_retry)
+                               pos = snprintf(tmp, (erreob - tmp),
+                                               _("%s, retrying"),
+                                               strerror(error));
+                       else
+                               pos = snprintf(tmp, (erreob - tmp),
+                                               _("%s, giving up"),
+                                               strerror(error));
+               }
+       }
+
+       if (bg) {
+               if (onlyonce++ < 1)
+                       openlog("mount", LOG_CONS|LOG_PID, LOG_AUTH);
+               syslog(LOG_ERR, "%s", errbuf);
+       } else
+               fprintf(stderr, "%s\n", errbuf);
+}
+
+/**
  * mount_error - report a foreground mount error
  * @spec: C string containing the device name being mounted
  * @mount_point: C string containing the pathname of the local mounted on dir
@@ -140,12 +198,24 @@ void rpc_mount_errors(char *server, int will_retry, int bg)
 void mount_error(const char *spec, const char *mount_point, int error)
 {
        switch(error) {
+       case EACCES:
+               nfs_error(_("%s: access denied by server while mounting %s"),
+                               progname, spec);
+               break;
+       case EINVAL:
+               nfs_error(_("%s: an incorrect mount option was specified"), progname);
+               break;
+       case EOPNOTSUPP:
+               nfs_error(_("%s: requested NFS version or transport"
+                               " protocol is not supported"),
+                               progname);
+               break;
        case ENOTDIR:
                nfs_error(_("%s: mount point %s is not a directory"),
                                progname, mount_point);
                break;
        case EBUSY:
-               nfs_error(_("%s: %s is already mounted or busy"),
+               nfs_error(_("%s: %s is busy or already mounted"),
                        progname, mount_point);
                break;
        case ENOENT:
@@ -157,6 +227,13 @@ void mount_error(const char *spec, const char *mount_point, int error)
                        nfs_error(_("%s: mount point %s does not exist"),
                                progname, mount_point);
                break;
+       case ESPIPE:
+               rpc_mount_errors((char *)spec, 0, 0);
+               break;
+       case EIO:
+       case EFAULT:
+               nfs_error(_("%s: internal error"), progname);
+               break;
        default:
                nfs_error(_("%s: %s"),
                        progname, strerror(error));