6cd875acfc
- spec file cleanup (don't pointelssly build whole OpenSSH)
- spec file and patch cleanup
* removing obsoleted auditing patch
(openssh-%{version}-audit.patch)
- added patches from SLE
* GSSAPI key exchange
* FIPS enablement (currently disabled)
* small bugfixes
- split the LDAP helper into a separate package: openssh-akc-ldap
OBS-URL: https://build.opensuse.org/request/show/199679
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=55
58 lines
1.4 KiB
Diff
58 lines
1.4 KiB
Diff
# try to remove xauth cookies on logout
|
|
# bnc#98815
|
|
|
|
diff --git a/openssh-6.2p2/session.c b/openssh-6.2p2/session.c
|
|
--- a/openssh-6.2p2/session.c
|
|
+++ b/openssh-6.2p2/session.c
|
|
@@ -2473,18 +2473,50 @@ session_exit_message(Session *s, int sta
|
|
if (c->ostate != CHAN_OUTPUT_CLOSED)
|
|
chan_write_failed(c);
|
|
}
|
|
|
|
void
|
|
session_close(Session *s)
|
|
{
|
|
u_int i;
|
|
+ int do_xauth;
|
|
|
|
debug("session_close: session %d pid %ld", s->self, (long)s->pid);
|
|
+
|
|
+ do_xauth = (s->display != NULL) && (s->auth_proto != NULL) && (s->auth_data != NULL);
|
|
+ if (do_xauth && 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) {
|
|
+ int status;
|
|
+
|
|
+ waitpid(pid, &status, 0);
|
|
+ }
|
|
+ }
|
|
+
|
|
if (s->ttyfd != -1)
|
|
session_pty_cleanup(s);
|
|
if (s->term)
|
|
xfree(s->term);
|
|
if (s->display)
|
|
xfree(s->display);
|
|
if (s->x11_chanids)
|
|
xfree(s->x11_chanids);
|