Use the new-style ngpppoe_init_data structure.

Approved by: archie

2 files changed, 3 insertions, 6 deletions

diff --git a/libexec/pppoed/pppoed.c b/libexec/pppoed/pppoed.c
index 87e9c10..c82d305 100644
--- a/libexec/pppoed/pppoed.c
+++ b/libexec/pppoed/pppoed.c
@@ -230,10 +230,9 @@ ConfigureNode(const char *prog, const char *iface, const char *provider,
 
   plen = strlen(provider);
 
-  data = (struct ngpppoe_init_data *)alloca(sizeof *data + plen + 1);
+  data = (struct ngpppoe_init_data *)alloca(sizeof *data + plen);
   snprintf(data->hook, sizeof data->hook, "%s", ngc->peerhook);
   strcpy(data->data, provider);
-  data->data_len = plen;
 
   spath = (char *)alloca(strlen(ngc->peerhook) + 3);
   strcpy(spath, ".:");
@@ -323,10 +322,9 @@ Spawn(const char *prog, const char *acname, const char *exec,
 
       /* Put the PPPoE node into OFFER mode */
       slen = strlen(acname);
-      data = (struct ngpppoe_init_data *)alloca(sizeof *data + slen + 1);
+      data = (struct ngpppoe_init_data *)alloca(sizeof *data + slen);
       snprintf(data->hook, sizeof data->hook, "%s", ngc.ourhook);
       strcpy(data->data, acname);
-      data->data_len = slen;
 
       path = (char *)alloca(strlen(ngc.ourhook) + 3);
       strcpy(path, ".:");
diff --git a/usr.sbin/ppp/ether.c b/usr.sbin/ppp/ether.c
index c9906db..b54ef0a 100644
--- a/usr.sbin/ppp/ether.c
+++ b/usr.sbin/ppp/ether.c
@@ -584,11 +584,10 @@ ether_Create(struct physical *p)
 
     /* And finally, request a connection to the given provider */
 
-    data = (struct ngpppoe_init_data *)alloca(sizeof *data + providerlen + 1);
+    data = (struct ngpppoe_init_data *)alloca(sizeof *data + providerlen);
 
     snprintf(data->hook, sizeof data->hook, "%s", dev->hook);
     strcpy(data->data, provider);
-    data->data_len = providerlen;
 
     snprintf(connectpath, sizeof connectpath, ".:%s", dev->hook);
     log_Printf(LogDEBUG, "Sending PPPOE_CONNECT to %s\n", connectpath);