mount.nfs: Fix retry= to handle lack of reserved port situation

[nfs-utils.git] / support / nfs / exports.c

diff --git a/support/nfs/exports.c b/support/nfs/exports.c
index 60cfe48d6f58038f294c4fb2d4c33739c85859dd..0baa5d05efd006a55233d2ca6fc486fd51a17d7e 100644 (file)
--- a/support/nfs/exports.c
+++ b/support/nfs/exports.c
@@ -48,7 +48,6 @@ static int    getpath(char *path, int len);
 static int     parseopts(char *cp, struct exportent *ep, int warn, int *had_subtree_opt_ptr);
 static int     parsesquash(char *list, int **idp, int *lenp, char **ep);
 static int     parsenum(char **cpp);
-static int     parsemaptype(char *type);
 static void    freesquash(void);
 static void    syntaxerr(char *msg);
 
@@ -94,7 +93,6 @@ getexportent(int fromkernel, int fromexports)
                        def_ee.e_flags &= ~NFSEXP_ASYNC;
                        def_ee.e_flags &= ~NFSEXP_GATHERED_WRITES;
                }
-               def_ee.e_maptype = CLE_MAP_IDENT;
                def_ee.e_anonuid = 65534;
                def_ee.e_anongid = 65534;
                def_ee.e_squids = NULL;
@@ -236,28 +234,15 @@ putexportent(struct exportent *ep)
        case FSLOC_REPLICA:
                fprintf(fp, "replicas=%s,", ep->e_fslocdata);
                break;
+#ifdef DEBUG
        case FSLOC_STUB:
                fprintf(fp, "fsloc=stub,");
                break;
+#endif
        default:
                xlog(L_ERROR, "unknown fsloc method for %s:%s",
                     ep->e_hostname, ep->e_path);
        }
-       fprintf(fp, "mapping=");
-       switch (ep->e_maptype) {
-       case CLE_MAP_IDENT:
-               fprintf(fp, "identity,");
-               break;
-       case CLE_MAP_UGIDD:
-               fprintf(fp, "ugidd,");
-               break;
-       case CLE_MAP_FILE:
-               fprintf(fp, "file,");
-               break;
-       default:
-               xlog(L_ERROR, "unknown mapping type for %s:%s",
-                                       ep->e_hostname, ep->e_path);
-       }
        if ((id = ep->e_squids) != NULL) {
                fprintf(fp, "squash_uids=");
                for (i = 0; i < ep->e_nsquids; i += 2)
@@ -315,7 +300,6 @@ mkexportent(char *hname, char *path, char *options)
        static struct exportent ee;
 
        ee.e_flags = EXPORT_DEFAULT_FLAGS;
-       ee.e_maptype = CLE_MAP_IDENT;
        ee.e_anonuid = 65534;
        ee.e_anongid = 65534;
        ee.e_squids = NULL;
@@ -445,12 +429,6 @@ parseopts(char *cp, struct exportent *ep, int warn, int *had_subtree_opt_ptr)
                        ep->e_flags &= ~NFSEXP_NOACL;
                else if (strcmp(opt, "no_acl") == 0)
                        ep->e_flags |= NFSEXP_NOACL;
-               else if (strncmp(opt, "mapping=", 8) == 0)
-                       ep->e_maptype = parsemaptype(opt+8);
-               else if (strcmp(opt, "map_identity") == 0)      /* old style */
-                       ep->e_maptype = CLE_MAP_IDENT;
-               else if (strcmp(opt, "map_daemon") == 0)        /* old style */
-                       ep->e_maptype = CLE_MAP_UGIDD;
                else if (strncmp(opt, "anonuid=", 8) == 0) {
                        char *oe;
                        ep->e_anonuid = strtol(opt+8, &oe, 10);
@@ -504,6 +482,7 @@ bad_option:
                                ep->e_mountpoint = strdup(mp+1);
                        else
                                ep->e_mountpoint = strdup("");
+#ifdef DEBUG
                } else if (strncmp(opt, "fsloc=", 6) == 0) {
                        if (strcmp(opt+6, "stub") == 0)
                                ep->e_fslocmethod = FSLOC_STUB;
@@ -512,6 +491,7 @@ bad_option:
                                     flname, flline, opt);
                                goto bad_option;
                        }
+#endif
                } else if (strncmp(opt, "refer=", 6) == 0) {
                        ep->e_fslocmethod = FSLOC_REFER;
                        ep->e_fslocdata = strdup(opt+6);
@@ -620,19 +600,6 @@ parsenum(char **cpp)
        return num;
 }
 
-static int
-parsemaptype(char *type)
-{
-       if (!strcmp(type, "identity"))
-               return CLE_MAP_IDENT;
-       if (!strcmp(type, "ugidd"))
-               return CLE_MAP_UGIDD;
-       if (!strcmp(type, "file"))
-               return CLE_MAP_FILE;
-       syntaxerr("invalid map type");
-       return CLE_MAP_IDENT;   /* default */
-}
-
 static int
 getpath(char *path, int len)
 {