author | Jan Parcel <jan.parcel@oracle.com> |
Tue, 25 Apr 2017 15:08:28 -0700 | |
branch | s11u3-sru |
changeset 7946 | 165bf092aa9c |
parent 6076 | 0d5715bee554 |
permissions | -rw-r--r-- |
5324
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
1 |
# |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
2 |
# Enable login to a role for hostbased authentication if allowed by PAM. |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
3 |
# |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
4 |
# Sets PAM_AUSER item to user who is asserting a new identity before |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
5 |
# calling do_pam_account(). Implemented using existing static variable |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
6 |
# hostbased_cuser. The change is protected by new HAVE_PAM_AUSER ifdef-guard, |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
7 |
# which is set to defined on Solaris. |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
8 |
# |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
9 |
# Patch offered upstream: |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
10 |
# https://bugzilla.mindrot.org/show_bug.cgi?id=2378 |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
11 |
# |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
12 |
diff -pur old/auth-pam.c new/auth-pam.c |
7946
165bf092aa9c
PSARC/2017/022 OpenSSH 7.4
Jan Parcel <jan.parcel@oracle.com>
parents:
6076
diff
changeset
|
13 |
--- old/auth-pam.c |
165bf092aa9c
PSARC/2017/022 OpenSSH 7.4
Jan Parcel <jan.parcel@oracle.com>
parents:
6076
diff
changeset
|
14 |
+++ new/auth-pam.c |
165bf092aa9c
PSARC/2017/022 OpenSSH 7.4
Jan Parcel <jan.parcel@oracle.com>
parents:
6076
diff
changeset
|
15 |
@@ -1040,6 +1040,20 @@ start_pam(Authctxt *authctxt) |
165bf092aa9c
PSARC/2017/022 OpenSSH 7.4
Jan Parcel <jan.parcel@oracle.com>
parents:
6076
diff
changeset
|
16 |
fatal("PAM: initialisation failed"); |
5324
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
17 |
} |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
18 |
|
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
19 |
+#ifdef HAVE_PAM_AUSER |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
20 |
+void |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
21 |
+do_pam_set_auser(const char* auser) |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
22 |
+{ |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
23 |
+ if (auser != NULL) { |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
24 |
+ debug("PAM: setting PAM_AUSER to \"%s\"", auser); |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
25 |
+ sshpam_err = pam_set_item(sshpam_handle, PAM_AUSER, auser); |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
26 |
+ if (sshpam_err != PAM_SUCCESS) |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
27 |
+ error("PAM: failed to set PAM_AUSER: %s", |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
28 |
+ pam_strerror(sshpam_handle, sshpam_err)); |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
29 |
+ } |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
30 |
+} |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
31 |
+#endif |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
32 |
+ |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
33 |
void |
7946
165bf092aa9c
PSARC/2017/022 OpenSSH 7.4
Jan Parcel <jan.parcel@oracle.com>
parents:
6076
diff
changeset
|
34 |
finish_pam(void) |
5324
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
35 |
{ |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
36 |
diff -pur old/auth-pam.h new/auth-pam.h |
7946
165bf092aa9c
PSARC/2017/022 OpenSSH 7.4
Jan Parcel <jan.parcel@oracle.com>
parents:
6076
diff
changeset
|
37 |
--- old/auth-pam.h |
165bf092aa9c
PSARC/2017/022 OpenSSH 7.4
Jan Parcel <jan.parcel@oracle.com>
parents:
6076
diff
changeset
|
38 |
+++ new/auth-pam.h |
165bf092aa9c
PSARC/2017/022 OpenSSH 7.4
Jan Parcel <jan.parcel@oracle.com>
parents:
6076
diff
changeset
|
39 |
@@ -29,6 +29,9 @@ void start_pam(Authctxt *); |
5324
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
40 |
void finish_pam(void); |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
41 |
u_int do_pam_account(void); |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
42 |
void do_pam_session(void); |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
43 |
+#ifdef HAVE_PAM_AUSER |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
44 |
+void do_pam_set_auser(const char *); |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
45 |
+#endif |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
46 |
void do_pam_setcred(int ); |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
47 |
void do_pam_chauthtok(void); |
7946
165bf092aa9c
PSARC/2017/022 OpenSSH 7.4
Jan Parcel <jan.parcel@oracle.com>
parents:
6076
diff
changeset
|
48 |
int do_pam_putenv(char *, char *); |
5324
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
49 |
diff -pur old/auth.h new/auth.h |
7946
165bf092aa9c
PSARC/2017/022 OpenSSH 7.4
Jan Parcel <jan.parcel@oracle.com>
parents:
6076
diff
changeset
|
50 |
--- old/auth.h |
165bf092aa9c
PSARC/2017/022 OpenSSH 7.4
Jan Parcel <jan.parcel@oracle.com>
parents:
6076
diff
changeset
|
51 |
+++ new/auth.h |
5324
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
52 |
@@ -84,6 +84,9 @@ struct Authctxt { |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
53 |
#ifdef PAM_ENHANCEMENT |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
54 |
char *authmethod_name; |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
55 |
#endif |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
56 |
+#ifdef HAVE_PAM_AUSER |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
57 |
+ char *auser; |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
58 |
+#endif |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
59 |
}; |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
60 |
/* |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
61 |
* Every authentication method has to handle authentication requests for |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
62 |
diff -pur old/auth2-hostbased.c new/auth2-hostbased.c |
7946
165bf092aa9c
PSARC/2017/022 OpenSSH 7.4
Jan Parcel <jan.parcel@oracle.com>
parents:
6076
diff
changeset
|
63 |
--- old/auth2-hostbased.c |
165bf092aa9c
PSARC/2017/022 OpenSSH 7.4
Jan Parcel <jan.parcel@oracle.com>
parents:
6076
diff
changeset
|
64 |
+++ new/auth2-hostbased.c |
5324
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
65 |
@@ -85,6 +85,9 @@ userauth_hostbased(Authctxt *authctxt) |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
66 |
buffer_dump(&b); |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
67 |
buffer_free(&b); |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
68 |
#endif |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
69 |
+#ifdef HAVE_PAM_AUSER |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
70 |
+ authctxt->auser = NULL; |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
71 |
+#endif |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
72 |
pktype = key_type_from_name(pkalg); |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
73 |
if (pktype == KEY_UNSPEC) { |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
74 |
/* this is perfectly legal */ |
7946
165bf092aa9c
PSARC/2017/022 OpenSSH 7.4
Jan Parcel <jan.parcel@oracle.com>
parents:
6076
diff
changeset
|
75 |
@@ -142,6 +145,13 @@ userauth_hostbased(Authctxt *authctxt) |
5324
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
76 |
buffer_len(&b))) == 1) |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
77 |
authenticated = 1; |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
78 |
|
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
79 |
+#ifdef HAVE_PAM_AUSER |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
80 |
+ if (authenticated) { |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
81 |
+ authctxt->auser = cuser; |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
82 |
+ cuser = NULL; |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
83 |
+ } |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
84 |
+#endif |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
85 |
+ |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
86 |
buffer_free(&b); |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
87 |
done: |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
88 |
debug2("userauth_hostbased: authenticated %d", authenticated); |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
89 |
diff -pur old/auth2.c new/auth2.c |
7946
165bf092aa9c
PSARC/2017/022 OpenSSH 7.4
Jan Parcel <jan.parcel@oracle.com>
parents:
6076
diff
changeset
|
90 |
--- old/auth2.c |
165bf092aa9c
PSARC/2017/022 OpenSSH 7.4
Jan Parcel <jan.parcel@oracle.com>
parents:
6076
diff
changeset
|
91 |
+++ new/auth2.c |
5324
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
92 |
@@ -339,6 +339,14 @@ userauth_finish(Authctxt *authctxt, int |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
93 |
#endif |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
94 |
} |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
95 |
|
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
96 |
+#ifdef HAVE_PAM_AUSER |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
97 |
+ if (!use_privsep) { |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
98 |
+ do_pam_set_auser(authctxt->auser); |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
99 |
+ free(authctxt->auser); |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
100 |
+ authctxt->auser = NULL; |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
101 |
+ } |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
102 |
+#endif |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
103 |
+ |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
104 |
if (authenticated && options.num_auth_methods != 0) { |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
105 |
|
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
106 |
#if defined(USE_PAM) && defined(PAM_ENHANCEMENT) |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
107 |
diff -pur old/config.h.in new/config.h.in |
7946
165bf092aa9c
PSARC/2017/022 OpenSSH 7.4
Jan Parcel <jan.parcel@oracle.com>
parents:
6076
diff
changeset
|
108 |
--- old/config.h.in |
165bf092aa9c
PSARC/2017/022 OpenSSH 7.4
Jan Parcel <jan.parcel@oracle.com>
parents:
6076
diff
changeset
|
109 |
+++ new/config.h.in |
165bf092aa9c
PSARC/2017/022 OpenSSH 7.4
Jan Parcel <jan.parcel@oracle.com>
parents:
6076
diff
changeset
|
110 |
@@ -839,6 +839,9 @@ |
5324
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
111 |
/* Define if you have Digital Unix Security Integration Architecture */ |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
112 |
#undef HAVE_OSF_SIA |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
113 |
|
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
114 |
+/* Define if you have PAM_AUSER PAM item */ |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
115 |
+#undef HAVE_PAM_AUSER |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
116 |
+ |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
117 |
/* Define to 1 if you have the `pam_getenvlist' function. */ |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
118 |
#undef HAVE_PAM_GETENVLIST |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
119 |
|
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
120 |
diff -pur old/configure.ac new/configure.ac |
7946
165bf092aa9c
PSARC/2017/022 OpenSSH 7.4
Jan Parcel <jan.parcel@oracle.com>
parents:
6076
diff
changeset
|
121 |
--- old/configure.ac |
165bf092aa9c
PSARC/2017/022 OpenSSH 7.4
Jan Parcel <jan.parcel@oracle.com>
parents:
6076
diff
changeset
|
122 |
+++ new/configure.ac |
165bf092aa9c
PSARC/2017/022 OpenSSH 7.4
Jan Parcel <jan.parcel@oracle.com>
parents:
6076
diff
changeset
|
123 |
@@ -951,6 +951,7 @@ mips-sony-bsd|mips-sony-newsos4) |
5324
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
124 |
TEST_SHELL=$SHELL # let configure find us a capable shell |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
125 |
AC_DEFINE([USE_GSS_STORE_CRED]) |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
126 |
AC_DEFINE([GSSAPI_STORECREDS_NEEDS_RUID]) |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
127 |
+ AC_DEFINE([HAVE_PAM_AUSER]) |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
128 |
;; |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
129 |
*-*-sunos4*) |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
130 |
CPPFLAGS="$CPPFLAGS -DSUNOS4" |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
131 |
diff -pur old/monitor.c new/monitor.c |
7946
165bf092aa9c
PSARC/2017/022 OpenSSH 7.4
Jan Parcel <jan.parcel@oracle.com>
parents:
6076
diff
changeset
|
132 |
--- old/monitor.c |
165bf092aa9c
PSARC/2017/022 OpenSSH 7.4
Jan Parcel <jan.parcel@oracle.com>
parents:
6076
diff
changeset
|
133 |
+++ new/monitor.c |
165bf092aa9c
PSARC/2017/022 OpenSSH 7.4
Jan Parcel <jan.parcel@oracle.com>
parents:
6076
diff
changeset
|
134 |
@@ -400,6 +400,12 @@ monitor_child_preauth(Authctxt *_authctx |
5324
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
135 |
} |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
136 |
} |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
137 |
|
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
138 |
+#if defined(HAVE_PAM_AUSER) && defined(USE_PAM) |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
139 |
+ if (hostbased_cuser != NULL) { |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
140 |
+ free(hostbased_cuser); |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
141 |
+ hostbased_cuser = NULL; |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
142 |
+ } |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
143 |
+#endif |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
144 |
if (!authctxt->valid) |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
145 |
fatal("%s: authenticated invalid user", __func__); |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
146 |
if (strcmp(auth_method, "unknown") == 0) |
7946
165bf092aa9c
PSARC/2017/022 OpenSSH 7.4
Jan Parcel <jan.parcel@oracle.com>
parents:
6076
diff
changeset
|
147 |
@@ -599,12 +605,14 @@ monitor_reset_key_state(void) |
5324
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
148 |
{ |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
149 |
/* reset state */ |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
150 |
free(key_blob); |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
151 |
+#if !defined(HAVE_PAM_AUSER) || !defined(USE_PAM) |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
152 |
free(hostbased_cuser); |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
153 |
+ hostbased_cuser = NULL; |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
154 |
+#endif |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
155 |
free(hostbased_chost); |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
156 |
key_blob = NULL; |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
157 |
key_bloblen = 0; |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
158 |
key_blobtype = MM_NOKEY; |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
159 |
- hostbased_cuser = NULL; |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
160 |
hostbased_chost = NULL; |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
161 |
} |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
162 |
|
7946
165bf092aa9c
PSARC/2017/022 OpenSSH 7.4
Jan Parcel <jan.parcel@oracle.com>
parents:
6076
diff
changeset
|
163 |
@@ -1061,6 +1069,11 @@ mm_answer_pam_account(int sock, Buffer * |
5324
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
164 |
if (!options.use_pam) |
7946
165bf092aa9c
PSARC/2017/022 OpenSSH 7.4
Jan Parcel <jan.parcel@oracle.com>
parents:
6076
diff
changeset
|
165 |
fatal("%s: PAM not enabled", __func__); |
5324
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
166 |
|
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
167 |
+#ifdef HAVE_PAM_AUSER |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
168 |
+ if (hostbased_cuser != NULL) |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
169 |
+ do_pam_set_auser(hostbased_cuser); |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
170 |
+#endif |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
171 |
+ |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
172 |
ret = do_pam_account(); |
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
173 |
|
5683175b6e99
PSARC/2015/395 OpenSSH 7.1p1
Jan Parcel <jan.parcel@oracle.com>
parents:
diff
changeset
|
174 |
buffer_put_int(m, ret); |