diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2014-04-23 15:39:10 +0200 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-04-23 19:28:24 +0000 |
| commit | 4eb4bae4131e576f340a9891b1150334c35c6be0 (patch) | |
| tree | a3e612e879e3f4832d66ba21fae59ebf9783e326 /epan/dissectors | |
| parent | 30c9f421c024266d0fd6a9d981f28b83d8b363ba (diff) | |
Add check for no kerberos keytab file.
Avoid printf warnings when loading a capture with kerberos packets
when not having configured a keytab file.
Change-Id: I0950daa18c42f4687d29101fac74f6f6bd6071b1
Reviewed-on: https://code.wireshark.org/review/1300
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-kerberos.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index 3225775c4e..aa6c5377ee 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -534,7 +534,10 @@ read_keytab_file(const char *filename) enc_key_t *new_key; static gboolean first_time=TRUE; -printf("read keytab file %s\n", filename); + if (filename == NULL || filename[0] == 0) { + return; + } + if(first_time){ first_time=FALSE; ret = krb5_init_context(&krb5_ctx); @@ -671,6 +674,10 @@ read_keytab_file(const char *filename) enc_key_t *new_key; static gboolean first_time=TRUE; + if (filename == NULL || filename[0] == 0) { + return; + } + if(first_time){ first_time=FALSE; ret = krb5_init_context(&krb5_ctx); @@ -3960,7 +3967,7 @@ dissect_kerberos_ChangePasswdData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, /*--- End of included file: packet-kerberos-fn.c ---*/ -#line 1667 "../../asn1/kerberos/packet-kerberos-template.c" +#line 1674 "../../asn1/kerberos/packet-kerberos-template.c" /* Make wrappers around exported functions for now */ int @@ -4916,7 +4923,7 @@ void proto_register_kerberos(void) { NULL, HFILL }}, /*--- End of included file: packet-kerberos-hfarr.c ---*/ -#line 1966 "../../asn1/kerberos/packet-kerberos-template.c" +#line 1973 "../../asn1/kerberos/packet-kerberos-template.c" }; /* List of subtrees */ @@ -4981,7 +4988,7 @@ void proto_register_kerberos(void) { &ett_kerberos_ChangePasswdData, /*--- End of included file: packet-kerberos-ettarr.c ---*/ -#line 1973 "../../asn1/kerberos/packet-kerberos-template.c" +#line 1980 "../../asn1/kerberos/packet-kerberos-template.c" }; static ei_register_info ei[] = { |