Mountd should use separate lockfiles

[nfs-utils.git] / support / include / nfslib.h

diff --git a/support/include/nfslib.h b/support/include/nfslib.h
index 3e25761cef700c70e4f16700e38fb617ee013bea..9d0d39d438d2c19872c313d59529a06ebd639109 100644 (file)
--- a/support/include/nfslib.h
+++ b/support/include/nfslib.h
@@ -34,27 +34,38 @@
 #ifndef _PATH_XTABTMP
 #define _PATH_XTABTMP          NFS_STATEDIR "/xtab.tmp"
 #endif
+#ifndef _PATH_XTABLCK
+#define _PATH_XTABLCK          NFS_STATEDIR "/.xtab.lock"
+#endif
 #ifndef _PATH_ETAB
 #define _PATH_ETAB             NFS_STATEDIR "/etab"
 #endif
 #ifndef _PATH_ETABTMP
 #define _PATH_ETABTMP          NFS_STATEDIR "/etab.tmp"
 #endif
+#ifndef _PATH_ETABLCK
+#define _PATH_ETABLCK          NFS_STATEDIR "/.etab.lock"
+#endif
 #ifndef _PATH_RMTAB
 #define _PATH_RMTAB            NFS_STATEDIR "/rmtab"
 #endif
 #ifndef _PATH_RMTABTMP
 #define _PATH_RMTABTMP         _PATH_RMTAB ".tmp"
 #endif
+#ifndef _PATH_RMTABLCK
+#define _PATH_RMTABLCK         NFS_STATEDIR "/.rmtab.lock"
+#endif
 #ifndef _PATH_PROC_EXPORTS
 #define        _PATH_PROC_EXPORTS      "/proc/fs/nfs/exports"
 #define        _PATH_PROC_EXPORTS_ALT  "/proc/fs/nfsd/exports"
 #endif
 
-enum cle_maptypes {
-       CLE_MAP_IDENT = 0,
-       CLE_MAP_FILE,
-       CLE_MAP_UGIDD,
+/* Maximum number of security flavors on an export: */
+#define SECFLAVOR_COUNT 8
+
+struct sec_entry {
+       struct flav_info *flav;
+       int flags;
 };
 
 /*
@@ -63,15 +74,9 @@ enum cle_maptypes {
  * allow overrides when using exportfs.
  */
 struct exportent {
-       char            e_hostname[NFSCLNT_IDMAX+1];
+       char *          e_hostname;
        char            e_path[NFS_MAXPATHLEN+1];
-       /* The mount path may be different from the exported path due
-          to submount. It may change for every mount. The idea is we
-          set m_path every time when we process a mount. We should not
-          use it for anything else. */
-       char            m_path[NFS_MAXPATHLEN+1];
        int             e_flags;
-       int             e_maptype;
        int             e_anonuid;
        int             e_anongid;
        int *           e_squids;
@@ -80,6 +85,10 @@ struct exportent {
        int             e_nsqgids;
        int             e_fsid;
        char *          e_mountpoint;
+       int             e_fslocmethod;
+       char *          e_fslocdata;
+       char *          e_uuid;
+       struct sec_entry e_secinfo[SECFLAVOR_COUNT+1];
 };
 
 struct rmtabent {
@@ -93,6 +102,7 @@ struct rmtabent {
  */
 void                   setexportent(char *fname, char *type);
 struct exportent *     getexportent(int,int);
+void                   secinfo_show(FILE *fp, struct exportent *ep);
 void                   putexportent(struct exportent *xep);
 void                   endexportent(void);
 struct exportent *     mkexportent(char *hname, char *path, char *opts);
@@ -132,18 +142,20 @@ struct nfs_fh_len *       getfh_size(struct sockaddr *addr, const char *, int size);
 void qword_print(FILE *f, char *str);
 void qword_printhex(FILE *f, char *str, int slen);
 void qword_printint(FILE *f, int num);
-void qword_eol(FILE *f);
+int qword_eol(FILE *f);
 int readline(int fd, char **buf, int *lenp);
 int qword_get(char **bpp, char *dest, int bufsize);
 int qword_get_int(char **bpp, int *anint);
 void cache_flush(int force);
 int check_new_cache(void);
+void qword_add(char **bpp, int *lp, char *str);
+void qword_addhex(char **bpp, int *lp, char *buf, int blen);
+void qword_addint(char **bpp, int *lp, int n);
+void qword_adduint(char **bpp, int *lp, unsigned int n);
+void qword_addeol(char **bpp, int *lp);
 
 void closeall(int min);
 
-/* lockd. */
-int                    lockdsvc();
-
 int                    svctcp_socket (u_long __number, int __reuse);
 int                    svcudp_socket (u_long __number, int __reuse);