summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc/openssh/files/openssh-3.7.1_p1-selinux.diff')
-rw-r--r--net-misc/openssh/files/openssh-3.7.1_p1-selinux.diff14
1 files changed, 7 insertions, 7 deletions
diff --git a/net-misc/openssh/files/openssh-3.7.1_p1-selinux.diff b/net-misc/openssh/files/openssh-3.7.1_p1-selinux.diff
index 97bcc75f95b1..7a97fe7f877a 100644
--- a/net-misc/openssh/files/openssh-3.7.1_p1-selinux.diff
+++ b/net-misc/openssh/files/openssh-3.7.1_p1-selinux.diff
@@ -57,19 +57,19 @@ diff -urN openssh-3.7.1p1.orig/session.c openssh-3.7.1p1/session.c
diff -urN openssh-3.7.1p1.orig/sshpty.c openssh-3.7.1p1/sshpty.c
--- openssh-3.7.1p1.orig/sshpty.c 2003-08-24 20:16:21.000000000 -0500
+++ openssh-3.7.1p1/sshpty.c 2003-09-19 19:08:04.000000000 -0500
-@@ -22,6 +22,12 @@
- #include "log.h"
- #include "misc.h"
-
+@@ -30,6 +30,12 @@
+ #define O_NOCTTY 0
+ #endif
+
+#ifdef WITH_SELINUX
+#include <selinux/flask.h>
+#include <selinux/get_context_list.h>
+#include <selinux/selinux.h>
+#endif
+
- /* Pty allocated with _getpty gets broken if we do I_PUSH:es to it. */
- #if defined(HAVE__GETPTY) || defined(HAVE_OPENPTY)
- #undef HAVE_DEV_PTMX
+ /*
+ * Allocates and opens a pty. Returns 0 if no pty could be allocated, or
+ * nonzero if a pty was successfully allocated. On success, open file
@@ -386,6 +392,37 @@
* Warn but continue if filesystem is read-only and the uids match/
* tty is owned by root.