- markus@cvs.openbsd.org 2001/03/20 19:21:21
[session.c]
remove unused arg
diff --git a/ChangeLog b/ChangeLog
index c728afc..923485b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
- markus@cvs.openbsd.org 2001/03/20 19:10:16
[readconf.c]
default to SSH protocol version 2
+ - markus@cvs.openbsd.org 2001/03/20 19:21:21
+ [session.c]
+ remove unused arg
20010321
- (djm) Fix ttyname breakage for AIX and Tru64. Patch from Steve
@@ -4666,4 +4669,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1002 2001/03/22 01:24:04 mouring Exp $
+$Id: ChangeLog,v 1.1003 2001/03/22 01:25:37 mouring Exp $
diff --git a/session.c b/session.c
index ace284d..d192533 100644
--- a/session.c
+++ b/session.c
@@ -33,7 +33,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.62 2001/03/20 18:57:04 markus Exp $");
+RCSID("$OpenBSD: session.c,v 1.63 2001/03/20 19:21:21 markus Exp $");
#include "ssh.h"
#include "ssh1.h"
@@ -124,8 +124,8 @@
void session_set_fds(Session *s, int fdin, int fdout, int fderr);
void session_pty_cleanup(Session *s);
void session_proctitle(Session *s);
-void do_exec_pty(Session *s, const char *command, struct passwd * pw);
-void do_exec_no_pty(Session *s, const char *command, struct passwd * pw);
+void do_exec_pty(Session *s, const char *command);
+void do_exec_no_pty(Session *s, const char *command);
void do_login(Session *s, const char *command);
void do_child(Session *s, const char *command);
@@ -421,9 +421,9 @@
debug("Forced command '%.500s'", forced_command);
}
if (have_pty)
- do_exec_pty(s, command, pw);
+ do_exec_pty(s, command);
else
- do_exec_no_pty(s, command, pw);
+ do_exec_no_pty(s, command);
if (command != NULL)
xfree(command);
@@ -457,7 +457,7 @@
* setting up file descriptors and such.
*/
void
-do_exec_no_pty(Session *s, const char *command, struct passwd * pw)
+do_exec_no_pty(Session *s, const char *command)
{
int pid;
@@ -586,7 +586,7 @@
* lastlog, and other such operations.
*/
void
-do_exec_pty(Session *s, const char *command, struct passwd * pw)
+do_exec_pty(Session *s, const char *command)
{
int fdout, ptyfd, ttyfd, ptymaster;
pid_t pid;
@@ -1661,7 +1661,7 @@
for (i = 0; i < options.num_subsystems; i++) {
if(strcmp(subsys, options.subsystem_name[i]) == 0) {
debug("subsystem: exec() %s", options.subsystem_command[i]);
- do_exec_no_pty(s, options.subsystem_command[i], s->pw);
+ do_exec_no_pty(s, options.subsystem_command[i]);
success = 1;
}
}
@@ -1737,9 +1737,9 @@
packet_done();
s->extended = 1;
if (s->ttyfd == -1)
- do_exec_no_pty(s, shell, s->pw);
+ do_exec_no_pty(s, shell);
else
- do_exec_pty(s, shell, s->pw);
+ do_exec_pty(s, shell);
return 1;
}
@@ -1756,9 +1756,9 @@
}
s->extended = 1;
if (s->ttyfd == -1)
- do_exec_no_pty(s, command, s->pw);
+ do_exec_no_pty(s, command);
else
- do_exec_pty(s, command, s->pw);
+ do_exec_pty(s, command);
if (forced_command == NULL)
xfree(command);
return 1;