diff --git a/krfb/rfbclient.cpp b/krfb/rfbclient.cpp
index fcf8359..7109ccc 100644
--- a/krfb/rfbclient.cpp
+++ b/krfb/rfbclient.cpp
@@ -1,233 +1,233 @@
 /*
     Copyright (C) 2009-2010 Collabora Ltd <info@collabora.co.uk>
       @author George Goldberg <george.goldberg@collabora.co.uk>
       @author George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
     Copyright (C) 2007 Alessandro Praduroux <pradu@pradu.it>
 
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU Lesser General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "rfbclient.h"
 #include "connectiondialog.h"
 #include "krfbconfig.h"
 #include "sockethelpers.h"
 #include "eventsmanager.h"
 #include <QSocketNotifier>
 #include <QDebug>
 #include <poll.h>
 #include <strings.h> //for bzero()
 
 struct RfbClient::Private
 {
     Private(rfbClientPtr client) :
         controlEnabled(KrfbConfig::allowDesktopControl()),
         client(client)
     {}
 
     bool controlEnabled;
     rfbClientPtr client;
     QSocketNotifier *notifier;
     QSharedPointer<EventHandler> eventHandler;
     QString remoteAddressString;
 };
 
 RfbClient::RfbClient(rfbClientPtr client, QObject* parent)
     : QObject(parent), d(new Private(client))
 {
     d->remoteAddressString = peerAddress(d->client->sock) + QLatin1Char(':') +
                              QString::number(peerPort(d->client->sock));
 
     d->notifier = new QSocketNotifier(client->sock, QSocketNotifier::Read, this);
     d->notifier->setEnabled(false);
     connect(d->notifier, &QSocketNotifier::activated, this, &RfbClient::onSocketActivated);
 
     d->eventHandler = EventsManager::instance()->eventHandler();
 }
 
 RfbClient::~RfbClient()
 {
     //qDebug();
     delete d;
 }
 
 QString RfbClient::name() const
 {
     return d->remoteAddressString;
 }
 
 //static
 bool RfbClient::controlCanBeEnabled()
 {
     return KrfbConfig::allowDesktopControl();
 }
 
 bool RfbClient::controlEnabled() const
 {
     return d->controlEnabled;
 }
 
 void RfbClient::setControlEnabled(bool enabled)
 {
     if (controlCanBeEnabled() && d->controlEnabled != enabled) {
         d->controlEnabled = enabled;
         Q_EMIT controlEnabledChanged(enabled);
     }
 }
 
 bool RfbClient::isOnHold() const
 {
     return d->client->onHold ? true : false;
 }
 
 void RfbClient::setOnHold(bool onHold)
 {
     if (isOnHold() != onHold) {
         d->client->onHold = onHold;
         d->notifier->setEnabled(!onHold);
         Q_EMIT holdStatusChanged(onHold);
     }
 }
 
 void RfbClient::closeConnection()
 {
     d->notifier->setEnabled(false);
     rfbCloseClient(d->client);
     rfbClientConnectionGone(d->client);
 }
 
 rfbClientPtr RfbClient::getRfbClientPtr()
 {
     return d->client;
 }
 
 void RfbClient::handleKeyboardEvent(bool down, rfbKeySym keySym)
 {
     if (d->controlEnabled) {
         d->eventHandler->handleKeyboard(down, keySym);
     }
 }
 
 void RfbClient::handleMouseEvent(int buttonMask, int x, int y)
 {
     if (d->controlEnabled) {
         d->eventHandler->handlePointer(buttonMask, x, y);
     }
 }
 
 void RfbClient::onSocketActivated()
 {
     //Process not only one, but all pending messages.
     //poll() idea/code copied from vino:
     // Copyright (C) 2003 Sun Microsystems, Inc.
     // License: GPL v2 or later
     struct pollfd pollfd = { d->client->sock, POLLIN|POLLPRI, 0 };
 
     while(poll(&pollfd, 1, 0) == 1) {
         rfbProcessClientMessage(d->client);
 
         //This is how we handle disconnection.
         //if rfbProcessClientMessage() finds out that it can't read the socket,
         //it closes it and sets it to -1. So, we just have to check this here
         //and call rfbClientConnectionGone() if necessary. This will call
         //the clientGoneHook which in turn will remove this RfbClient instance
         //from the server manager and will call deleteLater() to delete it
         if (d->client->sock == -1) {
             //qDebug() << "disconnected from socket signal";
             d->notifier->setEnabled(false);
             rfbClientConnectionGone(d->client);
             break;
         }
     }
 }
 
 void RfbClient::update()
 {
     rfbUpdateClient(d->client);
 
     //This is how we handle disconnection.
     //if rfbUpdateClient() finds out that it can't write to the socket,
     //it closes it and sets it to -1. So, we just have to check this here
     //and call rfbClientConnectionGone() if necessary. This will call
     //the clientGoneHook which in turn will remove this RfbClient instance
     //from the server manager and will call deleteLater() to delete it
     if (d->client->sock == -1) {
         //qDebug() << "disconnected during update";
         d->notifier->setEnabled(false);
         rfbClientConnectionGone(d->client);
     }
 }
 
 //*************
 
 PendingRfbClient::PendingRfbClient(rfbClientPtr client, QObject *parent)
     : QObject(parent), m_rfbClient(client)
 {
     m_rfbClient->clientData = this;
 }
 
 PendingRfbClient::~PendingRfbClient()
 {}
 
 void PendingRfbClient::accept(RfbClient *newClient)
 {
     //qDebug() << "accepted connection";
 
     m_rfbClient->clientData = newClient;
     newClient->setOnHold(false);
 
     Q_EMIT finished(newClient);
     deleteLater();
 }
 
 static void clientGoneHookNoop(rfbClientPtr cl) { Q_UNUSED(cl); }
 
 void PendingRfbClient::reject()
 {
     //qDebug() << "refused connection";
 
     //override the clientGoneHook that was previously set by RfbServer
     m_rfbClient->clientGoneHook = clientGoneHookNoop;
     rfbCloseClient(m_rfbClient);
     rfbClientConnectionGone(m_rfbClient);
 
     Q_EMIT finished(nullptr);
     deleteLater();
 }
 
 bool PendingRfbClient::checkPassword(const QByteArray & encryptedPassword)
 {
     Q_UNUSED(encryptedPassword);
 
     return m_rfbClient->screen->authPasswdData == (void*)nullptr;
 }
 
 bool PendingRfbClient::vncAuthCheckPassword(const QByteArray& password, const QByteArray& encryptedPassword) const
 {
     if (password.isEmpty() && encryptedPassword.isEmpty()) {
         return true;
     }
 
     char passwd[MAXPWLEN];
     unsigned char challenge[CHALLENGESIZE];
 
     memcpy(challenge, m_rfbClient->authChallenge, CHALLENGESIZE);
-    bzero(passwd, MAXPWLEN);
+    memset(passwd, 0, MAXPWLEN);
 
     if (!password.isEmpty()) {
         strncpy(passwd, password.constData(),
                 (MAXPWLEN <= password.size()) ? MAXPWLEN : password.size());
     }
 
     rfbEncryptBytes(challenge, passwd);
     return memcmp(challenge, encryptedPassword.constData(), encryptedPassword.size()) == 0;
 }