]>
Commit | Line | Data |
---|---|---|
b1ec4fd4 | 1 | --- XFree86-3.3.3.1/xc/programs/xterm/main.c.nosuidxterm Sun Mar 28 20:12:51 1999 |
2 | +++ XFree86-3.3.3.1/xc/programs/xterm/main.c Sun Mar 28 20:13:58 1999 | |
3 | @@ -1862,7 +1862,7 @@ | |
4 | static int | |
5 | get_pty (int *pty) | |
6 | { | |
7 | -#ifdef __osf__ | |
8 | +#if defined(__osf__) || defined(__linux__) | |
9 | int tty; | |
10 | return (openpty(pty, &tty, ttydev, NULL, NULL)); | |
11 | #endif | |
12 | @@ -2502,6 +2502,9 @@ | |
13 | #endif /* TIOCSWINSZ */ | |
14 | #endif /* sun */ | |
15 | ||
16 | +#undef UTMP | |
17 | + addToUtmp(ttydev, NULL, screen->respond); | |
18 | + | |
19 | if (!am_slave) { | |
20 | #ifdef USE_HANDSHAKE | |
21 | if (pipe(pc_pipe) || pipe(cp_pipe)) | |
22 | @@ -3088,6 +3091,7 @@ | |
23 | if (pw && pw->pw_name) | |
24 | Setenv ("LOGNAME=", pw->pw_name); /* for POSIX */ | |
25 | #ifdef USE_SYSV_UTMP | |
26 | + | |
27 | /* Set up our utmp entry now. We need to do it here | |
28 | ** for the following reasons: | |
29 | ** - It needs to have our correct process id (for | |
30 | @@ -3185,7 +3189,6 @@ | |
31 | #endif | |
32 | /* close the file */ | |
33 | (void) endutent(); | |
34 | - | |
35 | #else /* USE_SYSV_UTMP */ | |
36 | /* We can now get our ttyslot! We can also set the initial | |
37 | * UTMP entry. | |
38 | @@ -3921,6 +3924,7 @@ | |
39 | Exit(int n) | |
40 | { | |
41 | register TScreen *screen = &term->screen; | |
42 | + removeFromUtmp(); | |
43 | #ifdef UTMP | |
44 | #ifdef USE_SYSV_UTMP | |
45 | #if defined(SVR4) || defined(SCO325) | |
46 | --- XFree86-3.3.3.1/xc/programs/xterm/Imakefile.nosuidxterm Sat Oct 24 03:58:19 1998 | |
47 | +++ XFree86-3.3.3.1/xc/programs/xterm/Imakefile Sun Mar 28 20:13:58 1999 | |
48 | @@ -20,6 +20,10 @@ | |
49 | #define XkbClientDefines /**/ | |
50 | #endif | |
51 | ||
52 | +#if InstallXtermSetUID | |
53 | +#undef InstallXtermSetUID | |
54 | +#endif | |
55 | + | |
56 | #ifndef XkbClientDepLibs | |
57 | #define XkbClientDepLibs /**/ | |
58 | #endif | |
59 | @@ -48,6 +52,8 @@ | |
60 | PUCCPTYDDEF = -DPUCC_PTYD /* does not need to be setuid */ | |
61 | PTYLIB = -lpucc | |
62 | #endif | |
63 | + | |
64 | + PTYLIB = -lutil -lutempter | |
65 | ||
66 | #if XtermWithI18N | |
67 | I18NDEF = -DI18N |