libexport.a: Clean up client_compose() and client_member()

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

diff --git a/support/include/exportfs.h b/support/include/exportfs.h
index 458611b8f5ac3d3b0056c056b08079bd0040b965..9a19cbb68b7c13afeacfdd64b642d4506d8a5ccb 100644 (file)
--- a/support/include/exportfs.h
+++ b/support/include/exportfs.h
@@ -32,7 +32,7 @@ enum {
 
 typedef struct mclient {
        struct mclient *        m_next;
-       char                    m_hostname[NFSCLNT_IDMAX+1];
+       char *                  m_hostname;
        int                     m_type;
        int                     m_naddr;
        struct in_addr          m_addrlist[NFSCLNT_ADDRMAX];
@@ -47,26 +47,41 @@ typedef struct mexport {
        int                     m_exported;     /* known to knfsd. -1 means not sure */
        int                     m_xtabent  : 1, /* xtab entry exists */
                                m_mayexport: 1, /* derived from xtabbed */
-                               m_changed  : 1; /* options (may) have changed */
+                               m_changed  : 1, /* options (may) have changed */
+                               m_warned   : 1; /* warned about multiple exports
+                                                * matching one client */
 } nfs_export;
 
+#define HASH_TABLE_SIZE 1021
+
+typedef struct _exp_hash_entry {
+       nfs_export * p_first;
+       nfs_export * p_last;
+} exp_hash_entry;
+
+typedef struct _exp_hash_table {
+       nfs_export * p_head;
+       exp_hash_entry entries[HASH_TABLE_SIZE];
+} exp_hash_table;
+
+extern exp_hash_table exportlist[MCL_MAXTYPES];
+
 extern nfs_client *            clientlist[MCL_MAXTYPES];
-extern nfs_export *            exportlist[MCL_MAXTYPES];
 
 nfs_client *                   client_lookup(char *hname, int canonical);
-nfs_client *                   client_find(struct hostent *);
 void                           client_add(nfs_client *);
 nfs_client *                   client_dup(nfs_client *, struct hostent *);
 int                            client_gettype(char *hname);
 int                            client_check(nfs_client *, struct hostent *);
-int                            client_match(nfs_client *, char *hname);
 void                           client_release(nfs_client *);
 void                           client_freeall(void);
-char *                         client_compose(struct in_addr addr);
-int                            client_member(char *client, char *name);
+char *                         client_compose(struct hostent *he);
+struct hostent *               client_resolve(struct in_addr addr);
+int                            client_member(const char *client,
+                                               const char *name);
 
 int                            export_read(char *fname);
-void                           export_add(nfs_export *);
+void                   export_add(nfs_export *);
 void                           export_reset(nfs_export *);
 nfs_export *                   export_lookup(char *hname, char *path, int caconical);
 nfs_export *                   export_find(struct hostent *, char *path);
@@ -83,10 +98,19 @@ int                         xtab_mount_write(void);
 int                            xtab_export_write(void);
 void                           xtab_append(nfs_export *);
 
+int                            secinfo_addflavor(struct flav_info *, struct exportent *);
+
 int                            rmtab_read(void);
 
 struct nfskey *                        key_lookup(char *hname);
 
+struct export_features {
+       unsigned int flags;
+       unsigned int secinfo_flags;
+};
+
+struct export_features *get_export_features(void);
+
 /* Record export error.  */
 extern int export_errno;