[or-cvs] r16592: {incognito} Cleaned up TorK config, and disabled netstat based logging o (in incognito/trunk: . root_overlay/var/lib/kdesession)

[anonym@xxxxxxxx]

Author: anonym
Date: 2008-08-19 08:53:08 -0400 (Tue, 19 Aug 2008)
New Revision: 16592

Modified:
   incognito/trunk/fsscript.sh
   incognito/trunk/root_overlay/var/lib/kdesession/torkrc
Log:
Cleaned up TorK config, and disabled netstat based logging of Non-Tor traffic.


Modified: incognito/trunk/fsscript.sh
===================================================================
--- incognito/trunk/fsscript.sh	2008-08-19 12:21:21 UTC (rev 16591)
+++ incognito/trunk/fsscript.sh	2008-08-19 12:53:08 UTC (rev 16592)
@@ -173,7 +173,7 @@
 
 	# Firefox config, and setting up first run walkthrough
 	echo "Setting up Firefox"
-	if [[ -x /usr/bin/firefox-bin ]]; then
+	if [[ -x /usr/bin/firefox-bin ]] || [[ -x /usr/bin/firefox ]]; then
 		cp -a /var/lib/firefox-config ${USERDIR}/.mozilla
 	fi
 	if [[ -x /usr/sbin/first-run ]]; then
@@ -237,10 +237,6 @@
 #echo "Removing dangling links"
 #symlinks -dr /
 
-# Make netstat SUID root so user programs such as TorK can monitor the network
-chmod u+s /bin/netstat
-ln -s /bin/netstat /bin/torknetstat
-
 # Seems re-merge of ncurses does not remove /usr/share/terminfo
 rm -rf /usr/share/terminfo
 ln -s /etc/terminfo /usr/share/terminfo

Modified: incognito/trunk/root_overlay/var/lib/kdesession/torkrc
===================================================================
--- incognito/trunk/root_overlay/var/lib/kdesession/torkrc	2008-08-19 12:21:21 UTC (rev 16591)
+++ incognito/trunk/root_overlay/var/lib/kdesession/torkrc	2008-08-19 12:53:08 UTC (rev 16592)
@@ -1,71 +1,15 @@
-[FirewallEvasion]
-ReachableAddresses=
-
-[MainWindow]
-Height 1024=649
-Width 1280=790
-
-[MainWindow Toolbar MoreToolBar]
-Hidden=true
-IconText=IconOnly
-Index=2
-Offset=-1
-
-[MainWindow Toolbar TorToolBar]
-IconText=IconOnly
-Index=1
-
-[MainWindow Toolbar mainToolBar]
-Index=0
-
-[MyServer]
-NickName=TorKServer
-
 [RunningNormal]
 DataDirectory=/var/lib/tor/
 Group=tor
 User=__INCOGNITO_USER__
 
-[Servers]
-MapAddress=
-
-[TipOfDay]
-TipLastShown=
-
-[TorKOSD Position]
-Position=1000,700
-Screen=0
-
 [Usability]
 CookieAuthentication=true
-LongLivedPorts=5190,21,5222,5050,22,23
-TrackHostExits=
 
 [UsedDirectly]
 AvailablePrograms=
-BandwidthSlots=
-CurrentEntryNodes=
-CurrentExcludeNodes=
-CurrentExitNodes=
-DefaultRunningNormalOptions=false
-FilterRules=button_ok%:%Route all DNS TCP Requests to Tor. %:% iptables -t nat -I OUTPUT -o ! lo -p tcp -m tcp --dport 53 -j DNAT --to-destination 127.0.0.1:9040 -m comment --comment "Redirect TCP DNS Requests to Tor" ,button_ok%:%Route all DNS UDP Requests to Tor. %:% iptables -t nat -I OUTPUT -o ! lo -p udp -m udp --dport 53 -j DNAT --to-destination 127.0.0.1:9999 -m comment --comment "Redirect UDP DNS Requests to Tor"
-KonqFtpProxy=127.0.0.1
-KonqFtpProxyPort=8118
-KonqHttpProxy=127.0.0.1
-KonqHttpProxyPort=3128
-KonqHttpsProxy=127.0.0.1
-KonqHttpsProxyPort=3128
-LogNonTorTraffic=true
+LogNonTorTraffic=false
 LogTorTraffic=true
-NetstatLocation=torknetstat
-OriginalCookies=false
-OriginalEnableJava=false
-OriginalEnableJavascript=false
-OriginalEnablePlugins=false
-OriginalFtpProxy=127.0.0.1
-OriginalHttpProxy=http://127.0.0.1:3128
-OriginalHttpsProxy=http://127.0.0.1:3128
-OriginalProxyType=1
 QuickConfigure=7
 ShowApplySettingsQuestions=false
 ShowDNSLeaks=false
@@ -73,7 +17,3 @@
 SystemProxy=true
 TorLocation=/usr/bin/tor
 TorkProxy=false
-
-[UsingTor]
-SOCKSBindAddressMany=
-SOCKSPolicy=