X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=support%2Finclude%2Fnfslib.h;h=50892e22b0d3fe0874887df1b8606c284d34cedd;hp=b5c72372af793080221ed3fed158ab33965e9eff;hb=fde2ae7794047a698feeaf17963d690a1e660a80;hpb=93a8e35ff8def529f41b82a13440f2e9b46d0dbd diff --git a/support/include/nfslib.h b/support/include/nfslib.h index b5c7237..50892e2 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 { @@ -72,18 +78,21 @@ struct exportent { int e_nsquids; int * e_sqgids; int e_nsqgids; + int e_fsid; + char * e_mountpoint; }; struct rmtabent { char r_client[NFSCLNT_IDMAX+1]; char r_path[NFS_MAXPATHLEN+1]; + int r_count; }; /* * configuration file parsing */ void setexportent(char *fname, char *type); -struct exportent * getexportent(void); +struct exportent * getexportent(int,int); void putexportent(struct exportent *xep); void endexportent(void); struct exportent * mkexportent(char *hname, char *path, char *opts); @@ -92,13 +101,13 @@ void dupexportent(struct exportent *dst, int updateexportent(struct exportent *eep, char *options); int setrmtabent(char *type); -struct rmtabent * getrmtabent(int log); -void putrmtabent(struct rmtabent *xep); +struct rmtabent * getrmtabent(int log, long *pos); +void putrmtabent(struct rmtabent *xep, long *pos); void endrmtabent(void); void rewindrmtabent(void); FILE * fsetrmtabent(char *fname, char *type); -struct rmtabent * fgetrmtabent(FILE *fp, int log); -void fputrmtabent(FILE *fp, struct rmtabent *xep); +struct rmtabent * fgetrmtabent(FILE *fp, int log, long *pos); +void fputrmtabent(FILE *fp, struct rmtabent *xep, long *pos); void fendrmtabent(FILE *fp); void frewindrmtabent(FILE *fp); @@ -111,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); int nfsaddclient(struct nfsctl_client *clp); int nfsdelclient(struct nfsctl_client *clp); int nfsexport(struct nfsctl_export *exp); @@ -120,7 +129,22 @@ struct nfs_fh_len * getfh_old(struct sockaddr *addr, dev_t dev, ino_t ino); struct nfs_fh_len * getfh(struct sockaddr *addr, const char *); 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 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(); +int svctcp_socket (u_long __number, int __reuse); +int svcudp_socket (u_long __number, int __reuse); + #endif /* NFSLIB_H */