1 From 7332e7d5627a72f1587bca85f3fd37f42b419754 Mon Sep 17 00:00:00 2001
   2 From: oracle <solaris@oracle.com>
   3 Date: Mon, 3 Aug 2015 14:38:19 -0700
   4 Subject: [PATCH 16/30] Enable login to a role if PAM is ok with it
   5 
   6 ---
   7  auth-pam.c        | 14 ++++++++++++++
   8  auth-pam.h        |  3 +++
   9  auth.h            |  3 +++
  10  auth2-hostbased.c | 10 ++++++++++
  11  auth2.c           |  8 ++++++++
  12  monitor.c         | 15 ++++++++++++++-
  13  6 files changed, 52 insertions(+), 1 deletion(-)
  14 
  15 diff --git a/auth-pam.c b/auth-pam.c
  16 index 7bdee5c..6470d5e 100644
  17 --- a/auth-pam.c
  18 +++ b/auth-pam.c
  19 @@ -1038,6 +1038,20 @@ do_pam_account(void)
  20         return (sshpam_account_status);
  21  }
  22  
  23 +#ifdef HAVE_PAM_AUSER
  24 +void

 141         key_blob = NULL;
 142         key_bloblen = 0;
 143         key_blobtype = MM_NOKEY;
 144 -       hostbased_cuser = NULL;
 145         hostbased_chost = NULL;
 146  }
 147  
 148 @@ -1146,6 +1154,11 @@ mm_answer_pam_account(int sock, Buffer *m)
 149         if (!options.use_pam)
 150                 fatal("UsePAM not set, but ended up in %s anyway", __func__);
 151  
 152 +#ifdef HAVE_PAM_AUSER
 153 +       if (hostbased_cuser != NULL)
 154 +               do_pam_set_auser(hostbased_cuser);
 155 +#endif
 156 +
 157         ret = do_pam_account();
 158  
 159         buffer_put_int(m, ret);
 160 -- 
 161 2.3.2 (Apple Git-55)
 162 

   1 From 101a7bf94901c79603da5750d325f9de67fe3413 Mon Sep 17 00:00:00 2001
   2 From: oracle <solaris@oracle.com>
   3 Date: Mon, 3 Aug 2015 14:38:19 -0700
   4 Subject: [PATCH 17/36] Enable login to a role if PAM is ok with it
   5 
   6 ---
   7  auth-pam.c        | 14 ++++++++++++++
   8  auth-pam.h        |  3 +++
   9  auth.h            |  3 +++
  10  auth2-hostbased.c | 10 ++++++++++
  11  auth2.c           |  8 ++++++++
  12  monitor.c         | 15 ++++++++++++++-
  13  6 files changed, 52 insertions(+), 1 deletion(-)
  14 
  15 diff --git a/auth-pam.c b/auth-pam.c
  16 index 7bdee5c..6470d5e 100644
  17 --- a/auth-pam.c
  18 +++ b/auth-pam.c
  19 @@ -1038,6 +1038,20 @@ do_pam_account(void)
  20         return (sshpam_account_status);
  21  }
  22  
  23 +#ifdef HAVE_PAM_AUSER
  24 +void

 141         key_blob = NULL;
 142         key_bloblen = 0;
 143         key_blobtype = MM_NOKEY;
 144 -       hostbased_cuser = NULL;
 145         hostbased_chost = NULL;
 146  }
 147  
 148 @@ -1146,6 +1154,11 @@ mm_answer_pam_account(int sock, Buffer *m)
 149         if (!options.use_pam)
 150                 fatal("UsePAM not set, but ended up in %s anyway", __func__);
 151  
 152 +#ifdef HAVE_PAM_AUSER
 153 +       if (hostbased_cuser != NULL)
 154 +               do_pam_set_auser(hostbased_cuser);
 155 +#endif
 156 +
 157         ret = do_pam_account();
 158  
 159         buffer_put_int(m, ret);
 160 -- 
 161 2.5.4 (Apple Git-61)
 162