summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/cygwin/ssh-host-config24
1 files changed, 18 insertions, 6 deletions
diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config
index e2ad69f19..f90af8d2a 100644
--- a/contrib/cygwin/ssh-host-config
+++ b/contrib/cygwin/ssh-host-config
@@ -131,7 +131,7 @@ fi
131if [ -e "${SYSCONFDIR}" -a ! -d "${SYSCONFDIR}" ] 131if [ -e "${SYSCONFDIR}" -a ! -d "${SYSCONFDIR}" ]
132then 132then
133 echo 133 echo
134 echo "${SYSCONFDIR} is existant but not a directory." 134 echo "${SYSCONFDIR} exists but is not a directory."
135 echo "Cannot create global configuration files." 135 echo "Cannot create global configuration files."
136 echo 136 echo
137 exit 1 137 exit 1
@@ -156,7 +156,7 @@ fi
156if [ -e ${LOCALSTATEDIR}/log -a ! -d ${LOCALSTATEDIR}/log ] 156if [ -e ${LOCALSTATEDIR}/log -a ! -d ${LOCALSTATEDIR}/log ]
157then 157then
158 echo 158 echo
159 echo "${LOCALSTATEDIR}/log is existant but not a directory." 159 echo "${LOCALSTATEDIR}/log exists but is not a directory."
160 echo "Cannot create ssh host configuration." 160 echo "Cannot create ssh host configuration."
161 echo 161 echo
162 exit 1 162 exit 1
@@ -181,11 +181,23 @@ then
181fi 181fi
182 182
183# Create /var/empty file used as chroot jail for privilege separation 183# Create /var/empty file used as chroot jail for privilege separation
184if [ -f ${LOCALSTATEDIR}/empty ] 184if [ -e ${LOCALSTATEDIR}/empty -a ! -d ${LOCALSTATEDIR}/empty ]
185then 185then
186 echo "Creating ${LOCALSTATEDIR}/empty failed!" 186 echo
187else 187 echo "${LOCALSTATEDIR}/empty exists but is not a directory."
188 mkdir -p ${LOCALSTATEDIR}/empty 188 echo "Cannot create ssh host configuration."
189 echo
190 exit 1
191if [ ! -e ${LOCALSTATEDIR}/empty ]
192then
193 if ! mkdir -p ${LOCALSTATEDIR}/empty
194 then
195 echo
196 echo "Creating ${LOCALSTATEDIR}/empty directory failed."
197 echo "Cannot create ssh host configuration."
198 echo
199 exit 1
200 fi
189 if [ ${_nt} -gt 0 ] 201 if [ ${_nt} -gt 0 ]
190 then 202 then
191 chmod 755 ${LOCALSTATEDIR}/empty 203 chmod 755 ${LOCALSTATEDIR}/empty