diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-02-06 12:38:24 +1100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-02-10 15:36:37 -0800 |
| commit | ece7089918e37f407f84d13df9d816d5a6d90f2e (patch) | |
| tree | 3c6919817b656fa3a0f9a99063e14fbb9d55d7b8 /source3/nmbd/asyncdns.c | |
| parent | a5d2fb752cdb7e27a4949635b6486834d9fac313 (diff) | |
| download | samba-ece7089918e37f407f84d13df9d816d5a6d90f2e.tar.gz samba-ece7089918e37f407f84d13df9d816d5a6d90f2e.tar.bz2 samba-ece7089918e37f407f84d13df9d816d5a6d90f2e.zip | |
s3-nmbd: update nmbd to use new DLIST_ macros
(cherry picked from commit 4d23d777bc6d4fad20d0f3084fe658635812bee9)
Diffstat (limited to 'source3/nmbd/asyncdns.c')
| -rw-r--r-- | source3/nmbd/asyncdns.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/source3/nmbd/asyncdns.c b/source3/nmbd/asyncdns.c index 85729ae7ac..8b49f510a1 100644 --- a/source3/nmbd/asyncdns.c +++ b/source3/nmbd/asyncdns.c @@ -258,13 +258,8 @@ void run_dns_queue(void) in_dns = 0; p->locked = False; - if (p->prev) - p->prev->next = p->next; - else - dns_queue = p->next; - if (p->next) - p->next->prev = p->prev; p2 = p->next; + DLIST_REMOVE(dns_queue, p); free_packet(p); p = p2; } else { @@ -274,10 +269,7 @@ void run_dns_queue(void) if (dns_queue) { dns_current = dns_queue; - dns_queue = dns_queue->next; - if (dns_queue) - dns_queue->prev = NULL; - dns_current->next = NULL; + DLIST_REMOVE(dns_queue, dns_queue); if (!write_child(dns_current)) { DEBUG(3,("failed to send DNS query to child!\n")); @@ -304,11 +296,7 @@ bool queue_dns_query(struct packet_struct *p,struct nmb_name *question) p->locked = True; } else { p->locked = True; - p->next = dns_queue; - p->prev = NULL; - if (p->next) - p->next->prev = p; - dns_queue = p; + DLIST_ADD(dns_queue, p); } DEBUG(3,("added DNS query for %s\n", nmb_namestr(question))); |