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 /contrib/cygwin/ssh-user-config | |
parent | 440089afe071817443c15d8914097a43e0485a89 (diff) |
- (tim) [contrib/cygwin/ssh-user-config] Change script to call correct error
function. Patch from Corinna Vinschen.
Diffstat (limited to 'contrib/cygwin/ssh-user-config')
-rw-r--r-- | contrib/cygwin/ssh-user-config | 6 |
1 files changed, 3 insertions, 3 deletions
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() { | |||
130 | pwdhome=$(awk -F: '{ if ( $3 == '${uid}' ) print $6; }' < ${SYSCONFDIR}/passwd) | 130 | pwdhome=$(awk -F: '{ if ( $3 == '${uid}' ) print $6; }' < ${SYSCONFDIR}/passwd) |
131 | if [ "X${pwdhome}" = "X" ] | 131 | if [ "X${pwdhome}" = "X" ] |
132 | then | 132 | then |
133 | csih_error_multiline \ | 133 | csih_error_multi \ |
134 | "There is no home directory set for you in ${SYSCONFDIR}/passwd." \ | 134 | "There is no home directory set for you in ${SYSCONFDIR}/passwd." \ |
135 | 'Setting $HOME is not sufficient!' | 135 | 'Setting $HOME is not sufficient!' |
136 | fi | 136 | fi |
137 | 137 | ||
138 | if [ ! -d "${pwdhome}" ] | 138 | if [ ! -d "${pwdhome}" ] |
139 | then | 139 | then |
140 | csih_error_multiline \ | 140 | csih_error_multi \ |
141 | "${pwdhome} is set in ${SYSCONFDIR}/passwd as your home directory" \ | 141 | "${pwdhome} is set in ${SYSCONFDIR}/passwd as your home directory" \ |
142 | 'but it is not a valid directory. Cannot create user identity files.' | 142 | 'but it is not a valid directory. Cannot create user identity files.' |
143 | fi | 143 | fi |
@@ -303,7 +303,7 @@ done | |||
303 | # Check passwd file | 303 | # Check passwd file |
304 | if [ ! -f ${SYSCONFDIR}/passwd ] | 304 | if [ ! -f ${SYSCONFDIR}/passwd ] |
305 | then | 305 | then |
306 | csih_error_multiline \ | 306 | csih_error_multi \ |
307 | "${SYSCONFDIR}/passwd is nonexistant. Please generate an ${SYSCONFDIR}/passwd file" \ | 307 | "${SYSCONFDIR}/passwd is nonexistant. Please generate an ${SYSCONFDIR}/passwd file" \ |
308 | 'first using mkpasswd. Check if it contains an entry for you and' \ | 308 | 'first using mkpasswd. Check if it contains an entry for you and' \ |
309 | 'please care for the home directory in your entry as well.' | 309 | 'please care for the home directory in your entry as well.' |