From 059fac881660e41281391df3db9ef896428937ae Mon Sep 17 00:00:00 2001 From: Danil Mikhailov Date: Fri, 28 Nov 2014 19:42:57 +0300 Subject: [PATCH] # This is a combination of 4 commits. # The first commit's message is: Added initial autosshd-auth for automatic authorisation on anyssh.ru # This is the 2nd commit message: fixed ssh test # This is the 3rd commit message: alt9 # This is the 4th commit message: fixed ssh test --- autosshd.spec | 6 ++++++ autosshd/usr/bin/autosshd-ssh | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/autosshd.spec b/autosshd.spec index 43a427c..9db4872 100755 --- a/autosshd.spec +++ b/autosshd.spec @@ -92,6 +92,7 @@ cp lib/systemd/system/autosshd.service %buildroot/lib/systemd/system/autosshd.se /lib/systemd/system/autosshd.service %changelog +<<<<<<< HEAD * Tue Oct 06 2015 Danil Mikhailov 0.0.3-alt10 - added initial autosshd-auth for automatic authorisation on anyssh.ru - added cheking for existing config @@ -130,6 +131,11 @@ cp lib/systemd/system/autosshd.service %buildroot/lib/systemd/system/autosshd.se * Wed Dec 17 2014 Vitaly Lipatov 0.0.3-alt7 - small fixes +======= +* Mon Dec 29 2014 Danil Mikhailov 0.0.3-alt9 +- fixed test sudo autosshd-ssh anyssh.ru + +>>>>>>> # This is a combination of 4 commits. * Thu Nov 27 2014 Danil Mikhailov 0.0.3-alt6 - Cleanup git log diff --git a/autosshd/usr/bin/autosshd-ssh b/autosshd/usr/bin/autosshd-ssh index baf2feb..8a1f811 100755 --- a/autosshd/usr/bin/autosshd-ssh +++ b/autosshd/usr/bin/autosshd-ssh @@ -12,7 +12,7 @@ ${0##*/} anyssh.ru # if exist config /etc/autossh.d/anyssh.ru.conf" if [ -n "$1" ] ; then . /etc/sysconfig/autosshd . /etc/autossh.d/"$1".conf - su - -s /bin/sh -c "ssh ${SSH_OPTIONS}" $AUTOSSHUSER + su - -s /bin/sh -c "ssh ${SSH_OPTIONS}" _autossh else help fi -- 2.11.4.GIT