Merge branch 'pppoatm_wildcard' of https://github.com/sthibaul/ppp

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>

diff --cc pppd/plugins/pppoatm/pppoatm.c
index e37d8b71efeee2fc4b10e68301b70e628af1511d,cef5ff75dfd5471cce92a274982994e69e2c256a..5a3ecd61b6a2c278781ad94151c6e92458b4f77b
--- 1/pppd/plugins/pppoatm/pppoatm.c
--- 2/pppd/plugins/pppoatm/pppoatm.c
+++ b/pppd/plugins/pppoatm/pppoatm.c
@@@ -70,20 -70,18 +70,20 @@@ static int setdevname_pppoatm(const cha
  {
        struct sockaddr_atmpvc addr;
        extern struct stat devstat;
 +
        if (device_got_set)
                return 0;
 -      //info("PPPoATM setdevname_pppoatm: '%s'", cp);
 +
        memset(&addr, 0, sizeof addr);
        if (text2atm(cp, (struct sockaddr *) &addr, sizeof(addr),
-           T2A_PVC | T2A_NAME) < 0) {
+           T2A_PVC | T2A_NAME | T2A_WILDCARD) < 0) {
 -               if(doit)
 -                   info("atm does not recognize: %s", cp);
 +              if (doit)
 +                      info("cannot parse the ATM address: %s", cp);
                return 0;
 -           }
 -      if (!doit) return 1;
 -      //if (!dev_set_ok()) return -1;
 +      }
 +      if (!doit)
 +              return 1;
 +
        memcpy(&pvcaddr, &addr, sizeof pvcaddr);
        strlcpy(devnam, cp, sizeof devnam);
        devstat.st_mode = S_IFSOCK;