2
0
mirror of https://github.com/xcat2/xcat-dep.git synced 2024-11-21 17:11:45 +00:00

-Patch a segmentation fault if the configuration file lacks an option xCAT usually populates

Former-commit-id: c0b9077981cc06af0400009daa64db93f49e1f6e
This commit is contained in:
jbjohnso 2009-11-21 18:01:29 +00:00
parent 1d18b29d98
commit 15cce50a03
2 changed files with 15 additions and 1 deletions

View File

@ -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

View File

@ -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
};