From: Paul Mackerras <paulus@ozlabs.org>
Date: Thu, 31 Dec 2020 04:42:15 +0000 (+1100)
Subject: Merge branch 'pppoatm_wildcard' of https://github.com/sthibaul/ppp
X-Git-Tag: ppp-2.4.9~27
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=ace9c1c9bd73b7ed5777ec5b066ac61ba4ab2079;p=ppp.git

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

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

ace9c1c9bd73b7ed5777ec5b066ac61ba4ab2079
diff --cc pppd/plugins/pppoatm/pppoatm.c
index e37d8b7,cef5ff7..5a3ecd6
--- a/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;