summaryrefslogtreecommitdiff
path: root/contrib/cygwin
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/cygwin')
-rw-r--r--contrib/cygwin/README25
-rw-r--r--contrib/cygwin/ssh-host-config2
2 files changed, 18 insertions, 9 deletions
diff --git a/contrib/cygwin/README b/contrib/cygwin/README
index 5a9b1ce0c..3dd45014a 100644
--- a/contrib/cygwin/README
+++ b/contrib/cygwin/README
@@ -195,28 +195,37 @@ configure are used for the Cygwin binary distribution:
195 195
196 --prefix=/usr \ 196 --prefix=/usr \
197 --sysconfdir=/etc \ 197 --sysconfdir=/etc \
198 --libexecdir='$(sbindir)' \ 198 --libexecdir='${sbindir}' \
199 --localstatedir=/var \ 199 --localstatedir=/var \
200 --datadir='$(prefix)/share' \ 200 --datadir='${prefix}/share' \
201 --mandir='$(datadir)/man' \ 201 --mandir='${datadir}/man' \
202 --infodir='${datadir}/info'
202 --with-tcp-wrappers 203 --with-tcp-wrappers
203 204
204If you want to create a Cygwin package, equivalent to the one 205If you want to create a Cygwin package, equivalent to the one
205in the Cygwin binary distribution, install like this: 206in the Cygwin binary distribution, install like this:
206 207
207 mkdir /tmp/cygwin-ssh 208 mkdir /tmp/cygwin-ssh
208 cd $(builddir) 209 cd ${builddir}
209 make install DESTDIR=/tmp/cygwin-ssh 210 make install DESTDIR=/tmp/cygwin-ssh
210 cd $(srcdir)/contrib/cygwin 211 cd ${srcdir}/contrib/cygwin
211 make cygwin-postinstall DESTDIR=/tmp/cygwin-ssh 212 make cygwin-postinstall DESTDIR=/tmp/cygwin-ssh
212 cd /tmp/cygwin-ssh 213 cd /tmp/cygwin-ssh
213 find * \! -type d | tar cvjfT my-openssh.tar.bz2 - 214 find * \! -type d | tar cvjfT my-openssh.tar.bz2 -
214 215
215You must have installed the zlib, the openssl-devel and the minires-devel 216You must have installed the following packages to be able to build OpenSSH:
216packages to be able to build OpenSSH! 217
218- zlib
219- openssl-devel
220- minires-devel
221
222If you want to build with --with-tcp-wrappers, you also need the package
223
224- tcp_wrappers
217 225
218Please send requests, error reports etc. to cygwin@cygwin.com. 226Please send requests, error reports etc. to cygwin@cygwin.com.
219 227
228
220Have fun, 229Have fun,
221 230
222Corinna Vinschen 231Corinna Vinschen
diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config
index 9c0dabf41..c7164f610 100644
--- a/contrib/cygwin/ssh-host-config
+++ b/contrib/cygwin/ssh-host-config
@@ -449,7 +449,7 @@ then
449 echo "Should this script create a new local account 'sshd_server' which has" 449 echo "Should this script create a new local account 'sshd_server' which has"
450 if request "the required privileges?" 450 if request "the required privileges?"
451 then 451 then
452 _admingroup=`awk -F: '{if ( $2 == "S-1-5-32-544" ) print $1;}' ${SYSCONFDIR}/group` 452 _admingroup=`awk -F: '{if ( $1 != "root" && $2 == "S-1-5-32-544" ) print $1;}' ${SYSCONFDIR}/group`
453 if [ -z "${_admingroup}" ] 453 if [ -z "${_admingroup}" ]
454 then 454 then
455 echo "There's no group with SID S-1-5-32-544 (Local administrators group) in" 455 echo "There's no group with SID S-1-5-32-544 (Local administrators group) in"