3 files changed, 9 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 0d357ef86..9376129e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,9 @@
    - fgsch@cvs.openbsd.org 2001/07/09 05:58:47
      [ssh.c]
      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
  - (djm) dirname(3) may modify its argument on glibc and other systems. 
@@ -6003,4 +6006,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - 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 $
diff --git a/session.c b/session.c
index 8d7ef52ba..e01680423 100644
--- a/session.c
+++ b/session.c
@@ -33,7 +33,7 @@
  */
 
 #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 "ssh1.h"
@@ -1499,7 +1499,7 @@ do_child(Session *s, const char *command)
 #ifdef LOGIN_NEEDS_TERM
                              s->term? s->term : "unknown",
 #endif
-                             "-p", "-f", "--", pw->pw_name, NULL);
+                             "-p", "-f", "--", pw->pw_name, (char *)NULL);
 
                         /* Login couldn't be executed, die. */
 
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 @@
 /* XXX: recursive operations */
 
 #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 "xmalloc.h"
@@ -163,10 +163,10 @@ local_do_shell(const char *args)
                 /* XXX: child has pipe fds to ssh subproc open - issue? */
                 if (args) {
                         debug3("Executing %s -c \"%s\"", shell, args);
-                        execl(shell, shell, "-c", args, NULL);
+                        execl(shell, shell, "-c", args, (char *)NULL);
                 } else {
                         debug3("Executing %s", shell);
-                        execl(shell, shell, NULL);
+                        execl(shell, shell, (char *)NULL);
                 }
                 fprintf(stderr, "Couldn't execute \"%s\": %s\n", shell,
                     strerror(errno));