diff options
author | Damien Miller <djm@mindrot.org> | 2001-07-14 12:19:36 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2001-07-14 12:19:36 +1000 |
commit | efb1edfc7fb393b8de2f50efa77c006f3bfe5394 (patch) | |
tree | 022862ca6ba02c141299c8aff994f19512ec48e1 | |
parent | f4614450d10eaef8c256a561e9b7887c31333e09 (diff) |
- 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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | session.c | 4 | ||||
-rw-r--r-- | sftp-int.c | 6 |
3 files changed, 9 insertions, 6 deletions
@@ -28,6 +28,9 @@ | |||
28 | - fgsch@cvs.openbsd.org 2001/07/09 05:58:47 | 28 | - fgsch@cvs.openbsd.org 2001/07/09 05:58:47 |
29 | [ssh.c] | 29 | [ssh.c] |
30 | Use getopt(3); markus@ ok. | 30 | Use getopt(3); markus@ ok. |
31 | - deraadt@cvs.openbsd.org 2001/07/09 07:04:53 | ||
32 | [session.c sftp-int.c] | ||
33 | correct type on last arg to execl(); nordin@cse.ogi.edu | ||
31 | 34 | ||
32 | 20010711 | 35 | 20010711 |
33 | - (djm) dirname(3) may modify its argument on glibc and other systems. | 36 | - (djm) dirname(3) may modify its argument on glibc and other systems. |
@@ -6003,4 +6006,4 @@ | |||
6003 | - Wrote replacements for strlcpy and mkdtemp | 6006 | - Wrote replacements for strlcpy and mkdtemp |
6004 | - Released 1.0pre1 | 6007 | - Released 1.0pre1 |
6005 | 6008 | ||
6006 | $Id: ChangeLog,v 1.1393 2001/07/14 02:18:10 djm Exp $ | 6009 | $Id: ChangeLog,v 1.1394 2001/07/14 02:19:36 djm Exp $ |
@@ -33,7 +33,7 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "includes.h" | 35 | #include "includes.h" |
36 | RCSID("$OpenBSD: session.c,v 1.98 2001/07/02 13:59:15 markus Exp $"); | 36 | RCSID("$OpenBSD: session.c,v 1.99 2001/07/09 07:04:53 deraadt Exp $"); |
37 | 37 | ||
38 | #include "ssh.h" | 38 | #include "ssh.h" |
39 | #include "ssh1.h" | 39 | #include "ssh1.h" |
@@ -1499,7 +1499,7 @@ do_child(Session *s, const char *command) | |||
1499 | #ifdef LOGIN_NEEDS_TERM | 1499 | #ifdef LOGIN_NEEDS_TERM |
1500 | s->term? s->term : "unknown", | 1500 | s->term? s->term : "unknown", |
1501 | #endif | 1501 | #endif |
1502 | "-p", "-f", "--", pw->pw_name, NULL); | 1502 | "-p", "-f", "--", pw->pw_name, (char *)NULL); |
1503 | 1503 | ||
1504 | /* Login couldn't be executed, die. */ | 1504 | /* Login couldn't be executed, die. */ |
1505 | 1505 | ||
diff --git a/sftp-int.c b/sftp-int.c index aa3a8a02f..573fea1df 100644 --- a/sftp-int.c +++ b/sftp-int.c | |||
@@ -26,7 +26,7 @@ | |||
26 | /* XXX: recursive operations */ | 26 | /* XXX: recursive operations */ |
27 | 27 | ||
28 | #include "includes.h" | 28 | #include "includes.h" |
29 | RCSID("$OpenBSD: sftp-int.c,v 1.37 2001/06/23 15:12:20 itojun Exp $"); | 29 | RCSID("$OpenBSD: sftp-int.c,v 1.38 2001/07/09 07:04:53 deraadt Exp $"); |
30 | 30 | ||
31 | #include "buffer.h" | 31 | #include "buffer.h" |
32 | #include "xmalloc.h" | 32 | #include "xmalloc.h" |
@@ -163,10 +163,10 @@ local_do_shell(const char *args) | |||
163 | /* XXX: child has pipe fds to ssh subproc open - issue? */ | 163 | /* XXX: child has pipe fds to ssh subproc open - issue? */ |
164 | if (args) { | 164 | if (args) { |
165 | debug3("Executing %s -c \"%s\"", shell, args); | 165 | debug3("Executing %s -c \"%s\"", shell, args); |
166 | execl(shell, shell, "-c", args, NULL); | 166 | execl(shell, shell, "-c", args, (char *)NULL); |
167 | } else { | 167 | } else { |
168 | debug3("Executing %s", shell); | 168 | debug3("Executing %s", shell); |
169 | execl(shell, shell, NULL); | 169 | execl(shell, shell, (char *)NULL); |
170 | } | 170 | } |
171 | fprintf(stderr, "Couldn't execute \"%s\": %s\n", shell, | 171 | fprintf(stderr, "Couldn't execute \"%s\": %s\n", shell, |
172 | strerror(errno)); | 172 | strerror(errno)); |