diff options
Diffstat (limited to 'contrib/bind/bin/named/db_defs.h')
| -rw-r--r-- | contrib/bind/bin/named/db_defs.h | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/contrib/bind/bin/named/db_defs.h b/contrib/bind/bin/named/db_defs.h index f18acae..72aa19f 100644 --- a/contrib/bind/bin/named/db_defs.h +++ b/contrib/bind/bin/named/db_defs.h @@ -1,6 +1,6 @@ /* * from db.h 4.16 (Berkeley) 6/1/90 - * $Id: db_defs.h,v 8.41 2001/02/08 02:05:50 marka Exp $ + * $Id: db_defs.h,v 8.46 2001/11/17 15:16:46 marka Exp $ */ /* @@ -111,7 +111,14 @@ * indicate what the union is being used for. This should require less * memory than making d_addr a union of struct in6_addr and struct in_addr. */ +#ifdef CHECK_MAGIC +#define DATABUF_MAGIC (('D'<<24)|('A'<<16)|('T'<<8)|'A') +#endif + struct databuf { +#ifdef CHECK_MAGIC + u_int32_t d_magic; /* magic number */ +#endif struct databuf *d_next; /* linked list */ struct in_addr d_addr; /* NS from whence this came */ u_int32_t d_ttl; /* time to live */ @@ -130,6 +137,7 @@ struct databuf { unsigned d_clev :6; unsigned d_rcode :4; /* rcode for negative caching */ unsigned d_mark :3; /* place to mark data */ + unsigned d_noedns :1; /* this server does not support edns */ int16_t d_type; /* type number */ int16_t d_size; /* size of data area */ u_int32_t d_rcnt; @@ -184,11 +192,14 @@ struct namebuf { struct databuf *n_data; /* data records */ struct namebuf *n_parent; /* parent domain */ struct hashbuf *n_hash; /* hash table for children */ - char _n_name[sizeof(void*)]; /* Counted str (dynamic). */ + union { + char _n_name[sizeof(void*)]; + unsigned char _n_len[sizeof(void*)]; + } _n; /* Counted str (dynamic). */ }; #define NAMESIZE(n) (sizeof(struct namebuf) - sizeof(void*) + 1 + n + 1) -#define NAMELEN(nb) (((u_char *)((nb)._n_name))[0]) -#define NAME(nb) ((nb)._n_name + 1) +#define NAMELEN(nb) ((((nb)._n._n_len))[0]) +#define NAME(nb) ((nb)._n._n_name + 1) struct hashbuf { int h_size; /* size of hash table */ @@ -211,6 +222,7 @@ struct tsig_record { u_int8_t sig[TSIG_SIG_SIZE]; struct dst_key *key; int siglen; + int tsig_size; }; struct sig_record { @@ -227,7 +239,7 @@ struct dnode { struct databuf *dp; struct dnode *dn_next; int line; - char *file; + const char *file; }; typedef struct dnode * dlist; @@ -280,6 +292,7 @@ struct db_rrset { #endif #define CNAMEANDOTHER (-12) #define DNSSECFAIL (-13) /* db_set_update */ +#define NONGLUE (-14) /* * getnum() options |
