From owner-freebsd-current@FreeBSD.ORG Mon Dec 31 11:55:32 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 A99086EA for ; Mon, 31 Dec 2012 11:55:32 +0000 (UTC) (envelope-from rmacklem@uoguelph.ca) Received: from esa-annu.net.uoguelph.ca (esa-annu.mail.uoguelph.ca [131.104.91.36]) by mx1.freebsd.org (Postfix) with ESMTP id 5B0218FC0A for ; Mon, 31 Dec 2012 11:55:31 +0000 (UTC) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AqAEAIZ84VCDaFvO/2dsb2JhbABFhjq3O3OCHgEBAQMBAQEBICsgCwUWDgYEAgINGQIpAQkmBggHBAEcBIdsBgymGpBjgSKLNQsQgxWBEwOIYop8gi6BHI8sgxKBUzU X-IronPort-AV: E=Sophos;i="4.84,385,1355115600"; d="scan'208";a="6965606" Received: from erie.cs.uoguelph.ca (HELO zcs3.mail.uoguelph.ca) ([131.104.91.206]) by esa-annu.net.uoguelph.ca with ESMTP; 31 Dec 2012 06:55:30 -0500 Received: from zcs3.mail.uoguelph.ca (localhost.localdomain [127.0.0.1]) by zcs3.mail.uoguelph.ca (Postfix) with ESMTP id F10E7B4037; Mon, 31 Dec 2012 06:55:29 -0500 (EST) Date: Mon, 31 Dec 2012 06:55:29 -0500 (EST) From: Rick Macklem To: Garrett Cooper Message-ID: <1905046872.1604317.1356954929867.JavaMail.root@erie.cs.uoguelph.ca> In-Reply-To: Subject: Re: svn commit: r244604 - head/usr.sbin/gssd MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [172.17.91.201] X-Mailer: Zimbra 6.0.10_GA_2692 (ZimbraWebClient - FF3.0 (Win)/6.0.10_GA_2692) Cc: bf1783@gmail.com, 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 11:55:32 -0000 Garrett Cooper wrote: > On Sun, Dec 30, 2012 at 4:49 PM, Rick Macklem > wrote: > > 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. > > 1. I would name WITHOUT_KERBEROS to KERBEROS_SUPPORT in the sourcefile > and CFLAGS to avoid potential confusion/noise with build logic. > WITHOUT_KERBEROS is used other places, like telnetd. Were you aware of that? (I just thought it would keep it consistent, but if you think it is better to use a different name, I don't care.) > 2. This code should be revised per style(9): > > +#else > + fprintf(stderr, "This option not available when built" > + " without MK_KERBEROS\n"); > + exit(1); > > In particular: > > errx(1, "This option requires Kerberos support"); > > Seems more succinct and addresses the actual item at hand. > Yea, I'll switch it to errx(). I just cribbed the code further down, that used fprintf(). > 3. This could be simplified as well potentially: > > +.if ${MK_KERBEROS} != "no" > DPADD= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBROKEN} > ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO} > LDADD= -lgssapi -lkrb5 -lhx509 -lasn1 -lroken -lcom_err -lcrypt > -lcrypto > +.else > +CFLAGS+= -DWITHOUT_KERBEROS > +DPADD= ${LIBGSSAPI} > +LDADD= -lgssapi > +.endif > > to this: > > DPADD= ${LIBGSSAPI} > LDADD= -lgssapi > .if ${MK_KERBEROS} != "no" > CFLAGS+= -DKERBEROS_SUPPORT > DPADD+= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} > ${LIBCRYPT} ${LIBCRYPTO} > LDADD+= -lkrb5 -lhx509 -lasn1 -lroken -lcom_err -lcrypt -lcrypto > .endif > Yea, I can do this change too. I think the latter is more readable. Thanks, rick > Thanks! > -Garrett > _______________________________________________ > freebsd-current@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to > "freebsd-current-unsubscribe@freebsd.org"