- djm@cvs.openbsd.org 2013/03/07 00:19:59

     [auth2-pubkey.c monitor.c]
     reconstruct the original username that was sent by the client, which may
     have included a style (e.g. "root:skey") when checking public key
     signatures. Fixes public key and hostbased auth when the client specified
     a style; ok markus@

1 files changed, 7 insertions, 3 deletions

diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index 3ff6faa8b..c28bef7a2 100644
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-pubkey.c,v 1.34 2013/02/14 21:35:59 djm Exp $ */
+/* $OpenBSD: auth2-pubkey.c,v 1.35 2013/03/07 00:19:59 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -75,7 +75,7 @@ userauth_pubkey(Authctxt *authctxt)
 {
         Buffer b;
         Key *key = NULL;
-        char *pkalg;
+        char *pkalg, *userstyle;
         u_char *pkblob, *sig;
         u_int alen, blen, slen;
         int have_sig, pktype;
@@ -127,7 +127,11 @@ userauth_pubkey(Authctxt *authctxt)
                 }
                 /* reconstruct packet */
                 buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST);
-                buffer_put_cstring(&b, authctxt->user);
+                xasprintf(&userstyle, "%s%s%s", authctxt->user,
+                    authctxt->style ? ":" : "",
+                    authctxt->style ? authctxt->style : "");
+                buffer_put_cstring(&b, userstyle);
+                free(userstyle);
                 buffer_put_cstring(&b,
                     datafellows & SSH_BUG_PKSERVICE ?
                     "ssh-userauth" :