1 files changed, 33 insertions, 4 deletions

diff --git a/monitor.c b/monitor.c
index 4e574a2ae..c1e7e9b80 100644
--- a/monitor.c
+++ b/monitor.c
@@ -115,6 +115,7 @@ int mm_answer_sign(int, struct sshbuf *);
 int mm_answer_pwnamallow(int, struct sshbuf *);
 int mm_answer_auth2_read_banner(int, struct sshbuf *);
 int mm_answer_authserv(int, struct sshbuf *);
+int mm_answer_authrole(int, struct sshbuf *);
 int mm_answer_authpassword(int, struct sshbuf *);
 int mm_answer_bsdauthquery(int, struct sshbuf *);
 int mm_answer_bsdauthrespond(int, struct sshbuf *);
@@ -191,6 +192,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},
+    {MONITOR_REQ_AUTHROLE, MON_ONCE, mm_answer_authrole},
     {MONITOR_REQ_AUTH2_READ_BANNER, MON_ONCE, mm_answer_auth2_read_banner},
     {MONITOR_REQ_AUTHPASSWORD, MON_AUTH, mm_answer_authpassword},
 #ifdef USE_PAM
@@ -813,6 +815,7 @@ mm_answer_pwnamallow(int sock, struct sshbuf *m)
 
         /* Allow service/style information on the auth context */
         monitor_permit(mon_dispatch, MONITOR_REQ_AUTHSERV, 1);
+        monitor_permit(mon_dispatch, MONITOR_REQ_AUTHROLE, 1);
         monitor_permit(mon_dispatch, MONITOR_REQ_AUTH2_READ_BANNER, 1);
 
 #ifdef USE_PAM
@@ -846,16 +849,42 @@ mm_answer_authserv(int sock, struct sshbuf *m)
         monitor_permit_authentications(1);
 
         if ((r = sshbuf_get_cstring(m, &authctxt->service, NULL)) != 0 ||
-            (r = sshbuf_get_cstring(m, &authctxt->style, NULL)) != 0)
+            (r = sshbuf_get_cstring(m, &authctxt->style, NULL)) != 0 ||
+            (r = sshbuf_get_cstring(m, &authctxt->role, NULL)) != 0)
                 fatal("%s: buffer error: %s", __func__, ssh_err(r));
-        debug3("%s: service=%s, style=%s",
-            __func__, authctxt->service, authctxt->style);
+        debug3("%s: service=%s, style=%s, role=%s",
+            __func__, authctxt->service, authctxt->style, authctxt->role);
 
         if (strlen(authctxt->style) == 0) {
                 free(authctxt->style);
                 authctxt->style = NULL;
         }
 
+        if (strlen(authctxt->role) == 0) {
+                free(authctxt->role);
+                authctxt->role = NULL;
+        }
+
+        return (0);
+}
+
+int
+mm_answer_authrole(int sock, struct sshbuf *m)
+{
+        int r;
+
+        monitor_permit_authentications(1);
+
+        if ((r = sshbuf_get_cstring(m, &authctxt->role, NULL)) != 0)
+                fatal("%s: buffer error: %s", __func__, ssh_err(r));
+        debug3("%s: role=%s",
+            __func__, authctxt->role);
+
+        if (strlen(authctxt->role) == 0) {
+                free(authctxt->role);
+                authctxt->role = NULL;
+        }
+
         return (0);
 }
 
@@ -1497,7 +1526,7 @@ mm_answer_pty(int sock, struct sshbuf *m)
         res = pty_allocate(&s->ptyfd, &s->ttyfd, s->tty, sizeof(s->tty));
         if (res == 0)
                 goto error;
-        pty_setowner(authctxt->pw, s->tty);
+        pty_setowner(authctxt->pw, s->tty, authctxt->role);
 
         if ((r = sshbuf_put_u32(m, 1)) != 0 ||
             (r = sshbuf_put_cstring(m, s->tty)) != 0)