tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- deraadt@cvs.openbsd.org 2001/07/09 07:04:53 

[session.c sftp-int.c]
     correct type on last arg to execl(); nordin@cse.ogi.edu
This commit is contained in:
Damien Miller 2001-07-14 12:19:36 +10:00
parent f4614450d1
commit efb1edfc7f
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -28,6 +28,9 @@
- fgsch@cvs.openbsd.org 2001/07/09 05:58:47 - fgsch@cvs.openbsd.org 2001/07/09 05:58:47
[ssh.c] [ssh.c]
Use getopt(3); markus@ ok. Use getopt(3); markus@ ok.
- deraadt@cvs.openbsd.org 2001/07/09 07:04:53
[session.c sftp-int.c]
correct type on last arg to execl(); nordin@cse.ogi.edu
20010711 20010711
- (djm) dirname(3) may modify its argument on glibc and other systems. - (djm) dirname(3) may modify its argument on glibc and other systems.
@ -6003,4 +6006,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1393 2001/07/14 02:18:10 djm Exp $ $Id: ChangeLog,v 1.1394 2001/07/14 02:19:36 djm Exp $

4
session.c
View File

@ -33,7 +33,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: session.c,v 1.98 2001/07/02 13:59:15 markus Exp $"); RCSID("$OpenBSD: session.c,v 1.99 2001/07/09 07:04:53 deraadt Exp $");
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"
@ -1499,7 +1499,7 @@ do_child(Session *s, const char *command)
#ifdef LOGIN_NEEDS_TERM #ifdef LOGIN_NEEDS_TERM
s->term? s->term : "unknown", s->term? s->term : "unknown",
#endif #endif
"-p", "-f", "--", pw->pw_name, NULL); "-p", "-f", "--", pw->pw_name, (char *)NULL);
/* Login couldn't be executed, die. */ /* Login couldn't be executed, die. */

6
sftp-int.c
View File

@ -26,7 +26,7 @@
/* XXX: recursive operations */ /* XXX: recursive operations */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sftp-int.c,v 1.37 2001/06/23 15:12:20 itojun Exp $"); RCSID("$OpenBSD: sftp-int.c,v 1.38 2001/07/09 07:04:53 deraadt Exp $");
#include "buffer.h" #include "buffer.h"
#include "xmalloc.h" #include "xmalloc.h"
@ -163,10 +163,10 @@ local_do_shell(const char *args)
/* XXX: child has pipe fds to ssh subproc open - issue? */ /* XXX: child has pipe fds to ssh subproc open - issue? */
if (args) { if (args) {
debug3("Executing %s -c \"%s\"", shell, args); debug3("Executing %s -c \"%s\"", shell, args);
execl(shell, shell, "-c", args, NULL); execl(shell, shell, "-c", args, (char *)NULL);
} else { } else {
debug3("Executing %s", shell); debug3("Executing %s", shell);
execl(shell, shell, NULL); execl(shell, shell, (char *)NULL);
} }
fprintf(stderr, "Couldn't execute \"%s\": %s\n", shell, fprintf(stderr, "Couldn't execute \"%s\": %s\n", shell,
strerror(errno)); strerror(errno));