X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/blobdiff_plain/9cb1827beb97ef775b73d81402cc084ec8c316a3..1325a69de3944e18b428a7343961a957cfe7c3dd:/openssh/ssh.h?ds=sidebyside

diff --git a/openssh/ssh.h b/openssh/ssh.h
index e88b9b8..383c7fe 100644
--- a/openssh/ssh.h
+++ b/openssh/ssh.h
@@ -1,5 +1,3 @@
-/*	$OpenBSD: ssh.h,v 1.74 2003/09/01 13:52:18 markus Exp $	*/
-
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -12,6 +10,8 @@
  * 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
 
@@ -20,6 +20,7 @@
 #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
@@ -40,7 +41,7 @@
 #define SSH_MAX_IDENTITY_FILES		100
 
 /*
- * 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
@@ -59,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"
 
@@ -88,19 +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
-
 #endif				/* SSH_H */