- markus@cvs.openbsd.org 2003/05/11 20:30:25

[openssh.git] / ssh.h

diff --git a/ssh.h b/ssh.h
index fac6c694fcd3eb784c435b6af19453d64048d1bc..0a6ad1317b96398744d08c2a7755d2c3d0eb3f00 100644 (file)
--- a/ssh.h
+++ b/ssh.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ssh.h,v 1.67 2002/05/07 19:54:36 deraadt Exp $        */
+/*     $OpenBSD: ssh.h,v 1.71 2002/06/22 02:00:29 stevesk Exp $        */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -41,7 +41,7 @@
 #define SSH_MAX_IDENTITY_FILES         100
 
 /*
- * Major protocol version.  Different version indicates major incompatiblity
+ * Major protocol version.  Different version indicates major incompatibility
  * that prevents communication.
  *
  * Minor protocol version.  Different version indicates minor incompatibility
@@ -60,13 +60,9 @@
  */
 #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 pathname of the
- * authentication socket.
+ * Name of the environment variable containing the process ID of the
+ * authentication agent.
  */
 #define SSH_AGENTPID_ENV_NAME  "SSH_AGENT_PID"
 
@@ -101,11 +97,11 @@
 
 /*
  * unprivileged user when UsePrivilegeSeparation=yes;
- * sshd will change its pivileges to this user and its
+ * sshd will change its privileges to this user and its
  * primary group.
  */
 #ifndef SSH_PRIVSEP_USER
-#define SSH_PRIVSEP_USER               "ssh"
+#define SSH_PRIVSEP_USER               "sshd"
 #endif
 
 /* Minimum modulus size (n) for RSA keys. */