From 15cce50a031737c9c12739934983809668714ac9 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Sat, 21 Nov 2009 18:01:29 +0000
Subject: [PATCH] -Patch a segmentation fault if the configuration file lacks
 an option xCAT usually populates

Former-commit-id: c0b9077981cc06af0400009daa64db93f49e1f6e
---
 conserver/conserver.spec        |  4 +++-
 conserver/segfault-sslopt.patch | 12 ++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 conserver/segfault-sslopt.patch

diff --git a/conserver/conserver.spec b/conserver/conserver.spec
index 751c646..0674b3d 100644
--- a/conserver/conserver.spec
+++ b/conserver/conserver.spec
@@ -11,7 +11,7 @@
 # hostname (console)
 %define master console
 
-%define distver 8
+%define distver 9
 
 Summary: Serial console server daemon/client
 Name: %{pkg}
@@ -24,6 +24,7 @@ Source: http://www.conserver.com/%{pkg}-%{ver}.tar.gz
 Patch: certificate-auth.patch
 Patch1: initscript.patch
 Patch2: initscript1.patch
+Patch3: segfault-sslopt.patch
 BuildRoot: %{_tmppath}/%{pkg}-buildroot
 BuildRequires: openssl-devel
 Prefix: %{_prefix}
@@ -42,6 +43,7 @@ bells and whistles to accentuate that basic functionality.
 %patch -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 
 %build
diff --git a/conserver/segfault-sslopt.patch b/conserver/segfault-sslopt.patch
new file mode 100644
index 0000000..168d97e
--- /dev/null
+++ b/conserver/segfault-sslopt.patch
@@ -0,0 +1,12 @@
+diff -ruN conserver-8.1.16-orig/conserver/main.c conserver-8.1.16/conserver/main.c
+--- conserver-8.1.16-orig/conserver/main.c	2009-10-30 13:46:11 +0300
++++ conserver-8.1.16/conserver/main.c	2009-10-30 13:46:37 +0300
+@@ -66,7 +66,7 @@
+ 	, FLAGFALSE
+ #endif
+ #if HAVE_OPENSSL
+-	, (char *)0, FLAGTRUE
++	, (char *)0, (char*)0, FLAGTRUE
+ #endif
+ };
+