diff options
| author | Tim Rice <tim@multitalents.net> | 2009-07-29 07:21:13 -0700 |
|---|---|---|
| committer | Tim Rice <tim@multitalents.net> | 2009-07-29 07:21:13 -0700 |
| commit | caeb16498409fb0570e665a7400ce88c9c4d17be (patch) | |
| tree | ae4ef0e5c21078c0b3ae0b31effe31a04a362871 | |
| parent | 440089afe071817443c15d8914097a43e0485a89 (diff) | |
- (tim) [contrib/cygwin/ssh-user-config] Change script to call correct error
function. Patch from Corinna Vinschen.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | contrib/cygwin/ssh-user-config | 6 |
2 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,7 @@ +20090729 + - (tim) [contrib/cygwin/ssh-user-config] Change script to call correct error + function. Patch from Corinna Vinschen. + 20090713 - (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 diff --git a/contrib/cygwin/ssh-user-config b/contrib/cygwin/ssh-user-config index 303aef0b..f1a001a9 100644 --- a/contrib/cygwin/ssh-user-config +++ b/contrib/cygwin/ssh-user-config @@ -130,14 +130,14 @@ check_user_homedir() { pwdhome=$(awk -F: '{ if ( $3 == '${uid}' ) print $6; }' < ${SYSCONFDIR}/passwd) if [ "X${pwdhome}" = "X" ] then - csih_error_multiline \ + csih_error_multi \ "There is no home directory set for you in ${SYSCONFDIR}/passwd." \ 'Setting $HOME is not sufficient!' fi if [ ! -d "${pwdhome}" ] then - csih_error_multiline \ + csih_error_multi \ "${pwdhome} is set in ${SYSCONFDIR}/passwd as your home directory" \ 'but it is not a valid directory. Cannot create user identity files.' fi @@ -303,7 +303,7 @@ done # Check passwd file if [ ! -f ${SYSCONFDIR}/passwd ] then - csih_error_multiline \ + csih_error_multi \ "${SYSCONFDIR}/passwd is nonexistant. Please generate an ${SYSCONFDIR}/passwd file" \ 'first using mkpasswd. Check if it contains an entry for you and' \ 'please care for the home directory in your entry as well.' |