- (bal) Missed two files in major resync. auth-bsdauth.c and auth-skey.c

[openssh.git] / ssh.h

diff --git a/ssh.h b/ssh.h
index b2be65f525e29348e76897b4b0ec717397839bc1..383c7fe9b1c9214225718f62c951d0bbb5063d6f 100644 (file)
--- a/ssh.h
+++ b/ssh.h
@@ -10,7 +10,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: ssh.h,v 1.62 2001/01/23 10:45:10 markus Exp $"); */
+/* RCSID("$OpenBSD: ssh.h,v 1.63 2001/05/24 18:57:53 stevesk Exp $"); */
 
 #ifndef SSH_H
 #define SSH_H
@@ -20,7 +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 "fake-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
@@ -61,7 +61,7 @@
 #define SSH_SERVICE_NAME       "ssh"
 
 #if defined(USE_PAM) && !defined(SSHD_PAM_SERVICE)
-# define SSHD_PAM_SERVICE       "sshd"
+# define SSHD_PAM_SERVICE       __progname
 #endif
 
 /*
@@ -96,4 +96,7 @@
 /* Name of Kerberos service for SSH to use. */
 #define KRB4_SERVICE_NAME              "rcmd"
 
+/* Used to identify ``EscapeChar none'' */
+#define SSH_ESCAPECHAR_NONE            -2
+
 #endif                         /* SSH_H */