Resurrect the patch to sudosh.c to fix a pty issue.

2 files changed, 258 insertions, 0 deletions

diff --git a/security/sudosh2/files/patch-src::sudosh.c b/security/sudosh2/files/patch-src::sudosh.c
new file mode 100644
index 000000000000..0c79a345cfc4
--- /dev/null
+++ b/security/sudosh2/files/patch-src::sudosh.c
@@ -0,0 +1,129 @@
+--- src/sudosh.c.orig	Sun Jun 12 19:35:07 2005
++++ src/sudosh.c	Fri Jan  5 14:14:05 2007
+@@ -28,6 +28,13 @@
+ 
+ #define WRITE(a, b, c) do_write(a, b, c, __FILE__, __LINE__)
+ 
++#ifdef __FreeBSD__
++#include <sys/types.h>
++#include <sys/ioctl.h>
++#include <libutil.h>
++#include <sys/param.h>
++#endif
++
+ static struct termios termorig;
+ static struct winsize winorig;
+ 
+@@ -545,19 +552,43 @@
+ {
+   char *sname;
+ 
++#ifdef __FreeBSD__
++#define PTYLEN        16
++  char sname_area[PTYLEN];
++  struct termios tt;
++  struct winsize win;
++
++  sname = sname_area;
++  if (tcgetattr(STDIN_FILENO, &tt) == -1)
++    {
++      perror ("tcgetattr");
++      return -1;
++    }
++  if (ioctl(STDIN_FILENO, TIOCGWINSZ, &win) == -1)
++    {
++      perror ("ioctl");
++      return -1;
++    }
++    if (openpty(&p->mfd, &p->sfd, sname, &tt, &win) == -1) {
++#else
+   if ((p->mfd = open ("/dev/ptmx", O_RDWR)) == -1)
+     {
+       if ((p->mfd = open ("/dev/ptc", O_RDWR)) == -1)
+ 	{
++#endif
+ 	  perror ("Cannot open cloning master pty");
+ 	  return -1;
++#ifndef __FreeBSD__
+ 	}
++#endif
+     }
+ 
++#if !defined(__FreeBSD_version) || (defined(__FreeBSD_version) && __FreeBSD_version >= 500000)
+   (void) unlockpt (p->mfd);
+   (void) grantpt (p->mfd);
+ 
+   sname = (char *) ptsname (p->mfd);
++#endif
+ 
+   if ((p->sfd = open (sname, O_RDWR)) == -1)
+     {
+@@ -619,9 +650,14 @@
+   for (i = 3; i < 100; ++i)
+     close (i);
+ 
++#ifdef __FreeBSD__
++  (void) tcsetattr(0, TCSADRAIN, &termorig);
++  (void) login_tty(pst->sfd);
++#else
+ #ifdef TCSETS
+   (void) ioctl (0, TCSETS, &termorig);
+ #endif
++#endif
+   (void) ioctl (0, TIOCSWINSZ, &winorig);
+ 
+   setuid (getuid ());
+@@ -663,6 +699,13 @@
+ {
+   static struct termios termnew;
+ 
++#ifdef __FreeBSD__
++  if (tcgetattr(ttyfd, &termorig) == -1)
++    {
++      perror ("tcgetattr failed");
++      exit (EXIT_FAILURE);
++    }
++#else
+ #ifdef TCGETS
+   if (ioctl (ttyfd, TCGETS, &termorig) == -1)
+     {
+@@ -670,6 +713,7 @@
+       exit (EXIT_FAILURE);
+     }
+ #endif
++#endif
+ 
+   if (ioctl (ttyfd, TIOCGWINSZ, &winorig) == -1)
+     {
+@@ -677,6 +721,11 @@
+       exit (EXIT_FAILURE);
+     }
+ 
++#ifdef __FreeBSD__
++  (void) cfmakeraw(&termnew);
++  termnew.c_lflag &= ~ECHO;
++  (void) tcsetattr(ttyfd, TCSAFLUSH, &termnew);
++#else
+   termnew.c_cc[VEOF] = 1;
+   termnew.c_iflag = BRKINT | ISTRIP | IXON | IXANY;
+   termnew.c_oflag = 0;
+@@ -686,13 +735,19 @@
+ #ifdef TCSETS
+   (void) ioctl (ttyfd, TCSETS, &termnew);
+ #endif
++#endif
+ }
+ 
+ static void
+ bye (int signum)
+ {
++
++#ifdef __FreeBSD__
++  (void) tcsetattr(0, TCSADRAIN, &termorig);
++#else
+ #ifdef TCSETS
+   (void) ioctl (0, TCSETS, &termorig);
++#endif
+ #endif
+ 
+   close (timing.fd);
diff --git a/security/sudosh3/files/patch-src::sudosh.c b/security/sudosh3/files/patch-src::sudosh.c
new file mode 100644
index 000000000000..0c79a345cfc4
--- /dev/null
+++ b/security/sudosh3/files/patch-src::sudosh.c
@@ -0,0 +1,129 @@
+--- src/sudosh.c.orig	Sun Jun 12 19:35:07 2005
++++ src/sudosh.c	Fri Jan  5 14:14:05 2007
+@@ -28,6 +28,13 @@
+ 
+ #define WRITE(a, b, c) do_write(a, b, c, __FILE__, __LINE__)
+ 
++#ifdef __FreeBSD__
++#include <sys/types.h>
++#include <sys/ioctl.h>
++#include <libutil.h>
++#include <sys/param.h>
++#endif
++
+ static struct termios termorig;
+ static struct winsize winorig;
+ 
+@@ -545,19 +552,43 @@
+ {
+   char *sname;
+ 
++#ifdef __FreeBSD__
++#define PTYLEN        16
++  char sname_area[PTYLEN];
++  struct termios tt;
++  struct winsize win;
++
++  sname = sname_area;
++  if (tcgetattr(STDIN_FILENO, &tt) == -1)
++    {
++      perror ("tcgetattr");
++      return -1;
++    }
++  if (ioctl(STDIN_FILENO, TIOCGWINSZ, &win) == -1)
++    {
++      perror ("ioctl");
++      return -1;
++    }
++    if (openpty(&p->mfd, &p->sfd, sname, &tt, &win) == -1) {
++#else
+   if ((p->mfd = open ("/dev/ptmx", O_RDWR)) == -1)
+     {
+       if ((p->mfd = open ("/dev/ptc", O_RDWR)) == -1)
+ 	{
++#endif
+ 	  perror ("Cannot open cloning master pty");
+ 	  return -1;
++#ifndef __FreeBSD__
+ 	}
++#endif
+     }
+ 
++#if !defined(__FreeBSD_version) || (defined(__FreeBSD_version) && __FreeBSD_version >= 500000)
+   (void) unlockpt (p->mfd);
+   (void) grantpt (p->mfd);
+ 
+   sname = (char *) ptsname (p->mfd);
++#endif
+ 
+   if ((p->sfd = open (sname, O_RDWR)) == -1)
+     {
+@@ -619,9 +650,14 @@
+   for (i = 3; i < 100; ++i)
+     close (i);
+ 
++#ifdef __FreeBSD__
++  (void) tcsetattr(0, TCSADRAIN, &termorig);
++  (void) login_tty(pst->sfd);
++#else
+ #ifdef TCSETS
+   (void) ioctl (0, TCSETS, &termorig);
+ #endif
++#endif
+   (void) ioctl (0, TIOCSWINSZ, &winorig);
+ 
+   setuid (getuid ());
+@@ -663,6 +699,13 @@
+ {
+   static struct termios termnew;
+ 
++#ifdef __FreeBSD__
++  if (tcgetattr(ttyfd, &termorig) == -1)
++    {
++      perror ("tcgetattr failed");
++      exit (EXIT_FAILURE);
++    }
++#else
+ #ifdef TCGETS
+   if (ioctl (ttyfd, TCGETS, &termorig) == -1)
+     {
+@@ -670,6 +713,7 @@
+       exit (EXIT_FAILURE);
+     }
+ #endif
++#endif
+ 
+   if (ioctl (ttyfd, TIOCGWINSZ, &winorig) == -1)
+     {
+@@ -677,6 +721,11 @@
+       exit (EXIT_FAILURE);
+     }
+ 
++#ifdef __FreeBSD__
++  (void) cfmakeraw(&termnew);
++  termnew.c_lflag &= ~ECHO;
++  (void) tcsetattr(ttyfd, TCSAFLUSH, &termnew);
++#else
+   termnew.c_cc[VEOF] = 1;
+   termnew.c_iflag = BRKINT | ISTRIP | IXON | IXANY;
+   termnew.c_oflag = 0;
+@@ -686,13 +735,19 @@
+ #ifdef TCSETS
+   (void) ioctl (ttyfd, TCSETS, &termnew);
+ #endif
++#endif
+ }
+ 
+ static void
+ bye (int signum)
+ {
++
++#ifdef __FreeBSD__
++  (void) tcsetattr(0, TCSADRAIN, &termorig);
++#else
+ #ifdef TCSETS
+   (void) ioctl (0, TCSETS, &termorig);
++#endif
+ #endif
+ 
+   close (timing.fd);