Don't lose error status in kadm5_s_init_with_context (from upstream).
Prevents kpasswdd from crashing.
This commit is contained in:
parent
62b9c384d6
commit
52b19b9995
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.30 2018/06/26 07:45:42 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.31 2018/08/15 14:21:29 ajacoutot Exp $
|
||||
|
||||
COMMENT-main= Kerberos 5 implementation
|
||||
COMMENT-devel-docs= Heimdal C functions documentation
|
||||
@ -10,8 +10,9 @@ DISTNAME= heimdal-${V}
|
||||
PKGNAME-main= ${DISTNAME}
|
||||
PKGNAME-devel-docs= heimdal-devel-docs-${V}
|
||||
PKGNAME-libs= heimdal-libs-${V}
|
||||
|
||||
REVISION-main= 1
|
||||
REVISION-libs= 0
|
||||
REVISION-libs= 1
|
||||
|
||||
CATEGORIES= security net
|
||||
|
||||
|
19
security/heimdal/patches/patch-lib_kadm5_init_s_c
Normal file
19
security/heimdal/patches/patch-lib_kadm5_init_s_c
Normal file
@ -0,0 +1,19 @@
|
||||
$OpenBSD: patch-lib_kadm5_init_s_c,v 1.1 2018/08/15 14:21:29 ajacoutot Exp $
|
||||
|
||||
From dd249257e397a26c48164122c892c96a10b64c44 Mon Sep 17 00:00:00 2001
|
||||
From: Viktor Dukhovni <viktor@twosigma.com>
|
||||
Date: Sun, 5 Aug 2018 14:33:31 -0400
|
||||
Subject: [PATCH] Don't lose error status in kadm5_s_init_with_context
|
||||
|
||||
Index: lib/kadm5/init_s.c
|
||||
--- lib/kadm5/init_s.c.orig
|
||||
+++ lib/kadm5/init_s.c
|
||||
@@ -103,7 +103,7 @@ kadm5_s_init_with_context(krb5_context context,
|
||||
kadm5_s_destroy(ctx);
|
||||
else
|
||||
*server_handle = ctx;
|
||||
- return 0;
|
||||
+ return ret;
|
||||
}
|
||||
|
||||
kadm5_ret_t
|
Loading…
Reference in New Issue
Block a user