xterm.patch 1.7 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273
  1. Index: main.c
  2. --- main.c.orig 2005-09-19 01:48:12 +0200
  3. +++ main.c 2005-09-28 16:39:42 +0200
  4. @@ -379,14 +379,6 @@
  5. #include <util.h>
  6. #endif
  7. -#ifdef __FreeBSD__
  8. -#include <sys/types.h>
  9. -#include <sys/ioctl.h>
  10. -#include <termios.h>
  11. -#include <libutil.h>
  12. -#include <grp.h>
  13. -#endif
  14. -
  15. #if !defined(UTMP_FILENAME)
  16. #if defined(UTMP_FILE)
  17. #define UTMP_FILENAME UTMP_FILE
  18. @@ -472,7 +464,7 @@
  19. static Bool added_utmp_entry = False;
  20. -#if defined(__OpenBSD__) || defined(__FreeBSD__)
  21. +#if defined(__OpenBSD__)
  22. static gid_t utmpGid = -1;
  23. #endif
  24. @@ -1606,7 +1598,7 @@
  25. strcpy(ptydev, PTYDEV);
  26. #endif
  27. -#if defined(__OpenBSD__) || defined(__FreeBSD__)
  28. +#if defined(__OpenBSD__)
  29. get_pty(NULL, NULL);
  30. seteuid(getuid());
  31. setuid(getuid());
  32. @@ -1944,7 +1936,7 @@
  33. }
  34. #endif
  35. -#if defined(__OpenBSD__) || defined(__FreeBSD__)
  36. +#if defined(__OpenBSD__)
  37. if (resource.utmpInhibit) {
  38. /* Can totally revoke group privs */
  39. setegid(getgid());
  40. @@ -2354,7 +2346,7 @@
  41. {
  42. int result = 1;
  43. -#if defined(__OpenBSD__) || defined(__FreeBSD__)
  44. +#if defined(__OpenBSD__)
  45. static int m_tty = -1;
  46. static int m_pty = -1;
  47. struct group *ttygrp;
  48. @@ -4061,7 +4053,7 @@
  49. }
  50. #endif /* USE_LASTLOG */
  51. -#if defined(__OpenBSD__) || defined(__FreeBSD__)
  52. +#if defined(__OpenBSD__)
  53. /* Switch to real gid after writing utmp entry */
  54. utmpGid = getegid();
  55. if (getgid() != getegid()) {
  56. @@ -4436,7 +4428,7 @@
  57. && (resource.ptyHandshake && added_utmp_entry)
  58. #endif /* OPT_PTY_HANDSHAKE */
  59. ) {
  60. -#if defined(__OpenBSD__) || defined(__FreeBSD__)
  61. +#if defined(__OpenBSD__)
  62. if (utmpGid != -1) {
  63. /* Switch back to group utmp */
  64. setegid(utmpGid);