diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-10-13 20:24:37 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:43:00 +0100 |
| commit | b09047b78e981af8ade6a72d426bfcb0e742995b (patch) | |
| tree | 2547a72c9814f190d83cb0f8ecac678976a72ff5 /source4/lib/samba3 | |
| parent | 8517878144973aa23e653bfc7aabfbaef500c7e2 (diff) | |
| download | samba-b09047b78e981af8ade6a72d426bfcb0e742995b.tar.gz samba-b09047b78e981af8ade6a72d426bfcb0e742995b.tar.bz2 samba-b09047b78e981af8ade6a72d426bfcb0e742995b.zip | |
r25624: Remove ipv4_addr hack. Only causes 4 extra includes of system/network.h because we stripped down includes.
(This used to be commit 262c1c23a61f1f4fae13e0a61179fe98b682cecf)
Diffstat (limited to 'source4/lib/samba3')
| -rw-r--r-- | source4/lib/samba3/samba3.h | 2 | ||||
| -rw-r--r-- | source4/lib/samba3/winsdb.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source4/lib/samba3/samba3.h b/source4/lib/samba3/samba3.h index bc73e8941d..202ac767ec 100644 --- a/source4/lib/samba3/samba3.h +++ b/source4/lib/samba3/samba3.h @@ -98,7 +98,7 @@ struct samba3_winsdb_entry int type; time_t ttl; uint32_t ip_count; - struct ipv4_addr *ips; + struct in_addr *ips; }; struct samba3_policy diff --git a/source4/lib/samba3/winsdb.c b/source4/lib/samba3/winsdb.c index 0a93dbb0e1..5bed3523ea 100644 --- a/source4/lib/samba3/winsdb.c +++ b/source4/lib/samba3/winsdb.c @@ -23,6 +23,7 @@ #include "includes.h" #include "system/filesys.h" #include "lib/samba3/samba3.h" +#include "system/network.h" #define WINS_VERSION 1 @@ -110,7 +111,7 @@ NTSTATUS samba3_read_winsdb( const char *fn, TALLOC_CTX *ctx, struct samba3_wins } /* Allocate the space for the ip_list. */ - if((entry.ips = talloc_array ( ctx, struct ipv4_addr, entry.ip_count)) == NULL) { + if((entry.ips = talloc_array ( ctx, struct in_addr, entry.ip_count)) == NULL) { DEBUG(0,("initialise_wins: Malloc fail !\n")); SAFE_FREE(line); return NT_STATUS_NO_MEMORY; |