Drop the problematic patch for updating pw structure after authentication
This commit is contained in:
parent
ae802a53d8
commit
7a14283cba
@ -1,23 +0,0 @@
|
||||
diff -up openssh-7.4p1/session.c.update-pw openssh-7.4p1/session.c
|
||||
--- openssh-7.4p1/session.c.update-pw 2019-03-04 14:10:57.287054645 +0100
|
||||
+++ openssh-7.4p1/session.c 2019-03-04 14:12:39.259997218 +0100
|
||||
@@ -1522,9 +1522,18 @@ do_child(Session *s, const char *command
|
||||
extern char **environ;
|
||||
char **env, *argv[ARGV_MAX], remote_id[512];
|
||||
const char *shell, *shell0;
|
||||
- struct passwd *pw = s->pw;
|
||||
+ struct passwd *pw = NULL;
|
||||
int r = 0;
|
||||
|
||||
+ /* Update the users passwd structure after successful login */
|
||||
+ pw = getpwuid(s->pw->pw_uid);
|
||||
+ if (pw != NULL) {
|
||||
+ free(s->pw);
|
||||
+ s->pw = pw;
|
||||
+ } else {
|
||||
+ pw = s->pw;
|
||||
+ }
|
||||
+
|
||||
sshpkt_fmt_connection_id(ssh, remote_id, sizeof(remote_id));
|
||||
|
||||
/* remove hostkey from the child's memory */
|
@ -205,8 +205,6 @@ Patch953: openssh-7.8p1-scp-ipv6.patch
|
||||
# - do not return 0 if the write fails (full disk)
|
||||
# - shellcheck reports (upstream #2902)
|
||||
Patch958: openssh-7.9p1-ssh-copy-id.patch
|
||||
# Update cached passwd structure after PAM authentication (#1674541)
|
||||
Patch960: openssh-7.9p1-updated-cached-pw.patch
|
||||
# Verify the SCP vulnerabilities are fixed in the package testsuite
|
||||
# https://bugzilla.mindrot.org/show_bug.cgi?id=3007
|
||||
Patch961: openssh-8.0p1-scp-tests.patch
|
||||
@ -418,7 +416,6 @@ popd
|
||||
%patch951 -p1 -b .pkcs11-uri
|
||||
%patch953 -p1 -b .scp-ipv6
|
||||
%patch958 -p1 -b .ssh-copy-id
|
||||
%patch960 -p1 -b .update-pw
|
||||
%patch961 -p1 -b .scp-tests
|
||||
%patch962 -p1 -b .crypto-policies
|
||||
%patch963 -p1 -b .openssl-evp
|
||||
|
Loading…
Reference in New Issue
Block a user