Merge branch 'master' into next

[people/pmueller/ipfire-2.x.git] / config / rootfiles / common / misc-progs

diff --git a/config/rootfiles/common/misc-progs b/config/rootfiles/common/misc-progs
index 87cef398cfbc4037e4f2c25be91684bd767ad875..7746d03e0e5439bfbbd633c3a54bde1d5863544a 100644 (file)
--- a/config/rootfiles/common/misc-progs
+++ b/config/rootfiles/common/misc-progs
@@ -1,9 +1,11 @@
+usr/local/bin/addonctrl
 #usr/local/bin/applejuicectrl
 usr/local/bin/backupctrl
 #usr/local/bin/clamavctrl
 usr/local/bin/dhcpctrl
 usr/local/bin/extrahdctrl
 usr/local/bin/getipstat
+usr/local/bin/getiptstate
 #usr/local/bin/iowrap
 usr/local/bin/ipfirereboot
 usr/local/bin/ipsecctrl
@@ -17,16 +19,20 @@ usr/local/bin/qosctrl
 usr/local/bin/rebuildhosts
 usr/local/bin/redctrl
 #usr/local/bin/sambactrl
+usr/local/bin/setaliases
 usr/local/bin/setdmzholes
 usr/local/bin/setportfw
 usr/local/bin/setxtaccess
 usr/local/bin/smartctrl
 usr/local/bin/snortctrl
 usr/local/bin/squidctrl
-usr/local/bin/sshctrls
+usr/local/bin/sshctrl
 usr/local/bin/syslogdctrl
 usr/local/bin/timectrl
 #usr/local/bin/tripwirectrl
+usr/local/bin/updxlratorctrl
+usr/local/bin/updxsetperms
 usr/local/bin/upnpctrl
+usr/local/bin/urlfilterctrl
 usr/local/bin/wirelessctrl
-
+#usr/local/bin/wlanapctrl