Merge branch 'ldns-to-dnslib' into dnslib-slab
Conflicts: src/zone/parser-util.h src/zone/zone-load.c
Showing
- samples/dnssec.zone 10 additions, 6 deletionssamples/dnssec.zone
- src/dnslib/dname.c 24 additions, 0 deletionssrc/dnslib/dname.c
- src/dnslib/dname.h 2 additions, 0 deletionssrc/dnslib/dname.h
- src/dnslib/zone.c 113 additions, 1 deletionsrc/dnslib/zone.c
- src/dnslib/zone.h 5 additions, 2 deletionssrc/dnslib/zone.h
- src/hash/cuckoo-hash-table.c 2 additions, 0 deletionssrc/hash/cuckoo-hash-table.c
- src/server/name-server.c 4 additions, 2 deletionssrc/server/name-server.c
- src/zone/zone-dump.c 1 addition, 3 deletionssrc/zone/zone-dump.c
- src/zone/zone-load.c 16 additions, 48 deletionssrc/zone/zone-load.c
- src/zone/zonec.c 27 additions, 67 deletionssrc/zone/zonec.c
- src/zone/zonec.h 7 additions, 5 deletionssrc/zone/zonec.h
- src/zone/zparser.y 2 additions, 9 deletionssrc/zone/zparser.y
Loading
Please register or sign in to comment