From owner-freebsd-current@FreeBSD.ORG Mon Dec 31 00:49:30 2012 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1BA90993 for ; Mon, 31 Dec 2012 00:49:30 +0000 (UTC) (envelope-from rmacklem@uoguelph.ca) Received: from esa-jnhn.mail.uoguelph.ca (esa-jnhn.mail.uoguelph.ca [131.104.91.44]) by mx1.freebsd.org (Postfix) with ESMTP id BBA5B8FC08 for ; Mon, 31 Dec 2012 00:49:29 +0000 (UTC) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Ap4EALHg4FCDaFvO/2dsb2JhbABFhjq3O3OCHgEBBSNWGxQEERkCBFWILAylZpBWjFcLgyWBEwOIYoYmhwSBHI8sgxKBUzU X-IronPort-AV: E=Sophos;i="4.84,383,1355115600"; d="scan'208";a="7976953" Received: from erie.cs.uoguelph.ca (HELO zcs3.mail.uoguelph.ca) ([131.104.91.206]) by esa-jnhn.mail.uoguelph.ca with ESMTP; 30 Dec 2012 19:49:27 -0500 Received: from zcs3.mail.uoguelph.ca (localhost.localdomain [127.0.0.1]) by zcs3.mail.uoguelph.ca (Postfix) with ESMTP id 9B828B3F0D; Sun, 30 Dec 2012 19:49:27 -0500 (EST) Date: Sun, 30 Dec 2012 19:49:27 -0500 (EST) From: Rick Macklem To: bf1783@gmail.com Message-ID: <87170730.1602744.1356914967581.JavaMail.root@erie.cs.uoguelph.ca> In-Reply-To: Subject: Re: svn commit: r244604 - head/usr.sbin/gssd MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_1602743_344864969.1356914967578" X-Originating-IP: [172.17.91.203] X-Mailer: Zimbra 6.0.10_GA_2692 (ZimbraWebClient - FF3.0 (Win)/6.0.10_GA_2692) Cc: freebsd-current@freebsd.org X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Dec 2012 00:49:30 -0000 ------=_Part_1602743_344864969.1356914967578 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit bf1783 wrote: > >Author: rmacklem > >Date: Sat Dec 22 23:21:17 2012 > >New Revision: 244604 > >URL: http://svnweb.freebsd.org/changeset/base/244604 > > > >Log: > > It was reported via email that some sshds create kerberos > > credential cache files with names other than /tmp/krb5cc_. > > The gssd daemon does not know how to find these credential caches. > > This patch implements a new option "-s" that does a search for > > credential cache files, using roughly the same algorithm as the > > gssd daemon for Linux uses. The gssd behaviour is only changed > > if the new "-s" option is specified. It also implements two other > > new options related to the "-s" option. > > > > Reported by: Piete.Brooks at cl.cam.ac.uk, Herbert Poeckl > > Tested by: Herbert Poeckl (admin at ist.tugraz.at), Illias A. > > Marinos > > MFC after: 2 weeks > > ... > > >+#include > > Rick: > > This breaks world built WITHOUT_KERBEROS and WITH_GSSAPI. > > Regards, > b. Could you please test the attached patch. Also, if someone who is familiar with the build/Makefile side of things could review this, it would be appreciated. Thanks, rick ------=_Part_1602743_344864969.1356914967578 Content-Type: text/x-patch; name=gssd-build.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=gssd-build.patch LS0tIHVzci5zYmluL2dzc2QvZ3NzZC5jLnNhdjAJMjAxMi0xMi0zMCAxOTowNDoxOS4wMDAwMDAw MDAgLTA1MDAKKysrIHVzci5zYmluL2dzc2QvZ3NzZC5jCTIwMTItMTItMzAgMTk6MzU6MDYuNjQ4 NjAzMDAwIC0wNTAwCkBAIC0zNyw3ICszNyw5IEBAIF9fRkJTRElEKCIkRnJlZUJTRDogaGVhZC91 c3Iuc2Jpbi9nc3NkL2cKICNpbmNsdWRlIDxjdHlwZS5oPgogI2luY2x1ZGUgPGRpcmVudC5oPgog I2luY2x1ZGUgPGVyci5oPgorI2lmbmRlZiBXSVRIT1VUX0tFUkJFUk9TCiAjaW5jbHVkZSA8a3Ji NS5oPgorI2VuZGlmCiAjaW5jbHVkZSA8cHdkLmg+CiAjaW5jbHVkZSA8c3RkaW8uaD4KICNpbmNs dWRlIDxzdGRsaWIuaD4KQEAgLTEwMiwxMiArMTA0LDE4IEBAIG1haW4oaW50IGFyZ2MsIGNoYXIg Kiphcmd2KQogCQkJZGVidWdfbGV2ZWwrKzsKIAkJCWJyZWFrOwogCQljYXNlICdzJzoKKyNpZm5k ZWYgV0lUSE9VVF9LRVJCRVJPUwogCQkJLyoKIAkJCSAqIFNldCB0aGUgZGlyZWN0b3J5IHNlYXJj aCBsaXN0LiBUaGlzIGVuYWJsZXMgdXNlIG9mCiAJCQkgKiBmaW5kX2NjYWNoZV9maWxlKCkgdG8g c2VhcmNoIHRoZSBkaXJlY3RvcmllcyBmb3IgYQogCQkJICogc3VpdGFibGUgY3JlZGVudGlhbHMg Y2FjaGUgZmlsZS4KIAkJCSAqLwogCQkJc3RybGNweShjY2ZpbGVfZGlybGlzdCwgb3B0YXJnLCBz aXplb2YoY2NmaWxlX2Rpcmxpc3QpKTsKKyNlbHNlCisJCQlmcHJpbnRmKHN0ZGVyciwgIlRoaXMg b3B0aW9uIG5vdCBhdmFpbGFibGUgd2hlbiBidWlsdCIKKwkJCSAgICAiIHdpdGhvdXQgTUtfS0VS QkVST1NcbiIpOworCQkJZXhpdCgxKTsKKyNlbmRpZgogCQkJYnJlYWs7CiAJCWNhc2UgJ2MnOgog CQkJLyoKQEAgLTgxNCw2ICs4MjIsNyBAQCBzdGF0aWMgaW50CiBpc19hX3ZhbGlkX3RndF9jYWNo ZShjb25zdCBjaGFyICpmaWxlcGF0aCwgdWlkX3QgdWlkLCBpbnQgKnJldHJhdGluZywKICAgICB0 aW1lX3QgKnJldGV4cHRpbWUpCiB7CisjaWZuZGVmIFdJVEhPVVRfS0VSQkVST1MKIAlrcmI1X2Nv bnRleHQgY29udGV4dDsKIAlrcmI1X3ByaW5jaXBhbCBwcmluYzsKIAlrcmI1X2NjYWNoZSBjY2Fj aGU7CkBAIC05MTMsNSArOTIyLDggQEAgaXNfYV92YWxpZF90Z3RfY2FjaGUoY29uc3QgY2hhciAq ZmlsZXBhdAogCQkqcmV0ZXhwdGltZSA9IGV4cHRpbWU7CiAJfQogCXJldHVybiAocmV0KTsKKyNl bHNlIC8qIFdJVEhPVVRfS0VSQkVST1MgKi8KKwlyZXR1cm4gKDApOworI2VuZGlmIC8qICFXSVRI T1VUX0tFUkJFUk9TICovCiB9CiAKLS0tIHVzci5zYmluL2dzc2QvTWFrZWZpbGUuc2F2MAkyMDEy LTEyLTMwIDE5OjE4OjAwLjAwMDAwMDAwMCAtMDUwMAorKysgdXNyLnNiaW4vZ3NzZC9NYWtlZmls ZQkyMDEyLTEyLTMwIDE5OjM1OjAyLjAwMDAwMDAwMCAtMDUwMApAQCAtMSw1ICsxLDcgQEAKICMg JEZyZWVCU0Q6IGhlYWQvdXNyLnNiaW4vZ3NzZC9NYWtlZmlsZSAyNDQ2MzggMjAxMi0xMi0yMyAy MDoxMjo1N1ogcm1hY2tsZW0gJAogCisuaW5jbHVkZSA8YnNkLm93bi5taz4KKwogUFJPRz0JZ3Nz ZAogTUFOPQlnc3NkLjgKIFNSQ1M9CWdzc2QuYyBnc3NkLmggZ3NzZF9zdmMuYyBnc3NkX3hkci5j IGdzc2RfcHJvdC5jCkBAIC03LDggKzksMTQgQEAgU1JDUz0JZ3NzZC5jIGdzc2QuaCBnc3NkX3N2 Yy5jIGdzc2RfeGRyLgogQ0ZMQUdTKz0gLUkuCiBXQVJOUz89IDEKIAorLmlmICR7TUtfS0VSQkVS T1N9ICE9ICJubyIKIERQQUREPQkke0xJQkdTU0FQSX0gJHtMSUJLUkI1fSAke0xJQkhYNTA5fSAk e0xJQkFTTjF9ICR7TElCUk9LRU59ICR7TElCQ09NX0VSUn0gJHtMSUJDUllQVH0gJHtMSUJDUllQ VE99CiBMREFERD0JLWxnc3NhcGkgLWxrcmI1IC1saHg1MDkgLWxhc24xIC1scm9rZW4gLWxjb21f ZXJyIC1sY3J5cHQgLWxjcnlwdG8KKy5lbHNlCitDRkxBR1MrPSAtRFdJVEhPVVRfS0VSQkVST1MK K0RQQUREPQkke0xJQkdTU0FQSX0KK0xEQUREPQktbGdzc2FwaQorLmVuZGlmCiAKIENMRUFORklM RVM9IGdzc2Rfc3ZjLmMgZ3NzZC5oCiAK ------=_Part_1602743_344864969.1356914967578--