RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-26 20:02:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

- (tim) [contrib/cygwin/ssh-user-config] Change script to call correct error

Browse Source 
function. Patch from Corinna Vinschen.
This commit is contained in:
Tim Rice 2009-07-29 07:21:13 -07:00
parent 440089afe0
commit caeb164984
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
20090729
- (tim) [contrib/cygwin/ssh-user-config] Change script to call correct error
function. Patch from Corinna Vinschen.
20090713 20090713
- (dtucker) [openbsd-compat/getrrsetbyname.c] Reduce answer buffer size so it - (dtucker) [openbsd-compat/getrrsetbyname.c] Reduce answer buffer size so it
fits into 16 bits to work around a bug in glibc's resolver where it masks fits into 16 bits to work around a bug in glibc's resolver where it masks

6
contrib/cygwin/ssh-user-config
View File

@ -130,14 +130,14 @@ check_user_homedir() {
pwdhome=$(awk -F: '{ if ( $3 == '${uid}' ) print $6; }' < ${SYSCONFDIR}/passwd) pwdhome=$(awk -F: '{ if ( $3 == '${uid}' ) print $6; }' < ${SYSCONFDIR}/passwd)
if [ "X${pwdhome}" = "X" ] if [ "X${pwdhome}" = "X" ]
then then
csih_error_multiline \ csih_error_multi \
"There is no home directory set for you in ${SYSCONFDIR}/passwd." \ "There is no home directory set for you in ${SYSCONFDIR}/passwd." \
'Setting $HOME is not sufficient!' 'Setting $HOME is not sufficient!'
fi fi
if [ ! -d "${pwdhome}" ] if [ ! -d "${pwdhome}" ]
then then
csih_error_multiline \ csih_error_multi \
"${pwdhome} is set in ${SYSCONFDIR}/passwd as your home directory" \ "${pwdhome} is set in ${SYSCONFDIR}/passwd as your home directory" \
'but it is not a valid directory. Cannot create user identity files.' 'but it is not a valid directory. Cannot create user identity files.'
fi fi
@ -303,7 +303,7 @@ done
# Check passwd file # Check passwd file
if [ ! -f ${SYSCONFDIR}/passwd ] if [ ! -f ${SYSCONFDIR}/passwd ]
then then
csih_error_multiline \ csih_error_multi \
"${SYSCONFDIR}/passwd is nonexistant. Please generate an ${SYSCONFDIR}/passwd file" \ "${SYSCONFDIR}/passwd is nonexistant. Please generate an ${SYSCONFDIR}/passwd file" \
'first using mkpasswd. Check if it contains an entry for you and' \ 'first using mkpasswd. Check if it contains an entry for you and' \
'please care for the home directory in your entry as well.' 'please care for the home directory in your entry as well.'