Project

General

Profile

Bug #518

Name resolution from a jail

Added by qhwt+dfly almost 10 years ago. Updated almost 10 years ago.

Status:
Closed
Priority:
Normal
Assignee:
-
Category:
-
Target version:
-
Start date:
Due date:
% Done:

0%


Description

Hello.
ISTR posting a similar report a half year ago, but I'm not sure
if it's related or not... This occurs on -DEVELOPMENT, not on
1.6.1-RELEASE (but I haven't tried 1.6.2 yet).
I just did a `make DESTDIR=/path/to/jail installworld' in advance
to make sure that the jail is up-to-date with the jail host.

Depending the program, the source address of UDP packets from the
DNS query shows up corrupted in netstat -anfinet output:

$ cat /etc/resolv.conf
domain .
nameserver 192.168.2.175

$ w
6:13PM up 2:52, 1 user, load averages: 0.19, 0.25, 0.13
USER TTY FROM LOGIN@ IDLE WHAT
(press control+Z here, as it's stuck on reverse name resolution)
$ netstat -anfinet |fgrep .53
udp4 0 0 64.125.66.215.1119 192.168.2.175.53
~~~~~~~~~~~~~
this address doesn't belong to our network.

$ host 192.168.2.251
251.2.168.192.in-addr.arpa has no PTR record

Same thing happens to sshd, so I need to set `UseDNS no' in sshd_config
or I can't slogin to the jail(but even with this option, sshd tries
a reverse name lookup and fails). So it seems that `host' command is
using a different resolver library from `w' or `sshd' (if it's a library
problem).

The same problem doesn't happen on the jail host.

The jail node is assigned an IP address 192.168.2.251/32 which is an
alias address of the jail host, which has 192.168.2.250/24.

Regards.

jail-fixaddr.diff View (11.7 KB) corecode, 01/17/2007 03:43 PM

History

#1 Updated by corecode almost 10 years ago

This is a multi-part message in MIME format.
--------------000808030508040705030804
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: quoted-printable

I found a stack reference bug and took the chance to clean up the code. =
Please have a look at attached patch. If victor agrees, I'll commit this=
=2E

cheers
simon

--=20
Serve - BSD +++ RENT this banner advert +++ ASCII Ribbon /"\
Work - Mac +++ space for low =E2=82=AC=E2=82=AC=E2=82=AC NOW!1 +++=
Campaign \ /
Party Enjoy Relax | http://dragonflybsd.org Against HTML \
Dude 2c 2 the max ! http://golden-apple.biz Mail + News / \

--------------000808030508040705030804
Content-Type: text/plain;
name="jail-fixaddr.diff"
Content-Transfer-Encoding: base64
Content-Disposition: inline;
filename="jail-fixaddr.diff"

SW5kZXg6IHN5cy9qYWlsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2hvbWUvZGN2cy9z
cmMvc3lzL3N5cy9qYWlsLmgsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuOQpkaWZmIC11IC1w
IC1yMS45IGphaWwuaAotLS0gc3lzL2phaWwuaAkyOSBEZWMgMjAwNiAxODowMjo1NiAtMDAw
MAkxLjkKKysrIHN5cy9qYWlsLmgJMTcgSmFuIDIwMDcgMTI6NDU6NDcgLTAwMDAKQEAgLTY4
LDggKzY4LDggQEAgTUFMTE9DX0RFQ0xBUkUoTV9QUklTT04pOwogLyogVXNlZCB0byBzdG9y
ZSB0aGUgSVBzIG9mIHRoZSBqYWlsICovCiAKIHN0cnVjdCBqYWlsX2lwX3N0b3JhZ2Ugewot
CVNMSVNUX0VOVFJZKGphaWxfaXBfc3RvcmFnZSkgZW50cmllczsKIAlzdHJ1Y3Qgc29ja2Fk
ZHJfc3RvcmFnZSBpcDsKKwlTTElTVF9FTlRSWShqYWlsX2lwX3N0b3JhZ2UpIGVudHJpZXM7
CiB9OwogCiAvKgpAQCAtODUsMTAgKzg1LDEwIEBAIHN0cnVjdCBwcmlzb24gewogCXN0cnVj
dCBuY2hhbmRsZSBwcl9yb290OwkJCS8qIG5hbWVjYWNoZSBlbnRyeSBvZiByb290ICovCiAJ
Y2hhciAJCXByX2hvc3RbTUFYSE9TVE5BTUVMRU5dOwkvKiBob3N0IG5hbWUgKi8KIAlTTElT
VF9IRUFEKGlwbGlzdCwgamFpbF9pcF9zdG9yYWdlKSBwcl9pcHM7CS8qIGxpc3Qgb2YgSVAg
YWRkcmVzc2VzICovCi0Jc3RydWN0IHNvY2thZGRyX3N0b3JhZ2UJKmxvY2FsX2lwNDsJCS8q
IGNhY2hlIGZvciBhIGxvb3BiYWNrIGlwdjQgYWRkcmVzcyAqLwotCXN0cnVjdCBzb2NrYWRk
cl9zdG9yYWdlCSpub25sb2NhbF9pcDQ7CQkvKiBjYWNoZSBmb3IgYSBub24gbG9vcGJhY2sg
aXB2NCBhZGRyZXNzICovCi0Jc3RydWN0IHNvY2thZGRyX3N0b3JhZ2UJKmxvY2FsX2lwNjsJ
CS8qIGNhY2hlIGZvciBhIGxvb3BiYWNrIGlwdjYgYWRkcmVzcyAqLwotCXN0cnVjdCBzb2Nr
YWRkcl9zdG9yYWdlCSpub25sb2NhbF9pcDY7CQkvKiBjYWNoZSBmb3IgYSBub24gbG9vcGJh
Y2sgaXB2NiBhZGRyZXNzICovCisJc3RydWN0IHNvY2thZGRyX2luCSpsb2NhbF9pcDQ7CQkv
KiBjYWNoZSBmb3IgYSBsb29wYmFjayBpcHY0IGFkZHJlc3MgKi8KKwlzdHJ1Y3Qgc29ja2Fk
ZHJfaW4JKm5vbmxvY2FsX2lwNDsJCS8qIGNhY2hlIGZvciBhIG5vbiBsb29wYmFjayBpcHY0
IGFkZHJlc3MgKi8KKwlzdHJ1Y3Qgc29ja2FkZHJfaW42CSpsb2NhbF9pcDY7CQkvKiBjYWNo
ZSBmb3IgYSBsb29wYmFjayBpcHY2IGFkZHJlc3MgKi8KKwlzdHJ1Y3Qgc29ja2FkZHJfaW42
CSpub25sb2NhbF9pcDY7CQkvKiBjYWNoZSBmb3IgYSBub24gbG9vcGJhY2sgaXB2NiBhZGRy
ZXNzICovCiAJdm9pZAkJKnByX2xpbnV4OwkJCS8qIExpbnV4IEFCSSBlbXVsYXRpb24gKi8K
IAlpbnQJCSBwcl9zZWN1cmVsZXZlbDsJCS8qIGphaWwgc2VjdXJlbGV2ZWwgKi8KIAlzdHJ1
Y3QgdmFyc3ltc2V0IHByX3ZhcnN5bXNldDsJCQkvKiBqYWlsIHZhcnN5bXMgKi8KQEAgLTEw
NSw4ICsxMDUsMTAgQEAgZXh0ZXJuIGludAlqYWlsX2NoZmxhZ3NfYWxsb3dlZDsKIHZvaWQJ
cHJpc29uX2hvbGQoc3RydWN0IHByaXNvbiAqKTsKIHZvaWQJcHJpc29uX2ZyZWUoc3RydWN0
IHByaXNvbiAqKTsKIGludAlqYWlsZWRfaXAoc3RydWN0IHByaXNvbiAqLCBzdHJ1Y3Qgc29j
a2FkZHIgKik7Ci1pbnQJcHJpc29uX2dldF9sb2NhbChzdHJ1Y3QgcHJpc29uICpwciwgc3Ry
dWN0IHNvY2thZGRyICopOwotaW50CXByaXNvbl9nZXRfbm9ubG9jYWwoc3RydWN0IHByaXNv
biAqcHIsIHN0cnVjdCBzb2NrYWRkciAqKTsKK3N0cnVjdCBzb2NrYWRkciAqCisJcHJpc29u
X2dldF9sb2NhbChzdHJ1Y3QgcHJpc29uICpwciwgc2FfZmFtaWx5X3QsIHN0cnVjdCBzb2Nr
YWRkciAqKTsKK3N0cnVjdCBzb2NrYWRkciAqCisJcHJpc29uX2dldF9ub25sb2NhbChzdHJ1
Y3QgcHJpc29uICpwciwgc2FfZmFtaWx5X3QsIHN0cnVjdCBzb2NrYWRkciAqKTsKIAogLyoK
ICAqIFJldHVybiAxIGlmIHRoZSBwYXNzZWQgY3JlZGVudGlhbCBpcyBpbiBhIGphaWwsIG90
aGVyd2lzZSAwLgpJbmRleDoga2Vybi9rZXJuX2phaWwuYwo9PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBm
aWxlOiAvaG9tZS9kY3ZzL3NyYy9zeXMva2Vybi9rZXJuX2phaWwuYyx2CnJldHJpZXZpbmcg
cmV2aXNpb24gMS4xNgpkaWZmIC11IC1wIC1yMS4xNiBrZXJuX2phaWwuYwotLS0ga2Vybi9r
ZXJuX2phaWwuYwkxIEphbiAyMDA3IDE5OjQ1OjU0IC0wMDAwCTEuMTYKKysrIGtlcm4va2Vy
bl9qYWlsLmMJMTcgSmFuIDIwMDcgMTI6NTM6MTYgLTAwMDAKQEAgLTU5LDYgKzU5LDcgQEAK
ICNpbmNsdWRlIDxuZXRpbmV0Ni9pbjZfdmFyLmg+CiAKIHN0YXRpYyBzdHJ1Y3QgcHJpc29u
CSpwcmlzb25fZmluZChpbnQpOworc3RhdGljIHZvaWQJCXByaXNvbl9pcGNhY2hlX2luaXQo
c3RydWN0IHByaXNvbiAqKTsKIAogTUFMTE9DX0RFRklORShNX1BSSVNPTiwgInByaXNvbiIs
ICJQcmlzb24gc3RydWN0dXJlcyIpOwogCkBAIC0xOTUsNiArMTk2LDcgQEAgc3lzX2phaWwo
c3RydWN0IGphaWxfYXJncyAqdWFwKQogCWNhY2hlX2NvcHkoJm5kLm5sX25jaCwgJnByLT5w
cl9yb290KTsKIAogCXZhcnN5bXNldF9pbml0KCZwci0+cHJfdmFyc3ltc2V0LCBOVUxMKTsK
Kwlwcmlzb25faXBjYWNoZV9pbml0KHByKTsKIAogCXRyeXByaWQgPSBsYXN0cHJpZCArIDE7
CiAJaWYgKHRyeXByaWQgPT0gSkFJTF9NQVgpCkBAIC0yNTUsNiArMjU3LDQ1IEBAIHN5c19q
YWlsX2F0dGFjaChzdHJ1Y3QgamFpbF9hdHRhY2hfYXJncyAKIAlyZXR1cm4oa2Vybl9qYWls
X2F0dGFjaCh1YXAtPmppZCkpOwogfQogCitzdGF0aWMgdm9pZAorcHJpc29uX2lwY2FjaGVf
aW5pdChzdHJ1Y3QgcHJpc29uICpwcikKK3sKKwlzdHJ1Y3QgamFpbF9pcF9zdG9yYWdlICpq
aXM7CisJc3RydWN0IHNvY2thZGRyX2luICppcDQ7CisJc3RydWN0IHNvY2thZGRyX2luNiAq
aXA2OworCisJU0xJU1RfRk9SRUFDSChqaXMsICZwci0+cHJfaXBzLCBlbnRyaWVzKSB7CisJ
CXN3aXRjaCAoamlzLT5pcC5zc19mYW1pbHkpIHsKKwkJY2FzZSBBRl9JTkVUOgorCQkJaXA0
ID0gKHN0cnVjdCBzb2NrYWRkcl9pbiAqKSZqaXMtPmlwOworCQkJaWYgKChudG9obChpcDQt
PnNpbl9hZGRyLnNfYWRkcikgPj4gSU5fQ0xBU1NBX05TSElGVCkgPT0KKwkJCSAgICBJTl9M
T09QQkFDS05FVCkgeworCQkJCS8qIGxvb3BiYWNrIGFkZHJlc3MgKi8KKwkJCQlpZiAocHIt
PmxvY2FsX2lwNCA9PSBOVUxMKQorCQkJCQlwci0+bG9jYWxfaXA0ID0gaXA0OworCQkJfSBl
bHNlIHsKKwkJCQkvKiBwdWJsaWMgYWRkcmVzcyAqLworCQkJCWlmIChwci0+bm9ubG9jYWxf
aXA0ID09IE5VTEwpCisJCQkJCXByLT5ub25sb2NhbF9pcDQgPSBpcDQ7CisJCQl9CisJCQli
cmVhazsKKworCQljYXNlIEFGX0lORVQ2OgorCQkJaXA2ID0gKHN0cnVjdCBzb2NrYWRkcl9p
bjYgKikmamlzLT5pcDsKKwkJCWlmIChJTjZfSVNfQUREUl9MT09QQkFDSygmaXA2LT5zaW42
X2FkZHIpKSB7CisJCQkJLyogbG9vcGJhY2sgYWRkcmVzcyAqLworCQkJCWlmIChwci0+bG9j
YWxfaXA2ID09IE5VTEwpCisJCQkJCXByLT5sb2NhbF9pcDYgPSBpcDY7CisJCQl9IGVsc2Ug
eworCQkJCS8qIHB1YmxpYyBhZGRyZXNzICovCisJCQkJaWYgKHByLT5ub25sb2NhbF9pcDYg
PT0gTlVMTCkKKwkJCQkJcHItPm5vbmxvY2FsX2lwNiA9IGlwNjsKKwkJCX0KKwkJCWJyZWFr
OworCQl9CisJfQorfQorCiAvKiAKICAqIENoYW5nZXMgSU5BRERSX0xPT1BCQUNLIGZvciBh
IHZhbGlkIGphaWwgYWRkcmVzcy4KICAqIGlwIGlzIGluIG5ldHdvcmsgYnl0ZSBvcmRlci4K
QEAgLTI4NCw3ICszMjUsOCBAQCBwcmlzb25fcmVwbGFjZV93aWxkY2FyZHMoc3RydWN0IHRo
cmVhZCAqCiAJICAgIGlwNC0+c2luX2FkZHIuc19hZGRyID09IGh0b25sKElOQUREUl9MT09Q
QkFDSykpIHx8CiAJICAgIChpcC0+c2FfZmFtaWx5ID09IEFGX0lORVQ2ICYmCiAJICAgIElO
Nl9JU19BRERSX0xPT1BCQUNLKCZpcDYtPnNpbjZfYWRkcikpKSB7Ci0JCWlmICghcHJpc29u
X2dldF9sb2NhbChwciwgaXApICYmICFwcmlzb25fZ2V0X25vbmxvY2FsKHByLCBpcCkpCisJ
CWlmICghcHJpc29uX2dldF9sb2NhbChwciwgaXAtPnNhX2ZhbWlseSwgaXApICYmCisJCSAg
ICAhcHJpc29uX2dldF9ub25sb2NhbChwciwgaXAtPnNhX2ZhbWlseSwgaXApKQogCQkJcmV0
dXJuKDApOwogCQllbHNlCiAJCQlyZXR1cm4oMSk7CkBAIC0zMDksNyArMzUxLDggQEAgcHJp
c29uX3JlbW90ZV9pcChzdHJ1Y3QgdGhyZWFkICp0ZCwgc3RydQogCSAgICBpcDQtPnNpbl9h
ZGRyLnNfYWRkciA9PSBodG9ubChJTkFERFJfTE9PUEJBQ0spKSB8fAogCSAgICAoaXAtPnNh
X2ZhbWlseSA9PSBBRl9JTkVUNiAmJgogCSAgICBJTjZfSVNfQUREUl9MT09QQkFDSygmaXA2
LT5zaW42X2FkZHIpKSkgewotCQlpZiAoIXByaXNvbl9nZXRfbG9jYWwocHIsIGlwKSAmJiAh
cHJpc29uX2dldF9ub25sb2NhbChwciwgaXApKQorCQlpZiAoIXByaXNvbl9nZXRfbG9jYWwo
cHIsIGlwLT5zYV9mYW1pbHksIGlwKSAmJgorCQkgICAgIXByaXNvbl9nZXRfbm9ubG9jYWwo
cHIsIGlwLT5zYV9mYW1pbHksIGlwKSkKIAkJCXJldHVybigwKTsKIAkJZWxzZQogCQkJcmV0
dXJuKDEpOwpAQCAtMzE5LDEzNSArMzYyLDY4IEBAIHByaXNvbl9yZW1vdGVfaXAoc3RydWN0
IHRocmVhZCAqdGQsIHN0cnUKIAogLyoKICAqIFByaXNvbiBnZXQgbm9uIGxvb3BiYWNrIGlw
OgotICogUHV0IG9uICppcCB0aGUgZmlyc3QgSVAgYWRkcmVzcyB0aGF0IGlzIG5vdCBhIGxv
b3BiYWNrIGFkZHJlc3MuCi0gKiBhZiBpcyB0aGUgYWRkcmVzcyBmYW1pbHkgb2YgdGhlIGlw
IHdlIHdhbnQgKEFGX0lORVR8QUZfSU5FVDYpLgorICogLSBhZiBpcyB0aGUgYWRkcmVzcyBm
YW1pbHkgb2YgdGhlIGlwIHdlIHdhbnQgKEFGX0lORVR8QUZfSU5FVDYpLgorICogLSBJZiBp
cCAhPSBOVUxMLCBwdXQgdGhlIGZpcnN0IElQIGFkZHJlc3MgdGhhdCBpcyBub3QgYSBsb29w
YmFjayBhZGRyZXNzCisgKiAgIGludG8gKmlwLgorICoKICAqIGlwIGlzIGluIG5ldHdvcmsg
Ynkgb3JkZXIgYW5kIHdlIGRvbid0IHRvdWNoIGl0IHVubGVzcyB3ZSBmaW5kIGEgdmFsaWQg
aXAuCi0gKiBSZXR1cm4gMSBpZiB3ZSd2ZSBmb3VuZCBhIG5vbiBsb29wYmFjayBpcCwgZWxz
ZSByZXR1cm4gMC4KKyAqIE5vIG1hdHRlciBpZiBpcCA9PSBOVUxMIG9yIG5vdCwgd2UgcmV0
dXJuIGVpdGhlciBhIHZhbGlkIHN0cnVjdCBzb2NrYWRkciAqLAorICogb3IgTlVMTC4gIFRo
aXMgc3RydWN0IG1heSBub3QgYmUgbW9kaWZpZWQuCiAgKi8KLWludAotcHJpc29uX2dldF9u
b25sb2NhbChzdHJ1Y3QgcHJpc29uICpwciwgc3RydWN0IHNvY2thZGRyICppcCkKK3N0cnVj
dCBzb2NrYWRkciAqCitwcmlzb25fZ2V0X25vbmxvY2FsKHN0cnVjdCBwcmlzb24gKnByLCBz
YV9mYW1pbHlfdCBhZiwgc3RydWN0IHNvY2thZGRyICppcCkKIHsKLQlzdHJ1Y3QgamFpbF9p
cF9zdG9yYWdlICpqaXM7Ci0Jc3RydWN0IHNvY2thZGRyX2luICpqaXA0LCAqaXA0OwotCXN0
cnVjdCBzb2NrYWRkcl9pbjYgKmppcDYsICppcDY7CisJc3RydWN0IHNvY2thZGRyX2luICpp
cDQgPSAoc3RydWN0IHNvY2thZGRyX2luICopaXA7CisJc3RydWN0IHNvY2thZGRyX2luNiAq
aXA2ID0gKHN0cnVjdCBzb2NrYWRkcl9pbjYgKilpcDsKIAotCWlwNCA9IChzdHJ1Y3Qgc29j
a2FkZHJfaW4gKilpcDsKLQlpcDYgPSAoc3RydWN0IHNvY2thZGRyX2luNiAqKWlwOwogCS8q
IENoZWNrIGlmIGl0IGlzIGNhY2hlZCAqLwotCXN3aXRjaChpcC0+c2FfZmFtaWx5KSB7Ci0J
CWNhc2UgQUZfSU5FVDoKLQkJCS8qIC0xIE1lYW5zIHRoYXQgd2UgZG9uJ3QgaGF2ZSBhbnkg
YWRkcmVzcyAqLwotCQkJaWYgKHByLT5ub25sb2NhbF9pcDQgPT0gKHN0cnVjdCBzb2NrYWRk
cl9zdG9yYWdlICopLTEpCi0JCQkJcmV0dXJuKDApOwotCQkJaWYgKHByLT5ub25sb2NhbF9p
cDQgIT0gTlVMTCkgewotCQkJCWppcDQgPSAoc3RydWN0IHNvY2thZGRyX2luICopIHByLT5u
b25sb2NhbF9pcDQ7Ci0JCQkJaXA0LT5zaW5fYWRkci5zX2FkZHIgPSBqaXA0LT5zaW5fYWRk
ci5zX2FkZHI7Ci0JCQl9Ci0JCWJyZWFrOwotCQljYXNlIEFGX0lORVQ2OgotCQkJLyogLTEg
TWVhbnMgdGhhdCB3ZSBkb24ndCBoYXZlIGFueSBhZGRyZXNzICovCi0JCQlpZiAocHItPm5v
bmxvY2FsX2lwNiA9PSAoc3RydWN0IHNvY2thZGRyX3N0b3JhZ2UgKiktMSkKLQkJCQlyZXR1
cm4oMCk7Ci0JCQlpZiAocHItPm5vbmxvY2FsX2lwNiAhPSBOVUxMKSB7Ci0JCQkJamlwNiA9
IChzdHJ1Y3Qgc29ja2FkZHJfaW42ICopIHByLT5ub25sb2NhbF9pcDY7Ci0JCQkJaXA2LT5z
aW42X2FkZHIgPSBqaXA2LT5zaW42X2FkZHI7Ci0JCQl9Ci0JCWJyZWFrOwotCX07Ci0JU0xJ
U1RfRk9SRUFDSChqaXMsICZwci0+cHJfaXBzLCBlbnRyaWVzKSB7Ci0JCXN3aXRjaCAoaXAt
PnNhX2ZhbWlseSkgewotCQljYXNlIEFGX0lORVQ6Ci0JCQlqaXA0ID0gKHN0cnVjdCBzb2Nr
YWRkcl9pbiAqKSAmamlzLT5pcDsKLQkJCWlmIChqaXA0LT5zaW5fZmFtaWx5ID09IEFGX0lO
RVQgJiYKLSAgICAoKG50b2hsKGppcDQtPnNpbl9hZGRyLnNfYWRkcikgPj4gSU5fQ0xBU1NB
X05TSElGVCkgIT0gSU5fTE9PUEJBQ0tORVQpKSB7Ci0JCQkJcHItPm5vbmxvY2FsX2lwNCA9
ICZqaXMtPmlwOwotCQkJCWlwNC0+c2luX2FkZHIuc19hZGRyID0gamlwNC0+c2luX2FkZHIu
c19hZGRyOwotCQkJCXJldHVybigxKTsKLQkJCX0KLQkJCWJyZWFrOwotCQljYXNlIEFGX0lO
RVQ2OgotCQkJamlwNiA9IChzdHJ1Y3Qgc29ja2FkZHJfaW42ICopICZqaXMtPmlwOwotCQkJ
aWYgKCBqaXA2LT5zaW42X2ZhbWlseSA9PSBBRl9JTkVUNiAmJgotCQkJICAgICAhSU42X0lT
X0FERFJfTE9PUEJBQ0soJmppcDYtPnNpbjZfYWRkcikpIHsKLQkJCQlwci0+bm9ubG9jYWxf
aXA2ID0gJmppcy0+aXA7Ci0JCQkJaXA2LT5zaW42X2FkZHIgPSBqaXA2LT5zaW42X2FkZHI7
Ci0JCQkJcmV0dXJuKDEpOwotCQkJfQotCQkJYnJlYWs7Ci0JCX0KKwlzd2l0Y2goYWYpIHsK
KwljYXNlIEFGX0lORVQ6CisJCWlmIChpcDQgIT0gTlVMTCAmJiBwci0+bm9ubG9jYWxfaXA0
ICE9IE5VTEwpCisJCQlpcDQtPnNpbl9hZGRyLnNfYWRkciA9IHByLT5ub25sb2NhbF9pcDQt
PnNpbl9hZGRyLnNfYWRkcjsKKwkJcmV0dXJuIChzdHJ1Y3Qgc29ja2FkZHIgKilwci0+bm9u
bG9jYWxfaXA0OworCisJY2FzZSBBRl9JTkVUNjoKKwkJaWYgKGlwNiAhPSBOVUxMICYmIHBy
LT5ub25sb2NhbF9pcDYgIT0gTlVMTCkKKwkJCWlwNi0+c2luNl9hZGRyID0gcHItPm5vbmxv
Y2FsX2lwNi0+c2luNl9hZGRyOworCQlyZXR1cm4gKHN0cnVjdCBzb2NrYWRkciAqKXByLT5u
b25sb2NhbF9pcDY7CiAJfQotCWlmIChpcC0+c2FfZmFtaWx5ID09IEFGX0lORVQpCi0JCXBy
LT5ub25sb2NhbF9pcDQgPSAoc3RydWN0IHNvY2thZGRyX3N0b3JhZ2UgKiktMTsKLQllbHNl
Ci0JCXByLT5ub25sb2NhbF9pcDYgPSAoc3RydWN0IHNvY2thZGRyX3N0b3JhZ2UgKiktMTsK
LQlyZXR1cm4oMCk7CisKKwkvKiBOT1RSRUFDSEVEICovCisJcmV0dXJuIE5VTEw7CiB9CiAK
IC8qCiAgKiBQcmlzb24gZ2V0IGxvb3BiYWNrIGlwLgotICogUHV0IG9uICppcCB0aGUgZmly
c3QgbG9vcGJhY2sgSVAgYWRkcmVzcy4KLSAqIGFmIGlzIHRoZSBhZGRyZXNzIGZhbWlseSBv
ZiB0aGUgaXAgd2Ugd2FudCAoQUZfSU5FVHxQRl9JTkVUKS4KLSAqICppcCBpcyBpbiBuZXR3
b3JrIGJ5IG9yZGVyIGFuZCB3ZSBkb24ndCB0b3VjaCBpdCB1bmxlc3Mgd2UgZmluZCBhIHZh
bGlkIGlwLgotICogcmV0dXJuIDEgaWYgd2UndmUgZm91bmQgYSBsb29wYmFjayBpcCwgZWxz
ZSByZXR1cm4gMC4KKyAqIC0gYWYgaXMgdGhlIGFkZHJlc3MgZmFtaWx5IG9mIHRoZSBpcCB3
ZSB3YW50IChBRl9JTkVUfEFGX0lORVQ2KS4KKyAqIC0gSWYgaXAgIT0gTlVMTCwgcHV0IHRo
ZSBmaXJzdCBJUCBhZGRyZXNzIHRoYXQgaXMgbm90IGEgbG9vcGJhY2sgYWRkcmVzcworICog
ICBpbnRvICppcC4KKyAqCisgKiBpcCBpcyBpbiBuZXR3b3JrIGJ5IG9yZGVyIGFuZCB3ZSBk
b24ndCB0b3VjaCBpdCB1bmxlc3Mgd2UgZmluZCBhIHZhbGlkIGlwLgorICogTm8gbWF0dGVy
IGlmIGlwID09IE5VTEwgb3Igbm90LCB3ZSByZXR1cm4gZWl0aGVyIGEgdmFsaWQgc3RydWN0
IHNvY2thZGRyICosCisgKiBvciBOVUxMLiAgVGhpcyBzdHJ1Y3QgbWF5IG5vdCBiZSBtb2Rp
ZmllZC4KICAqLwotaW50Ci1wcmlzb25fZ2V0X2xvY2FsKHN0cnVjdCBwcmlzb24gKnByLCBz
dHJ1Y3Qgc29ja2FkZHIgKmlwKQorc3RydWN0IHNvY2thZGRyICoKK3ByaXNvbl9nZXRfbG9j
YWwoc3RydWN0IHByaXNvbiAqcHIsIHNhX2ZhbWlseV90IGFmLCBzdHJ1Y3Qgc29ja2FkZHIg
KmlwKQogewotCXN0cnVjdCBqYWlsX2lwX3N0b3JhZ2UgKmppczsKLQlzdHJ1Y3Qgc29ja2Fk
ZHJfaW4gKmppcDQsICppcDQ7Ci0Jc3RydWN0IHNvY2thZGRyX2luNiAqamlwNiwgKmlwNjsK
KwlzdHJ1Y3Qgc29ja2FkZHJfaW4gKmlwNCA9IChzdHJ1Y3Qgc29ja2FkZHJfaW4gKilpcDsK
KwlzdHJ1Y3Qgc29ja2FkZHJfaW42ICppcDYgPSAoc3RydWN0IHNvY2thZGRyX2luNiAqKWlw
OwogCi0JaXA0ID0gKHN0cnVjdCBzb2NrYWRkcl9pbiAqKWlwOwotCWlwNiA9IChzdHJ1Y3Qg
c29ja2FkZHJfaW42ICopaXA7CiAJLyogQ2hlY2sgaWYgaXQgaXMgY2FjaGVkICovCi0Jc3dp
dGNoKGlwLT5zYV9mYW1pbHkpIHsKLQkJY2FzZSBBRl9JTkVUOgotCQkJLyogLTEgTWVhbnMg
dGhhdCB3ZSBkb24ndCBoYXZlIGFueSBhZGRyZXNzICovCi0JCQlpZiAocHItPmxvY2FsX2lw
NCA9PSAoc3RydWN0IHNvY2thZGRyX3N0b3JhZ2UgKiktMSkKLQkJCQlyZXR1cm4oMCk7Ci0J
CQlpZiAocHItPmxvY2FsX2lwNCAhPSBOVUxMKSB7Ci0JCQkJamlwNCA9IChzdHJ1Y3Qgc29j
a2FkZHJfaW4gKikgcHItPmxvY2FsX2lwNDsKLQkJCQlpcDQtPnNpbl9hZGRyLnNfYWRkciA9
IGppcDQtPnNpbl9hZGRyLnNfYWRkcjsKLQkJCX0KLQkJYnJlYWs7Ci0JCWNhc2UgQUZfSU5F
VDY6Ci0JCQkvKiAtMSBNZWFucyB0aGF0IHdlIGRvbid0IGhhdmUgYW55IGFkZHJlc3MgKi8K
LQkJCWlmIChwci0+bG9jYWxfaXA2ID09IChzdHJ1Y3Qgc29ja2FkZHJfc3RvcmFnZSAqKS0x
KQotCQkJCXJldHVybigwKTsKLQkJCWlmIChwci0+bG9jYWxfaXA2ICE9IE5VTEwpIHsKLQkJ
CQlqaXA2ID0gKHN0cnVjdCBzb2NrYWRkcl9pbjYgKikgcHItPmxvY2FsX2lwNjsKLQkJCQlp
cDYtPnNpbjZfYWRkciA9IGppcDYtPnNpbjZfYWRkcjsKLQkJCX0KLQkJYnJlYWs7Ci0JfTsK
LQlTTElTVF9GT1JFQUNIKGppcywgJnByLT5wcl9pcHMsIGVudHJpZXMpIHsKLQkJc3dpdGNo
KGlwLT5zYV9mYW1pbHkpIHsKLQkJY2FzZSBBRl9JTkVUOgotCQkJamlwNCA9IChzdHJ1Y3Qg
c29ja2FkZHJfaW4gKikgJmppcy0+aXA7Ci0JCQlpZiAoamlwNC0+c2luX2ZhbWlseSA9PSBB
Rl9JTkVUICYmCi0JCQkgICAgKChudG9obChqaXA0LT5zaW5fYWRkci5zX2FkZHIpID4+IElO
X0NMQVNTQV9OU0hJRlQpCi0JCQkgICAgPT0gSU5fTE9PUEJBQ0tORVQpKSB7Ci0JCQkJcHIt
PmxvY2FsX2lwNCA9ICZqaXMtPmlwOwotCQkJCWlwNC0+c2luX2FkZHIuc19hZGRyID0gamlw
NC0+c2luX2FkZHIuc19hZGRyOwotCQkJCXJldHVybigxKTsKLQkJCX0KLQkJCWJyZWFrOwot
CQljYXNlIEFGX0lORVQ2OgotCQkJamlwNiA9IChzdHJ1Y3Qgc29ja2FkZHJfaW42ICopICZq
aXMtPmlwOwotCQkJaWYgKGppcDYtPnNpbjZfZmFtaWx5ID09IEFGX0lORVQ2ICYmCi0JCQkg
ICAgIElONl9JU19BRERSX0xPT1BCQUNLKCZqaXA2LT5zaW42X2FkZHIpKSB7Ci0JCQkJcHIt
PmxvY2FsX2lwNiA9ICZqaXMtPmlwOwotCQkJCWlwNi0+c2luNl9hZGRyID0gamlwNi0+c2lu
Nl9hZGRyOwotCQkJCXJldHVybigxKTsKLQkJCX0KLQkJCWJyZWFrOwotCQl9CisJc3dpdGNo
KGFmKSB7CisJY2FzZSBBRl9JTkVUOgorCQlpZiAoaXA0ICE9IE5VTEwgJiYgcHItPmxvY2Fs
X2lwNCAhPSBOVUxMKQorCQkJaXA0LT5zaW5fYWRkci5zX2FkZHIgPSBwci0+bG9jYWxfaXA0
LT5zaW5fYWRkci5zX2FkZHI7CisJCXJldHVybiAoc3RydWN0IHNvY2thZGRyICopcHItPmxv
Y2FsX2lwNDsKKworCWNhc2UgQUZfSU5FVDY6CisJCWlmIChpcDYgIT0gTlVMTCAmJiBwci0+
bG9jYWxfaXA2ICE9IE5VTEwpCisJCQlpcDYtPnNpbjZfYWRkciA9IHByLT5sb2NhbF9pcDYt
PnNpbjZfYWRkcjsKKwkJcmV0dXJuIChzdHJ1Y3Qgc29ja2FkZHIgKilwci0+bG9jYWxfaXA2
OwogCX0KLQlpZiAoaXAtPnNhX2ZhbWlseSA9PSBBRl9JTkVUKQotCQlwci0+bG9jYWxfaXA0
ID0gKHN0cnVjdCBzb2NrYWRkcl9zdG9yYWdlICopLTE7Ci0JZWxzZQotCQlwci0+bG9jYWxf
aXA2ID0gKHN0cnVjdCBzb2NrYWRkcl9zdG9yYWdlICopLTE7Ci0JcmV0dXJuKDApOworCisJ
LyogTk9UUkVBQ0hFRCAqLworCXJldHVybiBOVUxMOwogfQogCiAvKiBDaGVjayBpZiB0aGUg
SVAgaXMgYW1vbmcgb3VycywgaWYgaXQgaXMgcmV0dXJuIDEsIGVsc2UgMCAqLwpJbmRleDog
bmV0aW5ldC9pbl9wY2IuYwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9kY3ZzL3Ny
Yy9zeXMvbmV0aW5ldC9pbl9wY2IuYyx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS40MQpkaWZm
IC11IC1wIC1yMS40MSBpbl9wY2IuYwotLS0gbmV0aW5ldC9pbl9wY2IuYwkyOSBEZWMgMjAw
NiAxODowMjo1NiAtMDAwMAkxLjQxCisrKyBuZXRpbmV0L2luX3BjYi5jCTE3IEphbiAyMDA3
IDEyOjU4OjA3IC0wMDAwCkBAIC00NTcsNyArNDU3LDcgQEAgaW5fcGNibGFkZHIoc3RydWN0
IGlucGNiICppbnAsIHN0cnVjdCBzbwogCXN0cnVjdCBpbl9pZmFkZHIgKmlhOwogCXN0cnVj
dCB1Y3JlZCAqY3JlZCA9IE5VTEw7CiAJc3RydWN0IHNvY2thZGRyX2luICpzaW4gPSAoc3Ry
dWN0IHNvY2thZGRyX2luICopbmFtOwotCXN0cnVjdCBzb2NrYWRkcl9pbiBqc2luOworCXN0
cnVjdCBzb2NrYWRkciAqanNpbjsKIAlpbnQgamFpbGVkID0gMDsKIAogCWlmIChuYW0tPnNh
X2xlbiAhPSBzaXplb2YgKnNpbikKQEAgLTU3OSwxNCArNTc5LDEzIEBAIGluX3BjYmxhZGRy
KHN0cnVjdCBpbnBjYiAqaW5wLCBzdHJ1Y3Qgc28KIAkJICogRG9uJ3QgZG8gcGNibG9va3Vw
IGNhbGwgaGVyZTsgcmV0dXJuIGludGVyZmFjZSBpbiBwbG9jYWxfc2luCiAJCSAqIGFuZCBl
eGl0IHRvIGNhbGxlciwgdGhhdCB3aWxsIGRvIHRoZSBsb29rdXAuCiAJCSAqLwotCQlpZiAo
amFpbGVkKSB7Ci0JCQlqc2luLnNpbl9mYW1pbHkgPSBBRl9JTkVUOwotCQkJaWYgKCFwcmlz
b25fZ2V0X25vbmxvY2FsKGNyZWQtPmNyX3ByaXNvbiwKLQkJCSAgICBzaW50b3NhKCZqc2lu
KSkgJiYKLQkJCSAgICAhcHJpc29uX2dldF9sb2NhbChjcmVkLT5jcl9wcmlzb24sIHNpbnRv
c2EoJmpzaW4pKSkKLQkJCQkJLyogSVB2NiBvbmx5IEphaWwgKi8KLQkJCQkJcmV0dXJuIChF
QUREUk5PVEFWQUlMKTsKLQkJCSpwbG9jYWxfc2luID0gJmpzaW47CisJCWlmIChpYSA9PSBO
VUxMICYmIGphaWxlZCkgeworCQkJaWYgKChqc2luID0gcHJpc29uX2dldF9ub25sb2NhbChj
cmVkLT5jcl9wcmlzb24sIEFGX0lORVQsIE5VTEwpKSAhPSBOVUxMIHx8CisJCQkgICAgKGpz
aW4gPSBwcmlzb25fZ2V0X2xvY2FsKGNyZWQtPmNyX3ByaXNvbiwgQUZfSU5FVCwgTlVMTCkp
ICE9IE5VTEwpCisJCQkJKnBsb2NhbF9zaW4gPSBzYXRvc2luKGpzaW4pOworCQkJZWxzZQor
CQkJCS8qIElQdjYgb25seSBKYWlsICovCisJCQkJcmV0dXJuIChFQUREUk5PVEFWQUlMKTsK
IAkJfSBlbHNlIHsKIAkJCSpwbG9jYWxfc2luID0gJmlhLT5pYV9hZGRyOwogCQl9Cg==
--------------000808030508040705030804--

#2 Updated by corecode almost 10 years ago

sorry for the broken MIME. My enigmail from cvs seems to be quite broken. patch attached again.

somebody please commit this if it works.

cheers
simon

#3 Updated by victor almost 10 years ago

The patch looks good to me.

I'll commit it when yonetani reports if it's working for him.

#4 Updated by qhwt+dfly almost 10 years ago

It's working for me! I've seen no problem so far during building packages.

Thanks.

#5 Updated by victor almost 10 years ago

Fix commited.

Also available in: Atom PDF