aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2013-02-08 18:07:34 +0000
committerGerald Combs <gerald@wireshark.org>2013-02-08 18:07:34 +0000
commitd21f62b73b84086173901da197fe15eaa4e9dcce (patch)
treed14fa98879d71abccd2c8f3003090565c1890326 /epan/dissectors
parentc7525936983ae67912df1baffbddf60a2e69242b (diff)
Add a directory name preference type (PREF_DIRNAME) and registration
routine (prefs_register_directory_preference). Add PREF_FILENAME and PREF_DIRNAME support to the Qt module preferences. Change a couple of preferences to directory names. Clean up some names and default settings. svn path=/trunk/; revision=47573
Diffstat (limited to 'epan/dissectors')
-rw-r--r--epan/dissectors/packet-etch.c6
-rw-r--r--epan/dissectors/packet-kerberos.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-etch.c b/epan/dissectors/packet-etch.c
index eb6884c5f6..4c0b22fe66 100644
--- a/epan/dissectors/packet-etch.c
+++ b/epan/dissectors/packet-etch.c
@@ -937,7 +937,7 @@ void proto_register_etch(void)
};
proto_etch = proto_register_protocol("Apache Etch Protocol", /* name */
- "ETCH", /* short name */
+ "Etch", /* short name */
"etch" /* abbrev */
);
@@ -950,14 +950,14 @@ void proto_register_etch(void)
etch_module = prefs_register_protocol(proto_etch,
proto_reg_handoff_etch);
- prefs_register_string_preference(etch_module, "file",
+ prefs_register_directory_preference(etch_module, "file",
"Apache Etch symbol folder",
"Place the hash/symbol files "
"(generated by the Apache Etch compiler) "
"ending with .ewh here",
&gbl_keytab_folder);
prefs_register_uint_preference(etch_module, "tcp.port",
- "etch TCP Port",
+ "Etch TCP Port",
"Etch TCP port",
10,
&gbl_etch_port);
diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c
index a339ad4c9e..49df094702 100644
--- a/epan/dissectors/packet-kerberos.c
+++ b/epan/dissectors/packet-kerberos.c
@@ -384,7 +384,7 @@ call_kerberos_callbacks(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
gboolean krb_decrypt = FALSE;
/* keytab filename */
-static const char *keytab_filename = "insert filename here";
+static const char *keytab_filename = "";
void read_keytab_file(const char *);