mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-12-19 08:34:32 +00:00
037a0dc083
- [atomicio.c authfd.c scp.c serverloop.c ssh.h sshconnect.c sshd.c]
move atomicio into it's own file. wrap all socket write()s which
were doing write(sock, buf, len) != len, with atomicio() calls.
- [auth-skey.c]
fd leak
- [authfile.c]
properly name fd variable
- [channels.c]
display great hatred towards strcpy
- [pty.c pty.h sshd.c]
use openpty() if it exists (it does on BSD4_4)
- [tildexpand.c]
check for ~ expansion past MAXPATHLEN
- Modified helper.c to use new atomicio function.
- Reformat Makefile a little
- Moved RC4 routines from rc4.[ch] into helper.c
- Added autoconf code to detect /dev/ptmx (Solaris) and /dev/ptc (AIX)
67 lines
1.7 KiB
C
67 lines
1.7 KiB
C
/*
|
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
|
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
|
* All rights reserved
|
|
* Created: Wed Jul 12 01:07:36 1995 ylo
|
|
*/
|
|
|
|
#include "includes.h"
|
|
RCSID("$Id: tildexpand.c,v 1.4 1999/12/07 04:38:32 damien Exp $");
|
|
|
|
#include "xmalloc.h"
|
|
#include "ssh.h"
|
|
|
|
/*
|
|
* Expands tildes in the file name. Returns data allocated by xmalloc.
|
|
* Warning: this calls getpw*.
|
|
*/
|
|
char *
|
|
tilde_expand_filename(const char *filename, uid_t my_uid)
|
|
{
|
|
const char *cp;
|
|
unsigned int userlen;
|
|
char *expanded;
|
|
struct passwd *pw;
|
|
char user[100];
|
|
int len;
|
|
|
|
/* Return immediately if no tilde. */
|
|
if (filename[0] != '~')
|
|
return xstrdup(filename);
|
|
|
|
/* Skip the tilde. */
|
|
filename++;
|
|
|
|
/* Find where the username ends. */
|
|
cp = strchr(filename, '/');
|
|
if (cp)
|
|
userlen = cp - filename; /* Something after username. */
|
|
else
|
|
userlen = strlen(filename); /* Nothing after username. */
|
|
if (userlen == 0)
|
|
pw = getpwuid(my_uid); /* Own home directory. */
|
|
else {
|
|
/* Tilde refers to someone elses home directory. */
|
|
if (userlen > sizeof(user) - 1)
|
|
fatal("User name after tilde too long.");
|
|
memcpy(user, filename, userlen);
|
|
user[userlen] = 0;
|
|
pw = getpwnam(user);
|
|
}
|
|
if (!pw)
|
|
fatal("Unknown user %100s.", user);
|
|
|
|
/* If referring to someones home directory, return it now. */
|
|
if (!cp) {
|
|
/* Only home directory specified */
|
|
return xstrdup(pw->pw_dir);
|
|
}
|
|
/* Build a path combining the specified directory and path. */
|
|
len = strlen(pw->pw_dir) + strlen(cp + 1) + 2;
|
|
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);
|
|
return expanded;
|
|
}
|