Call MkSockNode() as uid 0

Forgotten by: julian

3 files changed, 22 insertions, 1 deletions

diff --git a/usr.sbin/ppp/ether.c b/usr.sbin/ppp/ether.c
index 14ec99a..77cd5e1 100644
--- a/usr.sbin/ppp/ether.c
+++ b/usr.sbin/ppp/ether.c
@@ -457,7 +457,7 @@ ether_Create(struct physical *p)
      */
 
     /* Create a socket node */
-    if (NgMkSockNode(NULL, &dev->cs, &p->fd) == -1) {
+    if (ID0NgMkSockNode(NULL, &dev->cs, &p->fd) == -1) {
       log_Printf(LogWARN, "Cannot create netgraph socket node: %s\n",
                  strerror(errno));
       free(dev);
diff --git a/usr.sbin/ppp/id.c b/usr.sbin/ppp/id.c
index 0d15c92..f2b4581 100644
--- a/usr.sbin/ppp/id.c
+++ b/usr.sbin/ppp/id.c
@@ -32,6 +32,9 @@
 
 #include <sys/ioctl.h>
 #include <fcntl.h>
+#ifndef NONETGRAPH
+#include <netgraph.h>
+#endif
 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -296,3 +299,18 @@ ID0kldload(const char *dev)
   return result;
 }
 #endif
+
+#ifndef NONETGRAPH
+int
+ID0NgMkSockNode(const char *name, int *cs, int *ds)
+{
+  int result;
+
+  ID0set0();
+  result = NgMkSockNode(name, cs, ds);
+  log_Printf(LogID0, "%d = NgMkSockNode(\"%s\", &cs, &ds)\n",
+             result, name ? name : "");
+  ID0setuser();
+  return result;
+}
+#endif
diff --git a/usr.sbin/ppp/id.h b/usr.sbin/ppp/id.h
index 57344cf..11cb831 100644
--- a/usr.sbin/ppp/id.h
+++ b/usr.sbin/ppp/id.h
@@ -49,3 +49,6 @@ extern void ID0setproctitle(const char *);
 #if defined(__FreeBSD__) && !defined(NOKLDLOAD)
 extern int ID0kldload(const char *);
 #endif
+#ifndef NONETGRAPH
+extern int ID0NgMkSockNode(const char *, int *, int *);
+#endif