diff options
| author | taesub kim <taesub.kim@samsung.com> | 2017-03-22 16:59:35 +0900 |
|---|---|---|
| committer | taesub kim <taesub.kim@samsung.com> | 2017-03-22 16:59:57 +0900 |
| commit | 50d251b7504e58ac58abc184ee9fe4c5b74ec387 (patch) | |
| tree | 94ba9a7ba025578be82eb7fdb342f765d0c70377 /src | |
| parent | bfe353fab22064f77f3ad423b95b848dcbad21b7 (diff) | |
| download | dnsmasq-50d251b7504e58ac58abc184ee9fe4c5b74ec387.tar.gz dnsmasq-50d251b7504e58ac58abc184ee9fe4c5b74ec387.tar.bz2 dnsmasq-50d251b7504e58ac58abc184ee9fe4c5b74ec387.zip | |
Imported Upstream version 2.74
Change-Id: If275adb44c88ff3daee1397fb7ae8a22e0f5ddbc
Diffstat (limited to 'src')
| -rw-r--r-- | src/cache.c | 2 | ||||
| -rw-r--r-- | src/config.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/cache.c b/src/cache.c index 1b76b67..178d654 100644 --- a/src/cache.c +++ b/src/cache.c @@ -481,7 +481,7 @@ struct crec *cache_insert(char *name, struct all_addr *addr, existing record is for an A or AAAA and the record we're trying to insert is the same, just drop the insert, but don't error the whole process. */ - if ((flags & (F_IPV4 | F_IPV6)) && (flags & F_FORWARD) && addr) + if ((flags & (F_IPV4 | F_IPV6)) && (flags & F_FORWARD)) { if ((flags & F_IPV4) && (new->flags & F_IPV4) && new->addr.addr.addr.addr4.s_addr == addr->addr.addr4.s_addr) diff --git a/src/config.h b/src/config.h index 8d964af..f75fe9d 100644 --- a/src/config.h +++ b/src/config.h @@ -14,8 +14,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#define VERSION "2.74" - #define FTABSIZ 150 /* max number of outstanding requests (default) */ #define MAX_PROCS 20 /* max no children for TCP requests */ #define CHILD_LIFETIME 150 /* secs 'till terminated (RFC1035 suggests > 120s) */ @@ -172,7 +170,7 @@ RESOLVFILE */ /* #define HAVE_LUASCRIPT */ -#define HAVE_DBUS +/* #define HAVE_DBUS */ /* #define HAVE_IDN */ /* #define HAVE_CONNTRACK */ /* #define HAVE_DNSSEC */ |