From 1d238ec636ff051635a7ed194df5c49752788d69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Tue, 26 Sep 2017 22:54:24 +0100 Subject: autotools: Remove setuid-root.pl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It seems to be some sort of development helper, and since CMake doesn't use it presumably it is not useful anymore. Change-Id: I23e4ab24199f21310ebd09064c3ae53e48673e4d Reviewed-on: https://code.wireshark.org/review/23945 Petri-Dish: Gerald Combs Petri-Dish: João Valverde Reviewed-by: João Valverde --- .gitignore | 1 - tools/Makefile.am | 14 --------- tools/setuid-root.pl.in | 78 ------------------------------------------------- 3 files changed, 93 deletions(-) delete mode 100644 tools/setuid-root.pl.in diff --git a/.gitignore b/.gitignore index 2d2b6e4d29..49e13c9027 100644 --- a/.gitignore +++ b/.gitignore @@ -54,7 +54,6 @@ plugin.c plugins/mate/mate_parser.c version.h tools/lemon/lemon -tools/setuid-root.pl tshark-tap-register.c wiretap/ascend.c wiretap/ascend.h diff --git a/tools/Makefile.am b/tools/Makefile.am index cff8ab3641..782f4b0113 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -85,7 +85,6 @@ EXTRA_DIST = \ rdps.py \ rpm_setup.sh \ runa2x.sh \ - setuid-root.pl.in \ test-common.sh \ test-captures.sh \ textify.ps1 \ @@ -101,18 +100,5 @@ EXTRA_DIST = \ ws-coding-style.cfg \ yacc.py -noinst_SCRIPTS = setuid-root.pl - -setuid-root.pl: setuid-root.pl.in Makefile - $(AM_V_SED)$(SED) \ - -e 's,@BIN_PREFIX\@,$(bindir),' \ - -e 's,@TSHARK_BIN\@,$(tshark_bin)$(EEXT),' \ - -e 's,@DUMPCAP_BIN\@,$(dumpcap_bin)$(EEXT),' \ - < $(srcdir)/setuid-root.pl.in > setuid-root.pl; \ - chmod +x setuid-root.pl - CLEANFILES = \ *.pyc - -DISTCLEANFILES = \ - setuid-root.pl diff --git a/tools/setuid-root.pl.in b/tools/setuid-root.pl.in deleted file mode 100644 index e9d06e0eba..0000000000 --- a/tools/setuid-root.pl.in +++ /dev/null @@ -1,78 +0,0 @@ -#!/usr/bin/perl -w -# -# setuid-root - Enable/disable setuid for tshark and dumpcap. -# -# Copyright 2007, Luis Ontanon and Gerald Combs -# -# Wireshark - Network traffic analyzer -# By Gerald Combs -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -sub usage() { - die <= 0) { - $revert_owner = shift; -} - -if (length($revert_owner) < 1 && length($ENV{SUDO_USER}) > 0) { - $revert_owner = $ENV{SUDO_USER}; -} - -if ($command eq "enable") { - system("chown root $bin_prefix/$tshark_bin"); - system("chown root $bin_prefix/$dumpcap_bin"); - system("chmod ug+s $bin_prefix/$tshark_bin"); - system("chmod ug+s $bin_prefix/$dumpcap_bin"); - exit 0; -} - -if ($command eq "disable"){ - system("chmod ug-s $bin_prefix/$tshark_bin"); - system("chmod ug-s $bin_prefix/$dumpcap_bin"); - die "Can't revert owner" if length($revert_owner) < 1; - system("chown $revert_owner $bin_prefix/$tshark_bin"); - system("chown $revert_owner $bin_prefix/$dumpcap_bin"); - exit(0); -} - -usage(); -- cgit v1.2.3