From 42815c7a5672edb16ab810378b7c34b3e8e74832 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Wed, 27 Nov 2019 16:58:29 +0100 Subject: [PATCH 3/3] auth: Add API to unregister built in security handlers If I have a VNC server that first accepts password based authentication, then switches to something not using password (e.g. a prompt on screen), the security handler from the first would still be sent as, meaning clients would still ask for a password without there being one. --- libvncserver/auth.c | 7 +++++++ rfb/rfb.h | 1 + 2 files changed, 8 insertions(+) diff --git a/libvncserver/auth.c b/libvncserver/auth.c index fc74c800..94b46fd6 100644 --- a/libvncserver/auth.c +++ b/libvncserver/auth.c @@ -248,6 +248,13 @@ determinePrimarySecurityType(rfbClientPtr cl) } } +void +rfbUnregisterPrimarySecurityHandlers (void) +{ + rfbUnregisterSecurityHandler(&VncSecurityHandlerNone); + rfbUnregisterSecurityHandler(&VncSecurityHandlerVncAuth); +} + void rfbSendSecurityTypeList(rfbClientPtr cl, enum rfbSecurityTag exclude) diff --git a/rfb/rfb.h b/rfb/rfb.h index f56bd47d..d1763c6c 100644 --- a/rfb/rfb.h +++ b/rfb/rfb.h @@ -856,6 +856,7 @@ extern void rfbUnregisterSecurityHandler(rfbSecurityHandler* handler); extern void rfbRegisterChannelSecurityHandler(rfbSecurityHandler* handler); extern void rfbUnregisterChannelSecurityHandler(rfbSecurityHandler* handler); extern void rfbSendSecurityTypeList(rfbClientPtr cl, enum rfbSecurityTag exclude); +extern void rfbUnregisterPrimarySecurityHandlers (void); /* rre.c */ -- 2.26.2