From: Koichiro IWAO <meta@vmeta.jp>
Date: Tue, 4 Oct 2016 08:17:06 +0000 (+0900)
Subject: Do not depends on mcookie command
X-Git-Tag: v1.7.90~80
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=31cad948089ba3f7b848b4f1376db33c4879cc20;p=tigervnc.git

Do not depends on mcookie command

for operating systems other than GNU/Linux.

mcookie is a part of util-linux. Usually only GNU/Linux systems have it.
Do not die even if mcookie is not found. Use the previous pure perl code
to generate cookie as fallback.
---

diff --git a/unix/vncserver b/unix/vncserver
index c59106ca..2ef436a7 100755
--- a/unix/vncserver
+++ b/unix/vncserver
@@ -293,8 +293,24 @@ $desktopLog = "$vncUserDir/$host:$displayNumber.log";
 unlink($desktopLog);
 
 # Make an X server cookie and set up the Xauthority file
-
+# mcookie is a part of util-linux, usually only GNU/Linux systems have it.
 $cookie = `mcookie`;
+# Fallback for non GNU/Linux OS - use /dev/urandom on systems that have it,
+# otherwise use perl's random number generator, seeded with the sum
+# of the current time, our PID and part of the encrypted form of the password.
+if ($cookie eq "" && open(URANDOM, '<', '/dev/urandom')) {
+  my $randata;
+  if (sysread(URANDOM, $randata, 16) == 16) {
+    $cookie = unpack 'h*', $randata;
+  }
+  close(URANDOM);
+}
+if ($cookie eq "") {
+  srand(time+$$+unpack("L",`cat $vncUserDir/passwd`));
+  for (1..16) {
+    $cookie .= sprintf("%02x", int(rand(256)) % 256);
+  }
+}
 
 open(XAUTH, "|xauth -f $xauthorityFile source -");
 print XAUTH "add $host:$displayNumber . $cookie\n";
@@ -818,7 +834,7 @@ sub SanityCheck
     #
 
  cmd:
-    foreach $cmd ("uname","mcookie","xauth") {
+    foreach $cmd ("uname","xauth") {
 	for (split(/:/,$ENV{PATH})) {
 	    if (-x "$_/$cmd") {
 		next cmd;