fix potential rootfs owner/group mismatch (tgz root only, patch from #4562)

[openwrt.git] / package / ppp / patches / 205-pppoe_iface_name.patch

diff --git a/package/ppp/patches/205-pppoe_iface_name.patch b/package/ppp/patches/205-pppoe_iface_name.patch
index 0961eca..4b5d627 100644 (file)
--- a/package/ppp/patches/205-pppoe_iface_name.patch
+++ b/package/ppp/patches/205-pppoe_iface_name.patch
@@ -1,12 +1,17 @@
-diff -ruN ppp-2.4.3-orig/pppd/plugins/rp-pppoe/plugin.c ppp-2.4.3-3/pppd/plugins/rp-pppoe/plugin.c
---- ppp-2.4.3-orig/pppd/plugins/rp-pppoe/plugin.c      2004-11-04 11:07:37.000000000 +0100
-+++ ppp-2.4.3-3/pppd/plugins/rp-pppoe/plugin.c 2004-12-16 01:07:22.000000000 +0100
-@@ -286,7 +286,7 @@
+Index: ppp-2.4.3/pppd/plugins/rp-pppoe/plugin.c
+===================================================================
+--- ppp-2.4.3.orig/pppd/plugins/rp-pppoe/plugin.c      2007-06-04 13:22:09.417423616 +0200
++++ ppp-2.4.3/pppd/plugins/rp-pppoe/plugin.c   2007-06-04 13:22:12.953885992 +0200
+@@ -282,9 +282,9 @@
+     if (strlen(cmd) > 4 && !strncmp(cmd, "nic-", 4)) {
        /* Strip off "nic-" */
        cmd += 4;
-     } else if (strlen(cmd) < 4
+-    } else if (strlen(cmd) < 4
 -             || (strncmp(cmd, "eth", 3) && strncmp(cmd, "nas", 3)
-+             || (strncmp(cmd, "eth", 3) && strncmp(cmd, "nas", 3) && strncmp(cmd, "vlan", 4) && strncmp(cmd, "ath", 3)
-                  && strncmp(cmd, "tap", 3) && strncmp(cmd, "br", 2))) {
+-                 && strncmp(cmd, "tap", 3) && strncmp(cmd, "br", 2))) {
++      } else if (strlen(cmd) < 3
++              || (strncmp(cmd, "eth", 3) && strncmp(cmd, "nas", 3) && strncmp(cmd, "vlan", 4) && strncmp(cmd, "ath", 3)
++                   && strncmp(cmd, "tap", 3) && strncmp(cmd, "br", 2))) {
        return 0;
      }
+