update version number for patch release today

[gssapi-openssh.git] / openssh / ssh.h

diff --git a/openssh/ssh.h b/openssh/ssh.h
index 186cfff9642f064cc0d048557cbe1a24a561a061..383c7fe9b1c9214225718f62c951d0bbb5063d6f 100644 (file)
--- a/openssh/ssh.h
+++ b/openssh/ssh.h
@@ -1,5 +1,3 @@
-/* $OpenBSD: ssh.h,v 1.78 2006/08/03 03:34:42 deraadt Exp $ */
-
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -12,6 +10,21 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
+/* RCSID("$OpenBSD: ssh.h,v 1.63 2001/05/24 18:57:53 stevesk Exp $"); */
+
+#ifndef SSH_H
+#define SSH_H
+
+#include <netinet/in.h> /* For struct sockaddr_in */
+#include <pwd.h> /* For struct pw */
+#include <stdarg.h> /* For va_list */
+#include <syslog.h> /* For LOG_AUTH and friends */
+#include <sys/socket.h> /* For struct sockaddr_storage */
+#include "openbsd-compat/fake-socket.h" /* For struct sockaddr_storage */
+#ifdef HAVE_SYS_SELECT_H
+# include <sys/select.h>
+#endif
+
 /* Cipher used for encrypting authentication files. */
 #define SSH_AUTHFILE_CIPHER    SSH_CIPHER_3DES
 
@@ -28,14 +41,7 @@
 #define SSH_MAX_IDENTITY_FILES         100
 
 /*
- * Maximum length of lines in authorized_keys file.
- * Current value permits 16kbit RSA and RSA1 keys and 8kbit DSA keys, with
- * some room for options and comments.
- */
-#define SSH_MAX_PUBKEY_BYTES           8192
-
-/*
- * Major protocol version.  Different version indicates major incompatibility
+ * Major protocol version.  Different version indicates major incompatiblity
  * that prevents communication.
  *
  * Minor protocol version.  Different version indicates minor incompatibility
@@ -54,9 +60,13 @@
  */
 #define SSH_SERVICE_NAME       "ssh"
 
+#if defined(USE_PAM) && !defined(SSHD_PAM_SERVICE)
+# define SSHD_PAM_SERVICE       __progname
+#endif
+
 /*
- * Name of the environment variable containing the process ID of the
- * authentication agent.
+ * Name of the environment variable containing the pathname of the
+ * authentication socket.
  */
 #define SSH_AGENTPID_ENV_NAME  "SSH_AGENT_PID"
 
@@ -83,20 +93,10 @@
  */
 #define SSH_SESSION_KEY_LENGTH         32
 
+/* Name of Kerberos service for SSH to use. */
+#define KRB4_SERVICE_NAME              "rcmd"
+
 /* Used to identify ``EscapeChar none'' */
 #define SSH_ESCAPECHAR_NONE            -2
 
-/*
- * unprivileged user when UsePrivilegeSeparation=yes;
- * sshd will change its privileges to this user and its
- * primary group.
- */
-#ifndef SSH_PRIVSEP_USER
-#define SSH_PRIVSEP_USER               "sshd"
-#endif
-
-/* Minimum modulus size (n) for RSA keys. */
-#define SSH_RSA_MINIMUM_MODULUS_SIZE   768
-
-/* Listen backlog for sshd, ssh-agent and forwarding sockets */
-#define SSH_LISTEN_BACKLOG             128
+#endif                         /* SSH_H */