From owner-freebsd-bugs@FreeBSD.ORG Thu Jan 24 17:20:06 2008 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BE71C16A468 for ; Thu, 24 Jan 2008 17:20:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id A433213C4EF for ; Thu, 24 Jan 2008 17:20:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m0OHK6dG061693 for ; Thu, 24 Jan 2008 17:20:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m0OHK68O061692; Thu, 24 Jan 2008 17:20:06 GMT (envelope-from gnats) Date: Thu, 24 Jan 2008 17:20:06 GMT Message-Id: <200801241720.m0OHK68O061692@freefall.freebsd.org> To: freebsd-bugs@FreeBSD.org From: =?UTF-8?B?VHVsaW8gR3VpbWFyw6NlcyBkYSBTaWx2YQ==?= Cc: Subject: Re: bin/66893: [patch] rpc.yppasswdd(8): Linux NIS clients connecting to FreeBSD NIS servers get authentication failure X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: =?UTF-8?B?VHVsaW8gR3VpbWFyw6NlcyBkYSBTaWx2YQ==?= List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jan 2008 17:20:06 -0000 The following reply was made to PR bin/66893; it has been noted by GNATS. From: =?UTF-8?B?VHVsaW8gR3VpbWFyw6NlcyBkYSBTaWx2YQ==?= To: bug-followup@FreeBSD.org, sgrig@aegean.dmst.aueb.gr, Andreas Steinel Cc: Subject: Re: bin/66893: [patch] rpc.yppasswdd(8): Linux NIS clients connecting to FreeBSD NIS servers get authentication failure Date: Thu, 24 Jan 2008 15:04:52 -0200 --------------070106010709060003080104 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Hello, the patch from Mr. Andreas Steinel fails with the following errors (FBSD 5.3-RELEASE, but similar to 6.0): =================== Hunk #1 succeeded at 40. Hunk #2 failed at 201. Hunk #3 failed at 504. Hunk #4 failed at 522. Hunk #5 succeeded at 629 with fuzz 2 (offset -1 lines). patch: **** misordered hunks! output would be garbled =================== In fact, the lines that need to be altered are not those. Besides, there are strange characters sequences (=2D, =3D etc., probably an encoding issue) in the above copy of patch, but not in the original file at http://www.bsdforen.de/showthread.php?t=14059 However, when manually applying this patch, "make" fails with: ==================== "Makefile", line 597: Need an operator "Makefile", line 607: Need an operator "Makefile", line 609: warning: duplicate script for target "@if" ignored "Makefile", line 609: warning: duplicate script for target "[" ignored "Makefile", line 611: warning: duplicate script for target "@if" ignored "Makefile", line 611: warning: duplicate script for target "[" ignored make: fatal errors encountered -- cannot continue ==================== The reason, simple as it is, is that the patch is indented with spaces, and for some reason "make" doesn´t accept that. The solution is to replace the spaces with tabs. I´m submitting a copy of the resulting unified diff, which can be applied with: patch -p1 Makefile $(PASSWD) ; \ + else \ + $(AWK) -F: '{if ($$1 != "" && $$1 !~ "^#.*" && $$1 != "+") \ + print $$1":"$$2":"$$3":"$$4":"$$8":"$$9":"$$10}' $(MASTER) \ + > $(PASSWD) ; fi +.else @if [ ! $(UNSECURE) ]; then \ $(AWK) -F: '{if ($$1 != "" && $$1 !~ "^#.*" && $$1 != "+") \ print $$1":*:"$$3":"$$4":"$$8":"$$9":"$$10}' $(MASTER) \ @@ -468,6 +482,7 @@ $(AWK) -F: '{if ($$1 != "" && $$1 !~ "^#.*" && $$1 != "+") \ print $$1":"$$2":"$$3":"$$4":"$$8":"$$9":"$$10}' $(MASTER) \ > $(PASSWD) ; fi +.endif passwd.byname: $(PASSWD) @@ -574,4 +589,22 @@ @$(DBLOAD) -c @if [ ! $(NOPUSH) ]; then $(YPPUSH) -d $(DOMAIN) $@; fi @if [ ! $(NOPUSH) ]; then echo "Pushed $@ map." ; fi + + +shadow.byname: $(MASTER) +.if defined(LINUXCOMPMODE) + @echo "Updating $@..." +.if ${MASTER} == "/dev/null" + @echo "Master.passwd source file not found -- skipping" +.else + @cat $(MASTER) | \ + $(AWK) -F: '{ if ($$1 != "" && $$1 !~ "^#.*" && $$1 != "+") \ + print $$1"\t"$$1":"$$2":::::::" }' $^ \ + | $(DBLOAD) ${S} -f -i $(MASTER) -o $(YPMAPDIR)/$@ - $(TMP); \ + $(RMV) $(TMP) $@ + @$(DBLOAD) -c + @if [ ! $(NOPUSH) ]; then $(YPPUSH) -d $(DOMAIN) $@; fi + @if [ ! $(NOPUSH) ]; then echo "Pushed $@ map." ; fi +.endif +.endif -------------------- Thanks to Mr. Steinel for the original work and efforts. Sincerely, Tulio G. da Silva --------------070106010709060003080104 Content-Type: text/plain; name="Yp.Makefile.patch" Content-Transfer-Encoding: base64 Content-Disposition: inline; filename="Yp.Makefile.patch" KysrIE1ha2VmaWxlCVR1ZSBKYW4gMjIgMjE6NDU6MDIgMjAwOA0KQEAgLTQwLDYgKzQwLDEw IEBADQogIyBrZXkgd2lsbCBiZSByZW1vdmVkIGZyb20gdGhlc2UgbWFwcywgYWxsb3dpbmcg YW55b25lIHRvIGFjY2VzcyB0aGVtLg0KIFM9LXMNCiANCisjIElmIHlvdSB3YW50IHRvIGhh dmUgbGludXggTklTIGNsaWVudHMgeW91IG11c3QgZW5hYmxlIHRoaXM6DQorIyBDb21tZW50 IHRoZSBsaW5lIGlmIHlvdSBoYXZlIG5vIGxpbnV4IE5JUyBjbGllbnRzDQorTElOVVhDT01Q TU9ERT0xDQorDQogIyBUaGVzZSBhcmUgY29tbWFuZHMgd2hpY2ggdGhpcyBNYWtlZmlsZSBu ZWVkcyB0byBwcm9wZXJseSByZWJ1aWxkIHRoZQ0KICMgTklTIGRhdGFiYXNlcy4gRG9uJ3Qg Y2hhbmdlIHRoZXNlIHVubGVzcyB5b3UgaGF2ZSBhIGdvb2QgcmVhc29uLiBBbHNvDQogIyBi ZSBzdXJlIG5vdCB0byBwbGFjZSBhbiBAIGluIGZyb250IG9mIC91c3IvYmluL2F3azogaXQg aXNuJ3QgbmVjZXNzYXJ5DQpAQCAtMTg3LDcgKzE5MSw3IEBADQogcHVibGlja2V5OiBwdWJs aWNrZXkuYnluYW1lDQogYWxpYXNlczogICBtYWlsLmFsaWFzZXMNCiANCi1tYXN0ZXIucGFz c3dkOgltYXN0ZXIucGFzc3dkLmJ5bmFtZSBtYXN0ZXIucGFzc3dkLmJ5dWlkDQorbWFzdGVy LnBhc3N3ZDoJbWFzdGVyLnBhc3N3ZC5ieW5hbWUgbWFzdGVyLnBhc3N3ZC5ieXVpZCBzaGFk b3cuYnluYW1lDQogDQogIw0KICMgVGhpcyBpcyBhIHNwZWNpYWwgdGFyZ2V0IHVzZWQgb25s eSB3aGVuIGRvaW5nIGluLXBsYWNlIHVwZGF0ZXMgd2l0aA0KQEAgLTQ2MCw2ICs0NjQsMTYg QEANCiANCiAkKFBBU1NXRCk6ICQoTUFTVEVSKQ0KIAlAZWNobyAiQ3JlYXRpbmcgbmV3ICRA IGZpbGUgZnJvbSAkKE1BU1RFUikuLi4iDQorLmlmIGRlZmluZWQoTElOVVhDT01QTU9ERSkN CisJQGlmIFsgISAkKFVOU0VDVVJFKSBdOyB0aGVuIFwNCisJJChBV0spIC1GOiAne2lmICgk JDEgIT0gIiIgJiYgJCQxICF+ICJeIy4qIiAmJiAkJDEgIT0gIisiKSBcDQorCQlwcmludCAk JDEiOng6IiQkMyI6IiQkNCI6IiQkOCI6IiQkOSI6IiQkMTB9JyAkKE1BU1RFUikgXA0KKwkJ PiAkKFBBU1NXRCkgOyBcDQorCWVsc2UgXA0KKwkkKEFXSykgLUY6ICd7aWYgKCQkMSAhPSAi IiAmJiAkJDEgIX4gIl4jLioiICYmICQkMSAhPSAiKyIpIFwNCisJCXByaW50ICQkMSI6IiQk MiI6IiQkMyI6IiQkNCI6IiQkOCI6IiQkOSI6IiQkMTB9JyAkKE1BU1RFUikgXA0KKwkJPiAk KFBBU1NXRCkgOyBmaQ0KKy5lbHNlDQogCUBpZiBbICEgJChVTlNFQ1VSRSkgXTsgdGhlbiBc DQogCSQoQVdLKSAtRjogJ3tpZiAoJCQxICE9ICIiICYmICQkMSAhfiAiXiMuKiIgJiYgJCQx ICE9ICIrIikgXA0KIAkJcHJpbnQgJCQxIjoqOiIkJDMiOiIkJDQiOiIkJDgiOiIkJDkiOiIk JDEwfScgJChNQVNURVIpIFwNCkBAIC00NjgsNiArNDgyLDcgQEANCiAJJChBV0spIC1GOiAn e2lmICgkJDEgIT0gIiIgJiYgJCQxICF+ICJeIy4qIiAmJiAkJDEgIT0gIisiKSBcDQogCQlw cmludCAkJDEiOiIkJDIiOiIkJDMiOiIkJDQiOiIkJDgiOiIkJDkiOiIkJDEwfScgJChNQVNU RVIpIFwNCiAJCT4gJChQQVNTV0QpIDsgZmkNCisuZW5kaWYNCiANCiANCiBwYXNzd2QuYnlu YW1lOiAkKFBBU1NXRCkNCkBAIC01NzQsNCArNTg5LDIyIEBADQogCUAkKERCTE9BRCkgLWMN CiAJQGlmIFsgISAkKE5PUFVTSCkgXTsgdGhlbiAkKFlQUFVTSCkgLWQgJChET01BSU4pICRA OyBmaQ0KIAlAaWYgWyAhICQoTk9QVVNIKSBdOyB0aGVuIGVjaG8gIlB1c2hlZCAkQCBtYXAu IiA7IGZpDQorDQorDQorc2hhZG93LmJ5bmFtZTogJChNQVNURVIpDQorLmlmIGRlZmluZWQo TElOVVhDT01QTU9ERSkNCisJQGVjaG8gIlVwZGF0aW5nICRALi4uIg0KKy5pZiAke01BU1RF Un0gPT0gIi9kZXYvbnVsbCINCisJQGVjaG8gIk1hc3Rlci5wYXNzd2Qgc291cmNlIGZpbGUg bm90IGZvdW5kIC0tIHNraXBwaW5nIg0KKy5lbHNlDQorCUBjYXQgJChNQVNURVIpIHwgXA0K KwkkKEFXSykgLUY6ICd7IGlmICgkJDEgIT0gIiIgJiYgJCQxICF+ICJeIy4qIiAmJiAkJDEg IT0gIisiKSBcDQorCQlwcmludCAkJDEiXHQiJCQxIjoiJCQyIjo6Ojo6OjoiIH0nICReIFwN CisJCXwgJChEQkxPQUQpICR7U30gLWYgLWkgJChNQVNURVIpIC1vICQoWVBNQVBESVIpLyRA IC0gJChUTVApOyBcDQorCQkkKFJNVikgJChUTVApICRADQorCUAkKERCTE9BRCkgLWMNCisJ QGlmIFsgISAkKE5PUFVTSCkgXTsgdGhlbiAkKFlQUFVTSCkgLWQgJChET01BSU4pICRAOyBm aQ0KKwlAaWYgWyAhICQoTk9QVVNIKSBdOyB0aGVuIGVjaG8gIlB1c2hlZCAkQCBtYXAuIiA7 IGZpDQorLmVuZGlmDQorLmVuZGlmDQo= --------------070106010709060003080104--