X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=support%2Finclude%2Fnfslib.h;h=aba37c2fced4e4ed7e42070b4c8c2461f7d19233;hp=90bd33a6ddb271dc286a5c1909e4021779eb6a44;hb=8fd9fad1ea4b25b8962d70133f476650ef0637b0;hpb=f6a8d3907cd24a4c255234b0161c868763736fdf diff --git a/support/include/nfslib.h b/support/include/nfslib.h index 90bd33a..aba37c2 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 +#endif #include #include @@ -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 { @@ -73,6 +79,7 @@ struct exportent { int * e_sqgids; int e_nsqgids; int e_fsid; + char * e_mountpoint; }; struct rmtabent { @@ -113,7 +120,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); @@ -125,7 +132,14 @@ 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();