define SSH_RAND_HELPER in a GPT-compliant relocatable way.

SSH_RAND_HELPER is conditionally used if the platform doesn't have /dev/random

diff --git a/openssh/pathnames.c b/openssh/pathnames.c
index 071f127bc681bb6d95b38c5f3b18403b2ff2fcc0..9991915fbfe15ead277c00c5aaaf49dc8cad4216 100644 (file)
--- a/openssh/pathnames.c
+++ b/openssh/pathnames.c
@@ -20,6 +20,7 @@ char *_PATH_SSH_PROGRAM;
 char *_PATH_SSH_SYSTEM_RC;
 char *_PATH_SSH_HOSTS_EQUIV;
 char *_PATH_SFTP_SERVER;
+char *SSH_RAND_HELPER;
 
 static char *
 compose(const char str1[], const char str2[], const char str3[])
@@ -58,4 +59,5 @@ init_pathnames()
     _PATH_SSH_SYSTEM_RC                = compose(gl, SSHDIR, "/sshrc");
     _PATH_SSH_HOSTS_EQUIV      = compose(gl, SSHDIR, "/shosts.equiv");
     _PATH_SFTP_SERVER          = compose(gl, LIBEXEC, "/sftp-server");
+    SSH_RAND_HELPER            = compose(gl, LIBEXEC, "/ssh-rand-helper");
 }

diff --git a/openssh/pathnames.h b/openssh/pathnames.h
index 4b8f26712003790756fc1d5196f214b44c01530e..df9b40973014e868fa355937d4b93705de5d99ef 100644 (file)
--- a/openssh/pathnames.h
+++ b/openssh/pathnames.h
@@ -154,3 +154,6 @@ extern char *_PATH_SFTP_SERVER;
 #ifndef ASKPASS_PROGRAM
 #define ASKPASS_PROGRAM         "/usr/lib/ssh/ssh-askpass"
 #endif /* ASKPASS_PROGRAM */
+
+/* Path to rand helper */
+extern char *SSH_RAND_HELPER;