dan/node-x11
1
0
Fork 0
mirror of https://github.com/danbulant/node-x11 synced 2026-06-24 17:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle nonexistent Xauthority file

Browse source
This commit is contained in:
Ian Scott 2016-01-28 16:35:04 -08:00
parent 582bd1a1b2
commit 86f977f9bd
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/auth.js
View file

@ -60,7 +60,13 @@ function readXauthority(cb) {
if(err.code == 'ENOENT') { if(err.code == 'ENOENT') {
// Xming/windows uses %HOME%/Xauthority ( .Xauthority with no dot ) - try with this name // Xming/windows uses %HOME%/Xauthority ( .Xauthority with no dot ) - try with this name
filename = process.env.XAUTHORITY || path.join(homedir(), 'Xauthority'); filename = process.env.XAUTHORITY || path.join(homedir(), 'Xauthority');
return fs.readFile(filename, cb); fs.readFile(filename, function (err, data) {
if (err.code == 'ENOENT') {
cb(null, null);
} else {
cb(err);
}
});
} else { } else {
cb(err); cb(err);
} }
@ -72,6 +78,13 @@ module.exports = function( display, host, cb )
readXauthority(function(err, data) { readXauthority(function(err, data) {
if(err) return cb(err); if(err) return cb(err);
if (!data) {
return cb(null, {
authName: '',
authData: ''
});
}
var auth = parseXauth(data); var auth = parseXauth(data);
for (var cookieNum in auth) for (var cookieNum in auth)
{ {