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 /contrib | |
parent | 23f269562b7537b2f6f5014e50a25e5dcc55a837 (diff) |
- (djm) [contrib/cygwin/ssh-host-config] Fix old code leading to
permissions/ACLs; from Corinna Vinschen
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/cygwin/ssh-host-config | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config index fed87947d..a7ea3e0d2 100644 --- a/contrib/cygwin/ssh-host-config +++ b/contrib/cygwin/ssh-host-config | |||
@@ -37,7 +37,6 @@ declare -a csih_required_commands=( | |||
37 | /usr/bin/mkpasswd cygwin | 37 | /usr/bin/mkpasswd cygwin |
38 | /usr/bin/mount cygwin | 38 | /usr/bin/mount cygwin |
39 | /usr/bin/ps cygwin | 39 | /usr/bin/ps cygwin |
40 | /usr/bin/setfacl cygwin | ||
41 | /usr/bin/umount cygwin | 40 | /usr/bin/umount cygwin |
42 | /usr/bin/cmp diffutils | 41 | /usr/bin/cmp diffutils |
43 | /usr/bin/grep grep | 42 | /usr/bin/grep grep |
@@ -651,32 +650,6 @@ echo | |||
651 | 650 | ||
652 | warning_cnt=0 | 651 | warning_cnt=0 |
653 | 652 | ||
654 | # Check for ${SYSCONFDIR} directory | ||
655 | csih_make_dir "${SYSCONFDIR}" "Cannot create global configuration files." | ||
656 | if ! /usr/bin/chmod 775 "${SYSCONFDIR}" >/dev/null 2>&1 | ||
657 | then | ||
658 | csih_warning "Can't set permissions on ${SYSCONFDIR}!" | ||
659 | let ++warning_cnt | ||
660 | fi | ||
661 | if ! /usr/bin/setfacl -m u:system:rwx "${SYSCONFDIR}" >/dev/null 2>&1 | ||
662 | then | ||
663 | csih_warning "Can't set extended permissions on ${SYSCONFDIR}!" | ||
664 | let ++warning_cnt | ||
665 | fi | ||
666 | |||
667 | # Check for /var/log directory | ||
668 | csih_make_dir "${LOCALSTATEDIR}/log" "Cannot create log directory." | ||
669 | if ! /usr/bin/chmod 775 "${LOCALSTATEDIR}/log" >/dev/null 2>&1 | ||
670 | then | ||
671 | csih_warning "Can't set permissions on ${LOCALSTATEDIR}/log!" | ||
672 | let ++warning_cnt | ||
673 | fi | ||
674 | if ! /usr/bin/setfacl -m u:system:rwx "${LOCALSTATEDIR}/log" >/dev/null 2>&1 | ||
675 | then | ||
676 | csih_warning "Can't set extended permissions on ${LOCALSTATEDIR}/log!" | ||
677 | let ++warning_cnt | ||
678 | fi | ||
679 | |||
680 | # Create /var/log/lastlog if not already exists | 653 | # Create /var/log/lastlog if not already exists |
681 | if [ -e ${LOCALSTATEDIR}/log/lastlog -a ! -f ${LOCALSTATEDIR}/log/lastlog ] | 654 | if [ -e ${LOCALSTATEDIR}/log/lastlog -a ! -f ${LOCALSTATEDIR}/log/lastlog ] |
682 | then | 655 | then |
@@ -701,11 +674,6 @@ then | |||
701 | csih_warning "Can't set permissions on ${LOCALSTATEDIR}/empty!" | 674 | csih_warning "Can't set permissions on ${LOCALSTATEDIR}/empty!" |
702 | let ++warning_cnt | 675 | let ++warning_cnt |
703 | fi | 676 | fi |
704 | if ! /usr/bin/setfacl -m u:system:rwx "${LOCALSTATEDIR}/empty" >/dev/null 2>&1 | ||
705 | then | ||
706 | csih_warning "Can't set extended permissions on ${LOCALSTATEDIR}/empty!" | ||
707 | let ++warning_cnt | ||
708 | fi | ||
709 | 677 | ||
710 | # generate missing host keys | 678 | # generate missing host keys |
711 | csih_inform "Generating missing SSH host keys" | 679 | csih_inform "Generating missing SSH host keys" |