From caeb16498409fb0570e665a7400ce88c9c4d17be Mon Sep 17 00:00:00 2001
From: Tim Rice <tim@multitalents.net>
Date: Wed, 29 Jul 2009 07:21:13 -0700
Subject: [PATCH]  - (tim) [contrib/cygwin/ssh-user-config] Change script to
 call correct error    function. Patch from Corinna Vinschen.

---
 ChangeLog                      | 4 ++++
 contrib/cygwin/ssh-user-config | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f6067e8a0..2c4129e3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 303aef0bb..f1a001a93 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.'