* New upstream release (closes: #395507, #397961, #420035). Important

  changes not previously backported to 4.3p2:
  - 4.4/4.4p1 (http://www.openssh.org/txt/release-4.4):
    + On portable OpenSSH, fix a GSSAPI authentication abort that could be
      used to determine the validity of usernames on some platforms.
    + Implemented conditional configuration in sshd_config(5) using the
      "Match" directive. This allows some configuration options to be
      selectively overridden if specific criteria (based on user, group,
      hostname and/or address) are met. So far a useful subset of
      post-authentication options are supported and more are expected to
      be added in future releases.
    + Add support for Diffie-Hellman group exchange key agreement with a
      final hash of SHA256.
    + Added a "ForceCommand" directive to sshd_config(5). Similar to the
      command="..." option accepted in ~/.ssh/authorized_keys, this forces
      the execution of the specified command regardless of what the user
      requested. This is very useful in conjunction with the new "Match"
      option.
    + Add a "PermitOpen" directive to sshd_config(5). This mirrors the
      permitopen="..." authorized_keys option, allowing fine-grained
      control over the port-forwardings that a user is allowed to
      establish.
    + Add optional logging of transactions to sftp-server(8).
    + ssh(1) will now record port numbers for hosts stored in
      ~/.ssh/known_hosts when a non-standard port has been requested
      (closes: #50612).
    + Add an "ExitOnForwardFailure" option to cause ssh(1) to exit (with a
      non-zero exit code) when requested port forwardings could not be
      established.
    + Extend sshd_config(5) "SubSystem" declarations to allow the
      specification of command-line arguments.
    + Replacement of all integer overflow susceptible invocations of
      malloc(3) and realloc(3) with overflow-checking equivalents.
    + Many manpage fixes and improvements.
    + Add optional support for OpenSSL hardware accelerators (engines),
      enabled using the --with-ssl-engine configure option.
    + Tokens in configuration files may be double-quoted in order to
      contain spaces (closes: #319639).
    + Move a debug() call out of a SIGCHLD handler, fixing a hang when the
      session exits very quickly (closes: #307890).
    + Fix some incorrect buffer allocation calculations (closes: #410599).
    + ssh-add doesn't ask for a passphrase if key file permissions are too
      liberal (closes: #103677).
    + Likewise, ssh doesn't ask either (closes: #99675).
  - 4.6/4.6p1 (http://www.openssh.org/txt/release-4.6):
    + sshd now allows the enabling and disabling of authentication methods
      on a per user, group, host and network basis via the Match directive
      in sshd_config.
    + Fixed an inconsistent check for a terminal when displaying scp
      progress meter (closes: #257524).
    + Fix "hang on exit" when background processes are running at the time
      of exit on a ttyful/login session (closes: #88337).
* Update to current GSSAPI patch from
  http://www.sxw.org.uk/computing/patches/openssh-4.6p1-gsskex-20070312.patch;
  install ChangeLog.gssapi.

1 files changed, 0 insertions, 95 deletions

diff --git a/selinux.c b/selinux.c
deleted file mode 100644
index 2811a9b80..000000000
--- a/selinux.c
+++ /dev/null
@@ -1,95 +0,0 @@
-#include "includes.h"
-#include "auth.h"
-#include "log.h"
-
-#ifdef WITH_SELINUX
-#include <selinux/selinux.h>
-#include <selinux/flask.h>
-#include <selinux/context.h>
-#include <selinux/get_context_list.h>
-#include <selinux/get_default_type.h>
-
-extern Authctxt *the_authctxt;
-
-static const security_context_t 
-selinux_get_user_context(const char *name)
-{
-        security_context_t user_context=NULL;
-        char *role=NULL;
-        int ret = -1;
-        char *seuser=NULL;
-        char *level=NULL;
-
-        if (the_authctxt) 
-          role=the_authctxt->role;
-        if (getseuserbyname(name, &seuser, &level)==0) {
-          if (role != NULL && role[0])
-            ret=get_default_context_with_rolelevel(seuser, role, level,NULL,
-                                                   &user_context);
-          else
-            ret=get_default_context_with_level(seuser, level, NULL,&user_context);
-        }
-        if ( ret < 0 ) {
-          if (security_getenforce() > 0)
-            fatal("Failed to get default security context for %s.",
-                  name);
-          else
-            error("Failed to get default security context for %s."
-                  "Continuing in permissive mode",
-                  name);
-        }
-        return user_context;
-}
-
-void 
-setup_selinux_pty(const char *name, const char *tty)
-{
-  if (is_selinux_enabled() > 0) {
-    security_context_t new_tty_context=NULL, user_context=NULL, old_tty_context=NULL;
-
-    user_context=selinux_get_user_context(name);
-
-    if (getfilecon(tty, &old_tty_context) < 0) {
-      error("getfilecon(%.100s) failed: %.100s",
-            tty, strerror(errno));
-    } else {
-      if (security_compute_relabel(user_context,old_tty_context,
-                                   SECCLASS_CHR_FILE, &new_tty_context) != 0) {
-        error("security_compute_relabel(%.100s) failed: "
-              "%.100s", tty, strerror(errno));
-      } else {
-        if (setfilecon (tty, new_tty_context) != 0)
-          error("setfilecon(%.100s, %s) failed: %.100s",
-                tty, new_tty_context, strerror(errno));
-        freecon(new_tty_context);
-      }
-      freecon(old_tty_context);
-    }
-    if (user_context) {
-      freecon(user_context);
-    }
-  }
-}
-
-void 
-setup_selinux_exec_context(char *name)
-{
-
-  if (is_selinux_enabled() > 0) {
-    security_context_t user_context=selinux_get_user_context(name);
-    if (setexeccon(user_context)) {
-      if (security_getenforce() > 0)
-        fatal("Failed to set exec security context %s for %s.",
-              user_context, name);
-      else
-        error("Failed to set exec security context %s for %s. "
-              "Continuing in permissive mode",
-              user_context, name);
-    }
-    if (user_context) {
-      freecon(user_context);
-    }
-  }
-}
-
-#endif /* WITH_SELINUX */