From 41f0ea96fee7c0908eaa3aeb3e1f9aeaebfb7bf9 Mon Sep 17 00:00:00 2001
From: anton <anton@openbsd.org>
Date: Wed, 22 Sep 2021 15:44:12 +0000
Subject: [PATCH] Prevent ucc keyboards from changing the wsmux keyboard
 layout.

ok deraadt@
---
 sys/dev/wscons/wsmux.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/dev/wscons/wsmux.c b/sys/dev/wscons/wsmux.c
index b3080573836..db5b9f0ad2f 100644
--- a/sys/dev/wscons/wsmux.c
+++ b/sys/dev/wscons/wsmux.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wsmux.c,v 1.54 2021/01/09 20:51:00 gnezdo Exp $	*/
+/*	$OpenBSD: wsmux.c,v 1.55 2021/09/22 15:44:12 anton Exp $	*/
 /*      $NetBSD: wsmux.c,v 1.37 2005/04/30 03:47:12 augustss Exp $      */
 
 /*
@@ -913,7 +913,7 @@ wsmux_get_layout(struct wsmux_softc *sc)
 void
 wsmux_set_layout(struct wsmux_softc *sc, uint32_t layout)
 {
-	if ((layout & KB_DEFAULT) == 0)
+	if ((layout & (KB_DEFAULT | KB_NOENCODING)) == 0)
 		sc->sc_kbd_layout = layout;
 }
 
-- 
2.20.1