summaryrefslogtreecommitdiff
path: root/sys/dev/wscons
diff options
context:
space:
mode:
authorAnton Lindqvist <anton@cvs.openbsd.org>2021-09-22 15:44:13 +0000
committerAnton Lindqvist <anton@cvs.openbsd.org>2021-09-22 15:44:13 +0000
commit4d41a46d070b36938c4df2531c277263460aa0d9 (patch)
tree8d5546ed3e1e70a7558fc256fd5e9fa3f94ee17d /sys/dev/wscons
parent39f8726c3ed1a41dbe0dd8b38f0c9eb5e23dabcb (diff)
Prevent ucc keyboards from changing the wsmux keyboard layout.
ok deraadt@
Diffstat (limited to 'sys/dev/wscons')
-rw-r--r--sys/dev/wscons/wsmux.c4
1 files 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;
}