utils: Return status 0 on clean exits

[nfs-utils.git] / utils / mountd / v4root.c

diff --git a/utils/mountd/v4root.c b/utils/mountd/v4root.c
index 7fd6af3dd4592462addb005c3986031d8f5020ad..726b50dc61093a2fa926d131131ed59860b1ae8c 100644 (file)
--- a/utils/mountd/v4root.c
+++ b/utils/mountd/v4root.c
@@ -46,6 +46,7 @@ static nfs_export pseudo_root = {
                .e_nsqgids = 0,
                .e_fsid = 0,
                .e_mountpoint = NULL,
+               .e_ttl = DEFAULT_TTL,
        },
        .m_exported = 0,
        .m_xtabent = 1,
@@ -61,6 +62,8 @@ void set_pseudofs_security(struct exportent *pseudo, struct exportent *source)
 
        if (source->e_flags & NFSEXP_INSECURE_PORT)
                pseudo->e_flags |= NFSEXP_INSECURE_PORT;
+       if ((source->e_flags & NFSEXP_ROOTSQUASH) == 0)
+               pseudo->e_flags &= ~NFSEXP_ROOTSQUASH;
        for (se = source->e_secinfo; se->flav; se++) {
                struct sec_entry *new;
 
@@ -83,7 +86,7 @@ v4root_create(char *path, nfs_export *export)
        struct exportent *curexp = &export->m_export;
 
        dupexportent(&eep, &pseudo_root.m_export);
-       eep.e_hostname = strdup(curexp->e_hostname);
+       eep.e_hostname = curexp->e_hostname;
        strncpy(eep.e_path, path, sizeof(eep.e_path));
        if (strcmp(path, "/") != 0)
                eep.e_flags &= ~NFSEXP_FSID;
@@ -91,7 +94,8 @@ v4root_create(char *path, nfs_export *export)
        exp = export_create(&eep, 0);
        if (exp == NULL)
                return NULL;
-       xlog(D_CALL, "v4root_create: path '%s'", exp->m_export.e_path);
+       xlog(D_CALL, "v4root_create: path '%s' flags 0x%x", 
+               exp->m_export.e_path, exp->m_export.e_flags);
        return &exp->m_export;
 }
 
@@ -144,15 +148,18 @@ static int v4root_add_parents(nfs_export *exp)
        char *ptr;
 
        path = strdup(exp->m_export.e_path);
-       if (!path)
+       if (!path) {
+               xlog(L_WARNING, "v4root_add_parents: Unable to create "
+                               "pseudo export for '%s'", exp->m_export.e_path);
                return -ENOMEM;
-       for (ptr = path + 1; ptr; ptr = strchr(ptr, '/')) {
+       }
+       for (ptr = path; ptr; ptr = strchr(ptr, '/')) {
                int ret;
                char saved;
 
                saved = *ptr;
                *ptr = '\0';
-               ret = pseudofs_update(hostname, path, exp);
+               ret = pseudofs_update(hostname, *path ? path : "/", exp);
                if (ret)
                        return ret;
                *ptr = saved;
@@ -173,7 +180,7 @@ void
 v4root_set()
 {
        nfs_export      *exp;
-       int     i, ret;
+       int     i;
 
        if (!v4root_needed)
                return;
@@ -189,7 +196,14 @@ v4root_set()
                                 */
                                continue;
 
-                       ret = v4root_add_parents(exp);
+                       if (strcmp(exp->m_export.e_path, "/") == 0 &&
+                           !(exp->m_export.e_flags & NFSEXP_FSID)) {
+                               /* Force '/' to be exported as fsid == 0*/
+                               exp->m_export.e_flags |= NFSEXP_FSID;
+                               exp->m_export.e_fsid = 0;
+                       }
+
+                       v4root_add_parents(exp);
                        /* XXX: error handling! */
                }
        }