packages/bind-dyndb-ldap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!2 fix build error with gcc9

Browse Source 
Merge pull request !2 from eaglegai/master
This commit is contained in:
openeuler-ci-bot 2020-06-22 13:56:23 +08:00 committed by Gitee
commit 7a37a95d64
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
0004-use-correct-dn-value.patch Normal file
View File

@ -0,0 +1,32 @@
commit d69150691983f7f1efaa078549cd80a14afb76cb
Author: Petr Menšík <pemensik@redhat.com>
Date: Mon Jan 28 00:31:25 2019 +0100
Use correct dn value
New GCC correctly reports error, NULL is always passed in case of
invalid objectclass.
Signed-off-by: Petr Menšík <pemensik@redhat.com>
diff --git a/src/ldap_helper.c b/src/ldap_helper.c
index ac8ce6e..8b486ae 100644
--- a/src/ldap_helper.c
+++ b/src/ldap_helper.c
@@ -4102,7 +4102,6 @@ syncrepl_update(ldap_instance_t *inst, ldap_entry_t **entryp, int chgtype)
ldap_entry_t *entry = NULL;
dns_name_t *zone_name = NULL;
dns_zone_t *zone_ptr = NULL;
- char *dn = NULL;
isc_taskaction_t action = NULL;
isc_task_t *task = NULL;
isc_boolean_t synchronous;
@@ -4156,7 +4155,7 @@ syncrepl_update(ldap_instance_t *inst, ldap_entry_t **entryp, int chgtype)
else if ((entry->class & LDAP_ENTRYCLASS_RR) != 0)
action = update_record;
else {
- log_error("unsupported objectClass: dn '%s'", dn);
+ log_error("unsupported objectClass: dn '%s'", entry->dn);
result = ISC_R_NOTIMPLEMENTED;
goto cleanup;
}

9
bind-dyndb-ldap.spec
View File

@ -2,7 +2,7 @@
Name: bind-dyndb-ldap Name: bind-dyndb-ldap
Version: 11.1 Version: 11.1
Release: 13 Release: 14
Summary: LDAP back-end plug-in for BIND Summary: LDAP back-end plug-in for BIND
License: GPLv2+ License: GPLv2+
URL: https://releases.pagure.org/bind-dyndb-ldap URL: https://releases.pagure.org/bind-dyndb-ldap
@ -12,6 +12,7 @@ Source1: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2.a
Patch0001: 0001-Coverity-fix-REVERSE_INULL-for-pevent-inst.patch Patch0001: 0001-Coverity-fix-REVERSE_INULL-for-pevent-inst.patch
Patch0002: 0002-Add-empty-callback-for-getsize.patch Patch0002: 0002-Add-empty-callback-for-getsize.patch
Patch0003: 0003-Support-for-BIND-9.11.3.patch Patch0003: 0003-Support-for-BIND-9.11.3.patch
Patch0004: 0004-use-correct-dn-value.patch
BuildRequires: bind-devel >= %{bind_version}, bind-lite-devel >= %{bind_version}, bind-pkcs11-devel >= %{bind_version} BuildRequires: bind-devel >= %{bind_version}, bind-lite-devel >= %{bind_version}, bind-pkcs11-devel >= %{bind_version}
BuildRequires: krb5-devel BuildRequires: krb5-devel
BuildRequires: openldap-devel BuildRequires: openldap-devel
@ -74,5 +75,11 @@ sed -i.bak -e "$SEDSCRIPT" /etc/named.conf
%changelog %changelog
* Mon Jun 22 2020 gaihuiying <gaihuiying1@huawei.com> - 11.1-14
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:fix build error with gcc9
* Wed Sep 11 2019 AlexChao <zhaolei746@huawei.com> - 11.1-13 * Wed Sep 11 2019 AlexChao <zhaolei746@huawei.com> - 11.1-13
- Package init - Package init