1 files changed, 26 insertions, 26 deletions

diff --git a/debian/patches/selinux-role.patch b/debian/patches/selinux-role.patch
index fea289291..bcb61480d 100644
--- a/debian/patches/selinux-role.patch
+++ b/debian/patches/selinux-role.patch
@@ -1,4 +1,4 @@
-From 206bdbf6bcc95e589effa11695aff2c6b9327e11 Mon Sep 17 00:00:00 2001
+From 7a7851c903e5dbb58a85014deb2c88cb718068c9 Mon Sep 17 00:00:00 2001
 From: Manoj Srivastava <srivasta@debian.org>
 Date: Sun, 9 Feb 2014 16:09:49 +0000
 Subject: Handle SELinux authorisation roles
@@ -32,7 +32,7 @@ Patch-Name: selinux-role.patch
  16 files changed, 104 insertions(+), 31 deletions(-)
 
 diff --git a/auth.h b/auth.h
-index 2160154..3b3a085 100644
+index 55170af..50baeaa 100644
 --- a/auth.h
 +++ b/auth.h
 @@ -62,6 +62,7 @@ struct Authctxt {
@@ -75,7 +75,7 @@ index 5073c49..dd00648 100644
         /* Verify that the user is a valid user. */
         if ((authctxt->pw = PRIVSEP(getpwnamallow(user))) != NULL)
 diff --git a/auth2.c b/auth2.c
-index 3f49bdc..6eb3cc7 100644
+index ce0d376..461311b 100644
 --- a/auth2.c
 +++ b/auth2.c
 @@ -216,7 +216,7 @@ input_userauth_request(int type, u_int32_t seq, void *ctxt)
@@ -113,10 +113,10 @@ index 3f49bdc..6eb3cc7 100644
                 if (auth2_setup_methods_lists(authctxt) != 0)
                         packet_disconnect("no authentication methods enabled");
 diff --git a/monitor.c b/monitor.c
-index 6c82023..5be3fbf 100644
+index 05bb48a..e91054e 100644
 --- a/monitor.c
 +++ b/monitor.c
-@@ -126,6 +126,7 @@ int mm_answer_sign(int, Buffer *);
+@@ -128,6 +128,7 @@ int mm_answer_sign(int, Buffer *);
  int mm_answer_pwnamallow(int, Buffer *);
  int mm_answer_auth2_read_banner(int, Buffer *);
  int mm_answer_authserv(int, Buffer *);
@@ -124,7 +124,7 @@ index 6c82023..5be3fbf 100644
  int mm_answer_authpassword(int, Buffer *);
  int mm_answer_bsdauthquery(int, Buffer *);
  int mm_answer_bsdauthrespond(int, Buffer *);
-@@ -207,6 +208,7 @@ struct mon_table mon_dispatch_proto20[] = {
+@@ -209,6 +210,7 @@ struct mon_table mon_dispatch_proto20[] = {
      {MONITOR_REQ_SIGN, MON_ONCE, mm_answer_sign},
      {MONITOR_REQ_PWNAM, MON_ONCE, mm_answer_pwnamallow},
      {MONITOR_REQ_AUTHSERV, MON_ONCE, mm_answer_authserv},
@@ -132,7 +132,7 @@ index 6c82023..5be3fbf 100644
      {MONITOR_REQ_AUTH2_READ_BANNER, MON_ONCE, mm_answer_auth2_read_banner},
      {MONITOR_REQ_AUTHPASSWORD, MON_AUTH, mm_answer_authpassword},
  #ifdef USE_PAM
-@@ -875,6 +877,7 @@ mm_answer_pwnamallow(int sock, Buffer *m)
+@@ -880,6 +882,7 @@ mm_answer_pwnamallow(int sock, Buffer *m)
         else {
                 /* Allow service/style information on the auth context */
                 monitor_permit(mon_dispatch, MONITOR_REQ_AUTHSERV, 1);
@@ -140,7 +140,7 @@ index 6c82023..5be3fbf 100644
                 monitor_permit(mon_dispatch, MONITOR_REQ_AUTH2_READ_BANNER, 1);
         }
  #ifdef USE_PAM
-@@ -905,14 +908,37 @@ mm_answer_authserv(int sock, Buffer *m)
+@@ -910,14 +913,37 @@ mm_answer_authserv(int sock, Buffer *m)
  
         authctxt->service = buffer_get_string(m, NULL);
         authctxt->style = buffer_get_string(m, NULL);
@@ -180,7 +180,7 @@ index 6c82023..5be3fbf 100644
         return (0);
  }
  
-@@ -1541,7 +1567,7 @@ mm_answer_pty(int sock, Buffer *m)
+@@ -1553,7 +1579,7 @@ mm_answer_pty(int sock, Buffer *m)
         res = pty_allocate(&s->ptyfd, &s->ttyfd, s->tty, sizeof(s->tty));
         if (res == 0)
                 goto error;
@@ -203,10 +203,10 @@ index bc50ade..2d82b8b 100644
  
  struct mm_master;
 diff --git a/monitor_wrap.c b/monitor_wrap.c
-index 74fbd2e..eaf0a12 100644
+index 5a9f1b5..11e3a69 100644
 --- a/monitor_wrap.c
 +++ b/monitor_wrap.c
-@@ -327,10 +327,10 @@ mm_auth2_read_banner(void)
+@@ -328,10 +328,10 @@ mm_auth2_read_banner(void)
         return (banner);
  }
  
@@ -219,7 +219,7 @@ index 74fbd2e..eaf0a12 100644
  {
         Buffer m;
  
-@@ -339,12 +339,30 @@ mm_inform_authserv(char *service, char *style)
+@@ -340,12 +340,30 @@ mm_inform_authserv(char *service, char *style)
         buffer_init(&m);
         buffer_put_cstring(&m, service);
         buffer_put_cstring(&m, style ? style : "");
@@ -251,7 +251,7 @@ index 74fbd2e..eaf0a12 100644
  int
  mm_auth_password(Authctxt *authctxt, char *password)
 diff --git a/monitor_wrap.h b/monitor_wrap.h
-index 403f8d0..d9de551 100644
+index b5414c2..d5b3334 100644
 --- a/monitor_wrap.h
 +++ b/monitor_wrap.h
 @@ -41,7 +41,8 @@ void mm_log_handler(LogLevel, const char *, void *);
@@ -361,10 +361,10 @@ index e3d1004..80ce13a 100644
  void ssh_selinux_setfscreatecon(const char *);
  #endif
 diff --git a/platform.c b/platform.c
-index ee313da..f35ec39 100644
+index acf8554..4831706 100644
 --- a/platform.c
 +++ b/platform.c
-@@ -143,7 +143,7 @@ platform_setusercontext(struct passwd *pw)
+@@ -145,7 +145,7 @@ platform_setusercontext(struct passwd *pw)
   * called if sshd is running as root.
   */
  void
@@ -373,7 +373,7 @@ index ee313da..f35ec39 100644
  {
  #if !defined(HAVE_LOGIN_CAP) && defined(USE_PAM)
         /*
-@@ -184,7 +184,7 @@ platform_setusercontext_post_groups(struct passwd *pw)
+@@ -186,7 +186,7 @@ platform_setusercontext_post_groups(struct passwd *pw)
         }
  #endif /* HAVE_SETPCRED */
  #ifdef WITH_SELINUX
@@ -383,7 +383,7 @@ index ee313da..f35ec39 100644
  }
  
 diff --git a/platform.h b/platform.h
-index e687c99..823901b 100644
+index e97ecd9..5b72304 100644
 --- a/platform.h
 +++ b/platform.h
 @@ -27,7 +27,7 @@ void platform_post_fork_parent(pid_t child_pid);
@@ -396,10 +396,10 @@ index e687c99..823901b 100644
  char *platform_krb5_get_principal_name(const char *);
  int platform_sys_dir_uid(uid_t);
 diff --git a/session.c b/session.c
-index 87fddfc..f246b8a 100644
+index 2235f26..6dfcf84 100644
 --- a/session.c
 +++ b/session.c
-@@ -1511,7 +1511,7 @@ safely_chroot(const char *path, uid_t uid)
+@@ -1517,7 +1517,7 @@ safely_chroot(const char *path, uid_t uid)
  
  /* Set login name, uid, gid, and groups. */
  void
@@ -408,7 +408,7 @@ index 87fddfc..f246b8a 100644
  {
         char *chroot_path, *tmp;
  
-@@ -1539,7 +1539,7 @@ do_setusercontext(struct passwd *pw)
+@@ -1545,7 +1545,7 @@ do_setusercontext(struct passwd *pw)
                 endgrent();
  #endif
  
@@ -417,7 +417,7 @@ index 87fddfc..f246b8a 100644
  
                 if (!in_chroot && options.chroot_directory != NULL &&
                     strcasecmp(options.chroot_directory, "none") != 0) {
-@@ -1696,7 +1696,7 @@ do_child(Session *s, const char *command)
+@@ -1703,7 +1703,7 @@ do_child(Session *s, const char *command)
  
         /* Force a password change */
         if (s->authctxt->force_pwchange) {
@@ -426,7 +426,7 @@ index 87fddfc..f246b8a 100644
                 child_close_fds();
                 do_pwchange(s);
                 exit(1);
-@@ -1723,7 +1723,7 @@ do_child(Session *s, const char *command)
+@@ -1730,7 +1730,7 @@ do_child(Session *s, const char *command)
                 /* When PAM is enabled we rely on it to do the nologin check */
                 if (!options.use_pam)
                         do_nologin(pw);
@@ -435,7 +435,7 @@ index 87fddfc..f246b8a 100644
                 /*
                  * PAM session modules in do_setusercontext may have
                  * generated messages, so if this in an interactive
-@@ -2134,7 +2134,7 @@ session_pty_req(Session *s)
+@@ -2141,7 +2141,7 @@ session_pty_req(Session *s)
         tty_parse_modes(s->ttyfd, &n_bytes);
  
         if (!use_privsep)
@@ -445,7 +445,7 @@ index 87fddfc..f246b8a 100644
         /* Set window size from the packet. */
         pty_change_window_size(s->ptyfd, s->row, s->col, s->xpixel, s->ypixel);
 diff --git a/session.h b/session.h
-index 6a2f35e..ef6593c 100644
+index f18eaf3..2b7d939 100644
 --- a/session.h
 +++ b/session.h
 @@ -77,7 +77,7 @@ void   session_pty_cleanup2(Session *);
@@ -458,10 +458,10 @@ index 6a2f35e..ef6593c 100644
                        const char *value);
  
 diff --git a/sshd.c b/sshd.c
-index d1dd711..bb093cc 100644
+index 982e545..76306da 100644
 --- a/sshd.c
 +++ b/sshd.c
-@@ -781,7 +781,7 @@ privsep_postauth(Authctxt *authctxt)
+@@ -787,7 +787,7 @@ privsep_postauth(Authctxt *authctxt)
         explicit_bzero(rnd, sizeof(rnd));
  
         /* Drop privileges */