yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xwayland: Also write a FamilyWild entry to the Xauthority file

Browse source 
This is needed to deal with hostname changes during lifetime of a session.
This commit is contained in:
Fabian Vogt 2021-02-10 14:18:15 +01:00 committed by Vlad Zahorodnii
parent 06d2a31bd3
commit 7c325b7436
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/xwl/xwayland.cpp
View file

@ -435,9 +435,7 @@ static QByteArray generateXauthorityCookie()
bool Xwayland::writeXauthorityEntries()
{
const quint16 family = 256; // FamilyLocal
const QByteArray address = QHostInfo::localHostName().toUtf8();
const QByteArray hostname = QHostInfo::localHostName().toUtf8();
const QByteArray display = QByteArray::number(m_display);
const QByteArray name = QByteArrayLiteral("MIT-MAGIC-COOKIE-1");
const QByteArray cookie = generateXauthorityCookie();
@ -445,7 +443,11 @@ bool Xwayland::writeXauthorityEntries()
QDataStream stream(&m_authorityFile);
stream.setByteOrder(QDataStream::BigEndian);
writeXauthorityEntry(stream, family, address, display, name, cookie);
// Write entry with FamilyLocal and the host name as address
writeXauthorityEntry(stream, 256 /* FamilyLocal */, hostname, display, name, cookie);
// Write entry with FamilyWild, no address
writeXauthorityEntry(stream, 65535 /* FamilyWild */, QByteArray{}, display, name, cookie);
return stream.status() == QDataStream::Ok && m_authorityFile.flush();
}