Merge branch 'plog-usability' of https://github.com/mityada/ppp

[ppp.git] / pppd / main.c

diff --git a/pppd/main.c b/pppd/main.c
index 1b513ca3030e1d621625ea6fedf8deb8a4ba0b2a..6d50d1bac1d998e7ad359a1ec4e35852e3739e1d 100644 (file)
--- a/pppd/main.c
+++ b/pppd/main.c
@@ -1719,7 +1719,7 @@ device_script(program, in, out, dont_wait)
     update_system_environment();
     execl("/bin/sh", "sh", "-c", program, (char *)0);
     perror("pppd: could not exec /bin/sh");
-    exit(99);
+    _exit(99);
     /* NOTREACHED */
 }
 
@@ -1841,7 +1841,7 @@ run_program(prog, args, must_exist, done, arg, wait)
        syslog(LOG_ERR, "Can't execute %s: %m", prog);
        closelog();
     }
-    _exit(-1);
+    _exit(99);
 }
 
 
@@ -2043,9 +2043,11 @@ script_setenv(var, value, iskey)
                free(p-1);
                script_env[i] = newstring;
 #ifdef USE_TDB
-               if (iskey && pppdb != NULL)
-                   add_db_key(newstring);
-               update_db_entry();
+               if (pppdb != NULL) {
+                   if (iskey)
+                       add_db_key(newstring);
+                   update_db_entry();
+               }
 #endif
                return;
            }