Merge branch 'glendale' into hollywood

Conflicts:

	debian/control
	scripts/install-system
	scripts/rl-system.init

5 files changed, 67 insertions, 10 deletions

diff --git a/debian/control b/debian/control
index a60e21dd..a66eed0c 100644
--- a/debian/control
+++ b/debian/control
@@ -7,14 +7,24 @@ Standards-Version: 3.7.2
 
 Package: vyatta-cfg-system
 Architecture: all
-Depends: bash (>= 3.1),
- sed (>= 4.1.5),
+Depends: sed (>= 4.1.5),
  perl (>= 5.8.8),
  procps (>= 1:3.2.7-3),
  coreutils (>= 5.97-5.3),
  libpam-radius-auth,
- vyatta-cfg, sysv-rc, ntp, sysklogd, busybox, ssh, whois, sudo,
- snmpd, keepalived, vyatta-bash, bridge-utils, tshark
+ vyatta-cfg,
+ vyatta-bash,
+ sysv-rc,
+ ntp,
+ sysklogd,
+ busybox,
+ whois,
+ sudo,
+ snmpd,
+ keepalived,
+ vyatta-bash,
+ bridge-utils,
+ tshark
 Suggests: util-linux (>= 2.13-5),
  net-tools,
  ethtool,
diff --git a/scripts/rl-system.init b/scripts/rl-system.init
index f74007cc..5b81a4fd 100755
--- a/scripts/rl-system.init
+++ b/scripts/rl-system.init
@@ -78,6 +78,21 @@ add_new_serial_if () {
     fi
 }
 
+proc_flags ()
+{
+    # reset_promiscous_arp_response
+    echo 1 > /proc/sys/net/ipv4/conf/default/arp_filter 
+    # set_ip_forwarding
+    echo 1 > /proc/sys/net/ipv4/ip_forward
+
+    # if a primary address is removed from an interface promote and
+    # secondary available
+    echo 1 > /proc/sys/net/ipv4/conf/all/promote_secondaries
+
+    # set maximum rmem_max to accomodate netlink buffers
+    echo 1048576 > /proc/sys/net/core/rmem_max
+}
+
 ## Update the version information
 update_version_info () {
     if [ -f ${vyatta_sysconfdir}/version.master ]; then
diff --git a/scripts/snmp/vyatta-snmp.pl b/scripts/snmp/vyatta-snmp.pl
index f12bcc45..0301a041 100644
--- a/scripts/snmp/vyatta-snmp.pl
+++ b/scripts/snmp/vyatta-snmp.pl
@@ -74,12 +74,37 @@ sub snmp_get_values {
     my @communities = $config->listNodes();
     
     foreach my $community (@communities) {
-	my $authorization = $config->returnValue("$community authorization");
-	if (defined $authorization and $authorization eq "rw") {
-	    $output .= "rwcommunity $community\n";
-	} else {
-	    $output .= "rocommunity $community\n";
-	}
+        my $authorization = $config->returnValue("$community authorization");
+        my @clients = $config->returnValues("$community client");
+        my @networks = $config->returnValues("$community network");
+
+        if (scalar(@clients) == 0 and scalar(@networks) == 0){
+           if (defined $authorization and $authorization eq "rw") {
+               $output .= "rwcommunity $community\n";
+           } else {
+                  $output .= "rocommunity $community\n";
+           }
+        } else {
+                if (scalar(@clients) != 0){
+                   foreach my $client (@clients){
+                        if (defined $authorization and $authorization eq "rw") {
+                            $output .= "rwcommunity $community $client\n";
+                        } else {
+                                $output .= "rocommunity $community $client\n";
+                        }
+                   }
+                }
+                if (scalar(@networks) != 0){
+                   foreach my $network (@networks){
+                        if (defined $authorization and $authorization eq "rw") {
+                            $output .= "rwcommunity $community $network\n";
+                        } else {
+                                $output .= "rocommunity $community $network\n";
+                        }
+
+                   }
+                }
+        }
     }
 
     $config->setLevel("protocols snmp");
diff --git a/templates/protocols/snmp/community/node.tag/client/node.def b/templates/protocols/snmp/community/node.tag/client/node.def
new file mode 100644
index 00000000..134698ef
--- /dev/null
+++ b/templates/protocols/snmp/community/node.tag/client/node.def
@@ -0,0 +1,3 @@
+multi:
+type: ipv4
+help: IP address of SNMP client allowed to contact system
diff --git a/templates/protocols/snmp/community/node.tag/network/node.def b/templates/protocols/snmp/community/node.tag/network/node.def
new file mode 100644
index 00000000..1afdb2a1
--- /dev/null
+++ b/templates/protocols/snmp/community/node.tag/network/node.def
@@ -0,0 +1,4 @@
+multi:
+type: ipv4net
+help: Subnet of SNMP client(s) allowed to contact system
+syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $VAR(@)"