From 515c95fb14f0a258c90e6760d2ee5ccf41dbf28e Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Feb 08 2019 21:18:53 +0000
Subject: CVE-2019-7639


---

diff --git a/gsi-openssh.spec b/gsi-openssh.spec
index 3470c62..090409a 100644
--- a/gsi-openssh.spec
+++ b/gsi-openssh.spec
@@ -31,7 +31,7 @@
 %global ldap 1
 
 %global openssh_ver 7.9p1
-%global openssh_rel 4
+%global openssh_rel 5
 
 Summary: An implementation of the SSH protocol with GSI authentication
 Name: gsi-openssh
@@ -556,6 +556,9 @@ getent passwd sshd >/dev/null || \
 %attr(0644,root,root) %{_tmpfilesdir}/gsissh.conf
 
 %changelog
+* Fri Feb 08 2019 Mattias Ellert <mattias.ellert@physics.uu.se> - 7.9p1-5
+- CVE-2019-7639
+
 * Thu Feb 07 2019 Mattias Ellert <mattias.ellert@physics.uu.se> - 7.9p1-4
 - Based on openssh-7.9p1-4.fc29
 
diff --git a/openssh-7.9p1-gsissh.patch b/openssh-7.9p1-gsissh.patch
index 0e83984..031f154 100644
--- a/openssh-7.9p1-gsissh.patch
+++ b/openssh-7.9p1-gsissh.patch
@@ -372,7 +372,7 @@ diff -Nur openssh-7.9p1.orig/auth.h openssh-7.9p1/auth.h
 diff -Nur openssh-7.9p1.orig/auth-pam.c openssh-7.9p1/auth-pam.c
 --- openssh-7.9p1.orig/auth-pam.c	2018-10-23 23:08:05.624763778 +0200
 +++ openssh-7.9p1/auth-pam.c	2018-10-23 23:09:11.659055270 +0200
-@@ -288,6 +288,55 @@
+@@ -288,6 +288,56 @@
  # define pam_chauthtok(a,b)	(sshpam_chauthtok_ruid((a), (b)))
  #endif
  
@@ -396,6 +396,7 @@ diff -Nur openssh-7.9p1.orig/auth-pam.c openssh-7.9p1/auth-pam.c
 +void
 +sshpam_check_userchanged(void)
 +{
++	int sshpam_err;
 +	struct passwd *pw;
 +	const char *user;
 +