diff options
| author | taesub kim <taesub.kim@samsung.com> | 2017-03-22 01:52:07 -0700 |
|---|---|---|
| committer | taesub kim <taesub.kim@samsung.com> | 2017-03-22 01:52:07 -0700 |
| commit | ccc167151c3e03021a5302035d2c55ebe78b479a (patch) | |
| tree | fe427d1440751f420666a1a7ad438860d11ab426 /src | |
| parent | 50d251b7504e58ac58abc184ee9fe4c5b74ec387 (diff) | |
| download | dnsmasq-ccc167151c3e03021a5302035d2c55ebe78b479a.tar.gz dnsmasq-ccc167151c3e03021a5302035d2c55ebe78b479a.tar.bz2 dnsmasq-ccc167151c3e03021a5302035d2c55ebe78b479a.zip | |
Revert "Imported Upstream version 2.74"
This reverts commit 50d251b7504e58ac58abc184ee9fe4c5b74ec387.
Change-Id: Ib37a4bd14f141095f4c4b7432e1c923d283311bf
Diffstat (limited to 'src')
| -rw-r--r-- | src/cache.c | 2 | ||||
| -rw-r--r-- | src/config.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/cache.c b/src/cache.c index 178d654..1b76b67 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)) + if ((flags & (F_IPV4 | F_IPV6)) && (flags & F_FORWARD) && addr) { 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 f75fe9d..8d964af 100644 --- a/src/config.h +++ b/src/config.h @@ -14,6 +14,8 @@ 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) */ @@ -170,7 +172,7 @@ RESOLVFILE */ /* #define HAVE_LUASCRIPT */ -/* #define HAVE_DBUS */ +#define HAVE_DBUS /* #define HAVE_IDN */ /* #define HAVE_CONNTRACK */ /* #define HAVE_DNSSEC */ |