Merge remote branch 'origin/zoneparser' into ldns-to-dnslib
Conflicts: src/dnslib/zone.h + Added function dname_from_wire() for creating dname structure in the given place.
No related branches found
No related tags found
Showing
- src/dnslib/debug.c 9 additions, 1 deletionsrc/dnslib/debug.c
- src/dnslib/dname.c 27 additions, 4 deletionssrc/dnslib/dname.c
- src/dnslib/dname.h 3 additions, 0 deletionssrc/dnslib/dname.h
- src/dnslib/zone.h 1 addition, 0 deletionssrc/dnslib/zone.h
- src/other/debug.h 3 additions, 0 deletionssrc/other/debug.h
- src/zone/zlexer.lex 4 additions, 0 deletionssrc/zone/zlexer.lex
- src/zone/zone-dump.c 194 additions, 23 deletionssrc/zone/zone-dump.c
- src/zone/zone-load.c 22 additions, 10 deletionssrc/zone/zone-load.c
- src/zone/zonec.c 14 additions, 25 deletionssrc/zone/zonec.c
Loading
Please register or sign in to comment