X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fexportfs%2Fexportfs.c;h=51965645203c77c886d01f4a7348eff362438ccf;hp=bd48e98fd4eaeb68fb9023dd7ac2a549b1e71510;hb=317522198e1493fe0f1b10614ff2f3a582a9aaff;hpb=d38ea02d0e4bcdc4e0114567028596f7bcba45b9 diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c index bd48e98..5196564 100644 --- a/utils/exportfs/exportfs.c +++ b/utils/exportfs/exportfs.c @@ -91,11 +91,14 @@ main(int argc, char **argv) fprintf(stderr, "exportfs: -r and -u are incompatible.\n"); return 1; } - if (optind == argc && ! f_all) { - xtab_export_read(); - dump(f_verbose); - return 0; - } + if (optind == argc && ! f_all) + if (force_flush) { + cache_flush(1); + } else { + xtab_export_read(); + dump(f_verbose); + return 0; + } new_cache = check_new_cache(); @@ -283,10 +286,14 @@ unexportfs(char *arg, int verbose) for (exp = exportlist[htype]; exp; exp = exp->m_next) { if (path && strcmp(path, exp->m_export.e_path)) continue; - if (htype != exp->m_client->m_type - || (htype == MCL_FQDN - && !matchhostname(exp->m_export.e_hostname, - hname))) + if (htype != exp->m_client->m_type) + continue; + if (htype == MCL_FQDN + && !matchhostname(exp->m_export.e_hostname, + hname)) + continue; + if (htype != MCL_FQDN + && strcasecmp(exp->m_export.e_hostname, hname)) continue; if (verbose) { #if 0