summaryrefslogtreecommitdiff
path: root/ssh.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-04-12 18:45:05 +1000
committerDamien Miller <djm@mindrot.org>2000-04-12 18:45:05 +1000
commitefb4afe0265333ce554f699c2a19ae249dd8d1b5 (patch)
tree8fe5e0bb9791e7fa3d1788084ae669f7a9dcd2e0 /ssh.h
parent11e37f638d3cc064371521001eaeb2d75bfe4a8d (diff)
- More large OpenBSD CVS updates:
- [auth.c auth.h servconf.c servconf.h serverloop.c session.c] [session.h ssh.h sshd.c README.openssh2] ssh2 server side, see README.openssh2; enable with 'sshd -2' - [channels.c] no adjust after close - [sshd.c compat.c ] interop w/ latest ssh.com windows client.
Diffstat (limited to 'ssh.h')
-rw-r--r--ssh.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/ssh.h b/ssh.h
index cc8940b5..7c5bf9c5 100644
--- a/ssh.h
+++ b/ssh.h
@@ -13,7 +13,7 @@
*
*/
-/* RCSID("$Id: ssh.h,v 1.29 2000/04/01 01:09:26 damien Exp $"); */
+/* RCSID("$Id: ssh.h,v 1.30 2000/04/12 08:45:07 damien Exp $"); */
#ifndef SSH_H
#define SSH_H
@@ -90,6 +90,7 @@
#define HOST_KEY_FILE ETCDIR "/ssh_host_key"
#define SERVER_CONFIG_FILE ETCDIR "/sshd_config"
#define HOST_CONFIG_FILE ETCDIR "/ssh_config"
+#define DSA_KEY_FILE ETCDIR "/ssh_dsa_key"
#ifndef SSH_PROGRAM
#define SSH_PROGRAM "/usr/bin/ssh"
@@ -486,6 +487,8 @@ void fatal_add_cleanup(void (*proc) (void *context), void *context);
/* Removes a cleanup function to be called at fatal(). */
void fatal_remove_cleanup(void (*proc) (void *context), void *context);
+/* ---- misc */
+
/*
* Expands tildes in the file name. Returns data allocated by xmalloc.
* Warning: this calls getpw*.
@@ -500,6 +503,7 @@ char *tilde_expand_filename(const char *filename, uid_t my_uid);
* program).
*/
void server_loop(int pid, int fdin, int fdout, int fderr);
+void server_loop2(void);
/* Client side main loop for the interactive session. */
int client_loop(int have_pty, int escape_char);