]>
Commit | Line | Data |
---|---|---|
b19d4d8b JR |
1 | diff -Nur XFree86-4.0.2.org/xc/programs/xdm/greeter/verify.c XFree86-4.0.2/xc/programs/xdm/greeter/verify.c |
2 | --- XFree86-4.0.2.org/xc/programs/xdm/greeter/verify.c Wed Nov 29 17:46:09 2000 | |
3 | +++ XFree86-4.0.2/xc/programs/xdm/greeter/verify.c Thu Dec 21 12:02:33 2000 | |
798d1d17 JR |
4 | @@ -114,6 +114,7 @@ |
5 | ||
6 | #ifdef USE_PAM | |
7 | static char *PAM_password; | |
05891e07 | 8 | +extern pam_handle_t *pamh; |
798d1d17 JR |
9 | static int pam_error; |
10 | ||
11 | static int PAM_conv (int num_msg, | |
12 | @@ -162,12 +163,8 @@ | |
13 | Verify (struct display *d, struct greet_info *greet, struct verify_info *verify) | |
14 | { | |
15 | struct passwd *p; | |
16 | -#ifdef USE_PAM | |
b19d4d8b | 17 | - pam_handle_t **pamhp = thepamhp(); |
798d1d17 JR |
18 | -#else |
19 | #ifdef USESHADOW | |
20 | struct spwd *sp; | |
21 | -#endif | |
22 | #endif | |
23 | #ifdef __OpenBSD__ | |
24 | char *s; | |
b19d4d8b JR |
25 | diff -Nur XFree86-4.0.2.org/xc/programs/xdm/session.c XFree86-4.0.2/xc/programs/xdm/session.c |
26 | --- XFree86-4.0.2.org/xc/programs/xdm/session.c Tue Dec 5 01:59:35 2000 | |
27 | +++ XFree86-4.0.2/xc/programs/xdm/session.c Thu Dec 21 12:06:41 2000 | |
798d1d17 JR |
28 | @@ -97,9 +97,9 @@ |
29 | extern char *crypt(CRYPT_ARGS); | |
30 | #endif | |
31 | #ifdef USE_PAM | |
05891e07 | 32 | +pam_handle_t *pamh; |
b19d4d8b | 33 | pam_handle_t **thepamhp() |
798d1d17 JR |
34 | { |
35 | - static pam_handle_t *pamh = NULL; | |
b19d4d8b | 36 | return &pamh; |
798d1d17 | 37 | } |
b19d4d8b JR |
38 | |
39 | @@ -472,9 +472,6 @@ | |
40 | SessionExit (struct display *d, int status, int removeAuth) | |
41 | { | |
42 | #ifdef USE_PAM | |
798d1d17 JR |
43 | - pam_handle_t *pamh = thepamh(); |
44 | -#endif | |
b19d4d8b JR |
45 | -#ifdef USE_PAM |
46 | if (pamh) { | |
47 | /* shutdown PAM session */ | |
48 | pam_close_session(pamh, 0); | |
49 | @@ -535,9 +532,6 @@ | |
798d1d17 JR |
50 | int pid; |
51 | #ifdef HAS_SETUSERCONTEXT | |
52 | struct passwd* pwd; | |
53 | -#endif | |
54 | -#ifdef USE_PAM | |
55 | - pam_handle_t *pamh = thepamh(); | |
56 | #endif | |
57 | ||
58 | if (verify->argv) { |