diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | auth-pam.c | 3 | ||||
-rw-r--r-- | auth-pam.h | 6 | ||||
-rw-r--r-- | ssh.h | 4 |
4 files changed, 8 insertions, 8 deletions
@@ -7,6 +7,7 @@ | |||
7 | warning on pam_conv struct conversation function. | 7 | warning on pam_conv struct conversation function. |
8 | - (stevesk) [auth-pam.h] license | 8 | - (stevesk) [auth-pam.h] license |
9 | - (stevesk) [auth-pam.h] unneeded include | 9 | - (stevesk) [auth-pam.h] unneeded include |
10 | - (stevesk) [auth-pam.[ch] ssh.h] move SSHD_PAM_SERVICE to auth-pam.h | ||
10 | 11 | ||
11 | 20020720 | 12 | 20020720 |
12 | - (stevesk) [ssh-keygen.c] bug #231: always init/seed_rng(). | 13 | - (stevesk) [ssh-keygen.c] bug #231: always init/seed_rng(). |
@@ -1407,4 +1408,4 @@ | |||
1407 | - (stevesk) entropy.c: typo in debug message | 1408 | - (stevesk) entropy.c: typo in debug message |
1408 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 1409 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
1409 | 1410 | ||
1410 | $Id: ChangeLog,v 1.2385 2002/07/21 23:20:07 stevesk Exp $ | 1411 | $Id: ChangeLog,v 1.2386 2002/07/21 23:59:40 stevesk Exp $ |
diff --git a/auth-pam.c b/auth-pam.c index 48d5afa0f..79af58a0b 100644 --- a/auth-pam.c +++ b/auth-pam.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | 26 | ||
27 | #ifdef USE_PAM | 27 | #ifdef USE_PAM |
28 | #include "ssh.h" | ||
29 | #include "xmalloc.h" | 28 | #include "xmalloc.h" |
30 | #include "log.h" | 29 | #include "log.h" |
31 | #include "auth.h" | 30 | #include "auth.h" |
@@ -39,7 +38,7 @@ extern char *__progname; | |||
39 | 38 | ||
40 | extern int use_privsep; | 39 | extern int use_privsep; |
41 | 40 | ||
42 | RCSID("$Id: auth-pam.c,v 1.50 2002/07/21 22:49:47 stevesk Exp $"); | 41 | RCSID("$Id: auth-pam.c,v 1.51 2002/07/21 23:59:39 stevesk Exp $"); |
43 | 42 | ||
44 | #define NEW_AUTHTOK_MSG \ | 43 | #define NEW_AUTHTOK_MSG \ |
45 | "Warning: Your password has expired, please change it now." | 44 | "Warning: Your password has expired, please change it now." |
diff --git a/auth-pam.h b/auth-pam.h index 8cb7389e1..215e75282 100644 --- a/auth-pam.h +++ b/auth-pam.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: auth-pam.h,v 1.14 2002/07/21 23:20:07 stevesk Exp $ */ | 1 | /* $Id: auth-pam.h,v 1.15 2002/07/21 23:59:39 stevesk Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2000 Damien Miller. All rights reserved. |
@@ -27,6 +27,10 @@ | |||
27 | #include "includes.h" | 27 | #include "includes.h" |
28 | #ifdef USE_PAM | 28 | #ifdef USE_PAM |
29 | 29 | ||
30 | #if !defined(SSHD_PAM_SERVICE) | ||
31 | # define SSHD_PAM_SERVICE __progname | ||
32 | #endif | ||
33 | |||
30 | void start_pam(const char *user); | 34 | void start_pam(const char *user); |
31 | void finish_pam(void); | 35 | void finish_pam(void); |
32 | int auth_pam_password(Authctxt *authctxt, const char *password); | 36 | int auth_pam_password(Authctxt *authctxt, const char *password); |
@@ -60,10 +60,6 @@ | |||
60 | */ | 60 | */ |
61 | #define SSH_SERVICE_NAME "ssh" | 61 | #define SSH_SERVICE_NAME "ssh" |
62 | 62 | ||
63 | #if defined(USE_PAM) && !defined(SSHD_PAM_SERVICE) | ||
64 | # define SSHD_PAM_SERVICE __progname | ||
65 | #endif | ||
66 | |||
67 | /* | 63 | /* |
68 | * Name of the environment variable containing the process ID of the | 64 | * Name of the environment variable containing the process ID of the |
69 | * authentication agent. | 65 | * authentication agent. |