diff options
| author | des <des@FreeBSD.org> | 2002-10-29 10:16:02 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2002-10-29 10:16:02 +0000 |
| commit | 279b0fa809e30e3a007bbc4b2adb1ccbd4d4a87a (patch) | |
| tree | 404fa392fc6f2560e3c459fa20228c7031d0289d /crypto/openssh/ssh.h | |
| parent | ce26c10eda4d687d476e9bbac51ccd26564af8da (diff) | |
| download | FreeBSD-src-279b0fa809e30e3a007bbc4b2adb1ccbd4d4a87a.zip FreeBSD-src-279b0fa809e30e3a007bbc4b2adb1ccbd4d4a87a.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/ssh.h')
| -rw-r--r-- | crypto/openssh/ssh.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/crypto/openssh/ssh.h b/crypto/openssh/ssh.h index ea71a56..794af34 100644 --- a/crypto/openssh/ssh.h +++ b/crypto/openssh/ssh.h @@ -61,10 +61,6 @@ */ #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. |
