From 250155dcb91be43508d486b5253e57568d70be37 Mon Sep 17 00:00:00 2001
From: Sebastian Roland <seroland86@gmail.com>
Date: Thu, 5 Apr 2018 20:46:57 +0200
Subject: [PATCH] OpenSSH 7.7 compatibility

---
 build/docker/.env                        | 2 +-
 build/docker/keeto-openssh/Dockerfile    | 2 +-
 build/docker/keeto-openssh/config/ps1.sh | 4 ++--
 src/keeto.c                              | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/docker/.env b/build/docker/.env
index a9c670d..a492388 100644
--- a/build/docker/.env
+++ b/build/docker/.env
@@ -1,5 +1,5 @@
 VERSION=0.4.0-beta
 KEETO_RPM_URL=https://keeto.io/static/downloads/keeto-0.4.0-beta/keeto-0.4.0-0.1.beta.el7.centos.x86_64.rpm
-OPENSSH_SRC_URL=https://ftp.hostserver.de/pub/OpenBSD/OpenSSH/portable/openssh-7.6p1.tar.gz
+OPENSSH_SRC_URL=https://ftp.hostserver.de/pub/OpenBSD/OpenSSH/portable/openssh-7.7p1.tar.gz
 SYSLOG_NG_REPO_URL=https://copr.fedorainfracloud.org/coprs/czanik/syslog-ng314/repo/epel-7/czanik-syslog-ng314-epel-7.repo
 
diff --git a/build/docker/keeto-openssh/Dockerfile b/build/docker/keeto-openssh/Dockerfile
index 49c8b43..a8f8a9f 120000
--- a/build/docker/keeto-openssh/Dockerfile
+++ b/build/docker/keeto-openssh/Dockerfile
@@ -1 +1 @@
-Dockerfile-prod
\ No newline at end of file
+Dockerfile-dev
\ No newline at end of file
diff --git a/build/docker/keeto-openssh/config/ps1.sh b/build/docker/keeto-openssh/config/ps1.sh
index 66150d7..4dbaaab 100644
--- a/build/docker/keeto-openssh/config/ps1.sh
+++ b/build/docker/keeto-openssh/config/ps1.sh
@@ -1,5 +1,5 @@
-if [ "${KEETO_REAL_USER}" ]; then
-    PS1="[\u~"${KEETO_REAL_USER}"@\h \W]\$ "
+if [ "${KEETOREALUSER}" ]; then
+    PS1="[\u~"${KEETOREALUSER}"@\h \W]\$ "
 else
     PS1="[\u@\h \W]\$ "
 fi
diff --git a/src/keeto.c b/src/keeto.c
index 69d27f3..f132afa 100644
--- a/src/keeto.c
+++ b/src/keeto.c
@@ -142,7 +142,7 @@ write_keystore(char *keystore, struct keeto_keystore_records *keystore_records)
 
     struct keeto_keystore_record *keystore_record = NULL;
     SIMPLEQ_FOREACH(keystore_record, keystore_records, next) {
-        fprintf(tmp_keystore_file, "environment=\"KEETO_REAL_USER=%s\"",
+        fprintf(tmp_keystore_file, "environment=\"KEETOREALUSER=%s\"",
             keystore_record->uid);
         bool command_option_set = keystore_record->command_option != NULL ?
             true : false;