diff options
| author | Joseph Sutton <josephsutton@catalyst.net.nz> | 2022-02-22 19:41:14 +1300 |
|---|---|---|
| committer | Joseph Sutton <jsutton@samba.org> | 2022-03-01 22:34:35 +0000 |
| commit | 94d387abd5031c12989f925ee5eb733432402d1d (patch) | |
| tree | a80936d4f2f3b5eb60439feb05814c9f385fff9d /third_party | |
| parent | 068f2bf117ab9968011fdb8d60b98bb37d529658 (diff) | |
| download | samba-94d387abd5031c12989f925ee5eb733432402d1d.tar.gz | |
s4:kdc: Adapt to hdb_entry_ex removal
Rather than having a 'free_entry' member that can be called to free an
hdb_entry, we now implement the free function in HDB. We perform the
free only if the context pointer is non-NULL.
We also remove the ZERO_STRUCTP() in sdb_entry_to_hdb_entry(), as the
context pointer is now part of the 'hdb_entry' structure itself, and
this would undesirably zero it out.
This is an adaptation to Heimdal commits:
commit c5551775e204d00c7ee8055ab6ddbba7e0590584
Author: Luke Howard <lukeh@padl.com>
Date: Fri Jan 7 12:15:55 2022 +1100
hdb: decorate HDB_entry with context member
Decorate HDB_entry with context and move free_entry callback into HDB structure
itself. Requires updating hdb_free_entry() signature to include HDB parameter.
A follow-up commit will consolidate hdb_entry_ex (which has a single hdb_entry
member) into hdb_entry.
commit 0e8c4ccc6ee0123ea39e53e8917fc3f6bb74e8c8
Author: Luke Howard <lukeh@padl.com>
Date: Fri Jan 7 12:54:40 2022 +1100
hdb: eliminate hdb_entry_ex
Remove hdb_entry_ex and revert to the original design of hdb_entry (except with
an additional context member in hdb_entry which is managed by the free_entry
method in HDB).
NOTE: THIS COMMIT WON'T COMPILE/WORK ON ITS OWN!
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14995
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/heimdal_build/wscript_build | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/third_party/heimdal_build/wscript_build b/third_party/heimdal_build/wscript_build index 3ea1fc93653..a395430c28f 100644 --- a/third_party/heimdal_build/wscript_build +++ b/third_party/heimdal_build/wscript_build @@ -433,10 +433,7 @@ if not bld.CONFIG_SET("USING_SYSTEM_HEIMNTLM"): if not bld.CONFIG_SET("USING_SYSTEM_HDB"): HEIMDAL_ASN1('HEIMDAL_HDB_ASN1', 'lib/hdb/hdb.asn1', directory='lib/asn1', - options="--sequence=HDB-extensions \ - --sequence=HDB-Ext-KeyRotation \ - --sequence=HDB-Ext-KeySet \ - --sequence=Keys", + option_file="lib/hdb/hdb.opt", template=False, includes='../heimdal/lib/asn1') |