forked from pool/openssh
Antonio Larrosa
fef1b16e66
commented out). The keycat binary isn't really installed nor supported, so we can drop it, except for the code that is used by other SELinux patches, which is what I kept from that patch (boo#1229072). - Add patch submitted to upstream to fix RFC4256 implementation so that keyboard-interactive authentication method can send instructions and sshd shows them to users even before a prompt is requested. This fixes MFA push notifications (boo#1229010). * 0001-auth-pam-Immediately-report-instructions-to-clients-and-fix-handling-in-ssh-client.patch OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=274
47 lines
1.3 KiB
Diff
47 lines
1.3 KiB
Diff
# HG changeset patch
|
|
# Parent a60c0d88667efe0a64c030168950b69476af1622
|
|
# --used to be called '-xauth'
|
|
try to remove xauth cookies on logout
|
|
|
|
bnc#98815
|
|
|
|
Index: openssh-8.8p1/session.c
|
|
===================================================================
|
|
--- openssh-8.8p1.orig/session.c
|
|
+++ openssh-8.8p1/session.c
|
|
@@ -2441,6 +2441,34 @@ session_close(struct ssh *ssh, Session *
|
|
ssh_remote_port(ssh),
|
|
s->self);
|
|
|
|
+ if ((s->display != NULL) && (s->auth_proto != NULL) &&
|
|
+ (s->auth_data != NULL) && (options.xauth_location != NULL)) {
|
|
+ pid_t pid;
|
|
+ FILE *f;
|
|
+ char cmd[1024];
|
|
+ struct passwd * pw = s->pw;
|
|
+
|
|
+ if (!(pid = fork())) {
|
|
+ permanently_set_uid(pw);
|
|
+
|
|
+ /* Remove authority data from .Xauthority if appropriate. */
|
|
+ debug("Running %.500s remove %.100s\n",
|
|
+ options.xauth_location, s->auth_display);
|
|
+
|
|
+ snprintf(cmd, sizeof cmd, "unset XAUTHORITY && HOME=\"%.200s\" %s -q -",
|
|
+ s->pw->pw_dir, options.xauth_location);
|
|
+ f = popen(cmd, "w");
|
|
+ if (f) {
|
|
+ fprintf(f, "remove %s\n", s->auth_display);
|
|
+ pclose(f);
|
|
+ } else
|
|
+ error("Could not run %s\n", cmd);
|
|
+ exit(0);
|
|
+ } else if (pid > 0) {
|
|
+ waitpid(pid, NULL, 0);
|
|
+ }
|
|
+ }
|
|
+
|
|
if (s->ttyfd != -1)
|
|
session_pty_cleanup(s);
|
|
free(s->term);
|