Get rid of AUTH completely and replace all uses with 'struct AUTH'

diff --git a/include/libnfs-private.h b/include/libnfs-private.h
index c12d95909ab39a53dbaf293082f7e44fc48a61ba..f0f8e195da57dc401e1720d00afa28795314b01e 100644 (file)
--- a/include/libnfs-private.h
+++ b/include/libnfs-private.h
@@ -33,7 +33,7 @@ struct rpc_context {
        rpc_cb connect_cb;
        void *connect_data;
 
-       AUTH *auth;
+       struct AUTH *auth;
        unsigned long xid;
 
        /* buffer used for encoding RPC PDU */

diff --git a/include/libnfs-raw.h b/include/libnfs-raw.h
index 238025d5ffeb330f9c42b0204e958644f678b63e..b2275062f765f972f227b5c373dc4accb3ac4078 100644 (file)
--- a/include/libnfs-raw.h
+++ b/include/libnfs-raw.h
@@ -30,7 +30,7 @@ struct rpc_context;
 struct rpc_context *rpc_init_context(void);
 void rpc_destroy_context(struct rpc_context *rpc);
 
-void rpc_set_auth(struct rpc_context *rpc, AUTH *auth);
+void rpc_set_auth(struct rpc_context *rpc, struct AUTH *auth);
 
 int rpc_get_fd(struct rpc_context *rpc);
 int rpc_which_events(struct rpc_context *rpc);

diff --git a/include/libnfs-zdr.h b/include/libnfs-zdr.h
index 660f3b187ce1aa643d5414f1cae8b2469f599646..4962a4b6bc986881730cb7556f815f005e31f639 100644 (file)
--- a/include/libnfs-zdr.h
+++ b/include/libnfs-zdr.h
@@ -96,11 +96,11 @@ struct opaque_auth {
 extern struct opaque_auth _null_auth;
 
 
-typedef struct {
+struct AUTH {
        struct opaque_auth      ah_cred;
        struct opaque_auth      ah_verf;
        caddr_t ah_private;
-} AUTH;
+};
 
 enum msg_type {
        CALL=0,
@@ -267,15 +267,15 @@ bool_t libnfs_zdr_callmsg(ZDR *zdrs, struct rpc_msg *msg);
 bool_t libnfs_zdr_replymsg(ZDR *zdrs, struct rpc_msg *msg);
 
 #define authnone_create libnfs_authnone_create
-AUTH *libnfs_authnone_create(void);
+struct AUTH *libnfs_authnone_create(void);
 
 #define authunix_create libnfs_authunix_create
-AUTH *libnfs_authunix_create(char *host, uint32_t uid, uint32_t gid, uint32_t len, uint32_t *groups);
+struct AUTH *libnfs_authunix_create(char *host, uint32_t uid, uint32_t gid, uint32_t len, uint32_t *groups);
 
 #define authunix_create_default libnfs_authunix_create_default
-AUTH *libnfs_authunix_create_default(void);
+struct AUTH *libnfs_authunix_create_default(void);
 
 #define auth_destroy libnfs_auth_destroy
-void libnfs_auth_destroy(AUTH *auth);
+void libnfs_auth_destroy(struct AUTH *auth);
 
 #endif

diff --git a/include/libnfs.h b/include/libnfs.h
index 3d296316aa7eda24810c6a1d2723fb699a983d92..ab2b583dea940a5e12b46ab14840c2bd9b040c9b 100644 (file)
--- a/include/libnfs.h
+++ b/include/libnfs.h
@@ -62,7 +62,8 @@ EXTERN int nfs_queue_length(struct nfs_context *nfs);
 /*
  * Used if you need different credentials than the default for the current user.
  */
-EXTERN void nfs_set_auth(struct nfs_context *nfs, AUTH *auth);
+struct AUTH;
+EXTERN void nfs_set_auth(struct nfs_context *nfs, struct AUTH *auth);
 
 
 /*

diff --git a/lib/init.c b/lib/init.c
index 6bbc11b09f8395f3a8da9ef45f67ba34ef43d8f9..936cc8b217884b95eea1587756cde3025bd4ac0a 100644 (file)
--- a/lib/init.c
+++ b/lib/init.c
@@ -76,7 +76,7 @@ struct rpc_context *rpc_init_udp_context(void)
        return rpc;
 }
 
-void rpc_set_auth(struct rpc_context *rpc, AUTH *auth)
+void rpc_set_auth(struct rpc_context *rpc, struct AUTH *auth)
 {
        if (rpc->auth != NULL) {
                auth_destroy(rpc->auth);

diff --git a/lib/libnfs-zdr.c b/lib/libnfs-zdr.c
index 8d43144a96bb6e88aebb1f08ae314e117ea9ac89..fd80a8d1c7f33e3c853378008c2bbcdcb2cff41f 100644 (file)
--- a/lib/libnfs-zdr.c
+++ b/lib/libnfs-zdr.c
@@ -413,11 +413,11 @@ bool_t libnfs_zdr_replymsg(ZDR *zdrs, struct rpc_msg *msg)
        return libnfs_rpc_msg(zdrs, msg);
 }
 
-AUTH *authnone_create(void)
+struct AUTH *authnone_create(void)
 {
-       AUTH *auth;
+       struct AUTH *auth;
 
-       auth = malloc(sizeof(AUTH));
+       auth = malloc(sizeof(struct AUTH));
 
        auth->ah_cred.oa_flavor = AUTH_NONE;
        auth->ah_cred.oa_length = 0;
@@ -432,15 +432,15 @@ AUTH *authnone_create(void)
        return auth;
 }
 
-AUTH *libnfs_authunix_create(char *host, uint32_t uid, uint32_t gid, uint32_t len, uint32_t *groups)
+struct AUTH *libnfs_authunix_create(char *host, uint32_t uid, uint32_t gid, uint32_t len, uint32_t *groups)
 {
-       AUTH *auth;
+       struct AUTH *auth;
        int size;
        uint32_t *buf;
        int idx;
 
        size = 4 + 4 + ((strlen(host) + 3) & ~3) + 4 + 4 + 4 + len * 4;
-       auth = malloc(sizeof(AUTH));
+       auth = malloc(sizeof(struct AUTH));
        auth->ah_cred.oa_flavor = AUTH_UNIX;
        auth->ah_cred.oa_length = size;
        auth->ah_cred.oa_base = malloc(size);
@@ -468,12 +468,12 @@ AUTH *libnfs_authunix_create(char *host, uint32_t uid, uint32_t gid, uint32_t le
        return auth;
 }
 
-AUTH *libnfs_authunix_create_default(void)
+struct AUTH *libnfs_authunix_create_default(void)
 {
        return libnfs_authunix_create("libnfs", getuid(), -1, 0, NULL);
 }
 
-void libnfs_auth_destroy(AUTH *auth)
+void libnfs_auth_destroy(struct AUTH *auth)
 {
        if (auth->ah_cred.oa_base) {
                free(auth->ah_cred.oa_base);

diff --git a/lib/libnfs.c b/lib/libnfs.c
index 5754bfbc6489ad097050f204531e96e663a70a7a..c7c9f48285a9f64ade49f9fdd0997d7c16f810ad 100644 (file)
--- a/lib/libnfs.c
+++ b/lib/libnfs.c
@@ -113,7 +113,7 @@ struct nfs_mcb_data {
 static int nfs_lookup_path_async_internal(struct nfs_context *nfs, struct nfs_cb_data *data, struct nfs_fh3 *fh);
 
 
-void nfs_set_auth(struct nfs_context *nfs, AUTH *auth)
+void nfs_set_auth(struct nfs_context *nfs, struct AUTH *auth)
 {
        rpc_set_auth(nfs->rpc, auth);
 }