ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/ptytty.C
(Generate patch)

Comparing rxvt-unicode/src/ptytty.C (file contents):
Revision 1.51 by ayin, Thu Jan 19 18:53:05 2006 UTC vs.
Revision 1.56 by root, Sun Jan 22 04:01:52 2006 UTC

1// This file is part of libptytty. Do not make local modifications.
2// http://software.schmorp.de/pkg/libptytty
3
1/*--------------------------------*-C-*---------------------------------* 4/*----------------------------------------------------------------------*
2 * File: ptytty.C 5 * File: ptytty.C
3 *----------------------------------------------------------------------* 6 *----------------------------------------------------------------------*
4 * 7 *
5 * All portions of code are copyright by their respective author/s. 8 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com> 9 * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
… …
19 * You should have received a copy of the GNU General Public License 22 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software 23 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 24 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *---------------------------------------------------------------------*/ 25 *---------------------------------------------------------------------*/
23 26
24#include "../config.h" /* NECESSARY */ 27#include "../config.h"
28
25#include "rxvt.h" 29#include "ptytty.h"
26 30
27#include <cstdlib> 31#include <cstdlib>
28#include <cstring> 32#include <cstring>
29 33
30#include <sys/types.h> 34#include <sys/types.h>
… …
33#include <fcntl.h> 37#include <fcntl.h>
34 38
35#ifdef HAVE_SYS_IOCTL_H 39#ifdef HAVE_SYS_IOCTL_H
36# include <sys/ioctl.h> 40# include <sys/ioctl.h>
37#endif 41#endif
38#if defined(PTYS_ARE_PTMX) && defined(HAVE_SYS_STROPTS_H) 42#if defined(HAVE_DEV_PTMX) && defined(HAVE_SYS_STROPTS_H)
39# include <sys/stropts.h> /* for I_PUSH */ 43# include <sys/stropts.h> /* for I_PUSH */
40#endif 44#endif
41#ifdef HAVE_ISASTREAM 45#ifdef HAVE_ISASTREAM
42# include <stropts.h> 46# include <stropts.h>
43#endif 47#endif
… …
46#elif defined(HAVE_LIBUTIL_H) 50#elif defined(HAVE_LIBUTIL_H)
47# include <libutil.h> 51# include <libutil.h>
48#elif defined(HAVE_UTIL_H) 52#elif defined(HAVE_UTIL_H)
49# include <util.h> 53# include <util.h>
50#endif 54#endif
55#ifdef TTY_GID_SUPPORT
56#include <grp.h>
57#endif
51 58
52#include <cstdio> 59#include <cstdio>
53#include <grp.h>
54
55#include "rxvtutil.h"
56#include "fdpass.h"
57#include "ptytty.h"
58 60
59///////////////////////////////////////////////////////////////////////////// 61/////////////////////////////////////////////////////////////////////////////
60 62
61/* ------------------------------------------------------------------------- * 63/* ------------------------------------------------------------------------- *
62 * GET PSEUDO TELETYPE - MASTER AND SLAVE * 64 * GET PSEUDO TELETYPE - MASTER AND SLAVE *
… …
64/* 66/*
65 * Returns pty file descriptor, or -1 on failure 67 * Returns pty file descriptor, or -1 on failure
66 * If successful, ttydev is set to the name of the slave device. 68 * If successful, ttydev is set to the name of the slave device.
67 * fd_tty _may_ also be set to an open fd to the slave device 69 * fd_tty _may_ also be set to an open fd to the slave device
68 */ 70 */
69static inline int 71#if defined(UNIX98_PTY)
72static int
70get_pty_streams (int *fd_tty, char **ttydev) 73get_pty (int *fd_tty, char **ttydev)
71{ 74{
72#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
73# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_POSIX) || defined(PTYS_ARE_PTMX)
74 int pfd; 75 int pfd;
75 76
76# if defined(PTYS_ARE_GETPT) 77# if defined(HAVE_GETPT)
77 pfd = getpt(); 78 pfd = getpt();
78# elif defined(PTYS_ARE_POSIX) 79# elif defined(HAVE_POSIX_OPENPT)
79 pfd = posix_openpt (O_RDWR); 80 pfd = posix_openpt (O_RDWR);
80# else 81# else
81 pfd = open ("/dev/ptmx", O_RDWR | O_NOCTTY, 0); 82 pfd = open (CLONE_DEVICE, O_RDWR | O_NOCTTY, 0);
82# endif 83# endif
83 if (pfd >= 0) 84 if (pfd >= 0)
84 { 85 {
85 if (grantpt (pfd) == 0 /* change slave permissions */ 86 if (grantpt (pfd) == 0 /* change slave permissions */
86 && unlockpt (pfd) == 0) 87 && unlockpt (pfd) == 0)
… …
89 return pfd; 90 return pfd;
90 } 91 }
91 92
92 close (pfd); 93 close (pfd);
93 } 94 }
94# endif
95#endif
96 95
97 return -1; 96 return -1;
98} 97}
99 98#elif defined(HAVE_OPENPTY)
100static inline int 99static int
101get_pty_openpty (int *fd_tty, char **ttydev) 100get_pty (int *fd_tty, char **ttydev)
102{ 101{
103#ifdef PTYS_ARE_OPENPTY
104 int pfd; 102 int pfd;
105 int res; 103 int res;
106 char tty_name[32]; 104 char tty_name[32];
107 105
108 res = openpty (&pfd, fd_tty, tty_name, NULL, NULL); 106 res = openpty (&pfd, fd_tty, tty_name, NULL, NULL);
109 if (res != -1) 107 if (res != -1)
110 { 108 {
111 *ttydev = strdup (tty_name); 109 *ttydev = strdup (tty_name);
112 return pfd; 110 return pfd;
113 } 111 }
114#endif
115 112
116 return -1; 113 return -1;
117} 114}
118 115#elif defined(HAVE__GETPTY)
119static inline int 116static int
120get_pty__getpty (int *fd_tty, char **ttydev) 117get_pty (int *fd_tty, char **ttydev)
121{ 118{
122#ifdef PTYS_ARE__GETPTY
123 int pfd; 119 int pfd;
124 120
125 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0); 121 *ttydev = _getpty (&pfd, O_RDWR | O_NONBLOCK | O_NOCTTY, 0622, 0);
126 if (*ttydev != NULL) 122 if (*ttydev != NULL)
127 return pfd; 123 return pfd;
128#endif
129 124
130 return -1; 125 return -1;
131} 126}
132 127#elif defined(HAVE_DEV_PTC)
133static inline int 128static int
134get_pty_ptc (int *fd_tty, char **ttydev) 129get_pty (int *fd_tty, char **ttydev)
135{ 130{
136#ifdef PTYS_ARE_PTC
137 int pfd; 131 int pfd;
138 132
139 if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0) 133 if ((pfd = open ("/dev/ptc", O_RDWR | O_NOCTTY, 0)) >= 0)
140 { 134 {
141 *ttydev = strdup (ttyname (pfd)); 135 *ttydev = strdup (ttyname (pfd));
142 return pfd; 136 return pfd;
143 } 137 }
144#endif
145 138
146 return -1; 139 return -1;
147} 140}
148 141#elif defined(HAVE_DEV_CLONE)
149static inline int 142static int
150get_pty_clone (int *fd_tty, char **ttydev) 143get_pty (int *fd_tty, char **ttydev)
151{ 144{
152#ifdef PTYS_ARE_CLONE
153 int pfd; 145 int pfd;
154 146
155 if ((pfd = open ("/dev/ptym/clone", O_RDWR | O_NOCTTY, 0)) >= 0) 147 if ((pfd = open ("/dev/ptym/clone", O_RDWR | O_NOCTTY, 0)) >= 0)
156 { 148 {
157 *ttydev = strdup (ptsname (pfd)); 149 *ttydev = strdup (ptsname (pfd));
158 return pfd; 150 return pfd;
159 } 151 }
160#endif
161 152
162 return -1; 153 return -1;
163} 154}
164 155#else
165static inline int 156/* Based on the code in openssh/openbsd-compat/bsd-openpty.c */
157static int
166get_pty_numeric (int *fd_tty, char **ttydev) 158get_pty (int *fd_tty, char **ttydev)
167{ 159{
168#ifdef PTYS_ARE_NUMERIC
169 int pfd; 160 int pfd;
170 int idx; 161 int i;
171 char *c1, *c2; 162 char pty_name[32];
172 char pty_name[] = "/dev/ptyp???"; 163 char tty_name[32];
173 char tty_name[] = "/dev/ttyp???"; 164 const char *majors = "pqrstuvwxyzabcde";
174 165 const char *minors = "0123456789abcdef";
175 c1 = &(pty_name[sizeof (pty_name) - 4]);
176 c2 = &(tty_name[sizeof (tty_name) - 4]);
177
178 for (idx = 0; idx < 256; idx++) 166 for (i = 0; i < 256; i++)
179 { 167 {
180 sprintf (c1, "%d", idx); 168 snprintf(pty_name, 32, "/dev/pty%c%c", majors[i / 16], minors[i % 16]);
181 sprintf (c2, "%d", idx); 169 snprintf(tty_name, 32, "/dev/tty%c%c", majors[i / 16], minors[i % 16]);
182
183 if (access (tty_name, F_OK) < 0)
184 {
185 idx = 256;
186 break;
187 }
188
189 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0) 170 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) == -1)
171 {
172 snprintf(pty_name, 32, "/dev/ptyp%d", i);
173 snprintf(tty_name, 32, "/dev/ttyp%d", i);
174 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) == -1)
175 continue;
190 { 176 }
191 if (access (tty_name, R_OK | W_OK) == 0) 177 if (access (tty_name, R_OK | W_OK) == 0)
192 { 178 {
193 *ttydev = strdup (tty_name); 179 *ttydev = strdup (tty_name);
194 return pfd; 180 return pfd;
195 } 181 }
196 182
197 close (pfd); 183 close (pfd);
198 }
199 } 184 }
200#endif
201
202 return -1;
203} 185}
204
205static inline int
206get_pty_searched (int *fd_tty, char **ttydev)
207{
208#ifdef PTYS_ARE_SEARCHED
209# ifndef PTYCHAR1
210# define PTYCHAR1 "pqrstuvwxyz"
211# endif 186#endif
212# ifndef PTYCHAR2
213# define PTYCHAR2 "0123456789abcdef"
214# endif
215 int pfd;
216 const char *c1, *c2;
217 char pty_name[] = "/dev/pty??";
218 char tty_name[] = "/dev/tty??";
219
220 for (c1 = PTYCHAR1; *c1; c1++)
221 {
222 pty_name[ (sizeof (pty_name) - 3)] =
223 tty_name[ (sizeof (pty_name) - 3)] = *c1;
224
225 for (c2 = PTYCHAR2; *c2; c2++)
226 {
227 pty_name[ (sizeof (pty_name) - 2)] =
228 tty_name[ (sizeof (pty_name) - 2)] = *c2;
229
230 if ((pfd = open (pty_name, O_RDWR | O_NOCTTY, 0)) >= 0)
231 {
232 if (access (tty_name, R_OK | W_OK) == 0)
233 {
234 *ttydev = strdup (tty_name);
235 return pfd;
236 }
237
238 close (pfd);
239 }
240 }
241 }
242#endif
243
244 return -1;
245}
246
247static int
248get_pty (int *fd_tty, char **ttydev)
249{
250 int pfd;
251
252 if ((pfd = get_pty_streams (fd_tty, ttydev)) != -1
253 || (pfd = get_pty_openpty (fd_tty, ttydev)) != -1
254 || (pfd = get_pty__getpty (fd_tty, ttydev)) != -1
255 || (pfd = get_pty_ptc (fd_tty, ttydev)) != -1
256 || (pfd = get_pty_clone (fd_tty, ttydev)) != -1
257 || (pfd = get_pty_numeric (fd_tty, ttydev)) != -1
258 || (pfd = get_pty_searched (fd_tty, ttydev)) != -1)
259 return pfd;
260
261 return -1;
262}
263 187
264/*----------------------------------------------------------------------*/ 188/*----------------------------------------------------------------------*/
265/* 189/*
266 * Returns tty file descriptor, or -1 on failure 190 * Returns tty file descriptor, or -1 on failure
267 */ 191 */
… …
278static int 202static int
279control_tty (int fd_tty) 203control_tty (int fd_tty)
280{ 204{
281 setsid (); 205 setsid ();
282 206
283#if defined(PTYS_ARE_PTMX) && defined(I_PUSH) 207#if defined(HAVE_DEV_PTMX) && defined(I_PUSH)
284 /* 208 /*
285 * Push STREAMS modules: 209 * Push STREAMS modules:
286 * ptem: pseudo-terminal hardware emulation module. 210 * ptem: pseudo-terminal hardware emulation module.
287 * ldterm: standard terminal line discipline. 211 * ldterm: standard terminal line discipline.
288 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module. 212 * ttcompat: V7, 4BSD and XENIX STREAMS compatibility module.
… …
310 234
311 ioctl (fd_tty, TIOCSCTTY, NULL); 235 ioctl (fd_tty, TIOCSCTTY, NULL);
312 236
313 int fd = open ("/dev/tty", O_WRONLY); 237 int fd = open ("/dev/tty", O_WRONLY);
314 if (fd < 0) 238 if (fd < 0)
315 return -1; /* fatal */ 239 return -1; /* fatal */
316 240
317 close (fd); 241 close (fd);
318 242
319 return 0; 243 return 0;
320} 244}
321 245
322void 246void
323rxvt_ptytty::close_tty () 247ptytty::close_tty ()
324{ 248{
325 if (tty < 0) 249 if (tty < 0)
326 return; 250 return;
327 251
328 close (tty); 252 close (tty);
329 tty = -1; 253 tty = -1;
330} 254}
331 255
332bool 256bool
333rxvt_ptytty::make_controlling_tty () 257ptytty::make_controlling_tty ()
334{ 258{
335 return control_tty (tty) >= 0; 259 return control_tty (tty) >= 0;
336} 260}
337 261
338void 262void
339rxvt_ptytty::set_utf8_mode (bool on) 263ptytty::set_utf8_mode (bool on)
340{ 264{
341#ifdef IUTF8 265#ifdef IUTF8
342 if (pty < 0) 266 if (pty < 0)
343 return; 267 return;
344 268
… …
383 gid = 0; 307 gid = 0;
384 } 308 }
385 } 309 }
386} ttyconf; 310} ttyconf;
387 311
388rxvt_ptytty_unix::rxvt_ptytty_unix () 312ptytty_unix::ptytty_unix ()
389{ 313{
390 pty = tty = -1;
391 name = 0; 314 name = 0;
392#if UTMP_SUPPORT 315#if UTMP_SUPPORT
393 cmd_pid = 0; 316 cmd_pid = 0;
394#endif 317#endif
395} 318}
396 319
397rxvt_ptytty_unix::~rxvt_ptytty_unix () 320ptytty_unix::~ptytty_unix ()
398{ 321{
399#if UTMP_SUPPORT 322#if UTMP_SUPPORT
400 logout (); 323 logout ();
401#endif 324#endif
402 put (); 325 put ();
403} 326}
404 327
405void 328void
406rxvt_ptytty_unix::put () 329ptytty_unix::put ()
407{ 330{
408 chmod (name, RESTORE_TTY_MODE); 331 chmod (name, RESTORE_TTY_MODE);
409 chown (name, 0, ttyconf.gid); 332 chown (name, 0, ttyconf.gid);
410 333
411 close_tty (); 334 close_tty ();
… …
418 pty = tty = -1; 341 pty = tty = -1;
419 name = 0; 342 name = 0;
420} 343}
421 344
422bool 345bool
423rxvt_ptytty_unix::get () 346ptytty_unix::get ()
424{ 347{
425 /* get master (pty) */ 348 /* get master (pty) */
426 if ((pty = get_pty (&tty, &name)) < 0) 349 if ((pty = get_pty (&tty, &name)) < 0)
427 return false; 350 return false;
428 351
… …
449 return true; 372 return true;
450} 373}
451 374
452#if PTYTTY_HELPER 375#if PTYTTY_HELPER
453 376
454static int sock_fd; 377static int sock_fd = -1;
455static int pid; 378static int helper_pid, owner_pid;
456 379
457struct command 380struct command
458{ 381{
459 enum { get, login, destroy } type; 382 enum { get, login, destroy } type;
460 383
461 rxvt_ptytty *id; 384 ptytty *id;
462 385
463 bool login_shell; 386 bool login_shell;
464 int cmd_pid; 387 int cmd_pid;
465 char hostname[512]; // arbitrary, but should be plenty 388 char hostname[512]; // arbitrary, but should be plenty
466}; 389};
467 390
468struct rxvt_ptytty_proxy : zero_initialized, rxvt_ptytty 391struct ptytty_proxy : ptytty
469{ 392{
470 rxvt_ptytty *id; 393 ptytty *id;
471 394
395 ptytty_proxy ()
396 : id(0)
397 {
398 }
399
472 ~rxvt_ptytty_proxy (); 400 ~ptytty_proxy ();
473 401
474 bool get (); 402 bool get ();
475 void login (int cmd_pid, bool login_shell, const char *hostname); 403 void login (int cmd_pid, bool login_shell, const char *hostname);
476}; 404};
477 405
478bool 406bool
479rxvt_ptytty_proxy::get () 407ptytty_proxy::get ()
480{ 408{
481 command cmd; 409 command cmd;
482 410
483 cmd.type = command::get; 411 cmd.type = command::get;
484 412
485 write (sock_fd, &cmd, sizeof (cmd)); 413 write (sock_fd, &cmd, sizeof (cmd));
486 414
487 if (read (sock_fd, &id, sizeof (id)) != sizeof (id)) 415 if (read (sock_fd, &id, sizeof (id)) != sizeof (id))
488 rxvt_fatal ("protocol error while creating pty using helper process, aborting.\n"); 416 ptytty_fatal ("protocol error while creating pty using helper process, aborting.\n");
489 417
490 if (!id) 418 if (!id)
491 return false; 419 return false;
492 420
493 if ((pty = rxvt_recv_fd (sock_fd)) < 0 421 if ((pty = recv_fd (sock_fd)) < 0
494 || (tty = rxvt_recv_fd (sock_fd)) < 0) 422 || (tty = recv_fd (sock_fd)) < 0)
495 rxvt_fatal ("protocol error while reading pty/tty fds from helper process, aborting.\n"); 423 ptytty_fatal ("protocol error while reading pty/tty fds from helper process, aborting.\n");
496 424
497 return true; 425 return true;
498} 426}
499 427
500void 428void
501rxvt_ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname) 429ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname)
502{ 430{
503 command cmd; 431 command cmd;
504 432
505 cmd.type = command::login; 433 cmd.type = command::login;
506 cmd.id = id; 434 cmd.id = id;
… …
509 strncpy (cmd.hostname, hostname, sizeof (cmd.hostname)); 437 strncpy (cmd.hostname, hostname, sizeof (cmd.hostname));
510 438
511 write (sock_fd, &cmd, sizeof (cmd)); 439 write (sock_fd, &cmd, sizeof (cmd));
512} 440}
513 441
514rxvt_ptytty_proxy::~rxvt_ptytty_proxy () 442ptytty_proxy::~ptytty_proxy ()
515{ 443{
444 if (id)
445 {
516 command cmd; 446 command cmd;
517 447
518 cmd.type = command::destroy; 448 cmd.type = command::destroy;
519 cmd.id = id; 449 cmd.id = id;
520 450
521 write (sock_fd, &cmd, sizeof (cmd)); 451 write (sock_fd, &cmd, sizeof (cmd));
452 }
522} 453}
523 454
524static 455static
525void serve () 456void serve ()
526{ 457{
527 command cmd; 458 command cmd;
528 vector<rxvt_ptytty *> ptys; 459 vector<ptytty *> ptys;
529 460
530 while (read (sock_fd, &cmd, sizeof (command)) == sizeof (command)) 461 while (read (sock_fd, &cmd, sizeof (command)) == sizeof (command))
531 { 462 {
532 if (cmd.type == command::get) 463 if (cmd.type == command::get)
533 { 464 {
534 // -> id ptyfd ttyfd 465 // -> id ptyfd ttyfd
535 cmd.id = new rxvt_ptytty_unix; 466 cmd.id = new ptytty_unix;
536 467
537 if (cmd.id->get ()) 468 if (cmd.id->get ())
538 { 469 {
539 write (sock_fd, &cmd.id, sizeof (cmd.id)); 470 write (sock_fd, &cmd.id, sizeof (cmd.id));
540 ptys.push_back (cmd.id); 471 ptys.push_back (cmd.id);
541 472
542 rxvt_send_fd (sock_fd, cmd.id->pty); 473 ptytty::send_fd (sock_fd, cmd.id->pty);
543 rxvt_send_fd (sock_fd, cmd.id->tty); 474 ptytty::send_fd (sock_fd, cmd.id->tty);
544 } 475 }
545 else 476 else
546 { 477 {
547 delete cmd.id; 478 delete cmd.id;
548 cmd.id = 0; 479 cmd.id = 0;
… …
559 } 490 }
560#endif 491#endif
561 } 492 }
562 else if (cmd.type == command::destroy) 493 else if (cmd.type == command::destroy)
563 { 494 {
564 rxvt_ptytty **pty = find (ptys.begin (), ptys.end (), cmd.id); 495 vector<ptytty *>::iterator pty = find (ptys.begin (), ptys.end (), cmd.id);
565 496
566 if (pty) 497 if (pty != ptys.end ())
567 { 498 {
568 delete *pty; 499 delete *pty;
569 ptys.erase (pty); 500 ptys.erase (pty);
570 } 501 }
571 } 502 }
572 else 503 else
573 break; 504 break;
574 } 505 }
575 506
576 // destroy all ptys 507 // destroy all ptys
577 for (rxvt_ptytty **i = ptys.end (); i-- > ptys.begin (); ) 508 for (vector<ptytty *>::iterator i = ptys.end (); i-- > ptys.begin (); )
578 delete *i; 509 delete *i;
579} 510}
580 511
581void rxvt_ptytty_server () 512void
513ptytty::use_helper ()
582{ 514{
515 int pid = getpid ();
516
517 if (sock_fd >= 0 && pid == owner_pid)
518 return;
519
520 owner_pid = pid;
521
583 int sv[2]; 522 int sv[2];
584 523
585 if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv)) 524 if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv))
586 rxvt_fatal ("could not create socket to communicate with pty/sessiondb helper, aborting.\n"); 525 ptytty_fatal ("could not create socket to communicate with pty/sessiondb helper, aborting.\n");
587 526
588 pid = fork (); 527 helper_pid = fork ();
589 528
590 if (pid < 0) 529 if (helper_pid < 0)
591 rxvt_fatal ("could not create pty/sessiondb helper process, aborting.\n"); 530 ptytty_fatal ("could not create pty/sessiondb helper process, aborting.\n");
592 531
593 if (pid) 532 if (helper_pid)
594 { 533 {
595 // client, urxvt 534 // client, process
596 sock_fd = sv[0]; 535 sock_fd = sv[0];
597 close (sv[1]); 536 close (sv[1]);
598 fcntl (sock_fd, F_SETFD, FD_CLOEXEC); 537 fcntl (sock_fd, F_SETFD, FD_CLOEXEC);
599 } 538 }
600 else 539 else
601 { 540 {
602 // server, pty-helper 541 // server, pty-helper
603 sock_fd = sv[1]; 542 sock_fd = sv[1];
604 543
544 chdir ("/");
545
605 for (int fd = 0; fd < 1023; fd++) 546 for (int fd = 0; fd < 1023; fd++)
606 if (fd != sock_fd) 547 if (fd != sock_fd)
607 close (fd); 548 close (fd);
608 549
609 serve (); 550 serve ();
… …
611 } 552 }
612} 553}
613 554
614#endif 555#endif
615 556
616// a "factory" *g*
617rxvt_ptytty * 557ptytty *
618rxvt_new_ptytty () 558ptytty::create ()
619{ 559{
620#if PTYTTY_HELPER 560#if PTYTTY_HELPER
621 if (pid > 0) 561 if (helper_pid && getpid () == owner_pid)
622 // use helper process 562 // use helper process
623 return new rxvt_ptytty_proxy; 563 return new ptytty_proxy;
624 else 564 else
625#endif 565#endif
626 return new rxvt_ptytty_unix; 566 return new ptytty_unix;
627} 567}
628 568
629/*----------------------- end-of-file (C source) -----------------------*/ 569void
570ptytty::init ()
571{
572 uid_t uid = getuid ();
573 gid_t gid = getgid ();
574
575 // before doing anything else, check for setuid/setgid operation,
576 // start the helper process and drop privileges
577 if (uid != geteuid ()
578 || gid != getegid ())
579 {
580#if PTYTTY_HELPER
581 use_helper ();
582#else
583 ptytty_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
584#endif
630 585
586 drop_privileges ();
587 }
588}
589
590void
591ptytty::drop_privileges ()
592{
593 uid_t uid = getuid ();
594 gid_t gid = getgid ();
595
596 // drop privileges
597#if HAVE_SETRESUID
598 setresgid (gid, gid, gid);
599 setresuid (uid, uid, uid);
600#elif HAVE_SETREUID
601 setregid (gid, gid);
602 setreuid (uid, uid);
603#elif HAVE_SETUID
604 setgid (gid);
605 setuid (uid);
606#endif
607
608 if (uid != geteuid ()
609 || gid != getegid ())
610 ptytty_fatal ("unable to drop privileges, aborting.\n");
611}
612

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines