Subject: Re: OpenSSH patches dealing with incorrect pathing
From: Corinna Vinschen <[email-masked]>
To: Mark Bradshaw <[email-masked]>
Cc: cygwin <[email-masked]>
Date: Thu, 9 Aug 2001 10:58:35 +0200

On Wed, Aug 08, 2001 at 06:46:53PM -0400, Mark Bradshaw wrote:
> [...]
> As far as I can tell only ssh.c and tildexpand.c need to be patched.  Ssh.c
> is patched where it tries to create the .ssh directory, and tildexpand.c is
> patched where it expands the user's home directory (incorrectly).
> 
> Mark

Thanks for these patches. Unfortunately they aren't ok since you seem
to have them pasted(?) into your mail so the patches are broken at...

> ================================================
> diff for ssh.c
> 
> --- /usr/src/openssh-2.9p2-3/ssh.c	Tue Apr 17 14:14:35 2001
> +++ ssh-new.c	Wed Aug  8 18:36:18 2001
> @@ -680,7 +680,7 @@ main(int ac, char **av)
>  	 * Now that we are back to our own permissions, create ~/.ssh
>  	 * directory if it doesn\'t already exist.
>  	 */
> -	snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir,
> _PATH_SSH_USER_DIR);
> +	snprintf(buf, sizeof buf, "%.100s%s%.100s", pw->pw_dir,
> strcmp(pw->pw_dir, "/") ? "/" : "", _PATH_SSH_USER_DIR);

...that point and at...

>  	if (stat(buf, &st) < 0)
>  		if (mkdir(buf, 0700) < 0)
>  			error("Could not create directory '%.200s'.", buf);
> 
> =================================================
> diff for tildexpand.c
> 
> --- /usr/src/openssh-2.9p2-3/tildexpand.c	Thu Feb  8 21:11:25 2001
> +++ tildexpand-new.c	Wed Aug  8 18:37:45 2001
> @@ -67,6 +67,6 @@ tilde_expand_filename(const char *filena
>  	if (len > MAXPATHLEN)
>  		fatal("Home directory too long (%d > %d", len-1,
> MAXPATHLEN-1);
>  	expanded = xmalloc(len);
> -	snprintf(expanded, len, "%s/%s", pw->pw_dir, cp + 1);
> +	snprintf(expanded, len, "%s%s%s", pw->pw_dir, strcmp(pw->pw_dir,
> "/") ? "/" : "", cp + 1);
  
...that point. Please send both patches together in one single 
attached file so that they immediately apply using `patch'.
I will forward them to the OpenSSH developers list then.

BTW, aren't you subscribed to the openssh-unix-dev mailing list?
I'm under the impression it could be of interest for you.

Corinna

-- 
Corinna Vinschen                  Please, send mails regarding Cygwin to
Cygwin Developer                                mailto:[email-masked]
Red Hat, Inc.

--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Bug reporting:         http://cygwin.com/bugs.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/