Merge branch 'branch-1-0'

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

diff --git a/support/include/nfslib.h b/support/include/nfslib.h
index 50892e22b0d3fe0874887df1b8606c284d34cedd..1372635b9a6fcf792e805ffbe1027670f1f2d689 100644 (file)
--- a/support/include/nfslib.h
+++ b/support/include/nfslib.h
@@ -80,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 {
@@ -120,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, unsigned int versbits);
+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);
@@ -132,7 +135,7 @@ 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);
@@ -141,9 +144,6 @@ int check_new_cache(void);
 
 void closeall(int min);
 
-/* lockd. */
-int                    lockdsvc();
-
 int                    svctcp_socket (u_long __number, int __reuse);
 int                    svcudp_socket (u_long __number, int __reuse);