From c581032039c1e00f729332a0109e36c1842cebe7f419b993b2a202e1d8df6499 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lorenzen?= <enzokiel@kabelmail.de>
Date: Thu, 7 Dec 2017 15:44:48 +0000
Subject: [PATCH] Accepting request 555082 from home:enzokiel:branches:network

- Added Avoid_NULL_structure_pointer_member_dereference.patch,
  fixes (bsc#1071675).

OBS-URL: https://build.opensuse.org/request/show/555082
OBS-URL: https://build.opensuse.org/package/show/network/libheimdal?expand=0&rev=17
---
 ...structure_pointer_member_dereference.patch | 23 +++++++++++++++++++
 libheimdal.changes                            |  6 +++++
 libheimdal.spec                               |  3 +++
 3 files changed, 32 insertions(+)
 create mode 100644 Avoid_NULL_structure_pointer_member_dereference.patch

diff --git a/Avoid_NULL_structure_pointer_member_dereference.patch b/Avoid_NULL_structure_pointer_member_dereference.patch
new file mode 100644
index 0000000..d207163
--- /dev/null
+++ b/Avoid_NULL_structure_pointer_member_dereference.patch
@@ -0,0 +1,23 @@
+--- kdc/kerberos5.c.orig
++++ kdc/kerberos5.c
+@@ -2226,15 +2226,17 @@
+     /*
+      * In case of a non proxy error, build an error message.
+      */
+-    if(ret != 0 && ret != HDB_ERR_NOT_FOUND_HERE && reply->length == 0) {
++    if (ret != 0 && ret != HDB_ERR_NOT_FOUND_HERE && reply->length == 0) {
+ 	ret = _kdc_fast_mk_error(context, r,
+ 				 &error_method,
+ 				 r->armor_crypto,
+ 				 &req->req_body,
+ 				 ret, r->e_text,
+ 				 r->server_princ,
+-				 &r->client_princ->name,
+-				 &r->client_princ->realm,
++				 r->client_princ ?
++                                     &r->client_princ->name : NULL,
++				 r->client_princ ?
++                                     &r->client_princ->realm : NULL,
+ 				 NULL, NULL,
+ 				 reply);
+ 	if (ret)
diff --git a/libheimdal.changes b/libheimdal.changes
index e13c3b2..0447631 100644
--- a/libheimdal.changes
+++ b/libheimdal.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Dec 07 15:17:23 UTC 2017 - joerg.lorenzen@ki.tng.de
+
+- Added Avoid_NULL_structure_pointer_member_dereference.patch,
+  fixes (bsc#1071675).
+
 -------------------------------------------------------------------
 Thu Aug 03 20:25:45 UTC 2017 - joerg.lorenzen@ki.tng.de
 
diff --git a/libheimdal.spec b/libheimdal.spec
index 06b4860..43e2ac9 100644
--- a/libheimdal.spec
+++ b/libheimdal.spec
@@ -28,6 +28,7 @@ Url:            http://www.h5l.org
 Source0:        heimdal-%{version}-patched.tar.bz2
 Source2:        heimdal-patch-source.sh
 Patch0:         heimdal-patched.diff
+Patch1:         Avoid_NULL_structure_pointer_member_dereference.patch
 %if 0%{?sles_version} == 11
 BuildRequires:  libcom_err-devel
 BuildRequires:  sqlite3-devel
@@ -49,6 +50,7 @@ BuildRequires:  pam-devel
 BuildRequires:  pkg-config
 BuildRequires:  readline-devel
 BuildRequires:  texinfo
+BuildRequires:  perl(JSON)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -97,6 +99,7 @@ libraries are required by 64-bit package of ICAClient version 13.2.
 %prep
 %setup -q -n heimdal-%{version}
 %patch0 -p1
+%patch1 -p0
 
 %build
 autoreconf -fi