SHA256
1
0
forked from pool/openssh
OBS User unknown 2007-12-10 23:29:55 +00:00 committed by Git OBS Bridge
parent 37cfaaa01c
commit b8d4e6c1d8
6 changed files with 22 additions and 11 deletions

View File

@ -8,4 +8,4 @@
+ Protocol 2 + Protocol 2
# Cipher 3des # Cipher 3des
# Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc # Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc
# EscapeChar ~ # MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160

View File

@ -6,5 +6,5 @@
+#include <string.h> +#include <string.h>
#include <stdarg.h> #include <stdarg.h>
#include <string.h>
#include <opensc/opensc.h>

View File

@ -1,21 +1,21 @@
--- session.c --- session.c
+++ session.c +++ session.c
@@ -2250,8 +2250,37 @@ @@ -2250,8 +2250,41 @@
session_close(Session *s) session_close(Session *s)
{ {
u_int i; u_int i;
+ pid_t pid;
+ FILE *f = NULL;
+ char cmd[1024];
+ int do_xauth; + int do_xauth;
+ struct passwd * pw = s->pw;
+ do_xauth = s->display != NULL && s->auth_proto != NULL && s->auth_data != NULL;
debug("session_close: session %d pid %ld", s->self, (long)s->pid); 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) { + if (do_xauth && options.xauth_location != NULL) {
+ pid_t pid;
+ FILE *f;
+ char cmd[1024];
+ struct passwd * pw = s->pw;
+ +
+ if ((pid = fork()) == 0) { + if (!(pid = fork())) {
+ permanently_set_uid(pw); + permanently_set_uid(pw);
+ +
+ /* Remove authority data from .Xauthority if appropriate. */ + /* Remove authority data from .Xauthority if appropriate. */
@ -31,6 +31,10 @@
+ } else + } else
+ error("Could not run %s\n", cmd); + error("Could not run %s\n", cmd);
+ exit(0); + exit(0);
+ } else if (pid > 0) {
+ int status;
+
+ waitpid(pid, &status, 0);
+ } + }
+ } + }
+ +

View File

@ -15,7 +15,7 @@ BuildRequires: gtk2-devel krb5-devel opensc-devel openssh openssl-devel pam-dev
License: BSD 3-Clause License: BSD 3-Clause
Group: Productivity/Networking/SSH Group: Productivity/Networking/SSH
Version: 4.7p1 Version: 4.7p1
Release: 1 Release: 3
Requires: openssh = %{version} openssh-askpass = %{version} Requires: openssh = %{version} openssh-askpass = %{version}
AutoReqProv: on AutoReqProv: on
Summary: A GNOME-Based Passphrase Dialog for OpenSSH Summary: A GNOME-Based Passphrase Dialog for OpenSSH

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Dec 7 22:28:40 CET 2007 - anicka@suse.cz
- fix race condition in xauth patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Dec 5 10:45:36 CET 2007 - anicka@suse.cz Wed Dec 5 10:45:36 CET 2007 - anicka@suse.cz

View File

@ -29,7 +29,7 @@ PreReq: /usr/sbin/groupadd /usr/sbin/useradd %insserv_prereq %fillup_pr
Conflicts: nonfreessh Conflicts: nonfreessh
AutoReqProv: on AutoReqProv: on
Version: 4.7p1 Version: 4.7p1
Release: 1 Release: 3
%define xversion 1.2.4.1 %define xversion 1.2.4.1
Summary: Secure Shell Client and Server (Remote Login Program) Summary: Secure Shell Client and Server (Remote Login Program)
Url: http://www.openssh.com/ Url: http://www.openssh.com/
@ -296,6 +296,8 @@ rm -rf $RPM_BUILD_ROOT
%config %_appdefdir/SshAskpass %config %_appdefdir/SshAskpass
%changelog %changelog
* Fri Dec 07 2007 - anicka@suse.cz
- fix race condition in xauth patch
* Wed Dec 05 2007 - anicka@suse.cz * Wed Dec 05 2007 - anicka@suse.cz
- update to 4.7p1 - update to 4.7p1
* Add "-K" flag for ssh to set GSSAPIAuthentication=yes and * Add "-K" flag for ssh to set GSSAPIAuthentication=yes and