diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-04 12:48:59 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-04 12:48:59 -0500 |
| commit | 169853a068683db6540e3b77542d5139bb7867d1 (patch) | |
| tree | 2163209e7dc0569f9b0f68cf15284fe80f8c9e2e /redhat/kdenetwork/kdenetwork-3.2.3-resolv.patch | |
| parent | 7acfaa9e6409ed0ebdbc2e6fb67e8bc9b64b33d2 (diff) | |
| parent | 43240f192dbdd0c0d267bc7c4a96f123704f0e2b (diff) | |
| download | tde-packaging-169853a068683db6540e3b77542d5139bb7867d1.tar.gz tde-packaging-169853a068683db6540e3b77542d5139bb7867d1.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat/kdenetwork/kdenetwork-3.2.3-resolv.patch')
| -rw-r--r-- | redhat/kdenetwork/kdenetwork-3.2.3-resolv.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/redhat/kdenetwork/kdenetwork-3.2.3-resolv.patch b/redhat/kdenetwork/kdenetwork-3.2.3-resolv.patch new file mode 100644 index 000000000..11d1c6cb6 --- /dev/null +++ b/redhat/kdenetwork/kdenetwork-3.2.3-resolv.patch @@ -0,0 +1,26 @@ +--- kdenetwork-3.2.3/kppp/connect.cpp.orig 2004-07-01 16:03:52.861908057 +0200 ++++ kdenetwork-3.2.3/kppp/connect.cpp 2004-07-01 16:33:35.943692521 +0200 +@@ -1399,9 +1399,13 @@ + + void addpeerdns() { + int fd, fd2; ++ QString p = "/var/run/ppp/resolv.conf"; ++ ++ if (!QFile::exists(p)) ++ p = "/etc/ppp/resolv.conf"; + + if((fd = Requester::rq->openResolv(O_WRONLY|O_APPEND)) >= 0) { +- if((fd2 = open("/etc/ppp/resolv.conf", O_RDONLY)) >= 0) { ++ if((fd2 = open(p.latin1(), O_RDONLY)) >= 0) { + char c; + int i = 0; + while(i++ < 100 && read(fd2, &c, 1) == 1) { +@@ -1412,7 +1416,7 @@ + } + close(fd2); + } else +- fprintf(stderr, "failed to read from /etc/ppp/resolv.conf\n"); ++ fprintf(stderr, "failed to read from %s\n", p.latin1()); + close(fd); + } + add_domain(gpppdata.domain()); |