← Back to branch summary

~ubuntu-branches/ubuntu/maverick/eglibc/maverick-proposed

« back to all changes in this revision

Viewing changes to debian/patches/any/submitted-etc-resolv.conf.diff

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2010-05-30 11:05:12 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20100530110512-axurnekxr2yygcf2
Tags: 2.12-0ubuntu1
* Build eglibc_2.12.orig.tar.gz, based on 2.12 branch (r10591).
* Merge with Debian (r4299, trunk).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/any/submitted-etc-resolv.conf.diff
3
3
        * resolv/res_init.c (__res_vinit): Initialize nameserver to the
4
4
        loopback address if none specified.
5
5
 
 
6
---
 
7
 resolv/res_init.c |   17 ++++++++++-------
 
8
 1 file changed, 10 insertions(+), 7 deletions(-)
 
9
 
6
10
--- a/resolv/res_init.c
7
11
+++ b/resolv/res_init.c
8
 
@@ -176,13 +176,6 @@ __res_vinit(res_state statp, int preinit) {
 
12
@@ -176,13 +176,6 @@
9
13
                statp->id = res_randomid();
10
14
        }
11
15
 
19
23
        statp->nscount = 0;
20
24
        statp->ndots = 1;
21
25
        statp->pfcode = 0;
22
 
@@ -433,6 +426,16 @@ __res_vinit(res_state statp, int preinit) {
 
26
@@ -433,6 +426,16 @@
23
27
 #endif
24
28
            (void) fclose(fp);
25
29
        }
36
40
        if (statp->defdname[0] == 0 &&
37
41
            __gethostname(buf, sizeof(statp->defdname) - 1) == 0 &&
38
42
            (cp = strchr(buf, '.')) != NULL)
39