From: Amit Gud Subject: Re: [PATCH] Fix NFS mount options in mount.nfs Date: Fri, 07 Jul 2006 15:47:00 -0400 Message-ID: <44AEBA34.9080804@redhat.com> References: <44AE9DC7.4050606@redhat.com> <20060707184009.GA3338@uio.no> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------060008040604010501070103" Cc: nfs@lists.sourceforge.net, Steve Dickson Return-path: Received: from sc8-sf-mx2-b.sourceforge.net ([10.3.1.92] helo=mail.sourceforge.net) by sc8-sf-list2-new.sourceforge.net with esmtp (Exim 4.43) id 1FywEZ-0007yQ-Hw for nfs@lists.sourceforge.net; Fri, 07 Jul 2006 12:43:27 -0700 Received: from mx1.redhat.com ([66.187.233.31]) by mail.sourceforge.net with esmtp (Exim 4.44) id 1FywEW-0001pH-Gx for nfs@lists.sourceforge.net; Fri, 07 Jul 2006 12:43:27 -0700 To: "Steinar H. Gunderson" , Neil Brown In-Reply-To: <20060707184009.GA3338@uio.no> List-Id: "Discussion of NFS under Linux development, interoperability, and testing." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: nfs-bounces@lists.sourceforge.net Errors-To: nfs-bounces@lists.sourceforge.net This is a multi-part message in MIME format. --------------060008040604010501070103 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Steinar H. Gunderson wrote: > FWIW, this part is wrong: > >> install-exec-hook: >> (cd $(DESTDIR)$(sbindir) && \ >> - ln -sf $(sbin_PROGRAMS) mount.nfs4 && \ >> - ln -sf $(sbin_PROGRAMS) umount.nfs && \ >> - ln -sf $(sbin_PROGRAMS) umount.nfs4) >> + chmod +s $(sbin_PROGRAMS) && \ >> + cp $(sbin_PROGRAMS) /sbin/mount.nfs4 && \ >> + cp $(sbin_PROGRAMS) /sbin/umount.nfs && \ >> + cp $(sbin_PROGRAMS) /sbin/umount.nfs4) > > You cannot expect to be able to put stuff directly into /sbin, you'll have to > heed $(DESTDIR). > Please use the attached patch for testing. It varies only in the above portion, but that should make a difference. AG -- May the source be with you. http://www.cis.ksu.edu/~gud --------------060008040604010501070103 Content-Type: text/plain; name="fix-mount-options-v2.patch" Content-Transfer-Encoding: base64 Content-Disposition: inline; filename="fix-mount-options-v2.patch" ZGlmZiAtdXByTiAtWCBkb250ZGlmZiBuZnMtdXRpbHMvdXRpbHMvbW91bnQvTWFrZWZpbGUu YW0gbmZzLXV0aWxzLWFnL3V0aWxzL21vdW50L01ha2VmaWxlLmFtCi0tLSBuZnMtdXRpbHMv dXRpbHMvbW91bnQvTWFrZWZpbGUuYW0JMjAwNi0wNy0wMiAxNzozNDo1OC4wMDAwMDAwMDAg LTA0MDAKKysrIG5mcy11dGlscy1hZy91dGlscy9tb3VudC9NYWtlZmlsZS5hbQkyMDA2LTA3 LTA3IDE1OjA2OjI2LjAwMDAwMDAwMCAtMDQwMApAQCAtMTQsOSArMTQsMTAgQEAgTUFJTlRB SU5FUkNMRUFORklMRVMgPSBNYWtlZmlsZS5pbgogCiBpbnN0YWxsLWV4ZWMtaG9vazoKIAko Y2QgJChERVNURElSKSQoc2JpbmRpcikgJiYgXAotCSAgbG4gLXNmICQoc2Jpbl9QUk9HUkFN UykgbW91bnQubmZzNCAmJiBcCi0JICBsbiAtc2YgJChzYmluX1BST0dSQU1TKSB1bW91bnQu bmZzICYmIFwKLQkgIGxuIC1zZiAkKHNiaW5fUFJPR1JBTVMpIHVtb3VudC5uZnM0KQorCSAg Y2htb2QgK3MgJChzYmluX1BST0dSQU1TKSAmJiBcCisJICBjcCAtcCAkKHNiaW5fUFJPR1JB TVMpIG1vdW50Lm5mczQgJiYgXAorCSAgY3AgLXAgJChzYmluX1BST0dSQU1TKSB1bW91bnQu bmZzICYmIFwKKwkgIGNwIC1wICQoc2Jpbl9QUk9HUkFNUykgdW1vdW50Lm5mczQpCiB1bmlu c3RhbGwtaG9vazoKIAkoY2QgJChERVNURElSKSQoc2JpbmRpcikgJiYgXAogCSAgICBybSAt ZiBtb3VudC5uZnM0IHVtb3VudC5uZnMgdW1vdW50Lm5mczQpCmRpZmYgLXVwck4gLVggZG9u dGRpZmYgbmZzLXV0aWxzL3V0aWxzL21vdW50L21vdW50LmMgbmZzLXV0aWxzLWFnL3V0aWxz L21vdW50L21vdW50LmMKLS0tIG5mcy11dGlscy91dGlscy9tb3VudC9tb3VudC5jCTIwMDYt MDctMDIgMTc6MzQ6NTguMDAwMDAwMDAwIC0wNDAwCisrKyBuZnMtdXRpbHMtYWcvdXRpbHMv bW91bnQvbW91bnQuYwkyMDA2LTA3LTA3IDEyOjQ5OjQxLjAwMDAwMDAwMCAtMDQwMApAQCAt MjgsNiArMjgsNyBAQAogI2luY2x1ZGUgPHN5cy9tb3VudC5oPgogI2luY2x1ZGUgPGdldG9w dC5oPgogI2luY2x1ZGUgPG1udGVudC5oPgorI2luY2x1ZGUgPHB3ZC5oPgogCiAjaW5jbHVk ZSAiZnN0YWIuaCIKICNpbmNsdWRlICJ4Y29tbW9uLmgiCkBAIC03NCw2ICs3NSwxNCBAQCBz dHJ1Y3Qgb3B0X21hcCB7CiAgIGludCAgbWFzazsgICAgICAgICAgICAgICAgICAgIC8qIGZs YWcgbWFzayB2YWx1ZSAqLwogfTsKIAorLyogQ3VzdG9tIG1vdW50IG9wdGlvbnMgZm9yIG91 ciBvd24gcHVycG9zZXMuICAqLworLyogTWF5YmUgdGhlc2Ugc2hvdWxkIG5vdyBiZSBmcmVl ZCBmb3Iga2VybmVsIHVzZSBhZ2FpbiAqLworI2RlZmluZSBNU19EVU1NWQkweDAwMDAwMDAw CisjZGVmaW5lIE1TX1VTRVJTCTB4NDAwMDAwMDAKKyNkZWZpbmUgTVNfVVNFUgkJMHgyMDAw MDAwMAorI2RlZmluZSBNU19PV05FUgkweDEwMDAwMDAwCisjZGVmaW5lIE1TX0dST1VQCTB4 MDgwMDAwMDAKKwogc3RhdGljIGNvbnN0IHN0cnVjdCBvcHRfbWFwIG9wdF9tYXBbXSA9IHsK ICAgeyAiZGVmYXVsdHMiLCAwLCAwLCAwICAgICAgICAgfSwgICAgICAvKiBkZWZhdWx0IG9w dGlvbnMgKi8KICAgeyAicm8iLCAgICAgICAxLCAwLCBNU19SRE9OTFkgfSwgICAgICAvKiBy ZWFkLW9ubHkgKi8KQEAgLTkwLDYgKzk5LDE4IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3Qgb3B0 X21hcCBvcHRfbWFwW10gPSAKICAgeyAicmVtb3VudCIsICAwLCAwLCBNU19SRU1PVU5UfSwg ICAgICAvKiBBbHRlciBmbGFncyBvZiBtb3VudGVkIEZTICovCiAgIHsgImJpbmQiLCAgICAg MCwgMCwgTVNfQklORCAgIH0sICAgICAgLyogUmVtb3VudCBwYXJ0IG9mIHRyZWUgZWxzZXdo ZXJlICovCiAgIHsgInJiaW5kIiwgICAgMCwgMCwgTVNfQklORHxNU19SRUMgfSwgLyogSWRl bSwgcGx1cyBtb3VudGVkIHN1YnRyZWVzICovCisgIHsgImF1dG8iLCAgICAgMCwgMCwgTVNf RFVNTVkgfSwgICAgICAvKiBDYW4gYmUgbW91bnRlZCB1c2luZyAtYSAqLworICB7ICJub2F1 dG8iLCAgIDAsIDAsIE1TX0RVTU1ZIH0sICAgICAgLyogQ2FuICBvbmx5IGJlIG1vdW50ZWQg ZXhwbGljaXRseSAqLworICB7ICJ1c2VycyIsICAgIDAsIDAsIE1TX1VTRVJTICB9LCAgICAg IC8qIEFsbG93IG9yZGluYXJ5IHVzZXIgdG8gbW91bnQgKi8KKyAgeyAibm91c2VycyIsICAw LCAwLCBNU19VU0VSUyAgfSwgICAgICAvKiBGb3JiaWQgb3JkaW5hcnkgdXNlciB0byBtb3Vu dCAqLworICB7ICJ1c2VyIiwgICAgIDAsIDAsIE1TX1VTRVIgICB9LCAgICAgIC8qIEFsbG93 IG9yZGluYXJ5IHVzZXIgdG8gbW91bnQgKi8KKyAgeyAibm91c2VyIiwgICAwLCAwLCBNU19V U0VSICAgfSwgICAgICAvKiBGb3JiaWQgb3JkaW5hcnkgdXNlciB0byBtb3VudCAqLworICB7 ICJvd25lciIsICAgIDAsIDAsIE1TX09XTkVSICB9LCAgICAgIC8qIExldCB0aGUgb3duZXIg b2YgdGhlIGRldmljZSBtb3VudCAqLworICB7ICJub293bmVyIiwgIDAsIDAsIE1TX09XTkVS ICB9LCAgICAgIC8qIERldmljZSBvd25lciBoYXMgbm8gc3BlY2lhbCBwcml2cyAqLworICB7 ICJncm91cCIsICAgIDAsIDAsIE1TX0dST1VQICB9LCAgICAgIC8qIExldCB0aGUgZ3JvdXAg b2YgdGhlIGRldmljZSBtb3VudCAqLworICB7ICJub2dyb3VwIiwgIDAsIDAsIE1TX0dST1VQ ICB9LCAgICAgIC8qIERldmljZSBncm91cCBoYXMgbm8gc3BlY2lhbCBwcml2cyAqLworICB7 ICJfbmV0ZGV2IiwgIDAsIDAsIE1TX0RVTU1ZfSwgICAgICAvKiBEZXZpY2UgcmVxdWlyZXMg bmV0d29yayAqLworICB7ICJjb21tZW50IiwgIDAsIDAsIE1TX0RVTU1ZfSwgICAgICAvKiBm c3RhYiBjb21tZW50IG9ubHkgKGt1ZHp1LF9uZXRkZXYpKi8KIAogICAvKiBhZGQgbmV3IG9w dGlvbnMgaGVyZSAqLwogI2lmZGVmIE1TX05PU1VCCkBAIC0xMDQsNiArMTI1LDcgQEAgc3Rh dGljIGNvbnN0IHN0cnVjdCBvcHRfbWFwIG9wdF9tYXBbXSA9IAogICB7ICJtYW5kIiwgICAg IDAsIDAsIE1TX01BTkRMT0NLIH0sICAgIC8qIEFsbG93IG1hbmRhdG9yeSBsb2NrcyBvbiB0 aGlzIEZTICovCiAgIHsgIm5vbWFuZCIsICAgMCwgMSwgTVNfTUFORExPQ0sgfSwgICAgLyog Rm9yYmlkIG1hbmRhdG9yeSBsb2NrcyBvbiB0aGlzIEZTICovCiAjZW5kaWYKKyAgeyAibG9v cCIsICAgICAxLCAwLCBNU19EVU1NWSAgIH0sICAgICAgLyogdXNlIGEgbG9vcCBkZXZpY2Ug Ki8KICNpZmRlZiBNU19OT0FUSU1FCiAgIHsgImF0aW1lIiwgICAgMCwgMSwgTVNfTk9BVElN RSB9LCAgICAgLyogVXBkYXRlIGFjY2VzcyB0aW1lICovCiAgIHsgIm5vYXRpbWUiLCAgMCwg MCwgTVNfTk9BVElNRSB9LCAgICAgLyogRG8gbm90IHVwZGF0ZSBhY2Nlc3MgdGltZSAqLwpA QCAtMTIxLDYgKzE0MywxMiBAQCBzdGF0aWMgY2hhciAqIGZpeF9vcHRzX3N0cmluZyAoaW50 IGZsYWdzCiAJY2hhciAqbmV3X29wdHM7CiAKIAluZXdfb3B0cyA9IHhzdHJkdXAoKGZsYWdz ICYgTVNfUkRPTkxZKSA/ICJybyIgOiAicnciKTsKKwlpZiAoZmxhZ3MgJiBNU19VU0VSKSB7 CisJCXN0cnVjdCBwYXNzd2QgKnB3ID0gZ2V0cHd1aWQoZ2V0dWlkKCkpOworCQlpZihwdykK KwkJCW5ld19vcHRzID0geHN0cmNvbmNhdDMobmV3X29wdHMsICIsdXNlcj0iLCBwdy0+cHdf bmFtZSk7CisJfQorCQogCWZvciAob20gPSBvcHRfbWFwOyBvbS0+b3B0ICE9IE5VTEw7IG9t KyspIHsKIAkJaWYgKG9tLT5za2lwKQogCQkJY29udGludWU7CkBAIC0xMzIsOSArMTYwLDIw IEBAIHN0YXRpYyBjaGFyICogZml4X29wdHNfc3RyaW5nIChpbnQgZmxhZ3MKIAlpZiAoZXh0 cmFfb3B0cyAmJiAqZXh0cmFfb3B0cykgewogCQluZXdfb3B0cyA9IHhzdHJjb25jYXQzKG5l d19vcHRzLCAiLCIsIGV4dHJhX29wdHMpOwogCX0KKwogCXJldHVybiBuZXdfb3B0czsKIH0K IAordm9pZCBjb3B5X21udGVudChzdHJ1Y3QgbW50ZW50ICptZW50LCBuZnNfbW50ZW50X3Qg Km5tZW50KQoreworCS8qIE5vdCBzdXJlIHdoeSBuZnNfbW50ZW50X3Qgc2hvdWxkIGV4aXN0 ICovCisJc3RyY3B5KG5tZW50LT5tbnRfZnNuYW1lLCBtZW50LT5tbnRfZnNuYW1lKTsKKwlz dHJjcHkobm1lbnQtPm1udF9kaXIsIG1lbnQtPm1udF9kaXIpOworCXN0cmNweShubWVudC0+ bW50X3R5cGUsIG1lbnQtPm1udF90eXBlKTsKKwlzdHJjcHkobm1lbnQtPm1udF9vcHRzLCBt ZW50LT5tbnRfb3B0cyk7CisJbm1lbnQtPm1udF9mcmVxID0gbWVudC0+bW50X2ZyZXE7CisJ bm1lbnQtPm1udF9wYXNzbm8gPSBtZW50LT5tbnRfcGFzc25vOworfQogCiBpbnQgYWRkX210 YWIoY2hhciAqZnNuYW1lLCBjaGFyICptb3VudF9wb2ludCwgY2hhciAqZnN0eXBlLCBpbnQg ZmxhZ3MsIGNoYXIgKm9wdHMsIGludCBmcmVxLCBpbnQgcGFzc25vKQogewpAQCAtMTQ2LDgg KzE4NSwxNiBAQCBpbnQgYWRkX210YWIoY2hhciAqZnNuYW1lLCBjaGFyICptb3VudF9wCiAJ bWVudC5tbnRfZGlyID0gbW91bnRfcG9pbnQ7CiAJbWVudC5tbnRfdHlwZSA9IGZzdHlwZTsK IAltZW50Lm1udF9vcHRzID0gZml4X29wdHNfc3RyaW5nKGZsYWdzLCBvcHRzKTsKLQltZW50 Lm1udF9mcmVxID0gMDsKLQltZW50Lm1udF9wYXNzbm89IDA7CisJbWVudC5tbnRfZnJlcSA9 IGZyZXE7CisJbWVudC5tbnRfcGFzc25vPSBwYXNzbm87CisKKwlpZihmbGFncyAmIE1TX1JF TU9VTlQpIHsKKwkJbmZzX21udGVudF90IG5tZW50OworCQkKKwkJY29weV9tbnRlbnQoJm1l bnQsICZubWVudCk7CisJCXVwZGF0ZV9tdGFiKG5tZW50Lm1udF9kaXIsICZubWVudCk7CisJ CXJldHVybiAwOworCX0KIAogCWlmICgoZmQgPSBvcGVuKE1PVU5URUQifiIsIE9fUkRXUnxP X0NSRUFUfE9fRVhDTCwgMDYwMCkpID09IC0xKQl7CiAJCWZwcmludGYoc3RkZXJyLCAiQ2Fu J3QgZ2V0ICJNT1VOVEVEIn4gbG9jayBmaWxlIik7CkBAIC0yNDYsMTYgKzI5MywxNiBAQCBz dGF0aWMgdm9pZCBtb3VudF9lcnJvcihjaGFyICpub2RlKQogewogCXN3aXRjaChlcnJubykg ewogCQljYXNlIEVOT1RESVI6Ci0JCQlwcmludGYoIiVzOiBtb3VudCBwb2ludCAlcyBpcyBu b3QgYSBkaXJlY3RvcnlcbiIsIHByb2duYW1lLCBub2RlKTsKKwkJCWZwcmludGYoc3RkZXJy LCAiJXM6IG1vdW50IHBvaW50ICVzIGlzIG5vdCBhIGRpcmVjdG9yeVxuIiwgcHJvZ25hbWUs IG5vZGUpOwogCQkJYnJlYWs7CiAJCWNhc2UgRUJVU1k6Ci0JCQlwcmludGYoIiVzOiAlcyBp cyBhbHJlYWR5IG1vdW50ZWQgb3IgYnVzeVxuIiwgcHJvZ25hbWUsIG5vZGUpOworCQkJZnBy aW50ZihzdGRlcnIsICIlczogJXMgaXMgYWxyZWFkeSBtb3VudGVkIG9yIGJ1c3lcbiIsIHBy b2duYW1lLCBub2RlKTsKIAkJCWJyZWFrOwogCQljYXNlIEVOT0VOVDoKLQkJCXByaW50Zigi JXM6IG1vdW50IHBvaW50ICVzIGRvZXMgbm90IGV4aXN0XG4iLCBwcm9nbmFtZSwgbm9kZSk7 CisJCQlmcHJpbnRmKHN0ZGVyciwgIiVzOiBtb3VudCBwb2ludCAlcyBkb2VzIG5vdCBleGlz dFxuIiwgcHJvZ25hbWUsIG5vZGUpOwogCQkJYnJlYWs7CiAJCWRlZmF1bHQ6Ci0JCQlwcmlu dGYoIiVzOiAlc1xuIiwgcHJvZ25hbWUsIHN0cmVycm9yKGVycm5vKSk7CisJCQlmcHJpbnRm KHN0ZGVyciwgIiVzOiAlc1xuIiwgcHJvZ25hbWUsIHN0cmVycm9yKGVycm5vKSk7CiAJfQog fQogCkBAIC0yNjksMTEgKzMxNiw2IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyICphcmd2 W10pCiAJaWYgKChwID0gc3RycmNocihwcm9nbmFtZSwgJy8nKSkgIT0gTlVMTCkKIAkJcHJv Z25hbWUgPSBwKzE7CiAKLQlpZiAoZ2V0dWlkKCkgIT0gMCkgewotCQlwcmludGYoIiVzOiBv bmx5IHJvb3QgY2FuIGRvIHRoYXQuXG4iLCBwcm9nbmFtZSk7Ci0JCWV4aXQoMSk7Ci0JfQot CiAJaWYoIXN0cm5jbXAocHJvZ25hbWUsICJ1bW91bnQiLCBzdHJsZW4oInVtb3VudCIpKSkg ewogCQlpZihhcmdjIDwgMikgewogCQkJdW1vdW50X3VzYWdlKCk7CkBAIC0zNTgsNiArNDAw LDExIEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyICphcmd2W10pCiAJCiAJcGFyc2Vfb3B0 cyhtb3VudF9vcHRzLCAmZmxhZ3MsICZleHRyYV9vcHRzKTsKIAorCWlmIChnZXR1aWQoKSAh PSAwICYmICEoZmxhZ3MgJiBNU19VU0VSUykgJiYgIShmbGFncyAmIE1TX1VTRVIpKSB7CisJ CWZwcmludGYoc3RkZXJyLCAiJXM6IHBlcm1pc3Npb24gZGVuaWVkLlxuIiwgcHJvZ25hbWUp OworCQlleGl0KDEpOworCX0KKwogCWlmICghc3RyY21wKHByb2duYW1lLCAibW91bnQubmZz NCIpIHx8IG5mc19tb3VudF92ZXJzID09IDQpIHsKIAkJbmZzX21vdW50X3ZlcnMgPSA0Owog CQltbnRfZXJyID0gbmZzNG1vdW50KHNwZWMsIG1vdW50X3BvaW50LCAmZmxhZ3MsICZleHRy YV9vcHRzLCAmbW91bnRfb3B0cywgMCk7CkBAIC0zNzAsMTYgKzQxNywxOSBAQCBpbnQgbWFp bihpbnQgYXJnYywgY2hhciAqYXJndltdKQogCX0KIAogCWlmICghbW50X2VyciAmJiAhZmFr ZSkgewotCQltbnRfZXJyID0gZG9fbW91bnRfc3lzY2FsbChzcGVjLCBtb3VudF9wb2ludCwg bmZzX21vdW50X3ZlcnMgPT0gNCA/ICJuZnM0IiA6ICJuZnMiLCBmbGFncywgbW91bnRfb3B0 cyk7CisJCWlmKCEoZmxhZ3MgJiBNU19SRU1PVU5UKSkgeworCQkJbW50X2VyciA9IGRvX21v dW50X3N5c2NhbGwoc3BlYywgbW91bnRfcG9pbnQsCisJCQkJCW5mc19tb3VudF92ZXJzID09 IDQgPyAibmZzNCIgOiAibmZzIiwgZmxhZ3MsIG1vdW50X29wdHMpOwogCQkKLQkJaWYobW50 X2VycikgewotCQkJbW91bnRfZXJyb3IobW91bnRfcG9pbnQpOwotCQkJZXhpdCgtMSk7CisJ CQlpZihtbnRfZXJyKSB7CisJCQkJbW91bnRfZXJyb3IobW91bnRfcG9pbnQpOworCQkJCWV4 aXQoLTEpOworCQkJfQogCQl9Ci0KLQkJaWYoIW5vbXRhYikKKwkJaWYoIW5vbXRhYikgewog CQkJYWRkX210YWIoc3BlYywgbW91bnRfcG9pbnQsIG5mc19tb3VudF92ZXJzID09IDQgPyAi bmZzNCIgOiAibmZzIiwKIAkJCQkgZmxhZ3MsIGV4dHJhX29wdHMsIDAsIDApOworCQl9CiAJ fQogCiAJcmV0dXJuIDA7CkJpbmFyeSBmaWxlcyBuZnMtdXRpbHMvdXRpbHMvbW91bnQvbW91 bnQubmZzIGFuZCBuZnMtdXRpbHMtYWcvdXRpbHMvbW91bnQvbW91bnQubmZzIGRpZmZlcgpk aWZmIC11cHJOIC1YIGRvbnRkaWZmIG5mcy11dGlscy91dGlscy9tb3VudC9uZnN1bW91bnQu YyBuZnMtdXRpbHMtYWcvdXRpbHMvbW91bnQvbmZzdW1vdW50LmMKLS0tIG5mcy11dGlscy91 dGlscy9tb3VudC9uZnN1bW91bnQuYwkyMDA2LTA3LTAyIDE3OjM0OjU4LjAwMDAwMDAwMCAt MDQwMAorKysgbmZzLXV0aWxzLWFnL3V0aWxzL21vdW50L25mc3Vtb3VudC5jCTIwMDYtMDct MDcgMTI6NDk6NDEuMDAwMDAwMDAwIC0wNDAwCkBAIC0yMyw2ICsyMyw3IEBACiAjaW5jbHVk ZSA8bW50ZW50Lmg+CiAjaW5jbHVkZSA8c3lzL21vdW50Lmg+CiAjaW5jbHVkZSA8Y3R5cGUu aD4KKyNpbmNsdWRlIDxwd2QuaD4KIAogI2luY2x1ZGUgInhjb21tb24uaCIKICNpbmNsdWRl ICJmc3RhYi5oIgpAQCAtMTU2LDYgKzE1Nyw0MiBAQCBzdGF0aWMgdm9pZCBjb21wbGFpbihp bnQgZXJyLCBjb25zdCBjaGFyCiAgIH0KIH0KIAorLyoKKyAqIExvb2sgZm9yIGFuIG9wdGlv biBpbiBhIGNvbW1hLXNlcGFyYXRlZCBsaXN0CisgKi8KK3N0YXRpYyBpbnQKK2NvbnRhaW5z KGNvbnN0IGNoYXIgKmxpc3QsIGNvbnN0IGNoYXIgKnMpIHsKKwlpbnQgbiA9IHN0cmxlbihz KTsKKworCXdoaWxlICgqbGlzdCkgeworCQlpZiAoc3RybmNtcChsaXN0LCBzLCBuKSA9PSAw ICYmCisJCSAgKGxpc3Rbbl0gPT0gMCB8fCBsaXN0W25dID09ICcsJykpCisJCQlyZXR1cm4g MTsKKwkJd2hpbGUgKCpsaXN0ICYmICpsaXN0KysgIT0gJywnKSA7CisJfQorCXJldHVybiAw OworfQorCisvKgorICogSWYgbGlzdCBjb250YWlucyAidXNlcj1wZXRlciIgYW5kIHdlIGFz ayBmb3IgInVzZXI9IiwgcmV0dXJuICJwZXRlciIKKyAqLworc3RhdGljIGNoYXIgKgorZ2V0 X3ZhbHVlKGNvbnN0IGNoYXIgKmxpc3QsIGNvbnN0IGNoYXIgKnMpIHsKKwljb25zdCBjaGFy ICp0OworCWludCBuID0gc3RybGVuKHMpOworCisJd2hpbGUgKCpsaXN0KSB7CisJCWlmIChz dHJuY21wKGxpc3QsIHMsIG4pID09IDApIHsKKwkJCXMgPSB0ID0gbGlzdCtuOworCQkJd2hp bGUgKCpzICYmICpzICE9ICcsJykKKwkJCQlzKys7CisJCQlyZXR1cm4geHN0cm5kdXAodCwg cy10KTsKKwkJfQorCQl3aGlsZSAoKmxpc3QgJiYgKmxpc3QrKyAhPSAnLCcpIDsKKwl9CisJ cmV0dXJuIDA7Cit9CisKIGludCBhZGRfbXRhYjIoY29uc3QgY2hhciAqc3BlYywgY29uc3Qg Y2hhciAqbm9kZSwgY29uc3QgY2hhciAqdHlwZSwKIAkJY29uc3QgY2hhciAqb3B0cywgc3Ry dWN0IG1udGVudGNobiAqbWMpCiB7CkBAIC0zMDcsNyArMzQ0LDcgQEAgaW50IF9uZnN1bW91 bnQoY29uc3QgY2hhciAqc3BlYywgY29uc3QgYwogCQlnb3RvIG91dF9iYWQ7CiAJcmV0dXJu IG5mc19jYWxsX3Vtb3VudCgmbW50X3NlcnZlciwgJmRpcm5hbWUpOwogIG91dF9iYWQ6Ci0J cHJpbnRmKCIlczogJXM6IG5vdCBmb3VuZCBvciBub3QgbW91bnRlZFxuIiwgcHJvZ25hbWUs IHNwZWMpOworCWZwcmludGYoc3RkZXJyLCAiJXM6ICVzOiBub3QgZm91bmQgb3Igbm90IG1v dW50ZWRcbiIsIHByb2duYW1lLCBzcGVjKTsKIAlyZXR1cm4gMDsKIH0KIApAQCAtMzc2LDYg KzQxMywyMSBAQCBpbnQgbmZzdW1vdW50KGludCBhcmdjLCBjaGFyICphcmd2W10pCiAJCXBy aW50ZihfKCJDb3VsZCBub3QgZmluZCAlcyBpbiBtdGFiXG4iKSwgc3BlYyk7CiAKIAlpZiht YykgeworCQlpZihjb250YWlucyhtYy0+bS5tbnRfb3B0cywgInVzZXIiKSAmJiBnZXR1aWQo KSAhPSAwKSB7CisJCQlzdHJ1Y3QgcGFzc3dkICpwdyA9IGdldHB3dWlkKGdldHVpZCgpKTsK KwkJCWlmKCFwdyB8fCBzdHJjbXAocHctPnB3X25hbWUsIGdldF92YWx1ZShtYy0+bS5tbnRf b3B0cywgInVzZXI9IikpKSB7CisJCQkJZnByaW50ZihzdGRlcnIsICIlczogcGVybWlzc2lv biBkZW5pZWQgdG8gdW5tb3VudCAlc1xuIiwKKwkJCQkJCXByb2duYW1lLCBzcGVjKTsKKwkJ CQlleGl0KDEpOworCQkJfQorCQl9IGVsc2UgeworCQkJaWYoIWNvbnRhaW5zKG1jLT5tLm1u dF9vcHRzLCAidXNlcnMiKSAmJiBnZXR1aWQoKSAhPSAwKSB7CisJCQkJZnByaW50ZihzdGRl cnIsICIlczogb25seSByb290IGNhbiB1bm1vdW50ICVzIGZyb20gJXNcbiIsCisJCQkJCQlw cm9nbmFtZSwgbWMtPm0ubW50X2ZzbmFtZSwgbWMtPm0ubW50X2Rpcik7CisJCQkJZXhpdCgx KTsKKwkJCX0KKwkJfQorCiAJCXJldCA9IF9uZnN1bW91bnQobWMtPm0ubW50X2ZzbmFtZSwg bWMtPm0ubW50X29wdHMpOwogCQlpZihyZXQpCiAJCQlyZXQgPSBhZGRfbXRhYjIobWMtPm0u bW50X2ZzbmFtZSwgbWMtPm0ubW50X2RpciwK --------------060008040604010501070103 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 --------------060008040604010501070103 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ NFS maillist - NFS@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/nfs --------------060008040604010501070103--