From: Paul Mackerras <paulus@samba.org>
Date: Sun, 13 Sep 1998 23:38:49 +0000 (+0000)
Subject: Change UID to ORIG_UID because bash defines UID.
X-Git-Tag: RELEASE_2_3_6~49
X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=55f9a71c296dcdf5bdad0970b55b2f91094ae2e7

Change UID to ORIG_UID because bash defines UID.
---

diff --git a/pppd/main.c b/pppd/main.c
index b6efbfa..7072d0a 100644
--- a/pppd/main.c
+++ b/pppd/main.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: main.c,v 1.49 1998/05/05 05:24:17 paulus Exp $";
+static char rcsid[] = "$Id: main.c,v 1.50 1998/09/13 23:38:49 paulus Exp $";
 #endif
 
 #include <stdio.h>
@@ -199,7 +199,7 @@ main(argc, argv)
     uid = getuid();
     privileged = uid == 0;
     sprintf(numbuf, "%d", uid);
-    script_setenv("UID", numbuf);
+    script_setenv("ORIG_UID", numbuf);
 
     /*
      * Initialize to the standard option set, then parse, in order,
diff --git a/pppd/pppd.8 b/pppd/pppd.8
index e7ea9c4..f69380e 100644
--- a/pppd/pppd.8
+++ b/pppd/pppd.8
@@ -1,5 +1,5 @@
 .\" manual page [] for pppd 2.3
-.\" $Id: pppd.8,v 1.28 1998/09/04 18:49:15 christos Exp $
+.\" $Id: pppd.8,v 1.29 1998/09/13 23:38:49 paulus Exp $
 .\" SH section heading
 .\" SS subsection heading
 .\" LP paragraph
@@ -1008,7 +1008,7 @@ authenticates itself.
 .B SPEED
 The baud rate of the tty device.
 .TP
-.B UID
+.B ORIG_UID
 The real user-id of the user who invoked pppd.
 .P
 Pppd invokes the following scripts, if they exist.  It is not an error