summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorneilbrown <neilbrown>2003-07-14 22:17:24 +0000
committerneilbrown <neilbrown>2003-07-14 22:17:24 +0000
commit317522198e1493fe0f1b10614ff2f3a582a9aaff (patch)
treea66f85bea45f294b55c48107b5e6e88751fd220d /utils
parent8b5bc63a7d56666950d4e3cd0937ab5187e84730 (diff)
downloadnfs-utils-317522198e1493fe0f1b10614ff2f3a582a9aaff.tar.gz
nfs-utils-317522198e1493fe0f1b10614ff2f3a582a9aaff.tar.xz
nfs-utils-317522198e1493fe0f1b10614ff2f3a582a9aaff.zip
Assorted fixes
Diffstat (limited to 'utils')
-rw-r--r--utils/exportfs/exportfs.c13
-rw-r--r--utils/mountd/auth.c1
-rw-r--r--utils/mountd/mountd.c2
3 files changed, 9 insertions, 7 deletions
diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
index ab8a4a2..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();
diff --git a/utils/mountd/auth.c b/utils/mountd/auth.c
index f968b07..6361fce 100644
--- a/utils/mountd/auth.c
+++ b/utils/mountd/auth.c
@@ -166,7 +166,6 @@ auth_authenticate(char *what, struct sockaddr_in *caller, char *path)
if (p == epath) p++;
*p = '\0';
}
- free(hp);
switch (error) {
case bad_path:
diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c
index 953891d..ae5daa1 100644
--- a/utils/mountd/mountd.c
+++ b/utils/mountd/mountd.c
@@ -438,7 +438,7 @@ main(int argc, char **argv)
/* Parse the command line options and arguments. */
opterr = 0;
- while ((c = getopt_long(argc, argv, "on:Fd:f:p:P:hN:V:v", longopts, NULL)) != EOF)
+ while ((c = getopt_long(argc, argv, "o:n:Fd:f:p:P:hN:V:v", longopts, NULL)) != EOF)
switch (c) {
case 'o':
descriptors = atoi(optarg);