X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=support%2Finclude%2Fnfslib.h;h=c0850291222fa64a45273cf83600aa05ad943bdd;hp=c41f92ebcdfbb3c384776ce704725744aae1b279;hb=5fb04a376e6d5ba940e66507e4a615f4e94116e6;hpb=d38ea02d0e4bcdc4e0114567028596f7bcba45b9

diff --git a/support/include/nfslib.h b/support/include/nfslib.h
index c41f92e..c085029 100644
--- a/support/include/nfslib.h
+++ b/support/include/nfslib.h
@@ -9,7 +9,9 @@
 #ifndef NFSLIB_H
 #define NFSLIB_H
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -23,6 +25,9 @@
 #ifndef _PATH_EXPORTS
 #define _PATH_EXPORTS		"/etc/exports"
 #endif
+#ifndef _PATH_IDMAPDCONF
+#define _PATH_IDMAPDCONF	"/etc/idmapd.conf"
+#endif
 #ifndef _PATH_XTAB
 #define _PATH_XTAB		NFS_STATEDIR "/xtab"
 #endif
@@ -43,6 +48,7 @@
 #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 {
@@ -53,7 +59,7 @@ enum cle_maptypes {
 
 /*
  * Data related to a single exports entry as returned by getexportent.
- * FIXME: export options should probably be parsed at a later time to 
+ * FIXME: export options should probably be parsed at a later time to
  * allow overrides when using exportfs.
  */
 struct exportent {
@@ -74,6 +80,9 @@ struct exportent {
 	int		e_nsqgids;
 	int		e_fsid;
 	char *		e_mountpoint;
+	int             e_fslocmethod;
+	char *          e_fslocdata;
+	char *		e_uuid;
 };
 
 struct rmtabent {
@@ -114,7 +123,7 @@ int			wildmat(char *text, char *pattern);
  * nfsd library functions.
  */
 int			nfsctl(int, struct nfsctl_arg *, union nfsctl_res *);
-int			nfssvc(int port, int nrservs);
+int			nfssvc(int port, int nrservs, unsigned int versbits, unsigned int portbits, char *haddr);
 int			nfsaddclient(struct nfsctl_client *clp);
 int			nfsdelclient(struct nfsctl_client *clp);
 int			nfsexport(struct nfsctl_export *exp);
@@ -126,13 +135,15 @@ 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 closeall(int min);
+
 /* lockd. */
 int			lockdsvc();