X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=support%2Finclude%2Fnfslib.h;h=cee826bb6f5f9ecb160b02dbe019f839ee7edf36;hp=82335fc16417b29432344bb9075d3177d1bde19b;hb=c7427b57e2be8ef0d57ad0618d4590c062b130f5;hpb=259185400a65f2fc0c304b42aae6dde1dddd4baa diff --git a/support/include/nfslib.h b/support/include/nfslib.h index 82335fc..cee826b 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,56 +25,76 @@ #ifndef _PATH_EXPORTS #define _PATH_EXPORTS "/etc/exports" #endif +#ifndef _PATH_EXPORTS_D +#define _PATH_EXPORTS_D "/etc/exports.d" +#endif +#ifndef _EXT_EXPORT +#define _EXT_EXPORT ".exports" +#endif +#ifndef _PATH_IDMAPDCONF +#define _PATH_IDMAPDCONF "/etc/idmapd.conf" +#endif #ifndef _PATH_XTAB #define _PATH_XTAB NFS_STATEDIR "/xtab" #endif #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; }; /* * 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 { - 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; int e_nsquids; int * e_sqgids; int e_nsqgids; - int e_fsid; + unsigned 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 { @@ -86,6 +108,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); @@ -113,23 +136,46 @@ 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 nfsaddclient(struct nfsctl_client *clp); int nfsdelclient(struct nfsctl_client *clp); int nfsexport(struct nfsctl_export *exp); int nfsunexport(struct nfsctl_export *exp); -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); -/* lockd. */ -int lockdsvc(); +struct nfs_fh_len * getfh_old(const struct sockaddr_in *sin, + const dev_t dev, const ino_t ino); +struct nfs_fh_len * getfh(const struct sockaddr_in *sin, const char *path); +struct nfs_fh_len * getfh_size(const struct sockaddr_in *sin, + const char *path, int const size); -#ifndef HAVE_SVCTCP_SOCKET -extern int svctcp_socket (u_long __number, int __reuse); -#endif -#ifndef HAVE_SVCUDP_SOCKET -extern int svcudp_socket (u_long __number, int __reuse); -#endif +void qword_print(FILE *f, char *str); +void qword_printhex(FILE *f, char *str, int slen); +void qword_printint(FILE *f, int num); +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); +int qword_get_uint(char **bpp, unsigned int *anint); +void qword_printuint(FILE *f, unsigned int num); + +void closeall(int min); + +int svctcp_socket (u_long __number, int __reuse); +int svcudp_socket (u_long __number); + +/* Misc shared code prototypes */ +size_t strlcat(char *, const char *, size_t); +size_t strlcpy(char *, const char *, size_t); +ssize_t atomicio(ssize_t (*f) (int, void*, size_t), + int, void *, size_t); + + +#define UNUSED(x) UNUSED_ ## x __attribute__((unused)) #endif /* NFSLIB_H */