oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

merge strcpy_truncate branch

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5027 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1998-06-09 19:25:40 +00:00
parent e255dfc950
commit a5f54865d4
87 changed files with 689 additions and 499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
appl/kx/common.c
View File

@@ -325,8 +325,7 @@ create_and_write_cookie (char *xauthfile,
auth.data = (char*)cookie;
des_rand_data (cookie, sz);
strncpy(xauthfile, "/tmp/AXXXXXX", size);
xauthfile[size-1] = 0;
strcpy_truncate(xauthfile, "/tmp/AXXXXXX", size);
fd = mkstemp(xauthfile);
if(fd < 0) {
syslog(LOG_ERR, "create_and_write_cookie: mkstemp: %m");

56
appl/kx/kx.c
View File

@@ -236,8 +236,8 @@ doit_passive (char *host, char *user, int debugp, int keepalivep,
p = msg;
*p++ = INIT;
len = strlen(user);
p += krb_put_int (len, p, 4);
strncpy(p, user, len);
p += krb_put_int (len, p, sizeof(msg) - 1, 4);
memcpy(p, user, len);
p += len;
*p++ = PASSIVE | (keepalivep ? KEEP_ALIVE : 0);
if (write_encrypted (otherside, msg, p - msg, schedule,
@@ -260,12 +260,12 @@ doit_passive (char *host, char *user, int debugp, int keepalivep,
} else
p++;
p += krb_get_int (p, &tmp, 4, 0);
strncpy(display, p, tmp);
memcpy(display, p, tmp);
display[tmp] = '\0';
p += tmp;
p += krb_get_int (p, &tmp, 4, 0);
strncpy(xauthfile, p, tmp);
memcpy(xauthfile, p, tmp);
xauthfile[tmp] = '\0';
p += tmp;
@@ -358,6 +358,8 @@ doit_active (char *host, char *user,
int tmp2;
char *s;
int i;
size_t rem;
u_int32_t other_port;
otherside = connect_host (host, user, &key, schedule, port,
&me, &him);
@@ -372,28 +374,46 @@ doit_active (char *host, char *user,
}
#endif
p = msg;
rem = sizeof(msg);
*p++ = INIT;
--rem;
len = strlen(user);
p += krb_put_int (len, p, 4);
strncpy(p, user, len);
tmp = krb_put_int (len, p, rem, 4);
if (tmp < 0)
return 1;
p += tmp;
rem -= tmp;
memcpy(p, user, len);
p += len;
rem -= len;
*p++ = (keepalivep ? KEEP_ALIVE : 0);
--rem;
s = getenv("DISPLAY");
if (s == NULL || (s = strchr(s, ':')) == NULL)
s = ":0";
len = strlen (s);
p += krb_put_int (len, p, 4);
strncpy (p, s, len);
tmp = krb_put_int (len, p, rem, 4);
if (tmp < 0)
return 1;
rem -= tmp;
p += tmp;
memcpy (p, s, len);
p += len;
rem -= len;
s = getenv("XAUTHORITY");
if (s == NULL)
s = "";
len = strlen (s);
p += krb_put_int (len, p, 4);
strncpy (p, s, len);
tmp = krb_put_int (len, p, rem, 4);
if (tmp < 0)
return 1;
p += len;
rem -= len;
memcpy (p, s, len);
p += len;
rem -= len;
if (write_encrypted (otherside, msg, p - msg, schedule,
&key, &me, &him) < 0)
@@ -405,9 +425,11 @@ doit_active (char *host, char *user,
err (1, "read from %s", host);
p = (u_char *)ret;
if (*p == ERROR) {
u_int32_t u32;
p++;
p += krb_get_int (p, &tmp, 4, 0);
errx (1, "%s: %.*s", host, (int)tmp, p);
p += krb_get_int (p, &u32, 4, 0);
errx (1, "%s: %.*s", host, (int)u32, p);
} else if (*p != ACK) {
errx (1, "%s: strange msg %d", host, *p);
} else
@@ -458,14 +480,16 @@ doit_active (char *host, char *user,
err (1, "read from %s", host);
p = (u_char *)ret;
if (*p == ERROR) {
u_int32_t val;
p++;
p += krb_get_int (p, &tmp, 4, 0);
errx (1, "%s: %.*s", host, (int)tmp, p);
p += krb_get_int (p, &val, 4, 0);
errx (1, "%s: %.*s", host, (int)val, p);
} else if (*p != NEW_CONN) {
errx (1, "%s: strange msg %d", host, *p);
} else {
p++;
p += krb_get_int (p, &tmp, 4, 0);
p += krb_get_int (p, &other_port, 4, 0);
}
++nchild;
@@ -483,7 +507,7 @@ doit_active (char *host, char *user,
addr = him;
close (otherside);
addr.sin_port = htons(tmp);
addr.sin_port = htons(other_port);
s = socket (AF_INET, SOCK_STREAM, 0);
if (s < 0)
err(1, "socket");

46
appl/kx/kxd.c
View File

@@ -83,7 +83,7 @@ fatal (int fd, des_cblock *key, des_key_schedule schedule,
vsnprintf (p + 4, sizeof(msg) - 5, format, args);
syslog (LOG_ERR, p + 4);
len = strlen (p + 4);
p += krb_put_int (len, p, 4);
p += krb_put_int (len, p, 4, 4);
p += len;
write_encrypted (fd, msg, p - msg, schedule, key, thisaddr, thataddr);
va_end(args);
@@ -113,8 +113,8 @@ recv_conn (int sock, des_cblock *key, des_key_schedule schedule,
int status;
KTEXT_ST ticket;
AUTH_DAT auth;
char user[ANAME_SZ + 1];
char instance[INST_SZ + 1];
char user[ANAME_SZ];
char instance[INST_SZ];
int addrlen;
char version[KRB_SENDAUTH_VLEN + 1];
struct passwd *passwd;
@@ -177,7 +177,7 @@ recv_conn (int sock, des_cblock *key, des_key_schedule schedule,
p++;
p += krb_get_int (p, &tmp, 4, 0);
len = min(sizeof(user), tmp);
strncpy (user, p, len);
memcpy (user, p, len);
p += tmp;
user[len] = '\0';
@@ -208,12 +208,13 @@ recv_conn (int sock, des_cblock *key, des_key_schedule schedule,
if (!(flags & PASSIVE)) {
p += krb_get_int (p, &tmp, 4, 0);
len = min(tmp, display_size);
strncpy (display, p, len);
memcpy (display, p, len);
display[len] = '\0';
p += tmp;
p += krb_get_int (p, &tmp, 4, 0);
len = min(tmp, xauthfile_size);
strncpy (xauthfile, p, len);
memcpy (xauthfile, p, len);
xauthfile[len] = '\0';
p += tmp;
}
#if defined(SO_KEEPALIVE) && defined(HAVE_SETSOCKOPT)
@@ -301,7 +302,7 @@ doit_conn (int fd, int meta_sock, int flags,
}
p = msg;
*p++ = NEW_CONN;
p += krb_put_int (ntohs(addr.sin_port), p, 4);
p += krb_put_int (ntohs(addr.sin_port), p, 4, 4);
if (write_encrypted (meta_sock, msg, p - msg, schedule, key,
thisaddr, thataddr) < 0) {
@@ -362,6 +363,7 @@ doit(int sock, int tcpp)
if (flags & PASSIVE) {
int tmp;
int len;
size_t rem;
tmp = get_xsockets (&nsockets, &sockets, tcpp);
if (tmp < 0) {
@@ -385,15 +387,37 @@ doit(int sock, int tcpp)
}
p = msg;
rem = sizeof(msg);
*p++ = ACK;
--rem;
len = strlen (display);
p += krb_put_int (len, p, 4);
strncpy (p, display, len);
tmp = krb_put_int (len, p, rem, 4);
if (tmp < 0 || rem < len + 4) {
syslog (LOG_ERR, "doit: buffer too small");
cleanup(nsockets, sockets);
return 1;
}
p += tmp;
rem -= tmp;
memcpy (p, display, len);
p += len;
rem -= len;
len = strlen (xauthfile);
p += krb_put_int (len, p, 4);
strncpy (p, xauthfile, len);
tmp = krb_put_int (len, p, rem, 4);
if (tmp < 0 || rem < len + 4) {
syslog (LOG_ERR, "doit: buffer too small");
cleanup(nsockets, sockets);
return 1;
}
p += tmp;
rem -= tmp;
memcpy (p, xauthfile, len);
p += len;
rem -= len;
if(write_encrypted (sock, msg, p - msg, schedule, &key,
&me, &him) < 0) {

2
appl/kx/rxterm.in
View File

@@ -34,4 +34,4 @@ pid=$1
disp=${2}${screen}
auth=$3
kill -USR1 $pid
rsh -n $rsh_args $host "env DISPLAY=$disp XAUTHORITY=$auth $term -T $title -n $title $xterm_args &"
rsh -n $rsh_args $host "/bin/sh -c 'DISPLAY=$disp XAUTHORITY=$auth $term -T $title -n $title $xterm_args </dev/null >/dev/null 2>/dev/null &'"