diff options
| author | Damien Miller <djm@mindrot.org> | 2014-09-03 05:35:32 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2014-09-03 05:35:32 +1000 |
| commit | 44988defb1f5e3afe576d86000365e1f07a1b494 (patch) | |
| tree | 7192c2f2cf30c58128130a65bd80e0d56d30465b | |
| parent | 23f269562b7537b2f6f5014e50a25e5dcc55a837 (diff) | |
| download | openssh-git-44988defb1f5e3afe576d86000365e1f07a1b494.tar.gz | |
- (djm) [contrib/cygwin/ssh-host-config] Fix old code leading to
permissions/ACLs; from Corinna Vinschen
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | contrib/cygwin/ssh-host-config | 32 |
2 files changed, 2 insertions, 32 deletions
@@ -1,6 +1,8 @@ 20140903 - (djm) [defines.h sshbuf.c] Move __predict_true|false to defines.h and conditionalise to avoid duplicate definition. + - (djm) [contrib/cygwin/ssh-host-config] Fix old code leading to + permissions/ACLs; from Corinna Vinschen 20140830 - (djm) [openbsd-compat/openssl-compat.h] add diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config index fed87947..a7ea3e0d 100644 --- a/contrib/cygwin/ssh-host-config +++ b/contrib/cygwin/ssh-host-config @@ -37,7 +37,6 @@ declare -a csih_required_commands=( /usr/bin/mkpasswd cygwin /usr/bin/mount cygwin /usr/bin/ps cygwin - /usr/bin/setfacl cygwin /usr/bin/umount cygwin /usr/bin/cmp diffutils /usr/bin/grep grep @@ -651,32 +650,6 @@ echo warning_cnt=0 -# Check for ${SYSCONFDIR} directory -csih_make_dir "${SYSCONFDIR}" "Cannot create global configuration files." -if ! /usr/bin/chmod 775 "${SYSCONFDIR}" >/dev/null 2>&1 -then - csih_warning "Can't set permissions on ${SYSCONFDIR}!" - let ++warning_cnt -fi -if ! /usr/bin/setfacl -m u:system:rwx "${SYSCONFDIR}" >/dev/null 2>&1 -then - csih_warning "Can't set extended permissions on ${SYSCONFDIR}!" - let ++warning_cnt -fi - -# Check for /var/log directory -csih_make_dir "${LOCALSTATEDIR}/log" "Cannot create log directory." -if ! /usr/bin/chmod 775 "${LOCALSTATEDIR}/log" >/dev/null 2>&1 -then - csih_warning "Can't set permissions on ${LOCALSTATEDIR}/log!" - let ++warning_cnt -fi -if ! /usr/bin/setfacl -m u:system:rwx "${LOCALSTATEDIR}/log" >/dev/null 2>&1 -then - csih_warning "Can't set extended permissions on ${LOCALSTATEDIR}/log!" - let ++warning_cnt -fi - # Create /var/log/lastlog if not already exists if [ -e ${LOCALSTATEDIR}/log/lastlog -a ! -f ${LOCALSTATEDIR}/log/lastlog ] then @@ -701,11 +674,6 @@ then csih_warning "Can't set permissions on ${LOCALSTATEDIR}/empty!" let ++warning_cnt fi -if ! /usr/bin/setfacl -m u:system:rwx "${LOCALSTATEDIR}/empty" >/dev/null 2>&1 -then - csih_warning "Can't set extended permissions on ${LOCALSTATEDIR}/empty!" - let ++warning_cnt -fi # generate missing host keys csih_inform "Generating missing SSH host keys" |