From 6250d51180af076ee86e4168271b5069f5866e64 Mon Sep 17 00:00:00 2001 From: Pragya Gandhi Date: Mon, 5 May 2025 12:34:49 +0000 Subject: [PATCH 1/5] Some changes --- include/nfsc/libnfs.h | 20 ++++++++++ lib/libnfs.c | 15 ++++---- lib/socket.c | 85 +++++++++++++++++++++++++++++++++++++++++-- nfs/nfs.x | 1 + 4 files changed, 111 insertions(+), 10 deletions(-) diff --git a/include/nfsc/libnfs.h b/include/nfsc/libnfs.h index 2f4f422e..86ba2f93 100755 --- a/include/nfsc/libnfs.h +++ b/include/nfsc/libnfs.h @@ -72,6 +72,13 @@ struct auth_token_cb_res { uint64_t expiry_time; }; +struct azauth_res_cb { + /* + * + */ + uint64_t server_cap_map; +} + struct nfs_url { char *server; char *path; @@ -253,6 +260,19 @@ typedef struct auth_token_cb_res *(*get_token_callback_t)(struct auth_context *a */ EXTERN void set_auth_token_callback(get_token_callback_t get_cb); +/* + * Function pointer type for setting azauth response values to turbo cl. + * It takes the auth_context, fetches the token for this context i.e., for the tenant, + * performs sanity checks and prepares the AZAUTH3args to be passed to rpc_nfs3_azauth_task. + * It returns auth_token_cb_res containing AZAUTH3args and expiry time of the token fetched. + */ + typedef bool status (*get_azauth_res_callback_t)(struct azauth_res_cb *auth); + +/* + * Function to set get_azauth_res_callback_t. + */ +EXTERN void set_azauth_res_callback(get_azauth_res_callback_t get_cb); + /* * Commands that are in flight are kept on linked lists and keyed by * XID so that responses received can be matched with a request. diff --git a/lib/libnfs.c b/lib/libnfs.c index f3c26249..48a96bfd 100755 --- a/lib/libnfs.c +++ b/lib/libnfs.c @@ -611,7 +611,9 @@ int nfs_set_auth_context(struct nfs_context *nfs, #endif assert(nfs->rpc->use_azauth == FALSE); - nfs->rpc->use_azauth = TRUE; + if (!strcmp(authtype,"AzAuthAAD")) { + nfs->rpc->use_azauth = TRUE; + } nfs->rpc->auth_context.magic = AUTH_CONTEXT_MAGIC; nfs->rpc->auth_context.export_path = strdup(export_path); @@ -908,8 +910,7 @@ rpc_connect_program_4_2_cb(struct rpc_context *rpc, int status, assert(data->magic == AZAUTH_CB_DATA_MAGIC); assert(rpc->magic == RPC_CONTEXT_MAGIC); - /* Must be called only when use_azauth is true */ - assert(rpc->use_azauth); + /* rpc_perform_azauth() MUST have set is_authorized to FALSE */ assert(rpc->auth_context.is_authorized == FALSE); @@ -950,12 +951,14 @@ rpc_connect_program_4_2_cb(struct rpc_context *rpc, int status, const char *server_version = res->AZAUTH3res_u.resok.server_version; const char *server_id = res->AZAUTH3res_u.resok.serverid; + const uint64_t server_cap_map = res->AZAUTH3res_u.resok.server_cap_map; assert(server_version); assert(server_id); + assert(server_cap_map); - RPC_LOG(rpc, 2, "AZAUTH Server version=%s Served id=%s", - server_version, server_id); + RPC_LOG(rpc, 2, "AZAUTH Server version=%s Served id=%s Server Capabilities=%llu", + server_version, server_id, server_cap_map); /* AZAUTH RPC successful, connection is now authorized */ rpc->auth_context.is_authorized = TRUE; @@ -2830,8 +2833,6 @@ rpc_null_task_authtls(struct rpc_context *rpc, int nfs_version, rpc_cb cb, struct rpc_pdu * rpc_perform_azauth(struct rpc_context *rpc, rpc_cb cb, void *private_data) { - /* MUST be called only if use_azauth is enabled */ - assert(rpc->use_azauth); assert(rpc->magic == RPC_CONTEXT_MAGIC); struct rpc_pdu *pdu; diff --git a/lib/socket.c b/lib/socket.c index 68f27513..105da133 100644 --- a/lib/socket.c +++ b/lib/socket.c @@ -1334,10 +1334,10 @@ rpc_auth_needs_refresh(struct rpc_context *rpc) assert((int64_t) refresh_at > 0); if (rpc->auth_context.is_authorized && now >= refresh_at) { - RPC_LOG(rpc, 1, "Auth token about to expire (or expired), " + RPC_LOG(rpc, 1, "%d Auth token about to expire (or expired), " "reconnecting to acquire a new token. " "refresh_at: %ld, now: %ld", - refresh_at, now); + rpc->use_azauth, refresh_at, now); rpc->auth_context.is_authorized = FALSE; rpc->auth_context.needs_refresh = TRUE; return TRUE; @@ -1978,7 +1978,7 @@ reconnect_cb_azauth(struct rpc_context *rpc, int status, return; } - RPC_LOG(rpc, 2, "reconnect_cb_azauth: AzAuth completed successfully!"); + RPC_LOG(rpc, 2, "reconnect_cb_azauth: AzAuth completed successfully!"); } /* @@ -2040,6 +2040,73 @@ reconnect_cb_tls(struct rpc_context *rpc, int status, } #endif /* HAVE_TLS */ +reconnect_fsinfo_cb(struct rpc_context *rpc, int status, void *command_data, + void *private_data) +{ + struct nfs_cb_data *data = private_data; + struct nfs_context *nfs = data->nfs; + FSINFO3res *res = command_data; + size_t readmax, writemax, dircount, maxcount; + + assert(rpc->magic == RPC_CONTEXT_MAGIC); + + if (check_nfs3_error(nfs, status, data, command_data)) { + free_nfs_cb_data(data); + return; + } + + if (res->status != NFS3_OK) { + nfs_set_error(nfs, "NFS: FSINFO of %s failed with %s(%d)", + nfs_get_export(nfs), nfsstat3_to_str(res->status), + nfsstat3_to_errno(res->status)); + data->cb(nfsstat3_to_errno(res->status), nfs, + nfs_get_error(nfs), data->private_data); + free_nfs_cb_data(data); + return; + } + + readmax = MIN(nfs->nfsi->readmax, res->FSINFO3res_u.resok.rtmax); + writemax = MIN(nfs->nfsi->writemax, res->FSINFO3res_u.resok.wtmax); + + /* The server supports sizes up to rtmax and wtmax, so it is legal + * to use smaller transfers sizes. + */ + if (nfs->nfsi->readmax < NFSMAXDATA2) { + nfs_set_error(nfs, "server max rsize of %d", + (int)nfs->nfsi->readmax); + data->cb(-EINVAL, nfs, nfs_get_error(nfs), data->private_data); + free_nfs_cb_data(data); + return; + } else { + nfs_set_readmax(nfs, readmax); + } + + if (nfs->nfsi->writemax < NFSMAXDATA2) { + nfs_set_error(nfs, "server max wsize of %d", + (int)nfs->nfsi->writemax); + data->cb(-EINVAL, nfs, nfs_get_error(nfs), data->private_data); + free_nfs_cb_data(data); + return; + } else { + nfs_set_writemax(nfs, writemax); + } + + dircount = MIN(nfs->nfsi->readdir_dircount, res->FSINFO3res_u.resok.dtpref); + maxcount = MIN(nfs->nfsi->readdir_maxcount, res->FSINFO3res_u.resok.dtpref); + + if (nfs->nfsi->readdir_dircount < NFSMAXDATA2) { + nfs_set_error(nfs, "server dtpref of %d", + (int)nfs->nfsi->readdir_dircount); + data->cb(-EINVAL, nfs, nfs_get_error(nfs), data->private_data); + free_nfs_cb_data(data); + return; + } else { + nfs_set_readdir_max_buffer_size(nfs, dircount, maxcount); + } +} + + + static void reconnect_cb(struct rpc_context *rpc, int status, void *data, void *private_data) @@ -2109,6 +2176,18 @@ reconnect_cb(struct rpc_context *rpc, int status, void *data, } } #endif + struct FSINFO3args args; + + if (rpc_nfs3_fsinfo_task(rpc, reconnect_fsinfo_cb, &args, NULL) == NULL) { + RPC_LOG(rpc, 1, "reconnect_cb: rpc_nfs3_fsinfo_task() failed, " + "restarting connection!"); + if (rpc->fd != -1) { + close(rpc->fd); + rpc->fd = -1; + } + rpc->is_connected = 0; + rpc_reconnect_requeue(rpc); + } } /* Disconnect but do not error all PDUs, just move pdus in-flight back to the diff --git a/nfs/nfs.x b/nfs/nfs.x index 4653ad63..f69e32d4 100644 --- a/nfs/nfs.x +++ b/nfs/nfs.x @@ -248,6 +248,7 @@ struct AZAUTH3args { struct AZAUTH3resok { string server_version<16>; string serverid<64>; + uint64_t server_cap_map; }; union AZAUTH3res switch (nfsstat3 status) { From f7438c69dcc8b00453545c77b1ad5019eae766d2 Mon Sep 17 00:00:00 2001 From: Pragya Gandhi Date: Wed, 7 May 2025 05:42:19 +0000 Subject: [PATCH 2/5] Updates --- include/nfsc/libnfs.h | 6 +- lib/libnfs.c | 15 +++-- lib/pdu.c | 8 +-- lib/socket.c | 134 ++++++++---------------------------------- nfs/libnfs-raw-nfs.c | 2 + nfs/libnfs-raw-nfs.h | 1 + nfs/nfs.x | 2 +- 7 files changed, 41 insertions(+), 127 deletions(-) diff --git a/include/nfsc/libnfs.h b/include/nfsc/libnfs.h index 86ba2f93..c531832f 100755 --- a/include/nfsc/libnfs.h +++ b/include/nfsc/libnfs.h @@ -77,7 +77,7 @@ struct azauth_res_cb { * */ uint64_t server_cap_map; -} +}; struct nfs_url { char *server; @@ -266,12 +266,12 @@ EXTERN void set_auth_token_callback(get_token_callback_t get_cb); * performs sanity checks and prepares the AZAUTH3args to be passed to rpc_nfs3_azauth_task. * It returns auth_token_cb_res containing AZAUTH3args and expiry time of the token fetched. */ - typedef bool status (*get_azauth_res_callback_t)(struct azauth_res_cb *auth); + //typedef bool status (*get_azauth_res_callback_t)(struct azauth_res_cb *auth); /* * Function to set get_azauth_res_callback_t. */ -EXTERN void set_azauth_res_callback(get_azauth_res_callback_t get_cb); +//EXTERN void set_azauth_res_callback(get_azauth_res_callback_t get_cb); /* * Commands that are in flight are kept on linked lists and keyed by diff --git a/lib/libnfs.c b/lib/libnfs.c index 48a96bfd..f8e6ac95 100755 --- a/lib/libnfs.c +++ b/lib/libnfs.c @@ -951,14 +951,14 @@ rpc_connect_program_4_2_cb(struct rpc_context *rpc, int status, const char *server_version = res->AZAUTH3res_u.resok.server_version; const char *server_id = res->AZAUTH3res_u.resok.serverid; - const uint64_t server_cap_map = res->AZAUTH3res_u.resok.server_cap_map; + //const uint64_t server_cap_map = res->AZAUTH3res_u.resok.server_cap_map; assert(server_version); assert(server_id); - assert(server_cap_map); + //assert(server_cap_map); - RPC_LOG(rpc, 2, "AZAUTH Server version=%s Served id=%s Server Capabilities=%llu", - server_version, server_id, server_cap_map); + RPC_LOG(rpc, 2, "AZAUTH Server version=%s Server id=%s", + server_version, server_id); /* AZAUTH RPC successful, connection is now authorized */ rpc->auth_context.is_authorized = TRUE; @@ -1031,6 +1031,7 @@ rpc_connect_program_5_cb(struct rpc_context *rpc, int status, void *command_data, void *private_data) { struct rpc_cb_data *data = private_data; + RPC_LOG(rpc, 2, "We enter rpc_connect_program_5_cb"); assert(rpc->magic == RPC_CONTEXT_MAGIC); @@ -1114,7 +1115,8 @@ rpc_connect_program_5_0_cb(struct rpc_context *rpc, int status, */ assert(rpc->tls_context.state == TLS_HANDSHAKE_COMPLETED); - if (rpc->use_azauth) { + uint64_t val = 1; + if (val == 1) { if (rpc_perform_azauth(rpc, rpc_connect_program_5_cb, data) == NULL) { data->cb(rpc, RPC_STATUS_ERROR, NULL, data->private_data); @@ -1132,6 +1134,7 @@ rpc_connect_program_4_cb(struct rpc_context *rpc, int status, void *command_data, void *private_data) { struct rpc_cb_data *data = private_data; + uint64_t val = 1; assert(rpc->magic == RPC_CONTEXT_MAGIC); @@ -1173,7 +1176,7 @@ rpc_connect_program_4_cb(struct rpc_context *rpc, int status, #endif /* HAVE_TLS */ #ifdef ENABLE_INSECURE_AUTH_FOR_DEVTEST - if (rpc->use_azauth) { + if (val == 1) { /* * Insecure connection, if azauth is enabled perform auth. * diff --git a/lib/pdu.c b/lib/pdu.c index 94fd5829..47bf434b 100644 --- a/lib/pdu.c +++ b/lib/pdu.c @@ -172,12 +172,6 @@ void rpc_add_to_outqueue_head(struct rpc_context *rpc, struct rpc_pdu *pdu) */ void rpc_add_to_outqueue_headp(struct rpc_context *rpc, struct rpc_pdu *pdu) { - /* - * AZAUTH RPC is the only one queued with head priority and - * AZAUTH RPC MUST only be sent if use_azauth is true. - */ - assert(rpc->use_azauth); - /* * When rpc_add_to_outqueue_headp() is called there shouldn't be any * partially sent pdu in the queue. It's typically called either when @@ -649,7 +643,7 @@ void rpc_free_pdu(struct rpc_context *rpc, struct rpc_pdu *pdu) * AZAUTH RPC is the only one queued with head priority and * AZAUTH RPC MUST only be sent if use_azauth is true. */ - assert(!pdu->is_head_prio || rpc->use_azauth); + //assert(!pdu->is_head_prio); #ifdef ENABLE_PARANOID /* PDU must be freed only after removing from all queues */ diff --git a/lib/socket.c b/lib/socket.c index 105da133..2e15895b 100644 --- a/lib/socket.c +++ b/lib/socket.c @@ -375,16 +375,15 @@ rpc_write_to_socket(struct rpc_context *rpc) * AZAUTH RPC is the only one queued with head priority and * AZAUTH RPC MUST only be sent if use_azauth is true. */ - assert(!pdu->is_head_prio || rpc->use_azauth); + //assert(!pdu->is_head_prio || rpc->use_azauth); /* * If context needs auth and connection is not authorized (yet), * only ever send AZAUTH RPCs out. */ - if (rpc->use_azauth && - !rpc->auth_context.is_authorized && + if (!rpc->auth_context.is_authorized && !pdu->is_head_prio) { - RPC_LOG(rpc, 2, "Not sending queued RPC pdu %p as " + RPC_LOG(rpc, 3, "Not sending queued RPC pdu %p as " "connection is not authorized", pdu); /* * If we have something to write, write it, else @@ -1958,9 +1957,6 @@ reconnect_cb_azauth(struct rpc_context *rpc, int status, assert(rpc->magic == RPC_CONTEXT_MAGIC); - /* Must be called only for TLS transport */ - assert(rpc->use_azauth); - /* * During reconnect, if azauth fails, we have no choice but to keep * trying. @@ -2023,89 +2019,21 @@ reconnect_cb_tls(struct rpc_context *rpc, int status, * TLS handshake completed successfully. * If azauth is enabled, perform it now. */ - if (rpc->use_azauth) { - RPC_LOG(rpc, 2, "reconnect_cb_tls: sending AZAUTH RPC"); - - if (rpc_perform_azauth(rpc, reconnect_cb_azauth, NULL) == NULL) { - RPC_LOG(rpc, 1, "reconnect_cb_azauth: rpc_perform_azauth() failed, " - "restarting connection!"); - if (rpc->fd != -1) { - close(rpc->fd); - rpc->fd = -1; - } - rpc->is_connected = 0; - rpc_reconnect_requeue(rpc); + RPC_LOG(rpc, 2, "reconnect_cb_tls: sending AZAUTH RPC"); + + if (rpc_perform_azauth(rpc, reconnect_cb_azauth, NULL) == NULL) { + RPC_LOG(rpc, 1, "reconnect_cb_azauth: rpc_perform_azauth() failed, " + "restarting connection!"); + if (rpc->fd != -1) { + close(rpc->fd); + rpc->fd = -1; } + rpc->is_connected = 0; + rpc_reconnect_requeue(rpc); } } #endif /* HAVE_TLS */ -reconnect_fsinfo_cb(struct rpc_context *rpc, int status, void *command_data, - void *private_data) -{ - struct nfs_cb_data *data = private_data; - struct nfs_context *nfs = data->nfs; - FSINFO3res *res = command_data; - size_t readmax, writemax, dircount, maxcount; - - assert(rpc->magic == RPC_CONTEXT_MAGIC); - - if (check_nfs3_error(nfs, status, data, command_data)) { - free_nfs_cb_data(data); - return; - } - - if (res->status != NFS3_OK) { - nfs_set_error(nfs, "NFS: FSINFO of %s failed with %s(%d)", - nfs_get_export(nfs), nfsstat3_to_str(res->status), - nfsstat3_to_errno(res->status)); - data->cb(nfsstat3_to_errno(res->status), nfs, - nfs_get_error(nfs), data->private_data); - free_nfs_cb_data(data); - return; - } - - readmax = MIN(nfs->nfsi->readmax, res->FSINFO3res_u.resok.rtmax); - writemax = MIN(nfs->nfsi->writemax, res->FSINFO3res_u.resok.wtmax); - - /* The server supports sizes up to rtmax and wtmax, so it is legal - * to use smaller transfers sizes. - */ - if (nfs->nfsi->readmax < NFSMAXDATA2) { - nfs_set_error(nfs, "server max rsize of %d", - (int)nfs->nfsi->readmax); - data->cb(-EINVAL, nfs, nfs_get_error(nfs), data->private_data); - free_nfs_cb_data(data); - return; - } else { - nfs_set_readmax(nfs, readmax); - } - - if (nfs->nfsi->writemax < NFSMAXDATA2) { - nfs_set_error(nfs, "server max wsize of %d", - (int)nfs->nfsi->writemax); - data->cb(-EINVAL, nfs, nfs_get_error(nfs), data->private_data); - free_nfs_cb_data(data); - return; - } else { - nfs_set_writemax(nfs, writemax); - } - - dircount = MIN(nfs->nfsi->readdir_dircount, res->FSINFO3res_u.resok.dtpref); - maxcount = MIN(nfs->nfsi->readdir_maxcount, res->FSINFO3res_u.resok.dtpref); - - if (nfs->nfsi->readdir_dircount < NFSMAXDATA2) { - nfs_set_error(nfs, "server dtpref of %d", - (int)nfs->nfsi->readdir_dircount); - data->cb(-EINVAL, nfs, nfs_get_error(nfs), data->private_data); - free_nfs_cb_data(data); - return; - } else { - nfs_set_readdir_max_buffer_size(nfs, dircount, maxcount); - } -} - - static void reconnect_cb(struct rpc_context *rpc, int status, void *data, @@ -2155,31 +2083,16 @@ reconnect_cb(struct rpc_context *rpc, int status, void *data, #endif /* HAVE_TLS */ #ifdef ENABLE_INSECURE_AUTH_FOR_DEVTEST - else if (rpc->use_azauth) { - /* - * Insecure connection, if azauth is enabled perform auth. - * - * Note: THIS WOULD SEND THE TOKEN OVER AN INSECURE CONNECTION - * AND MUST ONLY BE USED IN DEVTEST ON TRUSTED NETWORKS. - */ - RPC_LOG(rpc, 2, "reconnect_cb: sending insecure AZAUTH RPC"); - - if (rpc_perform_azauth(rpc, reconnect_cb_azauth, NULL) == NULL) { - RPC_LOG(rpc, 1, "reconnect_cb: rpc_perform_azauth() failed, " - "restarting connection!"); - if (rpc->fd != -1) { - close(rpc->fd); - rpc->fd = -1; - } - rpc->is_connected = 0; - rpc_reconnect_requeue(rpc); - } - } -#endif - struct FSINFO3args args; - - if (rpc_nfs3_fsinfo_task(rpc, reconnect_fsinfo_cb, &args, NULL) == NULL) { - RPC_LOG(rpc, 1, "reconnect_cb: rpc_nfs3_fsinfo_task() failed, " + /* + * Insecure connection, if azauth is enabled perform auth. + * + * Note: THIS WOULD SEND THE TOKEN OVER AN INSECURE CONNECTION + * AND MUST ONLY BE USED IN DEVTEST ON TRUSTED NETWORKS. + */ + RPC_LOG(rpc, 2, "reconnect_cb: sending insecure AZAUTH RPC"); + + if (rpc_perform_azauth(rpc, reconnect_cb_azauth, NULL) == NULL) { + RPC_LOG(rpc, 1, "reconnect_cb: rpc_perform_azauth() failed, " "restarting connection!"); if (rpc->fd != -1) { close(rpc->fd); @@ -2188,6 +2101,7 @@ reconnect_cb(struct rpc_context *rpc, int status, void *data, rpc->is_connected = 0; rpc_reconnect_requeue(rpc); } +#endif } /* Disconnect but do not error all PDUs, just move pdus in-flight back to the diff --git a/nfs/libnfs-raw-nfs.c b/nfs/libnfs-raw-nfs.c index 6fea172a..02e5730c 100644 --- a/nfs/libnfs-raw-nfs.c +++ b/nfs/libnfs-raw-nfs.c @@ -448,6 +448,8 @@ zdr_AZAUTH3resok (ZDR *zdrs, AZAUTH3resok *objp) return FALSE; if (!zdr_string (zdrs, &objp->serverid, 64)) return FALSE; + // if (!zdr_uint64_t (zdrs, &objp->server_cap_map)) + // return FALSE; return TRUE; } diff --git a/nfs/libnfs-raw-nfs.h b/nfs/libnfs-raw-nfs.h index c695833f..4ee11f62 100644 --- a/nfs/libnfs-raw-nfs.h +++ b/nfs/libnfs-raw-nfs.h @@ -294,6 +294,7 @@ typedef struct AZAUTH3args AZAUTH3args; struct AZAUTH3resok { char *server_version; char *serverid; + //uint64_t server_cap_map; }; typedef struct AZAUTH3resok AZAUTH3resok; diff --git a/nfs/nfs.x b/nfs/nfs.x index f69e32d4..7464caf1 100644 --- a/nfs/nfs.x +++ b/nfs/nfs.x @@ -248,7 +248,7 @@ struct AZAUTH3args { struct AZAUTH3resok { string server_version<16>; string serverid<64>; - uint64_t server_cap_map; + //uint64_t server_cap_map; }; union AZAUTH3res switch (nfsstat3 status) { From 6ecdd04d0aa9a26998965e868d7b45fb8d2c1fa4 Mon Sep 17 00:00:00 2001 From: Pragya Gandhi Date: Thu, 8 May 2025 05:12:21 +0000 Subject: [PATCH 3/5] Changes for unstablewrites --- include/nfsc/libnfs.h | 20 +- lib/libnfs.c | 40 ++- nfs/libnfs-raw-nfs.c | 578 +++++++++++++++++++++++++++++++++++++++++- nfs/libnfs-raw-nfs.h | 138 +++++----- nfs/nfs.x | 2 +- 5 files changed, 678 insertions(+), 100 deletions(-) diff --git a/include/nfsc/libnfs.h b/include/nfsc/libnfs.h index c531832f..0090c49e 100755 --- a/include/nfsc/libnfs.h +++ b/include/nfsc/libnfs.h @@ -72,13 +72,6 @@ struct auth_token_cb_res { uint64_t expiry_time; }; -struct azauth_res_cb { - /* - * - */ - uint64_t server_cap_map; -}; - struct nfs_url { char *server; char *path; @@ -255,23 +248,18 @@ EXTERN void nfs_destroy_context(struct nfs_context *nfs); */ typedef struct auth_token_cb_res *(*get_token_callback_t)(struct auth_context *auth); +typedef uint64_t (*set_azauth_res_sc_callback_t)(uint64_t server_cap_map); + /* * Function to set get_token_callback_t. */ EXTERN void set_auth_token_callback(get_token_callback_t get_cb); /* - * Function pointer type for setting azauth response values to turbo cl. - * It takes the auth_context, fetches the token for this context i.e., for the tenant, - * performs sanity checks and prepares the AZAUTH3args to be passed to rpc_nfs3_azauth_task. - * It returns auth_token_cb_res containing AZAUTH3args and expiry time of the token fetched. + * Function to set set_azauth_res_sc_callback_t. */ - //typedef bool status (*get_azauth_res_callback_t)(struct azauth_res_cb *auth); -/* - * Function to set get_azauth_res_callback_t. - */ -//EXTERN void set_azauth_res_callback(get_azauth_res_callback_t get_cb); +EXTERN void set_azauth_res_callback(set_azauth_res_sc_callback_t set_cb); /* * Commands that are in flight are kept on linked lists and keyed by diff --git a/lib/libnfs.c b/lib/libnfs.c index f8e6ac95..498ddbd2 100755 --- a/lib/libnfs.c +++ b/lib/libnfs.c @@ -241,6 +241,24 @@ get_azauth_token(struct auth_context *auth) return get_auth_token_cb(auth); } +static set_azauth_res_sc_callback_t set_azauth_res_sc_cb = 0; + +void +set_azauth_res_callback(set_azauth_res_sc_callback_t set_cb) +{ + assert(set_cb); + + set_azauth_res_sc_cb = set_cb; +} + +static uint64_t +set_server_cap_azauthres(uint64_t server_cap) +{ + return set_azauth_res_sc_cb(server_cap); +} + + + static void free_azauth_token(struct auth_token_cb_res *res, AZAUTH3args *args) { @@ -951,14 +969,28 @@ rpc_connect_program_4_2_cb(struct rpc_context *rpc, int status, const char *server_version = res->AZAUTH3res_u.resok.server_version; const char *server_id = res->AZAUTH3res_u.resok.serverid; - //const uint64_t server_cap_map = res->AZAUTH3res_u.resok.server_cap_map; + const uint64_t server_cap_map = res->AZAUTH3res_u.resok.server_cap_map; assert(server_version); assert(server_id); - //assert(server_cap_map); + assert(server_cap_map); + + RPC_LOG(rpc, 2, "AZAUTH Server version=%s Server id=%s Server Cap Map: %lu", + server_version, server_id, server_cap_map); + + if (set_server_cap_azauthres(server_cap_map) == -1) { + RPC_LOG(rpc, 1, "Failed to set server capabilities map in client"); + /* + * Caller doesn't care if it's NFS error or RPC error. + * For any failure we should call the callback with failed + * status. + */ + data->cb(rpc, RPC_STATUS_ERROR, NULL, data->private_data); + free_azauth_cb_data(data); + return; + } - RPC_LOG(rpc, 2, "AZAUTH Server version=%s Server id=%s", - server_version, server_id); + /* AZAUTH RPC successful, connection is now authorized */ rpc->auth_context.is_authorized = TRUE; diff --git a/nfs/libnfs-raw-nfs.c b/nfs/libnfs-raw-nfs.c index 02e5730c..ab88e1d7 100644 --- a/nfs/libnfs-raw-nfs.c +++ b/nfs/libnfs-raw-nfs.c @@ -38,6 +38,9 @@ either expressed or implied, of the FreeBSD Project. uint32_t zdr_cookieverf3 (ZDR *zdrs, cookieverf3 objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_opaque (zdrs, objp, NFS3_COOKIEVERFSIZE)) return FALSE; return TRUE; @@ -46,6 +49,9 @@ zdr_cookieverf3 (ZDR *zdrs, cookieverf3 objp) uint32_t zdr_cookie3 (ZDR *zdrs, cookie3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_uint64_t (zdrs, objp)) return FALSE; return TRUE; @@ -54,7 +60,10 @@ zdr_cookie3 (ZDR *zdrs, cookie3 *objp) uint32_t zdr_nfs_fh3 (ZDR *zdrs, nfs_fh3 *objp) { - if (!zdr_bytes (zdrs, (char **)&objp->data.data_val, &objp->data.data_len, NFS3_FHSIZE)) + register int32_t *buf; + buf = NULL; + + if (!zdr_bytes (zdrs, (char **)&objp->data.data_val, (u_int *) &objp->data.data_len, NFS3_FHSIZE)) return FALSE; return TRUE; } @@ -62,6 +71,9 @@ zdr_nfs_fh3 (ZDR *zdrs, nfs_fh3 *objp) uint32_t zdr_filename3 (ZDR *zdrs, filename3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_string (zdrs, objp, ~0)) return FALSE; return TRUE; @@ -70,6 +82,9 @@ zdr_filename3 (ZDR *zdrs, filename3 *objp) uint32_t zdr_diropargs3 (ZDR *zdrs, diropargs3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfs_fh3 (zdrs, &objp->dir)) return FALSE; if (!zdr_filename3 (zdrs, &objp->name)) @@ -80,6 +95,9 @@ zdr_diropargs3 (ZDR *zdrs, diropargs3 *objp) uint32_t zdr_ftype3 (ZDR *zdrs, ftype3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_enum (zdrs, (enum_t *) objp)) return FALSE; return TRUE; @@ -88,6 +106,9 @@ zdr_ftype3 (ZDR *zdrs, ftype3 *objp) uint32_t zdr_mode3 (ZDR *zdrs, mode3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_u_int (zdrs, objp)) return FALSE; return TRUE; @@ -96,6 +117,9 @@ zdr_mode3 (ZDR *zdrs, mode3 *objp) uint32_t zdr_uid3 (ZDR *zdrs, uid3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_u_int (zdrs, objp)) return FALSE; return TRUE; @@ -104,6 +128,9 @@ zdr_uid3 (ZDR *zdrs, uid3 *objp) uint32_t zdr_gid3 (ZDR *zdrs, gid3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_u_int (zdrs, objp)) return FALSE; return TRUE; @@ -112,6 +139,9 @@ zdr_gid3 (ZDR *zdrs, gid3 *objp) uint32_t zdr_size3 (ZDR *zdrs, size3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_uint64_t (zdrs, objp)) return FALSE; return TRUE; @@ -120,6 +150,9 @@ zdr_size3 (ZDR *zdrs, size3 *objp) uint32_t zdr_fileid3 (ZDR *zdrs, fileid3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_uint64_t (zdrs, objp)) return FALSE; return TRUE; @@ -128,6 +161,9 @@ zdr_fileid3 (ZDR *zdrs, fileid3 *objp) uint32_t zdr_specdata3 (ZDR *zdrs, specdata3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_u_int (zdrs, &objp->specdata1)) return FALSE; if (!zdr_u_int (zdrs, &objp->specdata2)) @@ -138,6 +174,9 @@ zdr_specdata3 (ZDR *zdrs, specdata3 *objp) uint32_t zdr_nfstime3 (ZDR *zdrs, nfstime3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_u_int (zdrs, &objp->seconds)) return FALSE; if (!zdr_u_int (zdrs, &objp->nseconds)) @@ -148,6 +187,9 @@ zdr_nfstime3 (ZDR *zdrs, nfstime3 *objp) uint32_t zdr_fattr3 (ZDR *zdrs, fattr3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_ftype3 (zdrs, &objp->type)) return FALSE; if (!zdr_mode3 (zdrs, &objp->mode)) @@ -180,6 +222,9 @@ zdr_fattr3 (ZDR *zdrs, fattr3 *objp) uint32_t zdr_post_op_attr (ZDR *zdrs, post_op_attr *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_bool (zdrs, &objp->attributes_follow)) return FALSE; switch (objp->attributes_follow) { @@ -198,6 +243,9 @@ zdr_post_op_attr (ZDR *zdrs, post_op_attr *objp) uint32_t zdr_nfsstat3 (ZDR *zdrs, nfsstat3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_enum (zdrs, (enum_t *) objp)) return FALSE; return TRUE; @@ -206,6 +254,9 @@ zdr_nfsstat3 (ZDR *zdrs, nfsstat3 *objp) uint32_t zdr_stable_how (ZDR *zdrs, stable_how *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_enum (zdrs, (enum_t *) objp)) return FALSE; return TRUE; @@ -214,6 +265,9 @@ zdr_stable_how (ZDR *zdrs, stable_how *objp) uint32_t zdr_offset3 (ZDR *zdrs, offset3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_uint64_t (zdrs, objp)) return FALSE; return TRUE; @@ -222,6 +276,9 @@ zdr_offset3 (ZDR *zdrs, offset3 *objp) uint32_t zdr_count3 (ZDR *zdrs, count3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_u_int (zdrs, objp)) return FALSE; return TRUE; @@ -230,6 +287,9 @@ zdr_count3 (ZDR *zdrs, count3 *objp) uint32_t zdr_wcc_attr (ZDR *zdrs, wcc_attr *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_size3 (zdrs, &objp->size)) return FALSE; if (!zdr_nfstime3 (zdrs, &objp->mtime)) @@ -242,6 +302,9 @@ zdr_wcc_attr (ZDR *zdrs, wcc_attr *objp) uint32_t zdr_pre_op_attr (ZDR *zdrs, pre_op_attr *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_bool (zdrs, &objp->attributes_follow)) return FALSE; switch (objp->attributes_follow) { @@ -260,6 +323,9 @@ zdr_pre_op_attr (ZDR *zdrs, pre_op_attr *objp) uint32_t zdr_wcc_data (ZDR *zdrs, wcc_data *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_pre_op_attr (zdrs, &objp->before)) return FALSE; if (!zdr_post_op_attr (zdrs, &objp->after)) @@ -270,6 +336,9 @@ zdr_wcc_data (ZDR *zdrs, wcc_data *objp) uint32_t zdr_WRITE3args (ZDR *zdrs, WRITE3args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfs_fh3 (zdrs, &objp->file)) return FALSE; if (!zdr_offset3 (zdrs, &objp->offset)) @@ -278,7 +347,7 @@ zdr_WRITE3args (ZDR *zdrs, WRITE3args *objp) return FALSE; if (!zdr_stable_how (zdrs, &objp->stable)) return FALSE; - if (!zdr_bytes (zdrs, (char **)&objp->data.data_val, &objp->data.data_len, ~0)) + if (!zdr_bytes (zdrs, (char **)&objp->data.data_val, (u_int *) &objp->data.data_len, ~0)) return FALSE; return TRUE; } @@ -286,6 +355,9 @@ zdr_WRITE3args (ZDR *zdrs, WRITE3args *objp) uint32_t zdr_writeverf3 (ZDR *zdrs, writeverf3 objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_opaque (zdrs, objp, NFS3_WRITEVERFSIZE)) return FALSE; return TRUE; @@ -294,6 +366,9 @@ zdr_writeverf3 (ZDR *zdrs, writeverf3 objp) uint32_t zdr_WRITE3resok (ZDR *zdrs, WRITE3resok *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_wcc_data (zdrs, &objp->file_wcc)) return FALSE; if (!zdr_count3 (zdrs, &objp->count)) @@ -308,6 +383,9 @@ zdr_WRITE3resok (ZDR *zdrs, WRITE3resok *objp) uint32_t zdr_WRITE3resfail (ZDR *zdrs, WRITE3resfail *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_wcc_data (zdrs, &objp->file_wcc)) return FALSE; return TRUE; @@ -316,6 +394,9 @@ zdr_WRITE3resfail (ZDR *zdrs, WRITE3resfail *objp) uint32_t zdr_WRITE3res (ZDR *zdrs, WRITE3res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -334,6 +415,9 @@ zdr_WRITE3res (ZDR *zdrs, WRITE3res *objp) uint32_t zdr_LOOKUP3args (ZDR *zdrs, LOOKUP3args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_diropargs3 (zdrs, &objp->what)) return FALSE; return TRUE; @@ -342,6 +426,9 @@ zdr_LOOKUP3args (ZDR *zdrs, LOOKUP3args *objp) uint32_t zdr_LOOKUP3resok (ZDR *zdrs, LOOKUP3resok *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfs_fh3 (zdrs, &objp->object)) return FALSE; if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) @@ -354,6 +441,9 @@ zdr_LOOKUP3resok (ZDR *zdrs, LOOKUP3resok *objp) uint32_t zdr_LOOKUP3resfail (ZDR *zdrs, LOOKUP3resfail *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_post_op_attr (zdrs, &objp->dir_attributes)) return FALSE; return TRUE; @@ -362,6 +452,9 @@ zdr_LOOKUP3resfail (ZDR *zdrs, LOOKUP3resfail *objp) uint32_t zdr_LOOKUP3res (ZDR *zdrs, LOOKUP3res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -380,6 +473,9 @@ zdr_LOOKUP3res (ZDR *zdrs, LOOKUP3res *objp) uint32_t zdr_COMMIT3args (ZDR *zdrs, COMMIT3args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfs_fh3 (zdrs, &objp->file)) return FALSE; if (!zdr_offset3 (zdrs, &objp->offset)) @@ -392,6 +488,9 @@ zdr_COMMIT3args (ZDR *zdrs, COMMIT3args *objp) uint32_t zdr_COMMIT3resok (ZDR *zdrs, COMMIT3resok *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_wcc_data (zdrs, &objp->file_wcc)) return FALSE; if (!zdr_writeverf3 (zdrs, objp->verf)) @@ -402,6 +501,9 @@ zdr_COMMIT3resok (ZDR *zdrs, COMMIT3resok *objp) uint32_t zdr_COMMIT3resfail (ZDR *zdrs, COMMIT3resfail *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_wcc_data (zdrs, &objp->file_wcc)) return FALSE; return TRUE; @@ -410,6 +512,9 @@ zdr_COMMIT3resfail (ZDR *zdrs, COMMIT3resfail *objp) uint32_t zdr_COMMIT3res (ZDR *zdrs, COMMIT3res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -428,6 +533,9 @@ zdr_COMMIT3res (ZDR *zdrs, COMMIT3res *objp) uint32_t zdr_AZAUTH3args (ZDR *zdrs, AZAUTH3args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_string (zdrs, &objp->client_version, 16)) return FALSE; if (!zdr_string (zdrs, &objp->clientid, 64)) @@ -444,18 +552,24 @@ zdr_AZAUTH3args (ZDR *zdrs, AZAUTH3args *objp) uint32_t zdr_AZAUTH3resok (ZDR *zdrs, AZAUTH3resok *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_string (zdrs, &objp->server_version, 16)) return FALSE; if (!zdr_string (zdrs, &objp->serverid, 64)) return FALSE; - // if (!zdr_uint64_t (zdrs, &objp->server_cap_map)) - // return FALSE; + if (!zdr_uint64_t (zdrs, &objp->server_cap_map)) + return FALSE; return TRUE; } uint32_t zdr_AZAUTH3res (ZDR *zdrs, AZAUTH3res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -472,6 +586,9 @@ zdr_AZAUTH3res (ZDR *zdrs, AZAUTH3res *objp) uint32_t zdr_ACCESS3args (ZDR *zdrs, ACCESS3args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfs_fh3 (zdrs, &objp->object)) return FALSE; if (!zdr_u_int (zdrs, &objp->access)) @@ -482,6 +599,9 @@ zdr_ACCESS3args (ZDR *zdrs, ACCESS3args *objp) uint32_t zdr_ACCESS3resok (ZDR *zdrs, ACCESS3resok *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) return FALSE; if (!zdr_u_int (zdrs, &objp->access)) @@ -492,6 +612,9 @@ zdr_ACCESS3resok (ZDR *zdrs, ACCESS3resok *objp) uint32_t zdr_ACCESS3resfail (ZDR *zdrs, ACCESS3resfail *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) return FALSE; return TRUE; @@ -500,6 +623,9 @@ zdr_ACCESS3resfail (ZDR *zdrs, ACCESS3resfail *objp) uint32_t zdr_ACCESS3res (ZDR *zdrs, ACCESS3res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -518,6 +644,9 @@ zdr_ACCESS3res (ZDR *zdrs, ACCESS3res *objp) uint32_t zdr_GETATTR3args (ZDR *zdrs, GETATTR3args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfs_fh3 (zdrs, &objp->object)) return FALSE; return TRUE; @@ -526,6 +655,9 @@ zdr_GETATTR3args (ZDR *zdrs, GETATTR3args *objp) uint32_t zdr_GETATTR3resok (ZDR *zdrs, GETATTR3resok *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_fattr3 (zdrs, &objp->obj_attributes)) return FALSE; return TRUE; @@ -534,6 +666,9 @@ zdr_GETATTR3resok (ZDR *zdrs, GETATTR3resok *objp) uint32_t zdr_GETATTR3res (ZDR *zdrs, GETATTR3res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -550,6 +685,9 @@ zdr_GETATTR3res (ZDR *zdrs, GETATTR3res *objp) uint32_t zdr_time_how (ZDR *zdrs, time_how *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_enum (zdrs, (enum_t *) objp)) return FALSE; return TRUE; @@ -558,6 +696,9 @@ zdr_time_how (ZDR *zdrs, time_how *objp) uint32_t zdr_set_mode3 (ZDR *zdrs, set_mode3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_bool (zdrs, &objp->set_it)) return FALSE; switch (objp->set_it) { @@ -574,6 +715,9 @@ zdr_set_mode3 (ZDR *zdrs, set_mode3 *objp) uint32_t zdr_set_uid3 (ZDR *zdrs, set_uid3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_bool (zdrs, &objp->set_it)) return FALSE; switch (objp->set_it) { @@ -590,6 +734,9 @@ zdr_set_uid3 (ZDR *zdrs, set_uid3 *objp) uint32_t zdr_set_gid3 (ZDR *zdrs, set_gid3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_bool (zdrs, &objp->set_it)) return FALSE; switch (objp->set_it) { @@ -606,6 +753,9 @@ zdr_set_gid3 (ZDR *zdrs, set_gid3 *objp) uint32_t zdr_set_size3 (ZDR *zdrs, set_size3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_bool (zdrs, &objp->set_it)) return FALSE; switch (objp->set_it) { @@ -622,6 +772,9 @@ zdr_set_size3 (ZDR *zdrs, set_size3 *objp) uint32_t zdr_set_atime (ZDR *zdrs, set_atime *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_time_how (zdrs, &objp->set_it)) return FALSE; switch (objp->set_it) { @@ -638,6 +791,9 @@ zdr_set_atime (ZDR *zdrs, set_atime *objp) uint32_t zdr_set_mtime (ZDR *zdrs, set_mtime *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_time_how (zdrs, &objp->set_it)) return FALSE; switch (objp->set_it) { @@ -654,6 +810,9 @@ zdr_set_mtime (ZDR *zdrs, set_mtime *objp) uint32_t zdr_sattr3 (ZDR *zdrs, sattr3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_set_mode3 (zdrs, &objp->mode)) return FALSE; if (!zdr_set_uid3 (zdrs, &objp->uid)) @@ -672,6 +831,9 @@ zdr_sattr3 (ZDR *zdrs, sattr3 *objp) uint32_t zdr_createmode3 (ZDR *zdrs, createmode3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_enum (zdrs, (enum_t *) objp)) return FALSE; return TRUE; @@ -680,6 +842,9 @@ zdr_createmode3 (ZDR *zdrs, createmode3 *objp) uint32_t zdr_createverf3 (ZDR *zdrs, createverf3 objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_opaque (zdrs, objp, NFS3_CREATEVERFSIZE)) return FALSE; return TRUE; @@ -688,6 +853,9 @@ zdr_createverf3 (ZDR *zdrs, createverf3 objp) uint32_t zdr_createhow3 (ZDR *zdrs, createhow3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_createmode3 (zdrs, &objp->mode)) return FALSE; switch (objp->mode) { @@ -712,6 +880,9 @@ zdr_createhow3 (ZDR *zdrs, createhow3 *objp) uint32_t zdr_CREATE3args (ZDR *zdrs, CREATE3args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_diropargs3 (zdrs, &objp->where)) return FALSE; if (!zdr_createhow3 (zdrs, &objp->how)) @@ -722,6 +893,9 @@ zdr_CREATE3args (ZDR *zdrs, CREATE3args *objp) uint32_t zdr_post_op_fh3 (ZDR *zdrs, post_op_fh3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_bool (zdrs, &objp->handle_follows)) return FALSE; switch (objp->handle_follows) { @@ -740,6 +914,9 @@ zdr_post_op_fh3 (ZDR *zdrs, post_op_fh3 *objp) uint32_t zdr_CREATE3resok (ZDR *zdrs, CREATE3resok *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_post_op_fh3 (zdrs, &objp->obj)) return FALSE; if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) @@ -752,6 +929,9 @@ zdr_CREATE3resok (ZDR *zdrs, CREATE3resok *objp) uint32_t zdr_CREATE3resfail (ZDR *zdrs, CREATE3resfail *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_wcc_data (zdrs, &objp->dir_wcc)) return FALSE; return TRUE; @@ -760,6 +940,9 @@ zdr_CREATE3resfail (ZDR *zdrs, CREATE3resfail *objp) uint32_t zdr_CREATE3res (ZDR *zdrs, CREATE3res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -778,6 +961,9 @@ zdr_CREATE3res (ZDR *zdrs, CREATE3res *objp) uint32_t zdr_REMOVE3args (ZDR *zdrs, REMOVE3args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_diropargs3 (zdrs, &objp->object)) return FALSE; return TRUE; @@ -786,6 +972,9 @@ zdr_REMOVE3args (ZDR *zdrs, REMOVE3args *objp) uint32_t zdr_REMOVE3resok (ZDR *zdrs, REMOVE3resok *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_wcc_data (zdrs, &objp->dir_wcc)) return FALSE; return TRUE; @@ -794,6 +983,9 @@ zdr_REMOVE3resok (ZDR *zdrs, REMOVE3resok *objp) uint32_t zdr_REMOVE3resfail (ZDR *zdrs, REMOVE3resfail *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_wcc_data (zdrs, &objp->dir_wcc)) return FALSE; return TRUE; @@ -802,6 +994,9 @@ zdr_REMOVE3resfail (ZDR *zdrs, REMOVE3resfail *objp) uint32_t zdr_REMOVE3res (ZDR *zdrs, REMOVE3res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -820,6 +1015,9 @@ zdr_REMOVE3res (ZDR *zdrs, REMOVE3res *objp) uint32_t zdr_READ3args (ZDR *zdrs, READ3args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfs_fh3 (zdrs, &objp->file)) return FALSE; if (!zdr_offset3 (zdrs, &objp->offset)) @@ -832,13 +1030,16 @@ zdr_READ3args (ZDR *zdrs, READ3args *objp) uint32_t zdr_READ3resok (ZDR *zdrs, READ3resok *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_post_op_attr (zdrs, &objp->file_attributes)) return FALSE; if (!zdr_count3 (zdrs, &objp->count)) return FALSE; if (!zdr_bool (zdrs, &objp->eof)) return FALSE; - if (!zdr_bytes (zdrs, (char **)&objp->data.data_val, &objp->data.data_len, ~0)) + if (!zdr_bytes (zdrs, (char **)&objp->data.data_val, (u_int *) &objp->data.data_len, ~0)) return FALSE; return TRUE; } @@ -846,6 +1047,9 @@ zdr_READ3resok (ZDR *zdrs, READ3resok *objp) uint32_t zdr_READ3resfail (ZDR *zdrs, READ3resfail *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_post_op_attr (zdrs, &objp->file_attributes)) return FALSE; return TRUE; @@ -854,6 +1058,9 @@ zdr_READ3resfail (ZDR *zdrs, READ3resfail *objp) uint32_t zdr_READ3res (ZDR *zdrs, READ3res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -872,6 +1079,9 @@ zdr_READ3res (ZDR *zdrs, READ3res *objp) uint32_t zdr_FSINFO3args (ZDR *zdrs, FSINFO3args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfs_fh3 (zdrs, &objp->fsroot)) return FALSE; return TRUE; @@ -881,6 +1091,8 @@ uint32_t zdr_FSINFO3resok (ZDR *zdrs, FSINFO3resok *objp) { register int32_t *buf; + buf = NULL; + if (zdrs->x_op == ZDR_ENCODE) { if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) @@ -984,6 +1196,9 @@ zdr_FSINFO3resok (ZDR *zdrs, FSINFO3resok *objp) uint32_t zdr_FSINFO3resfail (ZDR *zdrs, FSINFO3resfail *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) return FALSE; return TRUE; @@ -992,6 +1207,9 @@ zdr_FSINFO3resfail (ZDR *zdrs, FSINFO3resfail *objp) uint32_t zdr_FSINFO3res (ZDR *zdrs, FSINFO3res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -1010,6 +1228,9 @@ zdr_FSINFO3res (ZDR *zdrs, FSINFO3res *objp) uint32_t zdr_FSSTAT3args (ZDR *zdrs, FSSTAT3args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfs_fh3 (zdrs, &objp->fsroot)) return FALSE; return TRUE; @@ -1018,6 +1239,9 @@ zdr_FSSTAT3args (ZDR *zdrs, FSSTAT3args *objp) uint32_t zdr_FSSTAT3resok (ZDR *zdrs, FSSTAT3resok *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) return FALSE; if (!zdr_size3 (zdrs, &objp->tbytes)) @@ -1040,6 +1264,9 @@ zdr_FSSTAT3resok (ZDR *zdrs, FSSTAT3resok *objp) uint32_t zdr_FSSTAT3resfail (ZDR *zdrs, FSSTAT3resfail *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) return FALSE; return TRUE; @@ -1048,6 +1275,9 @@ zdr_FSSTAT3resfail (ZDR *zdrs, FSSTAT3resfail *objp) uint32_t zdr_FSSTAT3res (ZDR *zdrs, FSSTAT3res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -1066,6 +1296,9 @@ zdr_FSSTAT3res (ZDR *zdrs, FSSTAT3res *objp) uint32_t zdr_PATHCONF3args (ZDR *zdrs, PATHCONF3args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfs_fh3 (zdrs, &objp->object)) return FALSE; return TRUE; @@ -1075,6 +1308,8 @@ uint32_t zdr_PATHCONF3resok (ZDR *zdrs, PATHCONF3resok *objp) { register int32_t *buf; + buf = NULL; + if (zdrs->x_op == ZDR_ENCODE) { if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) @@ -1150,6 +1385,9 @@ zdr_PATHCONF3resok (ZDR *zdrs, PATHCONF3resok *objp) uint32_t zdr_PATHCONF3resfail (ZDR *zdrs, PATHCONF3resfail *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) return FALSE; return TRUE; @@ -1158,6 +1396,9 @@ zdr_PATHCONF3resfail (ZDR *zdrs, PATHCONF3resfail *objp) uint32_t zdr_PATHCONF3res (ZDR *zdrs, PATHCONF3res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -1176,6 +1417,9 @@ zdr_PATHCONF3res (ZDR *zdrs, PATHCONF3res *objp) uint32_t zdr_nfspath3 (ZDR *zdrs, nfspath3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_string (zdrs, objp, ~0)) return FALSE; return TRUE; @@ -1184,6 +1428,9 @@ zdr_nfspath3 (ZDR *zdrs, nfspath3 *objp) uint32_t zdr_symlinkdata3 (ZDR *zdrs, symlinkdata3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_sattr3 (zdrs, &objp->symlink_attributes)) return FALSE; if (!zdr_nfspath3 (zdrs, &objp->symlink_data)) @@ -1194,6 +1441,9 @@ zdr_symlinkdata3 (ZDR *zdrs, symlinkdata3 *objp) uint32_t zdr_SYMLINK3args (ZDR *zdrs, SYMLINK3args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_diropargs3 (zdrs, &objp->where)) return FALSE; if (!zdr_symlinkdata3 (zdrs, &objp->symlink)) @@ -1204,6 +1454,9 @@ zdr_SYMLINK3args (ZDR *zdrs, SYMLINK3args *objp) uint32_t zdr_SYMLINK3resok (ZDR *zdrs, SYMLINK3resok *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_post_op_fh3 (zdrs, &objp->obj)) return FALSE; if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) @@ -1216,6 +1469,9 @@ zdr_SYMLINK3resok (ZDR *zdrs, SYMLINK3resok *objp) uint32_t zdr_SYMLINK3resfail (ZDR *zdrs, SYMLINK3resfail *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_wcc_data (zdrs, &objp->dir_wcc)) return FALSE; return TRUE; @@ -1224,6 +1480,9 @@ zdr_SYMLINK3resfail (ZDR *zdrs, SYMLINK3resfail *objp) uint32_t zdr_SYMLINK3res (ZDR *zdrs, SYMLINK3res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -1242,6 +1501,9 @@ zdr_SYMLINK3res (ZDR *zdrs, SYMLINK3res *objp) uint32_t zdr_READLINK3args (ZDR *zdrs, READLINK3args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfs_fh3 (zdrs, &objp->symlink)) return FALSE; return TRUE; @@ -1250,6 +1512,9 @@ zdr_READLINK3args (ZDR *zdrs, READLINK3args *objp) uint32_t zdr_READLINK3resok (ZDR *zdrs, READLINK3resok *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_post_op_attr (zdrs, &objp->symlink_attributes)) return FALSE; if (!zdr_nfspath3 (zdrs, &objp->data)) @@ -1260,6 +1525,9 @@ zdr_READLINK3resok (ZDR *zdrs, READLINK3resok *objp) uint32_t zdr_READLINK3resfail (ZDR *zdrs, READLINK3resfail *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_post_op_attr (zdrs, &objp->symlink_attributes)) return FALSE; return TRUE; @@ -1268,6 +1536,9 @@ zdr_READLINK3resfail (ZDR *zdrs, READLINK3resfail *objp) uint32_t zdr_READLINK3res (ZDR *zdrs, READLINK3res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -1286,6 +1557,9 @@ zdr_READLINK3res (ZDR *zdrs, READLINK3res *objp) uint32_t zdr_devicedata3 (ZDR *zdrs, devicedata3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_sattr3 (zdrs, &objp->dev_attributes)) return FALSE; if (!zdr_specdata3 (zdrs, &objp->spec)) @@ -1296,6 +1570,9 @@ zdr_devicedata3 (ZDR *zdrs, devicedata3 *objp) uint32_t zdr_mknoddata3 (ZDR *zdrs, mknoddata3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_ftype3 (zdrs, &objp->type)) return FALSE; switch (objp->type) { @@ -1324,6 +1601,9 @@ zdr_mknoddata3 (ZDR *zdrs, mknoddata3 *objp) uint32_t zdr_MKNOD3args (ZDR *zdrs, MKNOD3args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_diropargs3 (zdrs, &objp->where)) return FALSE; if (!zdr_mknoddata3 (zdrs, &objp->what)) @@ -1334,6 +1614,9 @@ zdr_MKNOD3args (ZDR *zdrs, MKNOD3args *objp) uint32_t zdr_MKNOD3resok (ZDR *zdrs, MKNOD3resok *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_post_op_fh3 (zdrs, &objp->obj)) return FALSE; if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) @@ -1346,6 +1629,9 @@ zdr_MKNOD3resok (ZDR *zdrs, MKNOD3resok *objp) uint32_t zdr_MKNOD3resfail (ZDR *zdrs, MKNOD3resfail *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_wcc_data (zdrs, &objp->dir_wcc)) return FALSE; return TRUE; @@ -1354,6 +1640,9 @@ zdr_MKNOD3resfail (ZDR *zdrs, MKNOD3resfail *objp) uint32_t zdr_MKNOD3res (ZDR *zdrs, MKNOD3res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -1372,6 +1661,9 @@ zdr_MKNOD3res (ZDR *zdrs, MKNOD3res *objp) uint32_t zdr_MKDIR3args (ZDR *zdrs, MKDIR3args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_diropargs3 (zdrs, &objp->where)) return FALSE; if (!zdr_sattr3 (zdrs, &objp->attributes)) @@ -1382,6 +1674,9 @@ zdr_MKDIR3args (ZDR *zdrs, MKDIR3args *objp) uint32_t zdr_MKDIR3resok (ZDR *zdrs, MKDIR3resok *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_post_op_fh3 (zdrs, &objp->obj)) return FALSE; if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) @@ -1394,6 +1689,9 @@ zdr_MKDIR3resok (ZDR *zdrs, MKDIR3resok *objp) uint32_t zdr_MKDIR3resfail (ZDR *zdrs, MKDIR3resfail *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_wcc_data (zdrs, &objp->dir_wcc)) return FALSE; return TRUE; @@ -1402,6 +1700,9 @@ zdr_MKDIR3resfail (ZDR *zdrs, MKDIR3resfail *objp) uint32_t zdr_MKDIR3res (ZDR *zdrs, MKDIR3res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -1420,6 +1721,9 @@ zdr_MKDIR3res (ZDR *zdrs, MKDIR3res *objp) uint32_t zdr_RMDIR3args (ZDR *zdrs, RMDIR3args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_diropargs3 (zdrs, &objp->object)) return FALSE; return TRUE; @@ -1428,6 +1732,9 @@ zdr_RMDIR3args (ZDR *zdrs, RMDIR3args *objp) uint32_t zdr_RMDIR3resok (ZDR *zdrs, RMDIR3resok *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_wcc_data (zdrs, &objp->dir_wcc)) return FALSE; return TRUE; @@ -1436,6 +1743,9 @@ zdr_RMDIR3resok (ZDR *zdrs, RMDIR3resok *objp) uint32_t zdr_RMDIR3resfail (ZDR *zdrs, RMDIR3resfail *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_wcc_data (zdrs, &objp->dir_wcc)) return FALSE; return TRUE; @@ -1444,6 +1754,9 @@ zdr_RMDIR3resfail (ZDR *zdrs, RMDIR3resfail *objp) uint32_t zdr_RMDIR3res (ZDR *zdrs, RMDIR3res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -1462,6 +1775,9 @@ zdr_RMDIR3res (ZDR *zdrs, RMDIR3res *objp) uint32_t zdr_RENAME3args (ZDR *zdrs, RENAME3args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_diropargs3 (zdrs, &objp->from)) return FALSE; if (!zdr_diropargs3 (zdrs, &objp->to)) @@ -1472,6 +1788,9 @@ zdr_RENAME3args (ZDR *zdrs, RENAME3args *objp) uint32_t zdr_RENAME3resok (ZDR *zdrs, RENAME3resok *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_wcc_data (zdrs, &objp->fromdir_wcc)) return FALSE; if (!zdr_wcc_data (zdrs, &objp->todir_wcc)) @@ -1482,6 +1801,9 @@ zdr_RENAME3resok (ZDR *zdrs, RENAME3resok *objp) uint32_t zdr_RENAME3resfail (ZDR *zdrs, RENAME3resfail *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_wcc_data (zdrs, &objp->fromdir_wcc)) return FALSE; if (!zdr_wcc_data (zdrs, &objp->todir_wcc)) @@ -1492,6 +1814,9 @@ zdr_RENAME3resfail (ZDR *zdrs, RENAME3resfail *objp) uint32_t zdr_RENAME3res (ZDR *zdrs, RENAME3res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -1510,6 +1835,9 @@ zdr_RENAME3res (ZDR *zdrs, RENAME3res *objp) uint32_t zdr_READDIRPLUS3args (ZDR *zdrs, READDIRPLUS3args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfs_fh3 (zdrs, &objp->dir)) return FALSE; if (!zdr_cookie3 (zdrs, &objp->cookie)) @@ -1526,6 +1854,9 @@ zdr_READDIRPLUS3args (ZDR *zdrs, READDIRPLUS3args *objp) uint32_t zdr_entryplus3 (ZDR *zdrs, entryplus3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_fileid3 (zdrs, &objp->fileid)) return FALSE; if (!zdr_filename3 (zdrs, &objp->name)) @@ -1544,6 +1875,9 @@ zdr_entryplus3 (ZDR *zdrs, entryplus3 *objp) uint32_t zdr_dirlistplus3 (ZDR *zdrs, dirlistplus3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_pointer (zdrs, (char **)&objp->entries, sizeof (entryplus3), (zdrproc_t) zdr_entryplus3)) return FALSE; if (!zdr_bool (zdrs, &objp->eof)) @@ -1554,6 +1888,9 @@ zdr_dirlistplus3 (ZDR *zdrs, dirlistplus3 *objp) uint32_t zdr_READDIRPLUS3resok (ZDR *zdrs, READDIRPLUS3resok *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_post_op_attr (zdrs, &objp->dir_attributes)) return FALSE; if (!zdr_cookieverf3 (zdrs, objp->cookieverf)) @@ -1566,6 +1903,9 @@ zdr_READDIRPLUS3resok (ZDR *zdrs, READDIRPLUS3resok *objp) uint32_t zdr_READDIRPLUS3resfail (ZDR *zdrs, READDIRPLUS3resfail *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_post_op_attr (zdrs, &objp->dir_attributes)) return FALSE; return TRUE; @@ -1574,6 +1914,9 @@ zdr_READDIRPLUS3resfail (ZDR *zdrs, READDIRPLUS3resfail *objp) uint32_t zdr_READDIRPLUS3res (ZDR *zdrs, READDIRPLUS3res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -1592,6 +1935,9 @@ zdr_READDIRPLUS3res (ZDR *zdrs, READDIRPLUS3res *objp) uint32_t zdr_READDIR3args (ZDR *zdrs, READDIR3args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfs_fh3 (zdrs, &objp->dir)) return FALSE; if (!zdr_cookie3 (zdrs, &objp->cookie)) @@ -1606,6 +1952,9 @@ zdr_READDIR3args (ZDR *zdrs, READDIR3args *objp) uint32_t zdr_entry3 (ZDR *zdrs, entry3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_fileid3 (zdrs, &objp->fileid)) return FALSE; if (!zdr_filename3 (zdrs, &objp->name)) @@ -1620,6 +1969,9 @@ zdr_entry3 (ZDR *zdrs, entry3 *objp) uint32_t zdr_dirlist3 (ZDR *zdrs, dirlist3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_pointer (zdrs, (char **)&objp->entries, sizeof (entry3), (zdrproc_t) zdr_entry3)) return FALSE; if (!zdr_bool (zdrs, &objp->eof)) @@ -1630,6 +1982,9 @@ zdr_dirlist3 (ZDR *zdrs, dirlist3 *objp) uint32_t zdr_READDIR3resok (ZDR *zdrs, READDIR3resok *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_post_op_attr (zdrs, &objp->dir_attributes)) return FALSE; if (!zdr_cookieverf3 (zdrs, objp->cookieverf)) @@ -1642,6 +1997,9 @@ zdr_READDIR3resok (ZDR *zdrs, READDIR3resok *objp) uint32_t zdr_READDIR3resfail (ZDR *zdrs, READDIR3resfail *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_post_op_attr (zdrs, &objp->dir_attributes)) return FALSE; return TRUE; @@ -1650,6 +2008,9 @@ zdr_READDIR3resfail (ZDR *zdrs, READDIR3resfail *objp) uint32_t zdr_READDIR3res (ZDR *zdrs, READDIR3res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -1668,6 +2029,9 @@ zdr_READDIR3res (ZDR *zdrs, READDIR3res *objp) uint32_t zdr_LINK3args (ZDR *zdrs, LINK3args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfs_fh3 (zdrs, &objp->file)) return FALSE; if (!zdr_diropargs3 (zdrs, &objp->link)) @@ -1678,6 +2042,9 @@ zdr_LINK3args (ZDR *zdrs, LINK3args *objp) uint32_t zdr_LINK3resok (ZDR *zdrs, LINK3resok *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_post_op_attr (zdrs, &objp->file_attributes)) return FALSE; if (!zdr_wcc_data (zdrs, &objp->linkdir_wcc)) @@ -1688,6 +2055,9 @@ zdr_LINK3resok (ZDR *zdrs, LINK3resok *objp) uint32_t zdr_LINK3resfail (ZDR *zdrs, LINK3resfail *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_post_op_attr (zdrs, &objp->file_attributes)) return FALSE; if (!zdr_wcc_data (zdrs, &objp->linkdir_wcc)) @@ -1698,6 +2068,9 @@ zdr_LINK3resfail (ZDR *zdrs, LINK3resfail *objp) uint32_t zdr_LINK3res (ZDR *zdrs, LINK3res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -1716,6 +2089,9 @@ zdr_LINK3res (ZDR *zdrs, LINK3res *objp) uint32_t zdr_sattrguard3 (ZDR *zdrs, sattrguard3 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_bool (zdrs, &objp->check)) return FALSE; switch (objp->check) { @@ -1734,6 +2110,9 @@ zdr_sattrguard3 (ZDR *zdrs, sattrguard3 *objp) uint32_t zdr_SETATTR3args (ZDR *zdrs, SETATTR3args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfs_fh3 (zdrs, &objp->object)) return FALSE; if (!zdr_sattr3 (zdrs, &objp->new_attributes)) @@ -1746,6 +2125,9 @@ zdr_SETATTR3args (ZDR *zdrs, SETATTR3args *objp) uint32_t zdr_SETATTR3resok (ZDR *zdrs, SETATTR3resok *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_wcc_data (zdrs, &objp->obj_wcc)) return FALSE; return TRUE; @@ -1754,6 +2136,9 @@ zdr_SETATTR3resok (ZDR *zdrs, SETATTR3resok *objp) uint32_t zdr_SETATTR3resfail (ZDR *zdrs, SETATTR3resfail *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_wcc_data (zdrs, &objp->obj_wcc)) return FALSE; return TRUE; @@ -1762,6 +2147,9 @@ zdr_SETATTR3resfail (ZDR *zdrs, SETATTR3resfail *objp) uint32_t zdr_SETATTR3res (ZDR *zdrs, SETATTR3res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -1780,6 +2168,9 @@ zdr_SETATTR3res (ZDR *zdrs, SETATTR3res *objp) uint32_t zdr_fhandle2 (ZDR *zdrs, fhandle2 objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_opaque (zdrs, objp, FHSIZE2)) return FALSE; return TRUE; @@ -1788,6 +2179,9 @@ zdr_fhandle2 (ZDR *zdrs, fhandle2 objp) uint32_t zdr_ftype2 (ZDR *zdrs, ftype2 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_enum (zdrs, (enum_t *) objp)) return FALSE; return TRUE; @@ -1797,6 +2191,8 @@ uint32_t zdr_fattr2 (ZDR *zdrs, fattr2 *objp) { register int32_t *buf; + buf = NULL; + if (zdrs->x_op == ZDR_ENCODE) { if (!zdr_ftype2 (zdrs, &objp->type)) @@ -1925,6 +2321,8 @@ uint32_t zdr_sattr2 (ZDR *zdrs, sattr2 *objp) { register int32_t *buf; + buf = NULL; + if (zdrs->x_op == ZDR_ENCODE) { buf = ZDR_INLINE (zdrs, 4 * BYTES_PER_ZDR_UNIT); @@ -1992,6 +2390,9 @@ zdr_sattr2 (ZDR *zdrs, sattr2 *objp) uint32_t zdr_filename2 (ZDR *zdrs, filename2 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_string (zdrs, objp, MAXNAMLEN2)) return FALSE; return TRUE; @@ -2000,6 +2401,9 @@ zdr_filename2 (ZDR *zdrs, filename2 *objp) uint32_t zdr_path2 (ZDR *zdrs, path2 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_string (zdrs, objp, MAXPATHLEN2)) return FALSE; return TRUE; @@ -2008,7 +2412,10 @@ zdr_path2 (ZDR *zdrs, path2 *objp) uint32_t zdr_nfsdata2 (ZDR *zdrs, nfsdata2 *objp) { - if (!zdr_bytes (zdrs, (char **)&objp->nfsdata2_val, &objp->nfsdata2_len, NFSMAXDATA2)) + register int32_t *buf; + buf = NULL; + + if (!zdr_bytes (zdrs, (char **)&objp->nfsdata2_val, (u_int *) &objp->nfsdata2_len, NFSMAXDATA2)) return FALSE; return TRUE; } @@ -2016,6 +2423,9 @@ zdr_nfsdata2 (ZDR *zdrs, nfsdata2 *objp) uint32_t zdr_nfscookie2 (ZDR *zdrs, nfscookie2 objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_opaque (zdrs, objp, NFSCOOKIESIZE2)) return FALSE; return TRUE; @@ -2024,6 +2434,9 @@ zdr_nfscookie2 (ZDR *zdrs, nfscookie2 objp) uint32_t zdr_entry2 (ZDR *zdrs, entry2 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_u_int (zdrs, &objp->fileid)) return FALSE; if (!zdr_filename2 (zdrs, &objp->name)) @@ -2038,6 +2451,9 @@ zdr_entry2 (ZDR *zdrs, entry2 *objp) uint32_t zdr_diropargs2 (ZDR *zdrs, diropargs2 *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_fhandle2 (zdrs, objp->dir)) return FALSE; if (!zdr_filename2 (zdrs, &objp->name)) @@ -2048,6 +2464,9 @@ zdr_diropargs2 (ZDR *zdrs, diropargs2 *objp) uint32_t zdr_GETATTR2args (ZDR *zdrs, GETATTR2args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_fhandle2 (zdrs, objp->fhandle)) return FALSE; return TRUE; @@ -2056,6 +2475,9 @@ zdr_GETATTR2args (ZDR *zdrs, GETATTR2args *objp) uint32_t zdr_GETATTR2resok (ZDR *zdrs, GETATTR2resok *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_fattr2 (zdrs, &objp->attributes)) return FALSE; return TRUE; @@ -2064,6 +2486,9 @@ zdr_GETATTR2resok (ZDR *zdrs, GETATTR2resok *objp) uint32_t zdr_GETATTR2res (ZDR *zdrs, GETATTR2res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -2080,6 +2505,9 @@ zdr_GETATTR2res (ZDR *zdrs, GETATTR2res *objp) uint32_t zdr_SETATTR2args (ZDR *zdrs, SETATTR2args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_fhandle2 (zdrs, objp->fhandle)) return FALSE; if (!zdr_sattr2 (zdrs, &objp->attributes)) @@ -2090,6 +2518,9 @@ zdr_SETATTR2args (ZDR *zdrs, SETATTR2args *objp) uint32_t zdr_SETATTR2resok (ZDR *zdrs, SETATTR2resok *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_fattr2 (zdrs, &objp->attributes)) return FALSE; return TRUE; @@ -2098,6 +2529,9 @@ zdr_SETATTR2resok (ZDR *zdrs, SETATTR2resok *objp) uint32_t zdr_SETATTR2res (ZDR *zdrs, SETATTR2res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -2114,6 +2548,9 @@ zdr_SETATTR2res (ZDR *zdrs, SETATTR2res *objp) uint32_t zdr_LOOKUP2args (ZDR *zdrs, LOOKUP2args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_diropargs2 (zdrs, &objp->what)) return FALSE; return TRUE; @@ -2122,6 +2559,9 @@ zdr_LOOKUP2args (ZDR *zdrs, LOOKUP2args *objp) uint32_t zdr_LOOKUP2resok (ZDR *zdrs, LOOKUP2resok *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_fhandle2 (zdrs, objp->file)) return FALSE; if (!zdr_fattr2 (zdrs, &objp->attributes)) @@ -2132,6 +2572,9 @@ zdr_LOOKUP2resok (ZDR *zdrs, LOOKUP2resok *objp) uint32_t zdr_LOOKUP2res (ZDR *zdrs, LOOKUP2res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -2148,6 +2591,9 @@ zdr_LOOKUP2res (ZDR *zdrs, LOOKUP2res *objp) uint32_t zdr_READLINK2args (ZDR *zdrs, READLINK2args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_fhandle2 (zdrs, objp->file)) return FALSE; return TRUE; @@ -2156,6 +2602,9 @@ zdr_READLINK2args (ZDR *zdrs, READLINK2args *objp) uint32_t zdr_READLINK2resok (ZDR *zdrs, READLINK2resok *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_path2 (zdrs, &objp->data)) return FALSE; return TRUE; @@ -2164,6 +2613,9 @@ zdr_READLINK2resok (ZDR *zdrs, READLINK2resok *objp) uint32_t zdr_READLINK2res (ZDR *zdrs, READLINK2res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -2180,6 +2632,9 @@ zdr_READLINK2res (ZDR *zdrs, READLINK2res *objp) uint32_t zdr_READ2args (ZDR *zdrs, READ2args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_fhandle2 (zdrs, objp->file)) return FALSE; if (!zdr_u_int (zdrs, &objp->offset)) @@ -2194,6 +2649,9 @@ zdr_READ2args (ZDR *zdrs, READ2args *objp) uint32_t zdr_READ2resok (ZDR *zdrs, READ2resok *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_fattr2 (zdrs, &objp->attributes)) return FALSE; if (!zdr_nfsdata2 (zdrs, &objp->data)) @@ -2204,6 +2662,9 @@ zdr_READ2resok (ZDR *zdrs, READ2resok *objp) uint32_t zdr_READ2res (ZDR *zdrs, READ2res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -2221,6 +2682,8 @@ uint32_t zdr_WRITE2args (ZDR *zdrs, WRITE2args *objp) { register int32_t *buf; + buf = NULL; + if (zdrs->x_op == ZDR_ENCODE) { if (!zdr_fhandle2 (zdrs, objp->file)) @@ -2280,6 +2743,9 @@ zdr_WRITE2args (ZDR *zdrs, WRITE2args *objp) uint32_t zdr_WRITE2resok (ZDR *zdrs, WRITE2resok *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_fattr2 (zdrs, &objp->attributes)) return FALSE; return TRUE; @@ -2288,6 +2754,9 @@ zdr_WRITE2resok (ZDR *zdrs, WRITE2resok *objp) uint32_t zdr_WRITE2res (ZDR *zdrs, WRITE2res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -2304,6 +2773,9 @@ zdr_WRITE2res (ZDR *zdrs, WRITE2res *objp) uint32_t zdr_CREATE2args (ZDR *zdrs, CREATE2args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_diropargs2 (zdrs, &objp->where)) return FALSE; if (!zdr_sattr2 (zdrs, &objp->attributes)) @@ -2314,6 +2786,9 @@ zdr_CREATE2args (ZDR *zdrs, CREATE2args *objp) uint32_t zdr_CREATE2resok (ZDR *zdrs, CREATE2resok *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_fhandle2 (zdrs, objp->file)) return FALSE; if (!zdr_fattr2 (zdrs, &objp->attributes)) @@ -2324,6 +2799,9 @@ zdr_CREATE2resok (ZDR *zdrs, CREATE2resok *objp) uint32_t zdr_CREATE2res (ZDR *zdrs, CREATE2res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -2340,6 +2818,9 @@ zdr_CREATE2res (ZDR *zdrs, CREATE2res *objp) uint32_t zdr_REMOVE2args (ZDR *zdrs, REMOVE2args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_diropargs2 (zdrs, &objp->what)) return FALSE; return TRUE; @@ -2348,6 +2829,9 @@ zdr_REMOVE2args (ZDR *zdrs, REMOVE2args *objp) uint32_t zdr_REMOVE2res (ZDR *zdrs, REMOVE2res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; return TRUE; @@ -2356,6 +2840,9 @@ zdr_REMOVE2res (ZDR *zdrs, REMOVE2res *objp) uint32_t zdr_RENAME2args (ZDR *zdrs, RENAME2args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_diropargs2 (zdrs, &objp->from)) return FALSE; if (!zdr_diropargs2 (zdrs, &objp->to)) @@ -2366,6 +2853,9 @@ zdr_RENAME2args (ZDR *zdrs, RENAME2args *objp) uint32_t zdr_RENAME2res (ZDR *zdrs, RENAME2res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; return TRUE; @@ -2374,6 +2864,9 @@ zdr_RENAME2res (ZDR *zdrs, RENAME2res *objp) uint32_t zdr_LINK2args (ZDR *zdrs, LINK2args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_fhandle2 (zdrs, objp->from)) return FALSE; if (!zdr_diropargs2 (zdrs, &objp->to)) @@ -2384,6 +2877,9 @@ zdr_LINK2args (ZDR *zdrs, LINK2args *objp) uint32_t zdr_LINK2res (ZDR *zdrs, LINK2res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; return TRUE; @@ -2392,6 +2888,9 @@ zdr_LINK2res (ZDR *zdrs, LINK2res *objp) uint32_t zdr_SYMLINK2args (ZDR *zdrs, SYMLINK2args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_diropargs2 (zdrs, &objp->from)) return FALSE; if (!zdr_path2 (zdrs, &objp->to)) @@ -2404,6 +2903,9 @@ zdr_SYMLINK2args (ZDR *zdrs, SYMLINK2args *objp) uint32_t zdr_SYMLINK2res (ZDR *zdrs, SYMLINK2res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; return TRUE; @@ -2412,6 +2914,9 @@ zdr_SYMLINK2res (ZDR *zdrs, SYMLINK2res *objp) uint32_t zdr_MKDIR2args (ZDR *zdrs, MKDIR2args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_diropargs2 (zdrs, &objp->where)) return FALSE; if (!zdr_sattr2 (zdrs, &objp->attributes)) @@ -2422,6 +2927,9 @@ zdr_MKDIR2args (ZDR *zdrs, MKDIR2args *objp) uint32_t zdr_MKDIR2resok (ZDR *zdrs, MKDIR2resok *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_fhandle2 (zdrs, objp->file)) return FALSE; if (!zdr_fattr2 (zdrs, &objp->attributes)) @@ -2432,6 +2940,9 @@ zdr_MKDIR2resok (ZDR *zdrs, MKDIR2resok *objp) uint32_t zdr_MKDIR2res (ZDR *zdrs, MKDIR2res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -2448,6 +2959,9 @@ zdr_MKDIR2res (ZDR *zdrs, MKDIR2res *objp) uint32_t zdr_RMDIR2args (ZDR *zdrs, RMDIR2args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_diropargs2 (zdrs, &objp->what)) return FALSE; return TRUE; @@ -2456,6 +2970,9 @@ zdr_RMDIR2args (ZDR *zdrs, RMDIR2args *objp) uint32_t zdr_RMDIR2res (ZDR *zdrs, RMDIR2res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; return TRUE; @@ -2464,6 +2981,9 @@ zdr_RMDIR2res (ZDR *zdrs, RMDIR2res *objp) uint32_t zdr_READDIR2args (ZDR *zdrs, READDIR2args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_fhandle2 (zdrs, objp->dir)) return FALSE; if (!zdr_nfscookie2 (zdrs, objp->cookie)) @@ -2476,6 +2996,9 @@ zdr_READDIR2args (ZDR *zdrs, READDIR2args *objp) uint32_t zdr_READDIR2resok (ZDR *zdrs, READDIR2resok *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_pointer (zdrs, (char **)&objp->entries, sizeof (entry2), (zdrproc_t) zdr_entry2)) return FALSE; if (!zdr_bool (zdrs, &objp->eof)) @@ -2486,6 +3009,9 @@ zdr_READDIR2resok (ZDR *zdrs, READDIR2resok *objp) uint32_t zdr_READDIR2res (ZDR *zdrs, READDIR2res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -2502,6 +3028,9 @@ zdr_READDIR2res (ZDR *zdrs, READDIR2res *objp) uint32_t zdr_STATFS2args (ZDR *zdrs, STATFS2args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_fhandle2 (zdrs, objp->dir)) return FALSE; return TRUE; @@ -2511,6 +3040,8 @@ uint32_t zdr_STATFS2resok (ZDR *zdrs, STATFS2resok *objp) { register int32_t *buf; + buf = NULL; + if (zdrs->x_op == ZDR_ENCODE) { buf = ZDR_INLINE (zdrs, 5 * BYTES_PER_ZDR_UNIT); @@ -2572,6 +3103,9 @@ zdr_STATFS2resok (ZDR *zdrs, STATFS2resok *objp) uint32_t zdr_STATFS2res (ZDR *zdrs, STATFS2res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -2588,6 +3122,9 @@ zdr_STATFS2res (ZDR *zdrs, STATFS2res *objp) uint32_t zdr_nfsacl_type (ZDR *zdrs, nfsacl_type *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_enum (zdrs, (enum_t *) objp)) return FALSE; return TRUE; @@ -2596,6 +3133,9 @@ zdr_nfsacl_type (ZDR *zdrs, nfsacl_type *objp) uint32_t zdr_nfsacl_ace (ZDR *zdrs, nfsacl_ace *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsacl_type (zdrs, &objp->type)) return FALSE; if (!zdr_u_int (zdrs, &objp->id)) @@ -2608,6 +3148,9 @@ zdr_nfsacl_ace (ZDR *zdrs, nfsacl_ace *objp) uint32_t zdr_GETACL3args (ZDR *zdrs, GETACL3args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfs_fh3 (zdrs, &objp->dir)) return FALSE; if (!zdr_u_int (zdrs, &objp->mask)) @@ -2618,18 +3161,21 @@ zdr_GETACL3args (ZDR *zdrs, GETACL3args *objp) uint32_t zdr_GETACL3resok (ZDR *zdrs, GETACL3resok *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_post_op_attr (zdrs, &objp->attr)) return FALSE; if (!zdr_u_int (zdrs, &objp->mask)) return FALSE; if (!zdr_u_int (zdrs, &objp->ace_count)) return FALSE; - if (!zdr_array (zdrs, (char **)&objp->ace.ace_val, &objp->ace.ace_len, ~0, + if (!zdr_array (zdrs, (char **)&objp->ace.ace_val, (u_int *) &objp->ace.ace_len, ~0, sizeof (nfsacl_ace), (zdrproc_t) zdr_nfsacl_ace)) return FALSE; if (!zdr_u_int (zdrs, &objp->default_ace_count)) return FALSE; - if (!zdr_array (zdrs, (char **)&objp->default_ace.default_ace_val, &objp->default_ace.default_ace_len, ~0, + if (!zdr_array (zdrs, (char **)&objp->default_ace.default_ace_val, (u_int *) &objp->default_ace.default_ace_len, ~0, sizeof (nfsacl_ace), (zdrproc_t) zdr_nfsacl_ace)) return FALSE; return TRUE; @@ -2638,6 +3184,9 @@ zdr_GETACL3resok (ZDR *zdrs, GETACL3resok *objp) uint32_t zdr_GETACL3res (ZDR *zdrs, GETACL3res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -2654,18 +3203,21 @@ zdr_GETACL3res (ZDR *zdrs, GETACL3res *objp) uint32_t zdr_SETACL3args (ZDR *zdrs, SETACL3args *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfs_fh3 (zdrs, &objp->dir)) return FALSE; if (!zdr_u_int (zdrs, &objp->mask)) return FALSE; if (!zdr_u_int (zdrs, &objp->ace_count)) return FALSE; - if (!zdr_array (zdrs, (char **)&objp->ace.ace_val, &objp->ace.ace_len, ~0, + if (!zdr_array (zdrs, (char **)&objp->ace.ace_val, (u_int *) &objp->ace.ace_len, ~0, sizeof (nfsacl_ace), (zdrproc_t) zdr_nfsacl_ace)) return FALSE; if (!zdr_u_int (zdrs, &objp->default_ace_count)) return FALSE; - if (!zdr_array (zdrs, (char **)&objp->default_ace.default_ace_val, &objp->default_ace.default_ace_len, ~0, + if (!zdr_array (zdrs, (char **)&objp->default_ace.default_ace_val, (u_int *) &objp->default_ace.default_ace_len, ~0, sizeof (nfsacl_ace), (zdrproc_t) zdr_nfsacl_ace)) return FALSE; return TRUE; @@ -2674,6 +3226,9 @@ zdr_SETACL3args (ZDR *zdrs, SETACL3args *objp) uint32_t zdr_SETACL3resok (ZDR *zdrs, SETACL3resok *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_post_op_attr (zdrs, &objp->attr)) return FALSE; return TRUE; @@ -2682,6 +3237,9 @@ zdr_SETACL3resok (ZDR *zdrs, SETACL3resok *objp) uint32_t zdr_SETACL3res (ZDR *zdrs, SETACL3res *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { diff --git a/nfs/libnfs-raw-nfs.h b/nfs/libnfs-raw-nfs.h index 4ee11f62..d4dede16 100644 --- a/nfs/libnfs-raw-nfs.h +++ b/nfs/libnfs-raw-nfs.h @@ -56,7 +56,7 @@ typedef uint64_t cookie3; struct nfs_fh3 { struct { - uint32_t data_len; + u_int data_len; char *data_val; } data; }; @@ -81,32 +81,32 @@ enum ftype3 { }; typedef enum ftype3 ftype3; -typedef uint32_t mode3; +typedef u_int mode3; -typedef uint32_t uid3; +typedef u_int uid3; -typedef uint32_t gid3; +typedef u_int gid3; typedef uint64_t size3; typedef uint64_t fileid3; struct specdata3 { - uint32_t specdata1; - uint32_t specdata2; + u_int specdata1; + u_int specdata2; }; typedef struct specdata3 specdata3; struct nfstime3 { - uint32_t seconds; - uint32_t nseconds; + u_int seconds; + u_int nseconds; }; typedef struct nfstime3 nfstime3; struct fattr3 { ftype3 type; mode3 mode; - uint32_t nlink; + u_int nlink; uid3 uid; gid3 gid; size3 size; @@ -170,7 +170,7 @@ typedef enum stable_how stable_how; typedef uint64_t offset3; -typedef uint32_t count3; +typedef u_int count3; struct wcc_attr { size3 size; @@ -199,7 +199,7 @@ struct WRITE3args { count3 count; stable_how stable; struct { - uint32_t data_len; + u_int data_len; char *data_val; } data; }; @@ -294,7 +294,7 @@ typedef struct AZAUTH3args AZAUTH3args; struct AZAUTH3resok { char *server_version; char *serverid; - //uint64_t server_cap_map; + uint64_t server_cap_map; }; typedef struct AZAUTH3resok AZAUTH3resok; @@ -314,13 +314,13 @@ typedef struct AZAUTH3res AZAUTH3res; struct ACCESS3args { nfs_fh3 object; - uint32_t access; + u_int access; }; typedef struct ACCESS3args ACCESS3args; struct ACCESS3resok { post_op_attr obj_attributes; - uint32_t access; + u_int access; }; typedef struct ACCESS3resok ACCESS3resok; @@ -511,7 +511,7 @@ struct READ3resok { count3 count; uint32_t eof; struct { - uint32_t data_len; + u_int data_len; char *data_val; } data; }; @@ -542,16 +542,16 @@ typedef struct FSINFO3args FSINFO3args; struct FSINFO3resok { post_op_attr obj_attributes; - uint32_t rtmax; - uint32_t rtpref; - uint32_t rtmult; - uint32_t wtmax; - uint32_t wtpref; - uint32_t wtmult; - uint32_t dtpref; + u_int rtmax; + u_int rtpref; + u_int rtmult; + u_int wtmax; + u_int wtpref; + u_int wtmult; + u_int dtpref; size3 maxfilesize; nfstime3 time_delta; - uint32_t properties; + u_int properties; }; typedef struct FSINFO3resok FSINFO3resok; @@ -582,7 +582,7 @@ struct FSSTAT3resok { size3 tfiles; size3 ffiles; size3 afiles; - uint32_t invarsec; + u_int invarsec; }; typedef struct FSSTAT3resok FSSTAT3resok; @@ -607,8 +607,8 @@ typedef struct PATHCONF3args PATHCONF3args; struct PATHCONF3resok { post_op_attr obj_attributes; - uint32_t linkmax; - uint32_t name_max; + u_int linkmax; + u_int name_max; uint32_t no_trunc; uint32_t chown_restricted; uint32_t case_insensitive; @@ -977,16 +977,16 @@ typedef enum ftype2 ftype2; struct fattr2 { ftype2 type; - uint32_t mode; - uint32_t nlink; - uint32_t uid; - uint32_t gid; - uint32_t size; - uint32_t blocksize; - uint32_t rdev; - uint32_t blocks; - uint32_t fsid; - uint32_t fileid; + u_int mode; + u_int nlink; + u_int uid; + u_int gid; + u_int size; + u_int blocksize; + u_int rdev; + u_int blocks; + u_int fsid; + u_int fileid; nfstime3 atime; nfstime3 mtime; nfstime3 ctime; @@ -994,10 +994,10 @@ struct fattr2 { typedef struct fattr2 fattr2; struct sattr2 { - uint32_t mode; - uint32_t uid; - uint32_t gid; - uint32_t size; + u_int mode; + u_int uid; + u_int gid; + u_int size; nfstime3 atime; nfstime3 mtime; }; @@ -1011,7 +1011,7 @@ typedef char *path2; #define NFSMAXDATA2 8192 typedef struct { - uint32_t nfsdata2_len; + u_int nfsdata2_len; char *nfsdata2_val; } nfsdata2; #define NFSCOOKIESIZE2 4 @@ -1019,7 +1019,7 @@ typedef struct { typedef char nfscookie2[NFSCOOKIESIZE2]; struct entry2 { - uint32_t fileid; + u_int fileid; filename2 name; nfscookie2 cookie; struct entry2 *nextentry; @@ -1108,9 +1108,9 @@ typedef struct READLINK2res READLINK2res; struct READ2args { fhandle2 file; - uint32_t offset; - uint32_t count; - uint32_t totalcount; + u_int offset; + u_int count; + u_int totalcount; }; typedef struct READ2args READ2args; @@ -1130,9 +1130,9 @@ typedef struct READ2res READ2res; struct WRITE2args { fhandle2 file; - uint32_t beginoffset; - uint32_t offset; - uint32_t totalcount; + u_int beginoffset; + u_int offset; + u_int totalcount; nfsdata2 data; }; typedef struct WRITE2args WRITE2args; @@ -1247,7 +1247,7 @@ typedef struct RMDIR2res RMDIR2res; struct READDIR2args { fhandle2 dir; nfscookie2 cookie; - uint32_t count; + u_int count; }; typedef struct READDIR2args READDIR2args; @@ -1271,11 +1271,11 @@ struct STATFS2args { typedef struct STATFS2args STATFS2args; struct STATFS2resok { - uint32_t tsize; - uint32_t bsize; - uint32_t blocks; - uint32_t bfree; - uint32_t bavail; + u_int tsize; + u_int bsize; + u_int blocks; + u_int bfree; + u_int bavail; }; typedef struct STATFS2resok STATFS2resok; @@ -1309,8 +1309,8 @@ typedef enum nfsacl_type nfsacl_type; struct nfsacl_ace { enum nfsacl_type type; - uint32_t id; - uint32_t perm; + u_int id; + u_int perm; }; typedef struct nfsacl_ace nfsacl_ace; #define NFSACL_MASK_ACL_ENTRY 0x0001 @@ -1320,21 +1320,21 @@ typedef struct nfsacl_ace nfsacl_ace; struct GETACL3args { nfs_fh3 dir; - uint32_t mask; + u_int mask; }; typedef struct GETACL3args GETACL3args; struct GETACL3resok { post_op_attr attr; - uint32_t mask; - uint32_t ace_count; + u_int mask; + u_int ace_count; struct { - uint32_t ace_len; + u_int ace_len; struct nfsacl_ace *ace_val; } ace; - uint32_t default_ace_count; + u_int default_ace_count; struct { - uint32_t default_ace_len; + u_int default_ace_len; struct nfsacl_ace *default_ace_val; } default_ace; }; @@ -1350,15 +1350,15 @@ typedef struct GETACL3res GETACL3res; struct SETACL3args { nfs_fh3 dir; - uint32_t mask; - uint32_t ace_count; + u_int mask; + u_int ace_count; struct { - uint32_t ace_len; + u_int ace_len; struct nfsacl_ace *ace_val; } ace; - uint32_t default_ace_count; + u_int default_ace_count; struct { - uint32_t default_ace_len; + u_int default_ace_len; struct nfsacl_ace *default_ace_val; } default_ace; }; @@ -2052,9 +2052,9 @@ extern uint32_t zdr_SETACL3res (); #endif typedef struct { - uint32_t ace_count; + u_int ace_count; struct nfsacl_ace *ace; - uint32_t default_ace_count; + u_int default_ace_count; struct nfsacl_ace *default_ace; } fattr3_acl; diff --git a/nfs/nfs.x b/nfs/nfs.x index 7464caf1..f69e32d4 100644 --- a/nfs/nfs.x +++ b/nfs/nfs.x @@ -248,7 +248,7 @@ struct AZAUTH3args { struct AZAUTH3resok { string server_version<16>; string serverid<64>; - //uint64_t server_cap_map; + uint64_t server_cap_map; }; union AZAUTH3res switch (nfsstat3 status) { From 8c328f0d1430f8c560db495c0c385c6b7c57ba7a Mon Sep 17 00:00:00 2001 From: Pragya Gandhi Date: Thu, 8 May 2025 07:33:44 +0000 Subject: [PATCH 4/5] Removed build extra changes --- nfs/libnfs-raw-nfs.c | 576 +------------------------------------------ nfs/libnfs-raw-nfs.h | 138 +++++------ 2 files changed, 78 insertions(+), 636 deletions(-) diff --git a/nfs/libnfs-raw-nfs.c b/nfs/libnfs-raw-nfs.c index ab88e1d7..a69ab975 100644 --- a/nfs/libnfs-raw-nfs.c +++ b/nfs/libnfs-raw-nfs.c @@ -38,9 +38,6 @@ either expressed or implied, of the FreeBSD Project. uint32_t zdr_cookieverf3 (ZDR *zdrs, cookieverf3 objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_opaque (zdrs, objp, NFS3_COOKIEVERFSIZE)) return FALSE; return TRUE; @@ -49,9 +46,6 @@ zdr_cookieverf3 (ZDR *zdrs, cookieverf3 objp) uint32_t zdr_cookie3 (ZDR *zdrs, cookie3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_uint64_t (zdrs, objp)) return FALSE; return TRUE; @@ -60,10 +54,7 @@ zdr_cookie3 (ZDR *zdrs, cookie3 *objp) uint32_t zdr_nfs_fh3 (ZDR *zdrs, nfs_fh3 *objp) { - register int32_t *buf; - buf = NULL; - - if (!zdr_bytes (zdrs, (char **)&objp->data.data_val, (u_int *) &objp->data.data_len, NFS3_FHSIZE)) + if (!zdr_bytes (zdrs, (char **)&objp->data.data_val, &objp->data.data_len, NFS3_FHSIZE)) return FALSE; return TRUE; } @@ -71,9 +62,6 @@ zdr_nfs_fh3 (ZDR *zdrs, nfs_fh3 *objp) uint32_t zdr_filename3 (ZDR *zdrs, filename3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_string (zdrs, objp, ~0)) return FALSE; return TRUE; @@ -82,9 +70,6 @@ zdr_filename3 (ZDR *zdrs, filename3 *objp) uint32_t zdr_diropargs3 (ZDR *zdrs, diropargs3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfs_fh3 (zdrs, &objp->dir)) return FALSE; if (!zdr_filename3 (zdrs, &objp->name)) @@ -95,9 +80,6 @@ zdr_diropargs3 (ZDR *zdrs, diropargs3 *objp) uint32_t zdr_ftype3 (ZDR *zdrs, ftype3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_enum (zdrs, (enum_t *) objp)) return FALSE; return TRUE; @@ -106,9 +88,6 @@ zdr_ftype3 (ZDR *zdrs, ftype3 *objp) uint32_t zdr_mode3 (ZDR *zdrs, mode3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_u_int (zdrs, objp)) return FALSE; return TRUE; @@ -117,9 +96,6 @@ zdr_mode3 (ZDR *zdrs, mode3 *objp) uint32_t zdr_uid3 (ZDR *zdrs, uid3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_u_int (zdrs, objp)) return FALSE; return TRUE; @@ -128,9 +104,6 @@ zdr_uid3 (ZDR *zdrs, uid3 *objp) uint32_t zdr_gid3 (ZDR *zdrs, gid3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_u_int (zdrs, objp)) return FALSE; return TRUE; @@ -139,9 +112,6 @@ zdr_gid3 (ZDR *zdrs, gid3 *objp) uint32_t zdr_size3 (ZDR *zdrs, size3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_uint64_t (zdrs, objp)) return FALSE; return TRUE; @@ -150,9 +120,6 @@ zdr_size3 (ZDR *zdrs, size3 *objp) uint32_t zdr_fileid3 (ZDR *zdrs, fileid3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_uint64_t (zdrs, objp)) return FALSE; return TRUE; @@ -161,9 +128,6 @@ zdr_fileid3 (ZDR *zdrs, fileid3 *objp) uint32_t zdr_specdata3 (ZDR *zdrs, specdata3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_u_int (zdrs, &objp->specdata1)) return FALSE; if (!zdr_u_int (zdrs, &objp->specdata2)) @@ -174,9 +138,6 @@ zdr_specdata3 (ZDR *zdrs, specdata3 *objp) uint32_t zdr_nfstime3 (ZDR *zdrs, nfstime3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_u_int (zdrs, &objp->seconds)) return FALSE; if (!zdr_u_int (zdrs, &objp->nseconds)) @@ -187,9 +148,6 @@ zdr_nfstime3 (ZDR *zdrs, nfstime3 *objp) uint32_t zdr_fattr3 (ZDR *zdrs, fattr3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_ftype3 (zdrs, &objp->type)) return FALSE; if (!zdr_mode3 (zdrs, &objp->mode)) @@ -222,9 +180,6 @@ zdr_fattr3 (ZDR *zdrs, fattr3 *objp) uint32_t zdr_post_op_attr (ZDR *zdrs, post_op_attr *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_bool (zdrs, &objp->attributes_follow)) return FALSE; switch (objp->attributes_follow) { @@ -243,9 +198,6 @@ zdr_post_op_attr (ZDR *zdrs, post_op_attr *objp) uint32_t zdr_nfsstat3 (ZDR *zdrs, nfsstat3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_enum (zdrs, (enum_t *) objp)) return FALSE; return TRUE; @@ -254,9 +206,6 @@ zdr_nfsstat3 (ZDR *zdrs, nfsstat3 *objp) uint32_t zdr_stable_how (ZDR *zdrs, stable_how *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_enum (zdrs, (enum_t *) objp)) return FALSE; return TRUE; @@ -265,9 +214,6 @@ zdr_stable_how (ZDR *zdrs, stable_how *objp) uint32_t zdr_offset3 (ZDR *zdrs, offset3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_uint64_t (zdrs, objp)) return FALSE; return TRUE; @@ -276,9 +222,6 @@ zdr_offset3 (ZDR *zdrs, offset3 *objp) uint32_t zdr_count3 (ZDR *zdrs, count3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_u_int (zdrs, objp)) return FALSE; return TRUE; @@ -287,9 +230,6 @@ zdr_count3 (ZDR *zdrs, count3 *objp) uint32_t zdr_wcc_attr (ZDR *zdrs, wcc_attr *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_size3 (zdrs, &objp->size)) return FALSE; if (!zdr_nfstime3 (zdrs, &objp->mtime)) @@ -302,9 +242,6 @@ zdr_wcc_attr (ZDR *zdrs, wcc_attr *objp) uint32_t zdr_pre_op_attr (ZDR *zdrs, pre_op_attr *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_bool (zdrs, &objp->attributes_follow)) return FALSE; switch (objp->attributes_follow) { @@ -323,9 +260,6 @@ zdr_pre_op_attr (ZDR *zdrs, pre_op_attr *objp) uint32_t zdr_wcc_data (ZDR *zdrs, wcc_data *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_pre_op_attr (zdrs, &objp->before)) return FALSE; if (!zdr_post_op_attr (zdrs, &objp->after)) @@ -336,9 +270,6 @@ zdr_wcc_data (ZDR *zdrs, wcc_data *objp) uint32_t zdr_WRITE3args (ZDR *zdrs, WRITE3args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfs_fh3 (zdrs, &objp->file)) return FALSE; if (!zdr_offset3 (zdrs, &objp->offset)) @@ -347,7 +278,7 @@ zdr_WRITE3args (ZDR *zdrs, WRITE3args *objp) return FALSE; if (!zdr_stable_how (zdrs, &objp->stable)) return FALSE; - if (!zdr_bytes (zdrs, (char **)&objp->data.data_val, (u_int *) &objp->data.data_len, ~0)) + if (!zdr_bytes (zdrs, (char **)&objp->data.data_val, &objp->data.data_len, ~0)) return FALSE; return TRUE; } @@ -355,9 +286,6 @@ zdr_WRITE3args (ZDR *zdrs, WRITE3args *objp) uint32_t zdr_writeverf3 (ZDR *zdrs, writeverf3 objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_opaque (zdrs, objp, NFS3_WRITEVERFSIZE)) return FALSE; return TRUE; @@ -366,9 +294,6 @@ zdr_writeverf3 (ZDR *zdrs, writeverf3 objp) uint32_t zdr_WRITE3resok (ZDR *zdrs, WRITE3resok *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_wcc_data (zdrs, &objp->file_wcc)) return FALSE; if (!zdr_count3 (zdrs, &objp->count)) @@ -383,9 +308,6 @@ zdr_WRITE3resok (ZDR *zdrs, WRITE3resok *objp) uint32_t zdr_WRITE3resfail (ZDR *zdrs, WRITE3resfail *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_wcc_data (zdrs, &objp->file_wcc)) return FALSE; return TRUE; @@ -394,9 +316,6 @@ zdr_WRITE3resfail (ZDR *zdrs, WRITE3resfail *objp) uint32_t zdr_WRITE3res (ZDR *zdrs, WRITE3res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -415,9 +334,6 @@ zdr_WRITE3res (ZDR *zdrs, WRITE3res *objp) uint32_t zdr_LOOKUP3args (ZDR *zdrs, LOOKUP3args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_diropargs3 (zdrs, &objp->what)) return FALSE; return TRUE; @@ -426,9 +342,6 @@ zdr_LOOKUP3args (ZDR *zdrs, LOOKUP3args *objp) uint32_t zdr_LOOKUP3resok (ZDR *zdrs, LOOKUP3resok *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfs_fh3 (zdrs, &objp->object)) return FALSE; if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) @@ -441,9 +354,6 @@ zdr_LOOKUP3resok (ZDR *zdrs, LOOKUP3resok *objp) uint32_t zdr_LOOKUP3resfail (ZDR *zdrs, LOOKUP3resfail *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_post_op_attr (zdrs, &objp->dir_attributes)) return FALSE; return TRUE; @@ -452,9 +362,6 @@ zdr_LOOKUP3resfail (ZDR *zdrs, LOOKUP3resfail *objp) uint32_t zdr_LOOKUP3res (ZDR *zdrs, LOOKUP3res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -473,9 +380,6 @@ zdr_LOOKUP3res (ZDR *zdrs, LOOKUP3res *objp) uint32_t zdr_COMMIT3args (ZDR *zdrs, COMMIT3args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfs_fh3 (zdrs, &objp->file)) return FALSE; if (!zdr_offset3 (zdrs, &objp->offset)) @@ -488,9 +392,6 @@ zdr_COMMIT3args (ZDR *zdrs, COMMIT3args *objp) uint32_t zdr_COMMIT3resok (ZDR *zdrs, COMMIT3resok *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_wcc_data (zdrs, &objp->file_wcc)) return FALSE; if (!zdr_writeverf3 (zdrs, objp->verf)) @@ -501,9 +402,6 @@ zdr_COMMIT3resok (ZDR *zdrs, COMMIT3resok *objp) uint32_t zdr_COMMIT3resfail (ZDR *zdrs, COMMIT3resfail *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_wcc_data (zdrs, &objp->file_wcc)) return FALSE; return TRUE; @@ -512,9 +410,6 @@ zdr_COMMIT3resfail (ZDR *zdrs, COMMIT3resfail *objp) uint32_t zdr_COMMIT3res (ZDR *zdrs, COMMIT3res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -533,9 +428,6 @@ zdr_COMMIT3res (ZDR *zdrs, COMMIT3res *objp) uint32_t zdr_AZAUTH3args (ZDR *zdrs, AZAUTH3args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_string (zdrs, &objp->client_version, 16)) return FALSE; if (!zdr_string (zdrs, &objp->clientid, 64)) @@ -552,9 +444,6 @@ zdr_AZAUTH3args (ZDR *zdrs, AZAUTH3args *objp) uint32_t zdr_AZAUTH3resok (ZDR *zdrs, AZAUTH3resok *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_string (zdrs, &objp->server_version, 16)) return FALSE; if (!zdr_string (zdrs, &objp->serverid, 64)) @@ -567,9 +456,6 @@ zdr_AZAUTH3resok (ZDR *zdrs, AZAUTH3resok *objp) uint32_t zdr_AZAUTH3res (ZDR *zdrs, AZAUTH3res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -586,9 +472,6 @@ zdr_AZAUTH3res (ZDR *zdrs, AZAUTH3res *objp) uint32_t zdr_ACCESS3args (ZDR *zdrs, ACCESS3args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfs_fh3 (zdrs, &objp->object)) return FALSE; if (!zdr_u_int (zdrs, &objp->access)) @@ -599,9 +482,6 @@ zdr_ACCESS3args (ZDR *zdrs, ACCESS3args *objp) uint32_t zdr_ACCESS3resok (ZDR *zdrs, ACCESS3resok *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) return FALSE; if (!zdr_u_int (zdrs, &objp->access)) @@ -612,9 +492,6 @@ zdr_ACCESS3resok (ZDR *zdrs, ACCESS3resok *objp) uint32_t zdr_ACCESS3resfail (ZDR *zdrs, ACCESS3resfail *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) return FALSE; return TRUE; @@ -623,9 +500,6 @@ zdr_ACCESS3resfail (ZDR *zdrs, ACCESS3resfail *objp) uint32_t zdr_ACCESS3res (ZDR *zdrs, ACCESS3res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -644,9 +518,6 @@ zdr_ACCESS3res (ZDR *zdrs, ACCESS3res *objp) uint32_t zdr_GETATTR3args (ZDR *zdrs, GETATTR3args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfs_fh3 (zdrs, &objp->object)) return FALSE; return TRUE; @@ -655,9 +526,6 @@ zdr_GETATTR3args (ZDR *zdrs, GETATTR3args *objp) uint32_t zdr_GETATTR3resok (ZDR *zdrs, GETATTR3resok *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_fattr3 (zdrs, &objp->obj_attributes)) return FALSE; return TRUE; @@ -666,9 +534,6 @@ zdr_GETATTR3resok (ZDR *zdrs, GETATTR3resok *objp) uint32_t zdr_GETATTR3res (ZDR *zdrs, GETATTR3res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -685,9 +550,6 @@ zdr_GETATTR3res (ZDR *zdrs, GETATTR3res *objp) uint32_t zdr_time_how (ZDR *zdrs, time_how *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_enum (zdrs, (enum_t *) objp)) return FALSE; return TRUE; @@ -696,9 +558,6 @@ zdr_time_how (ZDR *zdrs, time_how *objp) uint32_t zdr_set_mode3 (ZDR *zdrs, set_mode3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_bool (zdrs, &objp->set_it)) return FALSE; switch (objp->set_it) { @@ -715,9 +574,6 @@ zdr_set_mode3 (ZDR *zdrs, set_mode3 *objp) uint32_t zdr_set_uid3 (ZDR *zdrs, set_uid3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_bool (zdrs, &objp->set_it)) return FALSE; switch (objp->set_it) { @@ -734,9 +590,6 @@ zdr_set_uid3 (ZDR *zdrs, set_uid3 *objp) uint32_t zdr_set_gid3 (ZDR *zdrs, set_gid3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_bool (zdrs, &objp->set_it)) return FALSE; switch (objp->set_it) { @@ -753,9 +606,6 @@ zdr_set_gid3 (ZDR *zdrs, set_gid3 *objp) uint32_t zdr_set_size3 (ZDR *zdrs, set_size3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_bool (zdrs, &objp->set_it)) return FALSE; switch (objp->set_it) { @@ -772,9 +622,6 @@ zdr_set_size3 (ZDR *zdrs, set_size3 *objp) uint32_t zdr_set_atime (ZDR *zdrs, set_atime *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_time_how (zdrs, &objp->set_it)) return FALSE; switch (objp->set_it) { @@ -791,9 +638,6 @@ zdr_set_atime (ZDR *zdrs, set_atime *objp) uint32_t zdr_set_mtime (ZDR *zdrs, set_mtime *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_time_how (zdrs, &objp->set_it)) return FALSE; switch (objp->set_it) { @@ -810,9 +654,6 @@ zdr_set_mtime (ZDR *zdrs, set_mtime *objp) uint32_t zdr_sattr3 (ZDR *zdrs, sattr3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_set_mode3 (zdrs, &objp->mode)) return FALSE; if (!zdr_set_uid3 (zdrs, &objp->uid)) @@ -831,9 +672,6 @@ zdr_sattr3 (ZDR *zdrs, sattr3 *objp) uint32_t zdr_createmode3 (ZDR *zdrs, createmode3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_enum (zdrs, (enum_t *) objp)) return FALSE; return TRUE; @@ -842,9 +680,6 @@ zdr_createmode3 (ZDR *zdrs, createmode3 *objp) uint32_t zdr_createverf3 (ZDR *zdrs, createverf3 objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_opaque (zdrs, objp, NFS3_CREATEVERFSIZE)) return FALSE; return TRUE; @@ -853,9 +688,6 @@ zdr_createverf3 (ZDR *zdrs, createverf3 objp) uint32_t zdr_createhow3 (ZDR *zdrs, createhow3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_createmode3 (zdrs, &objp->mode)) return FALSE; switch (objp->mode) { @@ -880,9 +712,6 @@ zdr_createhow3 (ZDR *zdrs, createhow3 *objp) uint32_t zdr_CREATE3args (ZDR *zdrs, CREATE3args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_diropargs3 (zdrs, &objp->where)) return FALSE; if (!zdr_createhow3 (zdrs, &objp->how)) @@ -893,9 +722,6 @@ zdr_CREATE3args (ZDR *zdrs, CREATE3args *objp) uint32_t zdr_post_op_fh3 (ZDR *zdrs, post_op_fh3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_bool (zdrs, &objp->handle_follows)) return FALSE; switch (objp->handle_follows) { @@ -914,9 +740,6 @@ zdr_post_op_fh3 (ZDR *zdrs, post_op_fh3 *objp) uint32_t zdr_CREATE3resok (ZDR *zdrs, CREATE3resok *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_post_op_fh3 (zdrs, &objp->obj)) return FALSE; if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) @@ -929,9 +752,6 @@ zdr_CREATE3resok (ZDR *zdrs, CREATE3resok *objp) uint32_t zdr_CREATE3resfail (ZDR *zdrs, CREATE3resfail *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_wcc_data (zdrs, &objp->dir_wcc)) return FALSE; return TRUE; @@ -940,9 +760,6 @@ zdr_CREATE3resfail (ZDR *zdrs, CREATE3resfail *objp) uint32_t zdr_CREATE3res (ZDR *zdrs, CREATE3res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -961,9 +778,6 @@ zdr_CREATE3res (ZDR *zdrs, CREATE3res *objp) uint32_t zdr_REMOVE3args (ZDR *zdrs, REMOVE3args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_diropargs3 (zdrs, &objp->object)) return FALSE; return TRUE; @@ -972,9 +786,6 @@ zdr_REMOVE3args (ZDR *zdrs, REMOVE3args *objp) uint32_t zdr_REMOVE3resok (ZDR *zdrs, REMOVE3resok *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_wcc_data (zdrs, &objp->dir_wcc)) return FALSE; return TRUE; @@ -983,9 +794,6 @@ zdr_REMOVE3resok (ZDR *zdrs, REMOVE3resok *objp) uint32_t zdr_REMOVE3resfail (ZDR *zdrs, REMOVE3resfail *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_wcc_data (zdrs, &objp->dir_wcc)) return FALSE; return TRUE; @@ -994,9 +802,6 @@ zdr_REMOVE3resfail (ZDR *zdrs, REMOVE3resfail *objp) uint32_t zdr_REMOVE3res (ZDR *zdrs, REMOVE3res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -1015,9 +820,6 @@ zdr_REMOVE3res (ZDR *zdrs, REMOVE3res *objp) uint32_t zdr_READ3args (ZDR *zdrs, READ3args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfs_fh3 (zdrs, &objp->file)) return FALSE; if (!zdr_offset3 (zdrs, &objp->offset)) @@ -1030,16 +832,13 @@ zdr_READ3args (ZDR *zdrs, READ3args *objp) uint32_t zdr_READ3resok (ZDR *zdrs, READ3resok *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_post_op_attr (zdrs, &objp->file_attributes)) return FALSE; if (!zdr_count3 (zdrs, &objp->count)) return FALSE; if (!zdr_bool (zdrs, &objp->eof)) return FALSE; - if (!zdr_bytes (zdrs, (char **)&objp->data.data_val, (u_int *) &objp->data.data_len, ~0)) + if (!zdr_bytes (zdrs, (char **)&objp->data.data_val, &objp->data.data_len, ~0)) return FALSE; return TRUE; } @@ -1047,9 +846,6 @@ zdr_READ3resok (ZDR *zdrs, READ3resok *objp) uint32_t zdr_READ3resfail (ZDR *zdrs, READ3resfail *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_post_op_attr (zdrs, &objp->file_attributes)) return FALSE; return TRUE; @@ -1058,9 +854,6 @@ zdr_READ3resfail (ZDR *zdrs, READ3resfail *objp) uint32_t zdr_READ3res (ZDR *zdrs, READ3res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -1079,9 +872,6 @@ zdr_READ3res (ZDR *zdrs, READ3res *objp) uint32_t zdr_FSINFO3args (ZDR *zdrs, FSINFO3args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfs_fh3 (zdrs, &objp->fsroot)) return FALSE; return TRUE; @@ -1091,8 +881,6 @@ uint32_t zdr_FSINFO3resok (ZDR *zdrs, FSINFO3resok *objp) { register int32_t *buf; - buf = NULL; - if (zdrs->x_op == ZDR_ENCODE) { if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) @@ -1196,9 +984,6 @@ zdr_FSINFO3resok (ZDR *zdrs, FSINFO3resok *objp) uint32_t zdr_FSINFO3resfail (ZDR *zdrs, FSINFO3resfail *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) return FALSE; return TRUE; @@ -1207,9 +992,6 @@ zdr_FSINFO3resfail (ZDR *zdrs, FSINFO3resfail *objp) uint32_t zdr_FSINFO3res (ZDR *zdrs, FSINFO3res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -1228,9 +1010,6 @@ zdr_FSINFO3res (ZDR *zdrs, FSINFO3res *objp) uint32_t zdr_FSSTAT3args (ZDR *zdrs, FSSTAT3args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfs_fh3 (zdrs, &objp->fsroot)) return FALSE; return TRUE; @@ -1239,9 +1018,6 @@ zdr_FSSTAT3args (ZDR *zdrs, FSSTAT3args *objp) uint32_t zdr_FSSTAT3resok (ZDR *zdrs, FSSTAT3resok *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) return FALSE; if (!zdr_size3 (zdrs, &objp->tbytes)) @@ -1264,9 +1040,6 @@ zdr_FSSTAT3resok (ZDR *zdrs, FSSTAT3resok *objp) uint32_t zdr_FSSTAT3resfail (ZDR *zdrs, FSSTAT3resfail *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) return FALSE; return TRUE; @@ -1275,9 +1048,6 @@ zdr_FSSTAT3resfail (ZDR *zdrs, FSSTAT3resfail *objp) uint32_t zdr_FSSTAT3res (ZDR *zdrs, FSSTAT3res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -1296,9 +1066,6 @@ zdr_FSSTAT3res (ZDR *zdrs, FSSTAT3res *objp) uint32_t zdr_PATHCONF3args (ZDR *zdrs, PATHCONF3args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfs_fh3 (zdrs, &objp->object)) return FALSE; return TRUE; @@ -1308,8 +1075,6 @@ uint32_t zdr_PATHCONF3resok (ZDR *zdrs, PATHCONF3resok *objp) { register int32_t *buf; - buf = NULL; - if (zdrs->x_op == ZDR_ENCODE) { if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) @@ -1385,9 +1150,6 @@ zdr_PATHCONF3resok (ZDR *zdrs, PATHCONF3resok *objp) uint32_t zdr_PATHCONF3resfail (ZDR *zdrs, PATHCONF3resfail *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) return FALSE; return TRUE; @@ -1396,9 +1158,6 @@ zdr_PATHCONF3resfail (ZDR *zdrs, PATHCONF3resfail *objp) uint32_t zdr_PATHCONF3res (ZDR *zdrs, PATHCONF3res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -1417,9 +1176,6 @@ zdr_PATHCONF3res (ZDR *zdrs, PATHCONF3res *objp) uint32_t zdr_nfspath3 (ZDR *zdrs, nfspath3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_string (zdrs, objp, ~0)) return FALSE; return TRUE; @@ -1428,9 +1184,6 @@ zdr_nfspath3 (ZDR *zdrs, nfspath3 *objp) uint32_t zdr_symlinkdata3 (ZDR *zdrs, symlinkdata3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_sattr3 (zdrs, &objp->symlink_attributes)) return FALSE; if (!zdr_nfspath3 (zdrs, &objp->symlink_data)) @@ -1441,9 +1194,6 @@ zdr_symlinkdata3 (ZDR *zdrs, symlinkdata3 *objp) uint32_t zdr_SYMLINK3args (ZDR *zdrs, SYMLINK3args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_diropargs3 (zdrs, &objp->where)) return FALSE; if (!zdr_symlinkdata3 (zdrs, &objp->symlink)) @@ -1454,9 +1204,6 @@ zdr_SYMLINK3args (ZDR *zdrs, SYMLINK3args *objp) uint32_t zdr_SYMLINK3resok (ZDR *zdrs, SYMLINK3resok *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_post_op_fh3 (zdrs, &objp->obj)) return FALSE; if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) @@ -1469,9 +1216,6 @@ zdr_SYMLINK3resok (ZDR *zdrs, SYMLINK3resok *objp) uint32_t zdr_SYMLINK3resfail (ZDR *zdrs, SYMLINK3resfail *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_wcc_data (zdrs, &objp->dir_wcc)) return FALSE; return TRUE; @@ -1480,9 +1224,6 @@ zdr_SYMLINK3resfail (ZDR *zdrs, SYMLINK3resfail *objp) uint32_t zdr_SYMLINK3res (ZDR *zdrs, SYMLINK3res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -1501,9 +1242,6 @@ zdr_SYMLINK3res (ZDR *zdrs, SYMLINK3res *objp) uint32_t zdr_READLINK3args (ZDR *zdrs, READLINK3args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfs_fh3 (zdrs, &objp->symlink)) return FALSE; return TRUE; @@ -1512,9 +1250,6 @@ zdr_READLINK3args (ZDR *zdrs, READLINK3args *objp) uint32_t zdr_READLINK3resok (ZDR *zdrs, READLINK3resok *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_post_op_attr (zdrs, &objp->symlink_attributes)) return FALSE; if (!zdr_nfspath3 (zdrs, &objp->data)) @@ -1525,9 +1260,6 @@ zdr_READLINK3resok (ZDR *zdrs, READLINK3resok *objp) uint32_t zdr_READLINK3resfail (ZDR *zdrs, READLINK3resfail *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_post_op_attr (zdrs, &objp->symlink_attributes)) return FALSE; return TRUE; @@ -1536,9 +1268,6 @@ zdr_READLINK3resfail (ZDR *zdrs, READLINK3resfail *objp) uint32_t zdr_READLINK3res (ZDR *zdrs, READLINK3res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -1557,9 +1286,6 @@ zdr_READLINK3res (ZDR *zdrs, READLINK3res *objp) uint32_t zdr_devicedata3 (ZDR *zdrs, devicedata3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_sattr3 (zdrs, &objp->dev_attributes)) return FALSE; if (!zdr_specdata3 (zdrs, &objp->spec)) @@ -1570,9 +1296,6 @@ zdr_devicedata3 (ZDR *zdrs, devicedata3 *objp) uint32_t zdr_mknoddata3 (ZDR *zdrs, mknoddata3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_ftype3 (zdrs, &objp->type)) return FALSE; switch (objp->type) { @@ -1601,9 +1324,6 @@ zdr_mknoddata3 (ZDR *zdrs, mknoddata3 *objp) uint32_t zdr_MKNOD3args (ZDR *zdrs, MKNOD3args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_diropargs3 (zdrs, &objp->where)) return FALSE; if (!zdr_mknoddata3 (zdrs, &objp->what)) @@ -1614,9 +1334,6 @@ zdr_MKNOD3args (ZDR *zdrs, MKNOD3args *objp) uint32_t zdr_MKNOD3resok (ZDR *zdrs, MKNOD3resok *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_post_op_fh3 (zdrs, &objp->obj)) return FALSE; if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) @@ -1629,9 +1346,6 @@ zdr_MKNOD3resok (ZDR *zdrs, MKNOD3resok *objp) uint32_t zdr_MKNOD3resfail (ZDR *zdrs, MKNOD3resfail *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_wcc_data (zdrs, &objp->dir_wcc)) return FALSE; return TRUE; @@ -1640,9 +1354,6 @@ zdr_MKNOD3resfail (ZDR *zdrs, MKNOD3resfail *objp) uint32_t zdr_MKNOD3res (ZDR *zdrs, MKNOD3res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -1661,9 +1372,6 @@ zdr_MKNOD3res (ZDR *zdrs, MKNOD3res *objp) uint32_t zdr_MKDIR3args (ZDR *zdrs, MKDIR3args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_diropargs3 (zdrs, &objp->where)) return FALSE; if (!zdr_sattr3 (zdrs, &objp->attributes)) @@ -1674,9 +1382,6 @@ zdr_MKDIR3args (ZDR *zdrs, MKDIR3args *objp) uint32_t zdr_MKDIR3resok (ZDR *zdrs, MKDIR3resok *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_post_op_fh3 (zdrs, &objp->obj)) return FALSE; if (!zdr_post_op_attr (zdrs, &objp->obj_attributes)) @@ -1689,9 +1394,6 @@ zdr_MKDIR3resok (ZDR *zdrs, MKDIR3resok *objp) uint32_t zdr_MKDIR3resfail (ZDR *zdrs, MKDIR3resfail *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_wcc_data (zdrs, &objp->dir_wcc)) return FALSE; return TRUE; @@ -1700,9 +1402,6 @@ zdr_MKDIR3resfail (ZDR *zdrs, MKDIR3resfail *objp) uint32_t zdr_MKDIR3res (ZDR *zdrs, MKDIR3res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -1721,9 +1420,6 @@ zdr_MKDIR3res (ZDR *zdrs, MKDIR3res *objp) uint32_t zdr_RMDIR3args (ZDR *zdrs, RMDIR3args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_diropargs3 (zdrs, &objp->object)) return FALSE; return TRUE; @@ -1732,9 +1428,6 @@ zdr_RMDIR3args (ZDR *zdrs, RMDIR3args *objp) uint32_t zdr_RMDIR3resok (ZDR *zdrs, RMDIR3resok *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_wcc_data (zdrs, &objp->dir_wcc)) return FALSE; return TRUE; @@ -1743,9 +1436,6 @@ zdr_RMDIR3resok (ZDR *zdrs, RMDIR3resok *objp) uint32_t zdr_RMDIR3resfail (ZDR *zdrs, RMDIR3resfail *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_wcc_data (zdrs, &objp->dir_wcc)) return FALSE; return TRUE; @@ -1754,9 +1444,6 @@ zdr_RMDIR3resfail (ZDR *zdrs, RMDIR3resfail *objp) uint32_t zdr_RMDIR3res (ZDR *zdrs, RMDIR3res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -1775,9 +1462,6 @@ zdr_RMDIR3res (ZDR *zdrs, RMDIR3res *objp) uint32_t zdr_RENAME3args (ZDR *zdrs, RENAME3args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_diropargs3 (zdrs, &objp->from)) return FALSE; if (!zdr_diropargs3 (zdrs, &objp->to)) @@ -1788,9 +1472,6 @@ zdr_RENAME3args (ZDR *zdrs, RENAME3args *objp) uint32_t zdr_RENAME3resok (ZDR *zdrs, RENAME3resok *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_wcc_data (zdrs, &objp->fromdir_wcc)) return FALSE; if (!zdr_wcc_data (zdrs, &objp->todir_wcc)) @@ -1801,9 +1482,6 @@ zdr_RENAME3resok (ZDR *zdrs, RENAME3resok *objp) uint32_t zdr_RENAME3resfail (ZDR *zdrs, RENAME3resfail *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_wcc_data (zdrs, &objp->fromdir_wcc)) return FALSE; if (!zdr_wcc_data (zdrs, &objp->todir_wcc)) @@ -1814,9 +1492,6 @@ zdr_RENAME3resfail (ZDR *zdrs, RENAME3resfail *objp) uint32_t zdr_RENAME3res (ZDR *zdrs, RENAME3res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -1835,9 +1510,6 @@ zdr_RENAME3res (ZDR *zdrs, RENAME3res *objp) uint32_t zdr_READDIRPLUS3args (ZDR *zdrs, READDIRPLUS3args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfs_fh3 (zdrs, &objp->dir)) return FALSE; if (!zdr_cookie3 (zdrs, &objp->cookie)) @@ -1854,9 +1526,6 @@ zdr_READDIRPLUS3args (ZDR *zdrs, READDIRPLUS3args *objp) uint32_t zdr_entryplus3 (ZDR *zdrs, entryplus3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_fileid3 (zdrs, &objp->fileid)) return FALSE; if (!zdr_filename3 (zdrs, &objp->name)) @@ -1875,9 +1544,6 @@ zdr_entryplus3 (ZDR *zdrs, entryplus3 *objp) uint32_t zdr_dirlistplus3 (ZDR *zdrs, dirlistplus3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_pointer (zdrs, (char **)&objp->entries, sizeof (entryplus3), (zdrproc_t) zdr_entryplus3)) return FALSE; if (!zdr_bool (zdrs, &objp->eof)) @@ -1888,9 +1554,6 @@ zdr_dirlistplus3 (ZDR *zdrs, dirlistplus3 *objp) uint32_t zdr_READDIRPLUS3resok (ZDR *zdrs, READDIRPLUS3resok *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_post_op_attr (zdrs, &objp->dir_attributes)) return FALSE; if (!zdr_cookieverf3 (zdrs, objp->cookieverf)) @@ -1903,9 +1566,6 @@ zdr_READDIRPLUS3resok (ZDR *zdrs, READDIRPLUS3resok *objp) uint32_t zdr_READDIRPLUS3resfail (ZDR *zdrs, READDIRPLUS3resfail *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_post_op_attr (zdrs, &objp->dir_attributes)) return FALSE; return TRUE; @@ -1914,9 +1574,6 @@ zdr_READDIRPLUS3resfail (ZDR *zdrs, READDIRPLUS3resfail *objp) uint32_t zdr_READDIRPLUS3res (ZDR *zdrs, READDIRPLUS3res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -1935,9 +1592,6 @@ zdr_READDIRPLUS3res (ZDR *zdrs, READDIRPLUS3res *objp) uint32_t zdr_READDIR3args (ZDR *zdrs, READDIR3args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfs_fh3 (zdrs, &objp->dir)) return FALSE; if (!zdr_cookie3 (zdrs, &objp->cookie)) @@ -1952,9 +1606,6 @@ zdr_READDIR3args (ZDR *zdrs, READDIR3args *objp) uint32_t zdr_entry3 (ZDR *zdrs, entry3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_fileid3 (zdrs, &objp->fileid)) return FALSE; if (!zdr_filename3 (zdrs, &objp->name)) @@ -1969,9 +1620,6 @@ zdr_entry3 (ZDR *zdrs, entry3 *objp) uint32_t zdr_dirlist3 (ZDR *zdrs, dirlist3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_pointer (zdrs, (char **)&objp->entries, sizeof (entry3), (zdrproc_t) zdr_entry3)) return FALSE; if (!zdr_bool (zdrs, &objp->eof)) @@ -1982,9 +1630,6 @@ zdr_dirlist3 (ZDR *zdrs, dirlist3 *objp) uint32_t zdr_READDIR3resok (ZDR *zdrs, READDIR3resok *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_post_op_attr (zdrs, &objp->dir_attributes)) return FALSE; if (!zdr_cookieverf3 (zdrs, objp->cookieverf)) @@ -1997,9 +1642,6 @@ zdr_READDIR3resok (ZDR *zdrs, READDIR3resok *objp) uint32_t zdr_READDIR3resfail (ZDR *zdrs, READDIR3resfail *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_post_op_attr (zdrs, &objp->dir_attributes)) return FALSE; return TRUE; @@ -2008,9 +1650,6 @@ zdr_READDIR3resfail (ZDR *zdrs, READDIR3resfail *objp) uint32_t zdr_READDIR3res (ZDR *zdrs, READDIR3res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -2029,9 +1668,6 @@ zdr_READDIR3res (ZDR *zdrs, READDIR3res *objp) uint32_t zdr_LINK3args (ZDR *zdrs, LINK3args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfs_fh3 (zdrs, &objp->file)) return FALSE; if (!zdr_diropargs3 (zdrs, &objp->link)) @@ -2042,9 +1678,6 @@ zdr_LINK3args (ZDR *zdrs, LINK3args *objp) uint32_t zdr_LINK3resok (ZDR *zdrs, LINK3resok *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_post_op_attr (zdrs, &objp->file_attributes)) return FALSE; if (!zdr_wcc_data (zdrs, &objp->linkdir_wcc)) @@ -2055,9 +1688,6 @@ zdr_LINK3resok (ZDR *zdrs, LINK3resok *objp) uint32_t zdr_LINK3resfail (ZDR *zdrs, LINK3resfail *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_post_op_attr (zdrs, &objp->file_attributes)) return FALSE; if (!zdr_wcc_data (zdrs, &objp->linkdir_wcc)) @@ -2068,9 +1698,6 @@ zdr_LINK3resfail (ZDR *zdrs, LINK3resfail *objp) uint32_t zdr_LINK3res (ZDR *zdrs, LINK3res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -2089,9 +1716,6 @@ zdr_LINK3res (ZDR *zdrs, LINK3res *objp) uint32_t zdr_sattrguard3 (ZDR *zdrs, sattrguard3 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_bool (zdrs, &objp->check)) return FALSE; switch (objp->check) { @@ -2110,9 +1734,6 @@ zdr_sattrguard3 (ZDR *zdrs, sattrguard3 *objp) uint32_t zdr_SETATTR3args (ZDR *zdrs, SETATTR3args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfs_fh3 (zdrs, &objp->object)) return FALSE; if (!zdr_sattr3 (zdrs, &objp->new_attributes)) @@ -2125,9 +1746,6 @@ zdr_SETATTR3args (ZDR *zdrs, SETATTR3args *objp) uint32_t zdr_SETATTR3resok (ZDR *zdrs, SETATTR3resok *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_wcc_data (zdrs, &objp->obj_wcc)) return FALSE; return TRUE; @@ -2136,9 +1754,6 @@ zdr_SETATTR3resok (ZDR *zdrs, SETATTR3resok *objp) uint32_t zdr_SETATTR3resfail (ZDR *zdrs, SETATTR3resfail *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_wcc_data (zdrs, &objp->obj_wcc)) return FALSE; return TRUE; @@ -2147,9 +1762,6 @@ zdr_SETATTR3resfail (ZDR *zdrs, SETATTR3resfail *objp) uint32_t zdr_SETATTR3res (ZDR *zdrs, SETATTR3res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -2168,9 +1780,6 @@ zdr_SETATTR3res (ZDR *zdrs, SETATTR3res *objp) uint32_t zdr_fhandle2 (ZDR *zdrs, fhandle2 objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_opaque (zdrs, objp, FHSIZE2)) return FALSE; return TRUE; @@ -2179,9 +1788,6 @@ zdr_fhandle2 (ZDR *zdrs, fhandle2 objp) uint32_t zdr_ftype2 (ZDR *zdrs, ftype2 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_enum (zdrs, (enum_t *) objp)) return FALSE; return TRUE; @@ -2191,8 +1797,6 @@ uint32_t zdr_fattr2 (ZDR *zdrs, fattr2 *objp) { register int32_t *buf; - buf = NULL; - if (zdrs->x_op == ZDR_ENCODE) { if (!zdr_ftype2 (zdrs, &objp->type)) @@ -2321,8 +1925,6 @@ uint32_t zdr_sattr2 (ZDR *zdrs, sattr2 *objp) { register int32_t *buf; - buf = NULL; - if (zdrs->x_op == ZDR_ENCODE) { buf = ZDR_INLINE (zdrs, 4 * BYTES_PER_ZDR_UNIT); @@ -2390,9 +1992,6 @@ zdr_sattr2 (ZDR *zdrs, sattr2 *objp) uint32_t zdr_filename2 (ZDR *zdrs, filename2 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_string (zdrs, objp, MAXNAMLEN2)) return FALSE; return TRUE; @@ -2401,9 +2000,6 @@ zdr_filename2 (ZDR *zdrs, filename2 *objp) uint32_t zdr_path2 (ZDR *zdrs, path2 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_string (zdrs, objp, MAXPATHLEN2)) return FALSE; return TRUE; @@ -2412,10 +2008,7 @@ zdr_path2 (ZDR *zdrs, path2 *objp) uint32_t zdr_nfsdata2 (ZDR *zdrs, nfsdata2 *objp) { - register int32_t *buf; - buf = NULL; - - if (!zdr_bytes (zdrs, (char **)&objp->nfsdata2_val, (u_int *) &objp->nfsdata2_len, NFSMAXDATA2)) + if (!zdr_bytes (zdrs, (char **)&objp->nfsdata2_val, &objp->nfsdata2_len, NFSMAXDATA2)) return FALSE; return TRUE; } @@ -2423,9 +2016,6 @@ zdr_nfsdata2 (ZDR *zdrs, nfsdata2 *objp) uint32_t zdr_nfscookie2 (ZDR *zdrs, nfscookie2 objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_opaque (zdrs, objp, NFSCOOKIESIZE2)) return FALSE; return TRUE; @@ -2434,9 +2024,6 @@ zdr_nfscookie2 (ZDR *zdrs, nfscookie2 objp) uint32_t zdr_entry2 (ZDR *zdrs, entry2 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_u_int (zdrs, &objp->fileid)) return FALSE; if (!zdr_filename2 (zdrs, &objp->name)) @@ -2451,9 +2038,6 @@ zdr_entry2 (ZDR *zdrs, entry2 *objp) uint32_t zdr_diropargs2 (ZDR *zdrs, diropargs2 *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_fhandle2 (zdrs, objp->dir)) return FALSE; if (!zdr_filename2 (zdrs, &objp->name)) @@ -2464,9 +2048,6 @@ zdr_diropargs2 (ZDR *zdrs, diropargs2 *objp) uint32_t zdr_GETATTR2args (ZDR *zdrs, GETATTR2args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_fhandle2 (zdrs, objp->fhandle)) return FALSE; return TRUE; @@ -2475,9 +2056,6 @@ zdr_GETATTR2args (ZDR *zdrs, GETATTR2args *objp) uint32_t zdr_GETATTR2resok (ZDR *zdrs, GETATTR2resok *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_fattr2 (zdrs, &objp->attributes)) return FALSE; return TRUE; @@ -2486,9 +2064,6 @@ zdr_GETATTR2resok (ZDR *zdrs, GETATTR2resok *objp) uint32_t zdr_GETATTR2res (ZDR *zdrs, GETATTR2res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -2505,9 +2080,6 @@ zdr_GETATTR2res (ZDR *zdrs, GETATTR2res *objp) uint32_t zdr_SETATTR2args (ZDR *zdrs, SETATTR2args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_fhandle2 (zdrs, objp->fhandle)) return FALSE; if (!zdr_sattr2 (zdrs, &objp->attributes)) @@ -2518,9 +2090,6 @@ zdr_SETATTR2args (ZDR *zdrs, SETATTR2args *objp) uint32_t zdr_SETATTR2resok (ZDR *zdrs, SETATTR2resok *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_fattr2 (zdrs, &objp->attributes)) return FALSE; return TRUE; @@ -2529,9 +2098,6 @@ zdr_SETATTR2resok (ZDR *zdrs, SETATTR2resok *objp) uint32_t zdr_SETATTR2res (ZDR *zdrs, SETATTR2res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -2548,9 +2114,6 @@ zdr_SETATTR2res (ZDR *zdrs, SETATTR2res *objp) uint32_t zdr_LOOKUP2args (ZDR *zdrs, LOOKUP2args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_diropargs2 (zdrs, &objp->what)) return FALSE; return TRUE; @@ -2559,9 +2122,6 @@ zdr_LOOKUP2args (ZDR *zdrs, LOOKUP2args *objp) uint32_t zdr_LOOKUP2resok (ZDR *zdrs, LOOKUP2resok *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_fhandle2 (zdrs, objp->file)) return FALSE; if (!zdr_fattr2 (zdrs, &objp->attributes)) @@ -2572,9 +2132,6 @@ zdr_LOOKUP2resok (ZDR *zdrs, LOOKUP2resok *objp) uint32_t zdr_LOOKUP2res (ZDR *zdrs, LOOKUP2res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -2591,9 +2148,6 @@ zdr_LOOKUP2res (ZDR *zdrs, LOOKUP2res *objp) uint32_t zdr_READLINK2args (ZDR *zdrs, READLINK2args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_fhandle2 (zdrs, objp->file)) return FALSE; return TRUE; @@ -2602,9 +2156,6 @@ zdr_READLINK2args (ZDR *zdrs, READLINK2args *objp) uint32_t zdr_READLINK2resok (ZDR *zdrs, READLINK2resok *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_path2 (zdrs, &objp->data)) return FALSE; return TRUE; @@ -2613,9 +2164,6 @@ zdr_READLINK2resok (ZDR *zdrs, READLINK2resok *objp) uint32_t zdr_READLINK2res (ZDR *zdrs, READLINK2res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -2632,9 +2180,6 @@ zdr_READLINK2res (ZDR *zdrs, READLINK2res *objp) uint32_t zdr_READ2args (ZDR *zdrs, READ2args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_fhandle2 (zdrs, objp->file)) return FALSE; if (!zdr_u_int (zdrs, &objp->offset)) @@ -2649,9 +2194,6 @@ zdr_READ2args (ZDR *zdrs, READ2args *objp) uint32_t zdr_READ2resok (ZDR *zdrs, READ2resok *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_fattr2 (zdrs, &objp->attributes)) return FALSE; if (!zdr_nfsdata2 (zdrs, &objp->data)) @@ -2662,9 +2204,6 @@ zdr_READ2resok (ZDR *zdrs, READ2resok *objp) uint32_t zdr_READ2res (ZDR *zdrs, READ2res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -2682,8 +2221,6 @@ uint32_t zdr_WRITE2args (ZDR *zdrs, WRITE2args *objp) { register int32_t *buf; - buf = NULL; - if (zdrs->x_op == ZDR_ENCODE) { if (!zdr_fhandle2 (zdrs, objp->file)) @@ -2743,9 +2280,6 @@ zdr_WRITE2args (ZDR *zdrs, WRITE2args *objp) uint32_t zdr_WRITE2resok (ZDR *zdrs, WRITE2resok *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_fattr2 (zdrs, &objp->attributes)) return FALSE; return TRUE; @@ -2754,9 +2288,6 @@ zdr_WRITE2resok (ZDR *zdrs, WRITE2resok *objp) uint32_t zdr_WRITE2res (ZDR *zdrs, WRITE2res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -2773,9 +2304,6 @@ zdr_WRITE2res (ZDR *zdrs, WRITE2res *objp) uint32_t zdr_CREATE2args (ZDR *zdrs, CREATE2args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_diropargs2 (zdrs, &objp->where)) return FALSE; if (!zdr_sattr2 (zdrs, &objp->attributes)) @@ -2786,9 +2314,6 @@ zdr_CREATE2args (ZDR *zdrs, CREATE2args *objp) uint32_t zdr_CREATE2resok (ZDR *zdrs, CREATE2resok *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_fhandle2 (zdrs, objp->file)) return FALSE; if (!zdr_fattr2 (zdrs, &objp->attributes)) @@ -2799,9 +2324,6 @@ zdr_CREATE2resok (ZDR *zdrs, CREATE2resok *objp) uint32_t zdr_CREATE2res (ZDR *zdrs, CREATE2res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -2818,9 +2340,6 @@ zdr_CREATE2res (ZDR *zdrs, CREATE2res *objp) uint32_t zdr_REMOVE2args (ZDR *zdrs, REMOVE2args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_diropargs2 (zdrs, &objp->what)) return FALSE; return TRUE; @@ -2829,9 +2348,6 @@ zdr_REMOVE2args (ZDR *zdrs, REMOVE2args *objp) uint32_t zdr_REMOVE2res (ZDR *zdrs, REMOVE2res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; return TRUE; @@ -2840,9 +2356,6 @@ zdr_REMOVE2res (ZDR *zdrs, REMOVE2res *objp) uint32_t zdr_RENAME2args (ZDR *zdrs, RENAME2args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_diropargs2 (zdrs, &objp->from)) return FALSE; if (!zdr_diropargs2 (zdrs, &objp->to)) @@ -2853,9 +2366,6 @@ zdr_RENAME2args (ZDR *zdrs, RENAME2args *objp) uint32_t zdr_RENAME2res (ZDR *zdrs, RENAME2res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; return TRUE; @@ -2864,9 +2374,6 @@ zdr_RENAME2res (ZDR *zdrs, RENAME2res *objp) uint32_t zdr_LINK2args (ZDR *zdrs, LINK2args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_fhandle2 (zdrs, objp->from)) return FALSE; if (!zdr_diropargs2 (zdrs, &objp->to)) @@ -2877,9 +2384,6 @@ zdr_LINK2args (ZDR *zdrs, LINK2args *objp) uint32_t zdr_LINK2res (ZDR *zdrs, LINK2res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; return TRUE; @@ -2888,9 +2392,6 @@ zdr_LINK2res (ZDR *zdrs, LINK2res *objp) uint32_t zdr_SYMLINK2args (ZDR *zdrs, SYMLINK2args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_diropargs2 (zdrs, &objp->from)) return FALSE; if (!zdr_path2 (zdrs, &objp->to)) @@ -2903,9 +2404,6 @@ zdr_SYMLINK2args (ZDR *zdrs, SYMLINK2args *objp) uint32_t zdr_SYMLINK2res (ZDR *zdrs, SYMLINK2res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; return TRUE; @@ -2914,9 +2412,6 @@ zdr_SYMLINK2res (ZDR *zdrs, SYMLINK2res *objp) uint32_t zdr_MKDIR2args (ZDR *zdrs, MKDIR2args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_diropargs2 (zdrs, &objp->where)) return FALSE; if (!zdr_sattr2 (zdrs, &objp->attributes)) @@ -2927,9 +2422,6 @@ zdr_MKDIR2args (ZDR *zdrs, MKDIR2args *objp) uint32_t zdr_MKDIR2resok (ZDR *zdrs, MKDIR2resok *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_fhandle2 (zdrs, objp->file)) return FALSE; if (!zdr_fattr2 (zdrs, &objp->attributes)) @@ -2940,9 +2432,6 @@ zdr_MKDIR2resok (ZDR *zdrs, MKDIR2resok *objp) uint32_t zdr_MKDIR2res (ZDR *zdrs, MKDIR2res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -2959,9 +2448,6 @@ zdr_MKDIR2res (ZDR *zdrs, MKDIR2res *objp) uint32_t zdr_RMDIR2args (ZDR *zdrs, RMDIR2args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_diropargs2 (zdrs, &objp->what)) return FALSE; return TRUE; @@ -2970,9 +2456,6 @@ zdr_RMDIR2args (ZDR *zdrs, RMDIR2args *objp) uint32_t zdr_RMDIR2res (ZDR *zdrs, RMDIR2res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; return TRUE; @@ -2981,9 +2464,6 @@ zdr_RMDIR2res (ZDR *zdrs, RMDIR2res *objp) uint32_t zdr_READDIR2args (ZDR *zdrs, READDIR2args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_fhandle2 (zdrs, objp->dir)) return FALSE; if (!zdr_nfscookie2 (zdrs, objp->cookie)) @@ -2996,9 +2476,6 @@ zdr_READDIR2args (ZDR *zdrs, READDIR2args *objp) uint32_t zdr_READDIR2resok (ZDR *zdrs, READDIR2resok *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_pointer (zdrs, (char **)&objp->entries, sizeof (entry2), (zdrproc_t) zdr_entry2)) return FALSE; if (!zdr_bool (zdrs, &objp->eof)) @@ -3009,9 +2486,6 @@ zdr_READDIR2resok (ZDR *zdrs, READDIR2resok *objp) uint32_t zdr_READDIR2res (ZDR *zdrs, READDIR2res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -3028,9 +2502,6 @@ zdr_READDIR2res (ZDR *zdrs, READDIR2res *objp) uint32_t zdr_STATFS2args (ZDR *zdrs, STATFS2args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_fhandle2 (zdrs, objp->dir)) return FALSE; return TRUE; @@ -3040,8 +2511,6 @@ uint32_t zdr_STATFS2resok (ZDR *zdrs, STATFS2resok *objp) { register int32_t *buf; - buf = NULL; - if (zdrs->x_op == ZDR_ENCODE) { buf = ZDR_INLINE (zdrs, 5 * BYTES_PER_ZDR_UNIT); @@ -3103,9 +2572,6 @@ zdr_STATFS2resok (ZDR *zdrs, STATFS2resok *objp) uint32_t zdr_STATFS2res (ZDR *zdrs, STATFS2res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -3122,9 +2588,6 @@ zdr_STATFS2res (ZDR *zdrs, STATFS2res *objp) uint32_t zdr_nfsacl_type (ZDR *zdrs, nfsacl_type *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_enum (zdrs, (enum_t *) objp)) return FALSE; return TRUE; @@ -3133,9 +2596,6 @@ zdr_nfsacl_type (ZDR *zdrs, nfsacl_type *objp) uint32_t zdr_nfsacl_ace (ZDR *zdrs, nfsacl_ace *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsacl_type (zdrs, &objp->type)) return FALSE; if (!zdr_u_int (zdrs, &objp->id)) @@ -3148,9 +2608,6 @@ zdr_nfsacl_ace (ZDR *zdrs, nfsacl_ace *objp) uint32_t zdr_GETACL3args (ZDR *zdrs, GETACL3args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfs_fh3 (zdrs, &objp->dir)) return FALSE; if (!zdr_u_int (zdrs, &objp->mask)) @@ -3161,21 +2618,18 @@ zdr_GETACL3args (ZDR *zdrs, GETACL3args *objp) uint32_t zdr_GETACL3resok (ZDR *zdrs, GETACL3resok *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_post_op_attr (zdrs, &objp->attr)) return FALSE; if (!zdr_u_int (zdrs, &objp->mask)) return FALSE; if (!zdr_u_int (zdrs, &objp->ace_count)) return FALSE; - if (!zdr_array (zdrs, (char **)&objp->ace.ace_val, (u_int *) &objp->ace.ace_len, ~0, + if (!zdr_array (zdrs, (char **)&objp->ace.ace_val, &objp->ace.ace_len, ~0, sizeof (nfsacl_ace), (zdrproc_t) zdr_nfsacl_ace)) return FALSE; if (!zdr_u_int (zdrs, &objp->default_ace_count)) return FALSE; - if (!zdr_array (zdrs, (char **)&objp->default_ace.default_ace_val, (u_int *) &objp->default_ace.default_ace_len, ~0, + if (!zdr_array (zdrs, (char **)&objp->default_ace.default_ace_val, &objp->default_ace.default_ace_len, ~0, sizeof (nfsacl_ace), (zdrproc_t) zdr_nfsacl_ace)) return FALSE; return TRUE; @@ -3184,9 +2638,6 @@ zdr_GETACL3resok (ZDR *zdrs, GETACL3resok *objp) uint32_t zdr_GETACL3res (ZDR *zdrs, GETACL3res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -3203,21 +2654,18 @@ zdr_GETACL3res (ZDR *zdrs, GETACL3res *objp) uint32_t zdr_SETACL3args (ZDR *zdrs, SETACL3args *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfs_fh3 (zdrs, &objp->dir)) return FALSE; if (!zdr_u_int (zdrs, &objp->mask)) return FALSE; if (!zdr_u_int (zdrs, &objp->ace_count)) return FALSE; - if (!zdr_array (zdrs, (char **)&objp->ace.ace_val, (u_int *) &objp->ace.ace_len, ~0, + if (!zdr_array (zdrs, (char **)&objp->ace.ace_val, &objp->ace.ace_len, ~0, sizeof (nfsacl_ace), (zdrproc_t) zdr_nfsacl_ace)) return FALSE; if (!zdr_u_int (zdrs, &objp->default_ace_count)) return FALSE; - if (!zdr_array (zdrs, (char **)&objp->default_ace.default_ace_val, (u_int *) &objp->default_ace.default_ace_len, ~0, + if (!zdr_array (zdrs, (char **)&objp->default_ace.default_ace_val, &objp->default_ace.default_ace_len, ~0, sizeof (nfsacl_ace), (zdrproc_t) zdr_nfsacl_ace)) return FALSE; return TRUE; @@ -3226,9 +2674,6 @@ zdr_SETACL3args (ZDR *zdrs, SETACL3args *objp) uint32_t zdr_SETACL3resok (ZDR *zdrs, SETACL3resok *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_post_op_attr (zdrs, &objp->attr)) return FALSE; return TRUE; @@ -3237,9 +2682,6 @@ zdr_SETACL3resok (ZDR *zdrs, SETACL3resok *objp) uint32_t zdr_SETACL3res (ZDR *zdrs, SETACL3res *objp) { - register int32_t *buf; - buf = NULL; - if (!zdr_nfsstat3 (zdrs, &objp->status)) return FALSE; switch (objp->status) { @@ -3251,4 +2693,4 @@ zdr_SETACL3res (ZDR *zdrs, SETACL3res *objp) break; } return TRUE; -} +} \ No newline at end of file diff --git a/nfs/libnfs-raw-nfs.h b/nfs/libnfs-raw-nfs.h index d4dede16..2fbded71 100644 --- a/nfs/libnfs-raw-nfs.h +++ b/nfs/libnfs-raw-nfs.h @@ -56,7 +56,7 @@ typedef uint64_t cookie3; struct nfs_fh3 { struct { - u_int data_len; + uint32_t data_len; char *data_val; } data; }; @@ -81,32 +81,32 @@ enum ftype3 { }; typedef enum ftype3 ftype3; -typedef u_int mode3; +typedef uint32_t mode3; -typedef u_int uid3; +typedef uint32_t uid3; -typedef u_int gid3; +typedef uint32_t gid3; typedef uint64_t size3; typedef uint64_t fileid3; struct specdata3 { - u_int specdata1; - u_int specdata2; + uint32_t specdata1; + uint32_t specdata2; }; typedef struct specdata3 specdata3; struct nfstime3 { - u_int seconds; - u_int nseconds; + uint32_t seconds; + uint32_t nseconds; }; typedef struct nfstime3 nfstime3; struct fattr3 { ftype3 type; mode3 mode; - u_int nlink; + uint32_t nlink; uid3 uid; gid3 gid; size3 size; @@ -170,7 +170,7 @@ typedef enum stable_how stable_how; typedef uint64_t offset3; -typedef u_int count3; +typedef uint32_t count3; struct wcc_attr { size3 size; @@ -199,7 +199,7 @@ struct WRITE3args { count3 count; stable_how stable; struct { - u_int data_len; + uint32_t data_len; char *data_val; } data; }; @@ -314,13 +314,13 @@ typedef struct AZAUTH3res AZAUTH3res; struct ACCESS3args { nfs_fh3 object; - u_int access; + uint32_t access; }; typedef struct ACCESS3args ACCESS3args; struct ACCESS3resok { post_op_attr obj_attributes; - u_int access; + uint32_t access; }; typedef struct ACCESS3resok ACCESS3resok; @@ -511,7 +511,7 @@ struct READ3resok { count3 count; uint32_t eof; struct { - u_int data_len; + uint32_t data_len; char *data_val; } data; }; @@ -542,16 +542,16 @@ typedef struct FSINFO3args FSINFO3args; struct FSINFO3resok { post_op_attr obj_attributes; - u_int rtmax; - u_int rtpref; - u_int rtmult; - u_int wtmax; - u_int wtpref; - u_int wtmult; - u_int dtpref; + uint32_t rtmax; + uint32_t rtpref; + uint32_t rtmult; + uint32_t wtmax; + uint32_t wtpref; + uint32_t wtmult; + uint32_t dtpref; size3 maxfilesize; nfstime3 time_delta; - u_int properties; + uint32_t properties; }; typedef struct FSINFO3resok FSINFO3resok; @@ -582,7 +582,7 @@ struct FSSTAT3resok { size3 tfiles; size3 ffiles; size3 afiles; - u_int invarsec; + uint32_t invarsec; }; typedef struct FSSTAT3resok FSSTAT3resok; @@ -607,8 +607,8 @@ typedef struct PATHCONF3args PATHCONF3args; struct PATHCONF3resok { post_op_attr obj_attributes; - u_int linkmax; - u_int name_max; + uint32_t linkmax; + uint32_t name_max; uint32_t no_trunc; uint32_t chown_restricted; uint32_t case_insensitive; @@ -977,16 +977,16 @@ typedef enum ftype2 ftype2; struct fattr2 { ftype2 type; - u_int mode; - u_int nlink; - u_int uid; - u_int gid; - u_int size; - u_int blocksize; - u_int rdev; - u_int blocks; - u_int fsid; - u_int fileid; + uint32_t mode; + uint32_t nlink; + uint32_t uid; + uint32_t gid; + uint32_t size; + uint32_t blocksize; + uint32_t rdev; + uint32_t blocks; + uint32_t fsid; + uint32_t fileid; nfstime3 atime; nfstime3 mtime; nfstime3 ctime; @@ -994,10 +994,10 @@ struct fattr2 { typedef struct fattr2 fattr2; struct sattr2 { - u_int mode; - u_int uid; - u_int gid; - u_int size; + uint32_t mode; + uint32_t uid; + uint32_t gid; + uint32_t size; nfstime3 atime; nfstime3 mtime; }; @@ -1011,7 +1011,7 @@ typedef char *path2; #define NFSMAXDATA2 8192 typedef struct { - u_int nfsdata2_len; + uint32_t nfsdata2_len; char *nfsdata2_val; } nfsdata2; #define NFSCOOKIESIZE2 4 @@ -1019,7 +1019,7 @@ typedef struct { typedef char nfscookie2[NFSCOOKIESIZE2]; struct entry2 { - u_int fileid; + uint32_t fileid; filename2 name; nfscookie2 cookie; struct entry2 *nextentry; @@ -1108,9 +1108,9 @@ typedef struct READLINK2res READLINK2res; struct READ2args { fhandle2 file; - u_int offset; - u_int count; - u_int totalcount; + uint32_t offset; + uint32_t count; + uint32_t totalcount; }; typedef struct READ2args READ2args; @@ -1130,9 +1130,9 @@ typedef struct READ2res READ2res; struct WRITE2args { fhandle2 file; - u_int beginoffset; - u_int offset; - u_int totalcount; + uint32_t beginoffset; + uint32_t offset; + uint32_t totalcount; nfsdata2 data; }; typedef struct WRITE2args WRITE2args; @@ -1247,7 +1247,7 @@ typedef struct RMDIR2res RMDIR2res; struct READDIR2args { fhandle2 dir; nfscookie2 cookie; - u_int count; + uint32_t count; }; typedef struct READDIR2args READDIR2args; @@ -1271,11 +1271,11 @@ struct STATFS2args { typedef struct STATFS2args STATFS2args; struct STATFS2resok { - u_int tsize; - u_int bsize; - u_int blocks; - u_int bfree; - u_int bavail; + uint32_t tsize; + uint32_t bsize; + uint32_t blocks; + uint32_t bfree; + uint32_t bavail; }; typedef struct STATFS2resok STATFS2resok; @@ -1309,8 +1309,8 @@ typedef enum nfsacl_type nfsacl_type; struct nfsacl_ace { enum nfsacl_type type; - u_int id; - u_int perm; + uint32_t id; + uint32_t perm; }; typedef struct nfsacl_ace nfsacl_ace; #define NFSACL_MASK_ACL_ENTRY 0x0001 @@ -1320,21 +1320,21 @@ typedef struct nfsacl_ace nfsacl_ace; struct GETACL3args { nfs_fh3 dir; - u_int mask; + uint32_t mask; }; typedef struct GETACL3args GETACL3args; struct GETACL3resok { post_op_attr attr; - u_int mask; - u_int ace_count; + uint32_t mask; + uint32_t ace_count; struct { - u_int ace_len; + uint32_t ace_len; struct nfsacl_ace *ace_val; } ace; - u_int default_ace_count; + uint32_t default_ace_count; struct { - u_int default_ace_len; + uint32_t default_ace_len; struct nfsacl_ace *default_ace_val; } default_ace; }; @@ -1350,15 +1350,15 @@ typedef struct GETACL3res GETACL3res; struct SETACL3args { nfs_fh3 dir; - u_int mask; - u_int ace_count; + uint32_t mask; + uint32_t ace_count; struct { - u_int ace_len; + uint32_t ace_len; struct nfsacl_ace *ace_val; } ace; - u_int default_ace_count; + uint32_t default_ace_count; struct { - u_int default_ace_len; + uint32_t default_ace_len; struct nfsacl_ace *default_ace_val; } default_ace; }; @@ -2052,9 +2052,9 @@ extern uint32_t zdr_SETACL3res (); #endif typedef struct { - u_int ace_count; + uint32_t ace_count; struct nfsacl_ace *ace; - u_int default_ace_count; + uint32_t default_ace_count; struct nfsacl_ace *default_ace; } fattr3_acl; @@ -2096,4 +2096,4 @@ EXTERN void nfs3_acl_free(fattr3_acl *nfs3acl); } #endif -#endif /* !_NFS_H_RPCGEN */ +#endif /* !_NFS_H_RPCGEN */ \ No newline at end of file From 3de4ceeb142ead64dac96f7d9f6caa4fc5f05688 Mon Sep 17 00:00:00 2001 From: Pragya Gandhi Date: Sun, 11 May 2025 19:32:53 +0000 Subject: [PATCH 5/5] Updated --- lib/libnfs.c | 9 ++++++--- lib/socket.c | 19 +++++++++---------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/lib/libnfs.c b/lib/libnfs.c index 498ddbd2..7d85e9ca 100755 --- a/lib/libnfs.c +++ b/lib/libnfs.c @@ -629,6 +629,12 @@ int nfs_set_auth_context(struct nfs_context *nfs, #endif assert(nfs->rpc->use_azauth == FALSE); + /* + * Use_azauth is set to be enabled only when auth is enabled + * for turbo client. In that case, authtype sent is AzAuthAAD. + * AzAuth will be sent each time a connection is established/ + * reconnected by a turbo client. + */ if (!strcmp(authtype,"AzAuthAAD")) { nfs->rpc->use_azauth = TRUE; } @@ -664,7 +670,6 @@ nfs_parse_url_incomplete(struct nfs_context *nfs, const char *url) return nfs_parse_url(nfs, url, 0, 1); } - void nfs_destroy_url(struct nfs_url *url) { @@ -990,8 +995,6 @@ rpc_connect_program_4_2_cb(struct rpc_context *rpc, int status, return; } - - /* AZAUTH RPC successful, connection is now authorized */ rpc->auth_context.is_authorized = TRUE; diff --git a/lib/socket.c b/lib/socket.c index 2e15895b..f8272c4b 100644 --- a/lib/socket.c +++ b/lib/socket.c @@ -383,7 +383,7 @@ rpc_write_to_socket(struct rpc_context *rpc) */ if (!rpc->auth_context.is_authorized && !pdu->is_head_prio) { - RPC_LOG(rpc, 3, "Not sending queued RPC pdu %p as " + RPC_LOG(rpc, 2, "Not sending queued RPC pdu %p as " "connection is not authorized", pdu); /* * If we have something to write, write it, else @@ -1333,10 +1333,10 @@ rpc_auth_needs_refresh(struct rpc_context *rpc) assert((int64_t) refresh_at > 0); if (rpc->auth_context.is_authorized && now >= refresh_at) { - RPC_LOG(rpc, 1, "%d Auth token about to expire (or expired), " + RPC_LOG(rpc, 1, "Auth token about to expire (or expired), " "reconnecting to acquire a new token. " "refresh_at: %ld, now: %ld", - rpc->use_azauth, refresh_at, now); + refresh_at, now); rpc->auth_context.is_authorized = FALSE; rpc->auth_context.needs_refresh = TRUE; return TRUE; @@ -1974,7 +1974,7 @@ reconnect_cb_azauth(struct rpc_context *rpc, int status, return; } - RPC_LOG(rpc, 2, "reconnect_cb_azauth: AzAuth completed successfully!"); + RPC_LOG(rpc, 2, "reconnect_cb_azauth: AzAuth completed successfully!"); } /* @@ -2034,7 +2034,6 @@ reconnect_cb_tls(struct rpc_context *rpc, int status, } #endif /* HAVE_TLS */ - static void reconnect_cb(struct rpc_context *rpc, int status, void *data, void *private_data) @@ -2084,11 +2083,11 @@ reconnect_cb(struct rpc_context *rpc, int status, void *data, #ifdef ENABLE_INSECURE_AUTH_FOR_DEVTEST /* - * Insecure connection, if azauth is enabled perform auth. - * - * Note: THIS WOULD SEND THE TOKEN OVER AN INSECURE CONNECTION - * AND MUST ONLY BE USED IN DEVTEST ON TRUSTED NETWORKS. - */ + * Insecure connection, if azauth is enabled perform auth. + * + * Note: THIS WOULD SEND THE TOKEN OVER AN INSECURE CONNECTION + * AND MUST ONLY BE USED IN DEVTEST ON TRUSTED NETWORKS. + */ RPC_LOG(rpc, 2, "reconnect_cb: sending insecure AZAUTH RPC"); if (rpc_perform_azauth(rpc, reconnect_cb_azauth, NULL) == NULL) {