diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-05-17 19:31:44 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-05-17 19:31:44 +0000 |
| commit | c080dd0474e1296020a52f4cd3eb8746f3e74937 (patch) | |
| tree | 1e34a2e16fdc21a2979d7b2cffcc03057533120c /asn1/kerberos | |
| parent | 6cfe8894b344c0d2bd214e6fa844714fe6206869 (diff) | |
More compilation fixes when having HAVE_KERBEROS
svn path=/trunk/; revision=49385
Diffstat (limited to 'asn1/kerberos')
| -rw-r--r-- | asn1/kerberos/kerberos.cnf | 4 | ||||
| -rw-r--r-- | asn1/kerberos/packet-kerberos-template.c | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/asn1/kerberos/kerberos.cnf b/asn1/kerberos/kerberos.cnf index a402a4638a..ccbd847811 100644 --- a/asn1/kerberos/kerberos.cnf +++ b/asn1/kerberos/kerberos.cnf @@ -319,8 +319,8 @@ guint32 msgtype; actx->value_ptr = key; offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - &keytype); - key->keytype = keytype; + &gbl_keytype); + key->keytype = gbl_keytype; #.FN_BODY EncryptionKey/keyvalue kerberos_key_t* key = (kerberos_key_t*)actx->value_ptr; diff --git a/asn1/kerberos/packet-kerberos-template.c b/asn1/kerberos/packet-kerberos-template.c index 6a4c02927a..07d28f1dda 100644 --- a/asn1/kerberos/packet-kerberos-template.c +++ b/asn1/kerberos/packet-kerberos-template.c @@ -157,7 +157,7 @@ static dissector_handle_t krb4_handle=NULL; /* Global variables */ static guint32 krb5_errorcode; -static guint32 keytype; +static guint32 gbl_keytype; static gboolean gbl_do_col_info; static void @@ -1315,7 +1315,7 @@ static const true_false_string tfs_gss_flags_dce_style = { #ifdef HAVE_KERBEROS static int dissect_krb5_decrypt_ticket_data (gboolean imp_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, - proto_tree *tree, int hf_index) + proto_tree *tree, int hf_index _U_) { guint8 *plaintext; int length; @@ -1350,7 +1350,7 @@ dissect_krb5_decrypt_ticket_data (gboolean imp_tag _U_, tvbuff_t *tvb, int offse static int dissect_krb5_decrypt_authenticator_data (gboolean imp_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, - proto_tree *tree, int hf_index) + proto_tree *tree, int hf_index _U_) { guint8 *plaintext; int length; @@ -1391,7 +1391,7 @@ dissect_krb5_decrypt_authenticator_data (gboolean imp_tag _U_, tvbuff_t *tvb, in static int dissect_krb5_decrypt_KDC_REP_data (gboolean imp_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, - proto_tree *tree, int hf_index) + proto_tree *tree, int hf_index _U_) { guint8 *plaintext; int length; @@ -1437,7 +1437,7 @@ dissect_krb5_decrypt_KDC_REP_data (gboolean imp_tag _U_, tvbuff_t *tvb, int offs static int dissect_krb5_decrypt_PA_ENC_TIMESTAMP (gboolean imp_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, - proto_tree *tree, int hf_index) + proto_tree *tree, int hf_index _U_) { guint8 *plaintext; int length; @@ -1473,7 +1473,7 @@ dissect_krb5_decrypt_PA_ENC_TIMESTAMP (gboolean imp_tag _U_, tvbuff_t *tvb, int static int dissect_krb5_decrypt_AP_REP_data (gboolean imp_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, - proto_tree *tree, int hf_index) + proto_tree *tree, int hf_index _U_) { guint8 *plaintext; int length; @@ -1508,7 +1508,7 @@ dissect_krb5_decrypt_AP_REP_data (gboolean imp_tag _U_, tvbuff_t *tvb, int offse static int dissect_krb5_decrypt_PRIV_data (gboolean imp_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, - proto_tree *tree, int hf_index) + proto_tree *tree, int hf_index _U_) { guint8 *plaintext; int length; @@ -1543,7 +1543,7 @@ dissect_krb5_decrypt_PRIV_data (gboolean imp_tag _U_, tvbuff_t *tvb, int offset, static int dissect_krb5_decrypt_CRED_data (gboolean imp_tag _U_, tvbuff_t *tvb, int offset, asn1_ctx_t *actx, - proto_tree *tree, int hf_index) + proto_tree *tree, int hf_index _U_) { guint8 *plaintext; int length; @@ -1841,7 +1841,7 @@ dissect_kerberos_main(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int d guint32 kerberos_output_keytype(void) { - return keytype; + return gbl_keytype; } static gint |