upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Nit changes in keymgr and kasp

Browse source 
Use the ISC_MAX define instead of "x = a > b ? a : b" paradigm.

Remove an unneeded include.

(cherry picked from commit 5d6f0de84b)
This commit is contained in:
Matthijs Mekking 2022-06-21 12:45:54 +02:00
parent e16cfce91d
commit fd34ea8523
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/dns/keymgr.c
View file

@ -131,12 +131,12 @@ keymgr_settime_remove(dns_dnsseckey_t *key, dns_kasp_t *kasp) {
dns_kasp_retiresafety(kasp);
}
remove = ksk_remove > zsk_remove ? ksk_remove : zsk_remove;
remove = ISC_MAX(ksk_remove, zsk_remove);
dst_key_settime(key->key, DST_TIME_DELETE, remove);
}
/*
* Set the SyncPublish time (when the DS may be submitted to the parent)
* Set the SyncPublish time (when the DS may be submitted to the parent).
*
*/
static void
@ -250,7 +250,7 @@ keymgr_prepublication_time(dns_dnsseckey_t *key, dns_kasp_t *kasp,
dns_kasp_zonepropagationdelay(kasp);
}
syncpub = syncpub1 > syncpub2 ? syncpub1 : syncpub2;
syncpub = ISC_MAX(syncpub1, syncpub2);
dst_key_settime(key->key, DST_TIME_SYNCPUBLISH,
syncpub);
}

2
lib/isccfg/include/isccfg/kaspconf.h
View file

@ -15,8 +15,6 @@
#include <isc/lang.h>
#include <dns/types.h>
#include <isccfg/cfg.h>
/***