mountd: fix exporting of "/" with sec= setting.
Subsystems (2)
PATCH 1/1 mountd: fix exporting of "/" with sec= setting.
Commit 91bb95f2689e84856ecdf6fac365489d36709cf9
4set_root: force "fsid=0" for all exports of '/'
set NFSEXP_FSID for the export of "/" if nothing else had any fsid set, however it didn't also set the flag for all security flavours. So the kernel complains that the flags on the security flavours don't match and it rejects the export.
So call fix_pseudoflavor_flags() in write_secinfo() to make sure that any fiddling that has been done to e_flags gets copied to e_secinfo.
support/include/exportfs.h +1 -0
@@ -177,6 +177,7 @@ struct export_features { };struct export_features *get_export_features (void ); +void fix_pseudoflavor_flags (struct exportent *ep);/* Record export error. */ extern int export_errno;
support/nfs/exports.c +1 -1
@@ -469,7 +469,7 @@ static void clearflags(int mask, unsigned int active, struct exportent *ep)* ensure that the export flags agree with the flags on each * pseudoflavor: */ -static void fix_pseudoflavor_flags (struct exportent *ep) +void fix_pseudoflavor_flags (struct exportent *ep) {struct export_features *ef;struct sec_entry *p;
utils/mountd/cache.c +1 -0
@@ -735,6 +735,7 @@ static void write_secinfo(FILE *f, struct exportent *ep, int flag_mask)/* There was no sec= option */ return ; } +fix_pseudoflavor_flags (ep);qword_print (f,"secinfo" );qword_printint (f, p - ep->e_secinfo);for (p = ep->e_secinfo; p->flav; p++) {
Quoted 10 lines · NeilBrown
Commit
91bb95f2689e84856ecdf6fac365489d36709cf9
4set_root: force "fsid=0" for all exports of '/'set
NFSEXP_FSIDfor the export of "/" if nothing else had any fsid set, however it didn't also set the flag for all security flavours. So the kernel complains that the flags on the security flavours don't match and it rejects the export.
Quoted 4 lines
So call
fix_pseudoflavor_flags()inwrite_secinfo()to make sure that any fiddling that has been done toe_flagsgets copied toe_secinfo.Signed-off-by NeilBrown <[email protected]>
Committed...
steved.
Quoted 39 lines
support/include/exportfs.h +1
-0@@ -177,6 +177,7 @@ struct export_features { };struct export_features *get_export_features (void ); +void fix_pseudoflavor_flags (struct exportent *ep);/* Record export error. */ extern int export_errno;support/nfs/exports.c +1
-1@@ -469,7 +469,7 @@ static void clearflags(int mask, unsigned int active, struct exportent *ep)* ensure that the export flags agree with the flags on each * pseudoflavor: */ -static void fix_pseudoflavor_flags (struct exportent *ep) +void fix_pseudoflavor_flags (struct exportent *ep) {struct export_features *ef;struct sec_entry *p;utils/mountd/cache.c +1
-0@@ -735,6 +735,7 @@ static void write_secinfo(FILE *f, struct exportent *ep, int flag_mask)/* There was no sec= option */ return ; } +fix_pseudoflavor_flags (ep);qword_print (f,"secinfo" );qword_printint (f, p - ep->e_secinfo);for (p = ep->e_secinfo; p->flav; p++) {