summaryrefslogtreecommitdiff
path: root/session.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-03-22 01:25:37 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-03-22 01:25:37 +0000
commitb4c961d822fd9cc4ed04285e45bfdaac335b8b21 (patch)
tree603b994568352a023633948294ffc98453ddc72f /session.c
parent6b77643fd58f697d68f6f99bfa345e0197e909c6 (diff)
- markus@cvs.openbsd.org 2001/03/20 19:21:21
[session.c] remove unused arg
Diffstat (limited to 'session.c')
-rw-r--r--session.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/session.c b/session.c
index ace284deb..d1925334d 100644
--- a/session.c
+++ b/session.c
@@ -33,7 +33,7 @@
33 */ 33 */
34 34
35#include "includes.h" 35#include "includes.h"
36RCSID("$OpenBSD: session.c,v 1.62 2001/03/20 18:57:04 markus Exp $"); 36RCSID("$OpenBSD: session.c,v 1.63 2001/03/20 19:21:21 markus Exp $");
37 37
38#include "ssh.h" 38#include "ssh.h"
39#include "ssh1.h" 39#include "ssh1.h"
@@ -124,8 +124,8 @@ Session *session_new(void);
124void session_set_fds(Session *s, int fdin, int fdout, int fderr); 124void session_set_fds(Session *s, int fdin, int fdout, int fderr);
125void session_pty_cleanup(Session *s); 125void session_pty_cleanup(Session *s);
126void session_proctitle(Session *s); 126void session_proctitle(Session *s);
127void do_exec_pty(Session *s, const char *command, struct passwd * pw); 127void do_exec_pty(Session *s, const char *command);
128void do_exec_no_pty(Session *s, const char *command, struct passwd * pw); 128void do_exec_no_pty(Session *s, const char *command);
129void do_login(Session *s, const char *command); 129void do_login(Session *s, const char *command);
130void do_child(Session *s, const char *command); 130void do_child(Session *s, const char *command);
131 131
@@ -421,9 +421,9 @@ do_authenticated(struct passwd * pw)
421 debug("Forced command '%.500s'", forced_command); 421 debug("Forced command '%.500s'", forced_command);
422 } 422 }
423 if (have_pty) 423 if (have_pty)
424 do_exec_pty(s, command, pw); 424 do_exec_pty(s, command);
425 else 425 else
426 do_exec_no_pty(s, command, pw); 426 do_exec_no_pty(s, command);
427 427
428 if (command != NULL) 428 if (command != NULL)
429 xfree(command); 429 xfree(command);
@@ -457,7 +457,7 @@ do_authenticated(struct passwd * pw)
457 * setting up file descriptors and such. 457 * setting up file descriptors and such.
458 */ 458 */
459void 459void
460do_exec_no_pty(Session *s, const char *command, struct passwd * pw) 460do_exec_no_pty(Session *s, const char *command)
461{ 461{
462 int pid; 462 int pid;
463 463
@@ -586,7 +586,7 @@ do_exec_no_pty(Session *s, const char *command, struct passwd * pw)
586 * lastlog, and other such operations. 586 * lastlog, and other such operations.
587 */ 587 */
588void 588void
589do_exec_pty(Session *s, const char *command, struct passwd * pw) 589do_exec_pty(Session *s, const char *command)
590{ 590{
591 int fdout, ptyfd, ttyfd, ptymaster; 591 int fdout, ptyfd, ttyfd, ptymaster;
592 pid_t pid; 592 pid_t pid;
@@ -1661,7 +1661,7 @@ session_subsystem_req(Session *s)
1661 for (i = 0; i < options.num_subsystems; i++) { 1661 for (i = 0; i < options.num_subsystems; i++) {
1662 if(strcmp(subsys, options.subsystem_name[i]) == 0) { 1662 if(strcmp(subsys, options.subsystem_name[i]) == 0) {
1663 debug("subsystem: exec() %s", options.subsystem_command[i]); 1663 debug("subsystem: exec() %s", options.subsystem_command[i]);
1664 do_exec_no_pty(s, options.subsystem_command[i], s->pw); 1664 do_exec_no_pty(s, options.subsystem_command[i]);
1665 success = 1; 1665 success = 1;
1666 } 1666 }
1667 } 1667 }
@@ -1737,9 +1737,9 @@ session_shell_req(Session *s)
1737 packet_done(); 1737 packet_done();
1738 s->extended = 1; 1738 s->extended = 1;
1739 if (s->ttyfd == -1) 1739 if (s->ttyfd == -1)
1740 do_exec_no_pty(s, shell, s->pw); 1740 do_exec_no_pty(s, shell);
1741 else 1741 else
1742 do_exec_pty(s, shell, s->pw); 1742 do_exec_pty(s, shell);
1743 return 1; 1743 return 1;
1744} 1744}
1745 1745
@@ -1756,9 +1756,9 @@ session_exec_req(Session *s)
1756 } 1756 }
1757 s->extended = 1; 1757 s->extended = 1;
1758 if (s->ttyfd == -1) 1758 if (s->ttyfd == -1)
1759 do_exec_no_pty(s, command, s->pw); 1759 do_exec_no_pty(s, command);
1760 else 1760 else
1761 do_exec_pty(s, command, s->pw); 1761 do_exec_pty(s, command);
1762 if (forced_command == NULL) 1762 if (forced_command == NULL)
1763 xfree(command); 1763 xfree(command);
1764 return 1; 1764 return 1;