wireshark/wireshark-1.2.0-disable-warning-dialog.patch
Andreas Stieger fe9dc4891c Accepting request 130973 from home:AndreasStieger:branches:network:utilities
update to upstream 1.8.2 (bnc#776083)
CVE-2012-4285
CVE-2012-4287
CVE-2012-4288
CVE-2012-4294
CVE-2012-4295
CVE-2012-4289
CVE-2012-4296
CVE-2012-4297
CVE-2012-4291
CVE-2012-4292
CVE-2012-4293
CVE-2012-4290
CVE-2012-4286
CVE-2012-4298

OBS-URL: https://build.opensuse.org/request/show/130973
OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=65
2012-08-15 22:08:39 +00:00

39 lines
1.2 KiB
Diff

Index: ui/gtk/main.c
===================================================================
--- ui/gtk/main.c.orig 2012-08-10 01:35:00.000000000 +0100
+++ ui/gtk/main.c 2012-08-15 20:28:59.000000000 +0100
@@ -1399,11 +1399,13 @@ main_colorize_changed(gboolean packet_li
static GtkWidget *close_dlg = NULL;
+/*
static void
priv_warning_dialog_cb(gpointer dialog, gint btn _U_, gpointer data _U_)
{
recent.privs_warn_if_elevated = !simple_dialog_check_get(dialog);
}
+*/
#ifdef _WIN32
static void
@@ -2081,9 +2083,10 @@ check_and_warn_user_startup(gchar *cf_na
#endif
{
gchar *cur_user, *cur_group;
- gpointer priv_warning_dialog;
+// gpointer priv_warning_dialog;
/* Tell the user not to run as root. */
+/*
if (running_with_special_privs() && recent.privs_warn_if_elevated) {
cur_user = get_cur_username();
cur_group = get_cur_groupname();
@@ -2098,6 +2101,7 @@ check_and_warn_user_startup(gchar *cf_na
simple_dialog_check_set(priv_warning_dialog, "Don't show this message again.");
simple_dialog_set_cb(priv_warning_dialog, priv_warning_dialog_cb, NULL);
}
+*/
#ifdef _WIN32
/* Warn the user if npf.sys isn't loaded. */