diff options
author | Simo Sorce <simo@redhat.com> | 2012-01-23 13:47:24 -0500 |
---|---|---|
committer | Simo Sorce <simo@redhat.com> | 2012-01-24 11:13:56 -0500 |
commit | 2b188641e277fe840831d7d04eebbf5903e6e7dd (patch) | |
tree | 4256d1cd8a171c1845301309feb645a4b29b8416 /proxy/rpcgen | |
parent | da20ed7625599d307a5e91a539716b2fa8c14a02 (diff) | |
download | gss-proxy-2b188641e277fe840831d7d04eebbf5903e6e7dd.tar.gz gss-proxy-2b188641e277fe840831d7d04eebbf5903e6e7dd.tar.xz gss-proxy-2b188641e277fe840831d7d04eebbf5903e6e7dd.zip |
Update gss_proxy generated files after .x file changes
Diffstat (limited to 'proxy/rpcgen')
-rw-r--r-- | proxy/rpcgen/gss_proxy.h | 57 | ||||
-rw-r--r-- | proxy/rpcgen/gss_proxy_xdr.c | 61 |
2 files changed, 52 insertions, 66 deletions
diff --git a/proxy/rpcgen/gss_proxy.h b/proxy/rpcgen/gss_proxy.h index f700c13..2a6566f 100644 --- a/proxy/rpcgen/gss_proxy.h +++ b/proxy/rpcgen/gss_proxy.h @@ -157,7 +157,7 @@ struct gssx_name { }; typedef struct gssx_name gssx_name; -struct gssx_cred_info { +struct gssx_cred_element { gssx_name MN; gssx_OID mech; gssx_cred_usage cred_usage; @@ -167,17 +167,28 @@ struct gssx_cred_info { u_int cred_options_len; gssx_option *cred_options_val; } cred_options; - octet_string cred_handle_reference; struct { u_int extensions_len; gssx_typed_hole *extensions_val; } extensions; }; -typedef struct gssx_cred_info gssx_cred_info; +typedef struct gssx_cred_element gssx_cred_element; + +struct gssx_cred { + gssx_name desired_name; + struct { + u_int elements_len; + gssx_cred_element *elements_val; + } elements; + octet_string cred_handle_reference; + bool_t needs_release; +}; +typedef struct gssx_cred gssx_cred; -struct gssx_ctx_info { - octet_string *exported_context_token; +struct gssx_ctx { + gssx_buffer *exported_context_token; octet_string *state; + bool_t needs_release; gssx_OID mech; gssx_name src_name; gssx_name targ_name; @@ -194,7 +205,7 @@ struct gssx_ctx_info { gssx_typed_hole *extensions_val; } extensions; }; -typedef struct gssx_ctx_info gssx_ctx_info; +typedef struct gssx_ctx gssx_ctx; enum gssx_handle_type { GSSX_C_HANDLE_SEC_CTX = 0, @@ -202,29 +213,19 @@ enum gssx_handle_type { }; typedef enum gssx_handle_type gssx_handle_type; -struct gssx_handle_info { +struct gssx_handle { gssx_handle_type handle_type; union { struct { u_int cred_info_len; - gssx_cred_info *cred_info_val; + gssx_cred *cred_info_val; } cred_info; - gssx_ctx_info sec_ctx_info; + gssx_ctx sec_ctx_info; octet_string extensions; - } gssx_handle_info_u; -}; -typedef struct gssx_handle_info gssx_handle_info; - -struct gssx_handle { - gssx_handle_info handle_info; - bool_t needs_release; + } gssx_handle_u; }; typedef struct gssx_handle gssx_handle; -typedef gssx_handle gssx_ctx; - -typedef gssx_handle gssx_cred; - struct gssx_cb { gssx_uint64 initiator_addrtype; gssx_buffer initiator_address; @@ -689,13 +690,11 @@ extern bool_t xdr_gssx_option (XDR *, gssx_option*); extern bool_t xdr_gssx_status (XDR *, gssx_status*); extern bool_t xdr_gssx_call_ctx (XDR *, gssx_call_ctx*); extern bool_t xdr_gssx_name (XDR *, gssx_name*); -extern bool_t xdr_gssx_cred_info (XDR *, gssx_cred_info*); -extern bool_t xdr_gssx_ctx_info (XDR *, gssx_ctx_info*); +extern bool_t xdr_gssx_cred_element (XDR *, gssx_cred_element*); +extern bool_t xdr_gssx_cred (XDR *, gssx_cred*); +extern bool_t xdr_gssx_ctx (XDR *, gssx_ctx*); extern bool_t xdr_gssx_handle_type (XDR *, gssx_handle_type*); -extern bool_t xdr_gssx_handle_info (XDR *, gssx_handle_info*); extern bool_t xdr_gssx_handle (XDR *, gssx_handle*); -extern bool_t xdr_gssx_ctx (XDR *, gssx_ctx*); -extern bool_t xdr_gssx_cred (XDR *, gssx_cred*); extern bool_t xdr_gssx_cb (XDR *, gssx_cb*); extern bool_t xdr_gssx_cb (XDR *, gssx_cb*); extern bool_t xdr_gssx_arg_release_handle (XDR *, gssx_arg_release_handle*); @@ -748,13 +747,11 @@ extern bool_t xdr_gssx_option (); extern bool_t xdr_gssx_status (); extern bool_t xdr_gssx_call_ctx (); extern bool_t xdr_gssx_name (); -extern bool_t xdr_gssx_cred_info (); -extern bool_t xdr_gssx_ctx_info (); +extern bool_t xdr_gssx_cred_element (); +extern bool_t xdr_gssx_cred (); +extern bool_t xdr_gssx_ctx (); extern bool_t xdr_gssx_handle_type (); -extern bool_t xdr_gssx_handle_info (); extern bool_t xdr_gssx_handle (); -extern bool_t xdr_gssx_ctx (); -extern bool_t xdr_gssx_cred (); extern bool_t xdr_gssx_cb (); extern bool_t xdr_gssx_cb (); extern bool_t xdr_gssx_arg_release_handle (); diff --git a/proxy/rpcgen/gss_proxy_xdr.c b/proxy/rpcgen/gss_proxy_xdr.c index 866eb95..54fc34a 100644 --- a/proxy/rpcgen/gss_proxy_xdr.c +++ b/proxy/rpcgen/gss_proxy_xdr.c @@ -223,7 +223,7 @@ xdr_gssx_name (XDR *xdrs, gssx_name *objp) } bool_t -xdr_gssx_cred_info (XDR *xdrs, gssx_cred_info *objp) +xdr_gssx_cred_element (XDR *xdrs, gssx_cred_element *objp) { if (!xdr_gssx_name (xdrs, &objp->MN)) return FALSE; @@ -238,8 +238,6 @@ xdr_gssx_cred_info (XDR *xdrs, gssx_cred_info *objp) if (!xdr_array (xdrs, (char **)&objp->cred_options.cred_options_val, (u_int *) &objp->cred_options.cred_options_len, ~0, sizeof (gssx_option), (xdrproc_t) xdr_gssx_option)) return FALSE; - if (!xdr_octet_string (xdrs, &objp->cred_handle_reference)) - return FALSE; if (!xdr_array (xdrs, (char **)&objp->extensions.extensions_val, (u_int *) &objp->extensions.extensions_len, ~0, sizeof (gssx_typed_hole), (xdrproc_t) xdr_gssx_typed_hole)) return FALSE; @@ -247,12 +245,29 @@ xdr_gssx_cred_info (XDR *xdrs, gssx_cred_info *objp) } bool_t -xdr_gssx_ctx_info (XDR *xdrs, gssx_ctx_info *objp) +xdr_gssx_cred (XDR *xdrs, gssx_cred *objp) { - if (!xdr_pointer (xdrs, (char **)&objp->exported_context_token, sizeof (octet_string), (xdrproc_t) xdr_octet_string)) + if (!xdr_gssx_name (xdrs, &objp->desired_name)) + return FALSE; + if (!xdr_array (xdrs, (char **)&objp->elements.elements_val, (u_int *) &objp->elements.elements_len, ~0, + sizeof (gssx_cred_element), (xdrproc_t) xdr_gssx_cred_element)) + return FALSE; + if (!xdr_octet_string (xdrs, &objp->cred_handle_reference)) + return FALSE; + if (!xdr_bool (xdrs, &objp->needs_release)) + return FALSE; + return TRUE; +} + +bool_t +xdr_gssx_ctx (XDR *xdrs, gssx_ctx *objp) +{ + if (!xdr_pointer (xdrs, (char **)&objp->exported_context_token, sizeof (gssx_buffer), (xdrproc_t) xdr_gssx_buffer)) return FALSE; if (!xdr_pointer (xdrs, (char **)&objp->state, sizeof (octet_string), (xdrproc_t) xdr_octet_string)) return FALSE; + if (!xdr_bool (xdrs, &objp->needs_release)) + return FALSE; if (!xdr_gssx_OID (xdrs, &objp->mech)) return FALSE; if (!xdr_gssx_name (xdrs, &objp->src_name)) @@ -285,22 +300,22 @@ xdr_gssx_handle_type (XDR *xdrs, gssx_handle_type *objp) } bool_t -xdr_gssx_handle_info (XDR *xdrs, gssx_handle_info *objp) +xdr_gssx_handle (XDR *xdrs, gssx_handle *objp) { if (!xdr_gssx_handle_type (xdrs, &objp->handle_type)) return FALSE; switch (objp->handle_type) { case GSSX_C_HANDLE_CRED: - if (!xdr_array (xdrs, (char **)&objp->gssx_handle_info_u.cred_info.cred_info_val, (u_int *) &objp->gssx_handle_info_u.cred_info.cred_info_len, ~0, - sizeof (gssx_cred_info), (xdrproc_t) xdr_gssx_cred_info)) + if (!xdr_array (xdrs, (char **)&objp->gssx_handle_u.cred_info.cred_info_val, (u_int *) &objp->gssx_handle_u.cred_info.cred_info_len, ~0, + sizeof (gssx_cred), (xdrproc_t) xdr_gssx_cred)) return FALSE; break; case GSSX_C_HANDLE_SEC_CTX: - if (!xdr_gssx_ctx_info (xdrs, &objp->gssx_handle_info_u.sec_ctx_info)) + if (!xdr_gssx_ctx (xdrs, &objp->gssx_handle_u.sec_ctx_info)) return FALSE; break; default: - if (!xdr_octet_string (xdrs, &objp->gssx_handle_info_u.extensions)) + if (!xdr_octet_string (xdrs, &objp->gssx_handle_u.extensions)) return FALSE; break; } @@ -308,32 +323,6 @@ xdr_gssx_handle_info (XDR *xdrs, gssx_handle_info *objp) } bool_t -xdr_gssx_handle (XDR *xdrs, gssx_handle *objp) -{ - if (!xdr_gssx_handle_info (xdrs, &objp->handle_info)) - return FALSE; - if (!xdr_bool (xdrs, &objp->needs_release)) - return FALSE; - return TRUE; -} - -bool_t -xdr_gssx_ctx (XDR *xdrs, gssx_ctx *objp) -{ - if (!xdr_gssx_handle (xdrs, objp)) - return FALSE; - return TRUE; -} - -bool_t -xdr_gssx_cred (XDR *xdrs, gssx_cred *objp) -{ - if (!xdr_gssx_handle (xdrs, objp)) - return FALSE; - return TRUE; -} - -bool_t xdr_gssx_cb (XDR *xdrs, gssx_cb *objp) { if (!xdr_gssx_uint64 (xdrs, &objp->initiator_addrtype)) |