diff options
| author | Luke Howard <lukeh@padl.com> | 2011-05-12 14:01:40 +0200 |
|---|---|---|
| committer | Luke Howard <lukeh@padl.com> | 2011-05-12 14:02:11 +0200 |
| commit | 32878204482e56c67a6b7c6217933d4bb163a6b7 (patch) | |
| tree | 47bc8325e445295ab2d6b97856b50729875e40c9 /lib/gssapi/mech | |
| parent | be92276b8ba7ee66518eba4e0ef014cc455dc3f6 (diff) | |
Allow NULL arguments to gss_{get_name_attribute,inquire_name}
Diffstat (limited to 'lib/gssapi/mech')
| -rw-r--r-- | lib/gssapi/mech/gss_get_name_attribute.c | 6 | ||||
| -rw-r--r-- | lib/gssapi/mech/gss_inquire_name.c | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/lib/gssapi/mech/gss_get_name_attribute.c b/lib/gssapi/mech/gss_get_name_attribute.c index cb72c044f..2c0132255 100644 --- a/lib/gssapi/mech/gss_get_name_attribute.c +++ b/lib/gssapi/mech/gss_get_name_attribute.c @@ -47,8 +47,10 @@ gss_get_name_attribute(OM_uint32 *minor_status, struct _gss_mechanism_name *mn; *minor_status = 0; - *authenticated = 0; - *complete = 0; + if (authenticated != NULL) + *authenticated = 0; + if (complete != NULL) + *complete = 0; _mg_buffer_zero(value); _mg_buffer_zero(display_value); diff --git a/lib/gssapi/mech/gss_inquire_name.c b/lib/gssapi/mech/gss_inquire_name.c index 5222439b2..587bee8b1 100644 --- a/lib/gssapi/mech/gss_inquire_name.c +++ b/lib/gssapi/mech/gss_inquire_name.c @@ -44,9 +44,12 @@ gss_inquire_name(OM_uint32 *minor_status, struct _gss_mechanism_name *mn; *minor_status = 0; - *name_is_MN = 0; - *MN_mech = GSS_C_NO_OID; - *attrs = GSS_C_NO_BUFFER_SET; + if (name_is_MN != NULL) + *name_is_MN = 0; + if (MN_mech != NULL) + *MN_mech = GSS_C_NO_OID; + if (attrs != NULL) + *attrs = GSS_C_NO_BUFFER_SET; if (input_name == GSS_C_NO_NAME) return GSS_S_BAD_NAME; @@ -63,7 +66,8 @@ gss_inquire_name(OM_uint32 *minor_status, MN_mech, attrs); if (major_status == GSS_S_COMPLETE) { - *name_is_MN = 1; + if (name_is_MN != NULL) + *name_is_MN = 1; #if 0 if (*MN_mech == GSS_C_NO_OID) *MN_mech = &m->gm_mech_oid; |