Remove obsolete "example_snmp_users_file"

svn path=/trunk/; revision=25936

diff --git a/Makefile.am b/Makefile.am
index 47fdb01ec65e1c6435fd61d7fc9b25140669c697..e65534cde713be8e0dfec7161c080167e7ed5af7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -614,7 +614,6 @@ EXTRA_DIST = \
        doxygen.cfg.in          \
        dumpcap.c       \
        editcap.c               \
-       example_snmp_users_file \
        wireshark.desktop       \
        image/capinfos.rc.in    \
        image/clist_ascend.xpm  \

diff --git a/example_snmp_users_file b/example_snmp_users_file
deleted file mode 100644 (file)
index 553b532..0000000
--- a/example_snmp_users_file
+++ /dev/null
@@ -1,34 +0,0 @@
-# this is an example snmp_users_file
-#
-# This can be used to enable the snmp dissector to authenticate and decrypt 
-# SNMPv3 packets.
-#
-# Its location should be specified in the preferences of the SNMP protocol.
-#
-# comments start with a # and finish at the end of line
-# empty lines are ignored 
-#
-# records are separated by whitespace
-# engine-id username auth_pass priv_pass auth_proto priv_proto
-# fileds are separated by whitespace
-# engine-id, username and passwds can be either "double quoted" or hex
-# double quoted strings are c-style strings and take escape chars
-# a '*' as engine-id matches any any given engine-id
-# auth_proto can be either MD5 or SHA1 (SHA works too), defaults to MD5.
-# priv_proto can be either DES or AES Defaults to DES if not given
-# protocols are case-insensitive (md5 == MD5)
-# first match wins (i.e. have localized entries before those for * )
-
-80001F888059DC486145A26322 "pippo" "pippoxxx" "PIPPOxxx" MD5 DES
-
-# pippo for any engine will use DES and MD5
-* "pippo" "pippoyyy" "PIPPOyyy"
-
-# SHA + DES
-80001F888059DC486145A26322 "pluto" "plutoxxx" "PLUTOxxx" SHA
-
-# SHA + AES
-80001F888059DC486145A26322 "topolino" "topolino" "TOPOLINO" SHA AES
-
-# MD5 + AES
-80001F888059DC486145A26322 "paperino" "paperino" "PAPERINO" AES

diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index e9ddee6db43f39c2cf87a61ae07eba6d1e97b965..4ba5fd54133cfceec7e0f5f48696c3c51a1deaab 100644 (file)
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -346,7 +346,6 @@ File "..\..\doc\wireshark.html"
 File "..\..\doc\wireshark-filter.html"
 File "..\..\dumpcap.exe"
 File "..\..\doc\dumpcap.html"
-File "..\..\example_snmp_users_file"
 
 ; C-runtime redistributable
 !ifdef VCREDIST_EXE