Assorted fixes

diff --git a/ChangeLog b/ChangeLog
index f1890c3eba4c4759ebf7769bdf002d5801d6a3e6..876385481da504cf2f91bb577d3fdd88373588f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-07-15 NeilBrown <neilb@cse.unsw.edu.au>
+
+       * utils/mountd/mountd.c(main): getopt string fix for 'o'
+       * utils/mountd/auth.c(auth_authenticate): remove extra 'free'
+       * utils/exportfs/exportfs.c(main): make 'exportfs -f' just flush
+       the caches.
+       * support/include/nfs/export.h: Reserve a bit for possible ACL
+       related use.
        
 2003-07-03 NeilBrown <neilb@cse.unsw.edu.au>
 

diff --git a/support/include/nfs/export.h b/support/include/nfs/export.h
index d79a179dcff17b1dbd1cb955a0958b62f08bdc4d..9c73aaa2d3eb4b2fe0baafed51e5fcd0beb3a7f6 100644 (file)
--- a/support/include/nfs/export.h
+++ b/support/include/nfs/export.h
@@ -25,6 +25,7 @@
 #define NFSEXP_NOAUTHNLM       0x0800
 #define NFSEXP_FSID            0x2000
 #define        NFSEXP_CROSSMNT         0x4000
-#define NFSEXP_ALLFLAGS                0x7FFF
+#define NFSEXP_NOACL           0x8000 /* reserved for possible ACL related use */
+#define NFSEXP_ALLFLAGS                0xFFFF
 
 #endif /* _NSF_EXPORT_H */

diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
index ab8a4a23bec6618283b3cfbbdca4181199c71df4..51965645203c77c886d01f4a7348eff362438ccf 100644 (file)
--- 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 f968b07f906317642a4d438e8b40f7f8b653ee22..6361fcebb13f6f1170c791ba9e65752e8416e5f6 100644 (file)
--- 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 953891df30f5deac6b8111f62242220d79672dde..ae5daa12fff4fc491c6707f74f6ed402f14fc595 100644 (file)
--- 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);