diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/exportfs/exportfs.c | 11 | ||||
| -rw-r--r-- | utils/mountd/auth.c | 2 | ||||
| -rw-r--r-- | utils/mountd/cache.c | 4 | ||||
| -rw-r--r-- | utils/mountd/mountd.c | 2 |
4 files changed, 9 insertions, 10 deletions
diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c index fec2571..593a8eb 100644 --- a/utils/exportfs/exportfs.c +++ b/utils/exportfs/exportfs.c @@ -111,7 +111,6 @@ main(int argc, char **argv) return 0; } } - if (f_export && ! f_ignore) export_read(_PATH_EXPORTS); if (f_export) { @@ -193,10 +192,10 @@ exports_update(int verbose) { nfs_export *exp; - for (exp = exportlist[MCL_FQDN]; exp; exp=exp->m_next) { + for (exp = exportlist[MCL_FQDN].p_head; exp; exp=exp->m_next) { exports_update_one(exp, verbose); } - for (exp = exportlist[MCL_GSS]; exp; exp=exp->m_next) { + for (exp = exportlist[MCL_GSS].p_head; exp; exp=exp->m_next) { exports_update_one(exp, verbose); } } @@ -212,7 +211,7 @@ export_all(int verbose) int i; for (i = 0; i < MCL_MAXTYPES; i++) { - for (exp = exportlist[i]; exp; exp = exp->m_next) { + for (exp = exportlist[i].p_head; exp; exp = exp->m_next) { if (verbose) printf("exporting %s:%s\n", exp->m_client->m_hostname, @@ -308,7 +307,7 @@ unexportfs(char *arg, int verbose) } } - for (exp = exportlist[htype]; exp; exp = exp->m_next) { + for (exp = exportlist[htype].p_head; exp; exp = exp->m_next) { if (path && strcmp(path, exp->m_export.e_path)) continue; if (htype != exp->m_client->m_type) @@ -453,7 +452,7 @@ dump(int verbose) char *hname, c; for (htype = 0; htype < MCL_MAXTYPES; htype++) { - for (exp = exportlist[htype]; exp; exp = exp->m_next) { + for (exp = exportlist[htype].p_head; exp; exp = exp->m_next) { ep = &exp->m_export; if (!exp->m_xtabent) continue; /* neilb */ diff --git a/utils/mountd/auth.c b/utils/mountd/auth.c index dfe61ea..575f207 100644 --- a/utils/mountd/auth.c +++ b/utils/mountd/auth.c @@ -142,7 +142,7 @@ auth_authenticate_internal(char *what, struct sockaddr_in *caller, exp = NULL; for (i = 0; !exp && i < MCL_MAXTYPES; i++) - for (exp = exportlist[i]; exp; exp = exp->m_next) { + for (exp = exportlist[i].p_head; exp; exp = exp->m_next) { if (strcmp(path, exp->m_export.e_path)) continue; if (!use_ipaddr && !client_member(my_client.m_hostname, exp->m_client->m_hostname)) diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c index fa15472..9bbbfb3 100644 --- a/utils/mountd/cache.c +++ b/utils/mountd/cache.c @@ -394,7 +394,7 @@ void nfsd_fh(FILE *f) /* Now determine export point for this fsid/domain */ for (i=0 ; i < MCL_MAXTYPES; i++) { nfs_export *next_exp; - for (exp = exportlist[i]; exp; exp = next_exp) { + for (exp = exportlist[i].p_head; exp; exp = next_exp) { struct stat stb; char u[16]; char *path; @@ -654,7 +654,7 @@ void nfsd_export(FILE *f) /* now find flags for this export point in this domain */ for (i=0 ; i < MCL_MAXTYPES; i++) { - for (exp = exportlist[i]; exp; exp = exp->m_next) { + for (exp = exportlist[i].p_head; exp; exp = exp->m_next) { if (!use_ipaddr && !client_member(dom, exp->m_client->m_hostname)) continue; if (exp->m_export.e_flags & NFSEXP_CROSSMOUNT) { diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c index 6adb68f..deeaa07 100644 --- a/utils/mountd/mountd.c +++ b/utils/mountd/mountd.c @@ -521,7 +521,7 @@ get_exportlist(void) elist = NULL; for (i = 0; i < MCL_MAXTYPES; i++) { - for (exp = exportlist[i]; exp; exp = exp->m_next) { + for (exp = exportlist[i].p_head; exp; exp = exp->m_next) { for (e = elist; e != NULL; e = e->ex_next) { if (!strcmp(exp->m_export.e_path, e->ex_dir)) break; |