Add pppoe-mac option to rp-pppoe plugin

[ppp.git] / pppd / options.c

diff --git a/pppd/options.c b/pppd/options.c
index 5c9d3a0d9534345460c7dc247521506d59bd630d..0285b1bb8d3c629dbc14de2ae4af6a49353c039b 100644 (file)
--- a/pppd/options.c
+++ b/pppd/options.c
@@ -40,7 +40,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define RCSID  "$Id: options.c,v 1.99 2006/06/04 07:04:57 paulus Exp $"
+#define RCSID  "$Id: options.c,v 1.101 2008/06/03 12:07:13 paulus Exp $"
 
 #include <ctype.h>
 #include <stdio.h>
@@ -399,17 +399,19 @@ options_from_file(filename, must_exist, check_prot, priv)
     option_t *opt;
     int oldpriv, n;
     char *oldsource;
+    uid_t euid;
     char *argv[MAXARGS];
     char args[MAXARGS][MAXWORDLEN];
     char cmd[MAXWORDLEN];
 
+    euid = geteuid();
     if (check_prot && seteuid(getuid()) == -1) {
        option_error("unable to drop privileges to open %s: %m", filename);
        return 0;
     }
     f = fopen(filename, "r");
     err = errno;
-    if (check_prot && seteuid(0) == -1)
+    if (check_prot && seteuid(euid) == -1)
        fatal("unable to regain privileges");
     if (f == NULL) {
        errno = err;
@@ -769,17 +771,20 @@ process_option(opt, cmd, argv)
        if (!(*parser)(argv))
            return 0;
        if (opt->flags & OPT_A2LIST) {
-           struct option_value *ovp, **pp;
+           struct option_value *ovp, *pp;
 
            ovp = malloc(sizeof(*ovp) + strlen(*argv));
            if (ovp != 0) {
                strcpy(ovp->value, *argv);
                ovp->source = option_source;
                ovp->next = NULL;
-               pp = (struct option_value **) &opt->addr2;
-               while (*pp != 0)
-                   pp = &(*pp)->next;
-               *pp = ovp;
+               if (opt->addr2 == NULL) {
+                   opt->addr2 = ovp;
+               } else {
+                   for (pp = opt->addr2; pp->next != NULL; pp = pp->next)
+                       ;
+                   pp->next = ovp;
+               }
            }
        }
        break;
@@ -1512,7 +1517,9 @@ setlogfile(argv)
     char **argv;
 {
     int fd, err;
+    uid_t euid;
 
+    euid = geteuid();
     if (!privileged_option && seteuid(getuid()) == -1) {
        option_error("unable to drop permissions to open %s: %m", *argv);
        return 0;
@@ -1521,7 +1528,7 @@ setlogfile(argv)
     if (fd < 0 && errno == EEXIST)
        fd = open(*argv, O_WRONLY | O_APPEND);
     err = errno;
-    if (!privileged_option && seteuid(0) == -1)
+    if (!privileged_option && seteuid(euid) == -1)
        fatal("unable to regain privileges: %m");
     if (fd < 0) {
        errno = err;