Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7241b2ad authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revet part of aosp/2163902" am: d942ca43 am: c3bd6648 am: 25d3dcc6 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/2183579



Change-Id: Ie4c74b6a473a1c6a17c9f5d50ff3cc866529c78f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fff1159c 25d3dcc6

getaddrinfo.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1792,6 +1792,7 @@ static int res_searchN(const char* name, res_target* target, ResState* res, int* 


    hp = (HEADER*)(void*)target->answer.data();



    errno = 0;

    *herrno = HOST_NOT_FOUND; /* default, if we never query */

    dots = 0;

    for (cp = name; *cp; cp++) dots += (*cp == '.');

res_query.cpp

+1 −0
Original line number Diff line number Diff line
@@ -211,6 +211,7 @@ int res_nsearch(ResState* statp, const char* name, /* domain name */ 
    int got_nodata = 0, got_servfail = 0, root_on_list = 0;

    int tried_as_is = 0;



    errno = 0;

    *herrno = HOST_NOT_FOUND; /* True if we never query. */



    dots = 0;

res_send.cpp

+1 −0
Original line number Diff line number Diff line
@@ -780,6 +780,7 @@ same_ns: 
                return -1;

            }

        }

        errno = 0;

        if (random_bind(statp->tcp_nssock, nsap->sa_family) < 0) {

            *terrno = errno;

            dump_error("bind/vc", nsap);