Login | Register For Free | Help
Search for: (Advanced)

Mailing List Archive: OpenSSH: Dev

[PATCH] contrib/cygwin/ssh-user-config

 

 

OpenSSH dev RSS feed   Index | Next | Previous | View Threaded


vinschen at redhat

Jul 29, 2009, 1:49 AM

Post #1 of 2 (978 views)
Permalink
[PATCH] contrib/cygwin/ssh-user-config

Hi,

the Cygwin ssh-user-config script calls the wrong error function.
Please apply the below patch.


Thanks,
Corinna


Index: contrib/cygwin/ssh-user-config
===================================================================
RCS file: /cvs/openssh/contrib/cygwin/ssh-user-config,v
retrieving revision 1.6
diff -u -p -r1.6 ssh-user-config
--- contrib/cygwin/ssh-user-config 12 Jul 2009 11:58:42 -0000 1.6
+++ contrib/cygwin/ssh-user-config 29 Jul 2009 08:49:06 -0000
@@ -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.'


--
Corinna Vinschen
Cygwin Project Co-Leader
Red Hat
_______________________________________________
openssh-unix-dev mailing list
openssh-unix-dev [at] mindrot
https://lists.mindrot.org/mailman/listinfo/openssh-unix-dev


tim at multitalents

Jul 29, 2009, 7:22 AM

Post #2 of 2 (927 views)
Permalink
Re: [PATCH] contrib/cygwin/ssh-user-config [In reply to]

On Wed, 29 Jul 2009, Corinna Vinschen wrote:

> Hi,
>
> the Cygwin ssh-user-config script calls the wrong error function.
> Please apply the below patch.

Done.

> Thanks,
> Corinna
>
>
> Index: contrib/cygwin/ssh-user-config
> ===================================================================
[snip]

--
Tim Rice Multitalents (707) 887-1469
tim [at] multitalents


_______________________________________________
openssh-unix-dev mailing list
openssh-unix-dev [at] mindrot
https://lists.mindrot.org/mailman/listinfo/openssh-unix-dev

OpenSSH dev RSS feed   Index | Next | Previous | View Threaded
 
 


Interested in having your list archived? Contact Gossamer Threads
 
  Web Applications & Managed Hosting Powered by Gossamer Threads Inc.