X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fsys-linux.c;h=4c04e7e5c2d005bf0a37994b1dbc21cda4e4b488;hb=5c62101f3ba79a98b2651cfa4704a0ef1ceecdfb;hp=c68dbe1065b146d3c1a694ce55fd277e4a3ad53c;hpb=e4b85dae99f201d2b9f3c1d3c4492154ef76a2e8;p=ppp.git

diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c
index c68dbe1..4c04e7e 100644
--- a/pppd/sys-linux.c
+++ b/pppd/sys-linux.c
@@ -700,8 +700,8 @@ static int make_ppp_unit(void)
 		char t[IFNAMSIZ];
 		memset(&ifr, 0, sizeof(struct ifreq));
 		slprintf(t, sizeof(t), "%s%d", PPP_DRV_NAME, ifunit);
-		strlcpy(ifr.ifr_name, t, IF_NAMESIZE);
-		strlcpy(ifr.ifr_newname, req_ifname, IF_NAMESIZE);
+		strlcpy(ifr.ifr_name, t, IFNAMSIZ);
+		strlcpy(ifr.ifr_newname, req_ifname, IFNAMSIZ);
 		x = ioctl(sock_fd, SIOCSIFNAME, &ifr);
 		if (x < 0)
 		    error("Couldn't rename interface %s to %s: %m", t, req_ifname);
@@ -3143,7 +3143,7 @@ int cif6addr (int unit, eui64_t our_eui64, eui64_t his_eui64)
 int
 get_pty(int *master_fdp, int *slave_fdp, char *slave_name, int uid)
 {
-    int i, mfd, sfd = -1;
+    int i, mfd, ret, sfd = -1;
     char pty_name[16];
     struct termios tios;
 
@@ -3181,8 +3181,14 @@ get_pty(int *master_fdp, int *slave_fdp, char *slave_name, int uid)
 		pty_name[5] = 't';
 		sfd = open(pty_name, O_RDWR | O_NOCTTY, 0);
 		if (sfd >= 0) {
-		    fchown(sfd, uid, -1);
-		    fchmod(sfd, S_IRUSR | S_IWUSR);
+		    ret = fchown(sfd, uid, -1);
+		    if (ret != 0) {
+			warn("Couldn't change ownership of %s, %m", pty_name);
+		    }
+		    ret = fchmod(sfd, S_IRUSR | S_IWUSR);
+		    if (ret != 0) {
+			warn("Couldn't change permissions of %s, %m", pty_name);
+		    }
 		    break;
 		}
 		close(mfd);