diff options
author | Damien Miller <djm@mindrot.org> | 2008-11-03 19:20:49 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2008-11-03 19:20:49 +1100 |
commit | d58f56000c95f2c4eca22b4f89f19c557e23d919 (patch) | |
tree | 929d7b9a052858f33847471189c6c669f6beb91f | |
parent | 456e6f0ebb27b4851363422aa9974b0848d4b168 (diff) |
- millert@cvs.openbsd.org 2008/10/02 14:39:35
[session.c]
Convert an unchecked strdup to xstrdup. OK deraadt@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | session.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -31,6 +31,9 @@ | |||
31 | [compat.c compat.h nchan.c ssh.c] | 31 | [compat.c compat.h nchan.c ssh.c] |
32 | only send eow and no-more-sessions requests to openssh 5 and newer; | 32 | only send eow and no-more-sessions requests to openssh 5 and newer; |
33 | fixes interop problems with broken ssh v2 implementations; ok djm@ | 33 | fixes interop problems with broken ssh v2 implementations; ok djm@ |
34 | - millert@cvs.openbsd.org 2008/10/02 14:39:35 | ||
35 | [session.c] | ||
36 | Convert an unchecked strdup to xstrdup. OK deraadt@ | ||
34 | 37 | ||
35 | 20080906 | 38 | 20080906 |
36 | - (dtucker) [config.guess config.sub] Update to latest versions from | 39 | - (dtucker) [config.guess config.sub] Update to latest versions from |
@@ -4765,4 +4768,4 @@ | |||
4765 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4768 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4766 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4769 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4767 | 4770 | ||
4768 | $Id: ChangeLog,v 1.5106 2008/11/03 08:20:10 djm Exp $ | 4771 | $Id: ChangeLog,v 1.5107 2008/11/03 08:20:49 djm Exp $ |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: session.c,v 1.242 2008/08/21 04:09:57 djm Exp $ */ | 1 | /* $OpenBSD: session.c,v 1.243 2008/10/02 14:39:35 millert Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
4 | * All rights reserved | 4 | * All rights reserved |
@@ -1795,7 +1795,7 @@ do_child(Session *s, const char *command) | |||
1795 | char *p, *args; | 1795 | char *p, *args; |
1796 | 1796 | ||
1797 | setproctitle("%s@internal-sftp-server", s->pw->pw_name); | 1797 | setproctitle("%s@internal-sftp-server", s->pw->pw_name); |
1798 | args = strdup(command ? command : "sftp-server"); | 1798 | args = xstrdup(command ? command : "sftp-server"); |
1799 | for (i = 0, (p = strtok(args, " ")); p; (p = strtok(NULL, " "))) | 1799 | for (i = 0, (p = strtok(args, " ")); p; (p = strtok(NULL, " "))) |
1800 | if (i < ARGV_MAX - 1) | 1800 | if (i < ARGV_MAX - 1) |
1801 | argv[i++] = p; | 1801 | argv[i++] = p; |