From owner-cvs-src@FreeBSD.ORG Sun Jan 1 08:45:10 2006 Return-Path: X-Original-To: cvs-src@freebsd.org Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D7AD416A420; Sun, 1 Jan 2006 08:45:10 +0000 (GMT) (envelope-from bz@FreeBSD.org) Received: from transport.cksoft.de (transport.cksoft.de [62.111.66.27]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C4D143D53; Sun, 1 Jan 2006 08:45:10 +0000 (GMT) (envelope-from bz@FreeBSD.org) Received: from transport.cksoft.de (localhost [127.0.0.1]) by transport.cksoft.de (Postfix) with ESMTP id EF9FE1FFACA; Sun, 1 Jan 2006 09:45:07 +0100 (CET) Received: by transport.cksoft.de (Postfix, from userid 66) id 351781FF9AC; Sun, 1 Jan 2006 09:45:05 +0100 (CET) Received: from maildrop.int.zabbadoz.net (maildrop.int.zabbadoz.net [10.111.66.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.int.zabbadoz.net (Postfix) with ESMTP id 89F0C44487E; Sun, 1 Jan 2006 08:41:09 +0000 (UTC) Date: Sun, 1 Jan 2006 08:41:09 +0000 (UTC) From: "Bjoern A. Zeeb" X-X-Sender: bz@maildrop.int.zabbadoz.net To: Doug Rabson In-Reply-To: <200512291440.jBTEeMt7052684@repoman.freebsd.org> Message-ID: <20060101060217.S24703@maildrop.int.zabbadoz.net> References: <200512291440.jBTEeMt7052684@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Virus-Scanned: by AMaViS cksoft-s20020300-20031204bz on transport.cksoft.de Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src Makefile.inc1 src/crypto/openssh sshd.c src/etc Makefile src/etc/gss Makefile mech qop src/etc/mtree BSD.include.dist BSD.root.dist src/gnu/usr.bin/cvs/cvs Makefile src/include Makefile gssapi.h src/include/gssapi Makefile gssapi.h ... X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Jan 2006 08:45:11 -0000 On Thu, 29 Dec 2005, Doug Rabson wrote: > dfr 2005-12-29 14:40:22 UTC > > FreeBSD src repository > > Modified files: > . Makefile.inc1 > crypto/openssh sshd.c > etc Makefile > etc/mtree BSD.include.dist BSD.root.dist > gnu/usr.bin/cvs/cvs Makefile > include Makefile > kerberos5/lib/libgssapi Makefile > lib Makefile > secure/lib/libssh Makefile > secure/usr.bin/ssh Makefile > secure/usr.sbin/sshd Makefile > tools make_libdeps.sh > Added files: > etc/gss Makefile mech qop > include gssapi.h > include/gssapi Makefile gssapi.h > lib/libgssapi Makefile context.h cred.h ... > Log: > Add a new extensible GSS-API layer which can support GSS-API plugins, > similar the the Solaris implementation. Repackage the krb5 GSS mechanism > as a plugin library for the new implementation. This also includes a > comprehensive set of manpages for the GSS-API functions with text mostly > taken from the RFC. On Sat, 31 Dec 2005, FreeBSD Tinderbox still wrote: >>>> stage 5.1: building 32 bit shim libraries > [...] > /src/kerberos5/lib/libgssapi/../../../crypto/heimdal/lib/gssapi/accept_sec_context.c:385: error: dereferencing pointer to incomplete type > /src/kerberos5/lib/libgssapi/../../../crypto/heimdal/lib/gssapi/accept_sec_context.c:395: error: dereferencing pointer to incomplete type > /src/kerberos5/lib/libgssapi/../../../crypto/heimdal/lib/gssapi/accept_sec_context.c:415: error: dereferencing pointer to incomplete type > /src/kerberos5/lib/libgssapi/../../../crypto/heimdal/lib/gssapi/accept_sec_context.c:431: error: dereferencing pointer to incomplete type > /src/kerberos5/lib/libgssapi/../../../crypto/heimdal/lib/gssapi/accept_sec_context.c:432: error: dereferencing pointer to incomplete type > /src/kerberos5/lib/libgssapi/../../../crypto/heimdal/lib/gssapi/accept_sec_context.c:434: error: dereferencing pointer to incomplete type > /src/kerberos5/lib/libgssapi/../../../crypto/heimdal/lib/gssapi/accept_sec_context.c:435: error: dereferencing pointer to incomplete type > /src/kerberos5/lib/libgssapi/../../../crypto/heimdal/lib/gssapi/accept_sec_context.c:437: error: dereferencing pointer to incomplete type > *** Error code 1 > > Stop in /src/kerberos5/lib/libgssapi. > *** Error code 1 Ok, the problem with this seems to be -I ordering. Building world it starts with -I.../crypto/heimdal/lib/gssapi but building lib32 has -I.../lib32/usr/include first which makes #include select the one in usr/include/ which gives the deprecated warning and we include the gssapi.h from gssapi/gssapi.h (the one from lib/libgssapi): ===> kerberos5/lib/libgssapi (all) ... cc -O2 -fno-strict-aliasing -pipe -I/local/building/freebsd/HEAD/kerberos5/lib/libgssapi/../../../crypto/heimdal/lib/gssapi -I/local/building/freebsd/HEAD/kerberos5/lib/libgssapi/../../../crypto/heimdal/lib/krb5 -I/local/building/freebsd/HEAD/kerberos5/lib/libgssapi/../../../crypto/heimdal/lib/asn1 -I/local/building/freebsd/HEAD/kerberos5/lib/libgssapi/../../../crypto/heimdal/lib/roken -I. -DHAVE_CONFIG_H -I/local/building/freebsd/HEAD/kerberos5/lib/libgssapi/../../include -DINET6 -g -c /local/building/freebsd/HEAD/kerberos5/lib/libgssapi/../../../crypto/heimdal/lib/gssapi/accept_sec_context.c ===> kerberos5/lib/libgssapi (all) ... cc -m32 -march=k8 -mfancy-math-387 -DCOMPAT_32BIT -I/usr/obj/local/building/freebsd/HEAD/lib32/usr/include -L/usr/obj/local/building/freebsd/HEAD/lib32/usr/lib32 -B/usr/obj/local/building/freebsd/HEAD/lib32/usr/lib32 -O2 -fno-strict-aliasing -pipe -I/local/building/freebsd/HEAD/kerberos5/lib/libgssapi/../../../crypto/heimdal/lib/gssapi -I/local/building/freebsd/HEAD/kerberos5/lib/libgssapi/../../../crypto/heimdal/lib/krb5 -I/local/building/freebsd/HEAD/kerberos5/lib/libgssapi/../../../crypto/heimdal/lib/asn1 -I/local/building/freebsd/HEAD/kerberos5/lib/libgssapi/../../../crypto/heimdal/lib/roken -I. -DHAVE_CONFIG_H -I/local/building/freebsd/HEAD/kerberos5/lib/libgssapi/../../include -DINET6 -g -c /local/building/freebsd/HEAD/kerberos5/lib/libgssapi/../../../crypto/heimdal/lib/gssapi/accept_sec_context.c In file included from /local/building/freebsd/HEAD/kerberos5/lib/libgssapi/../../../crypto/heimdal/lib/gssapi/gssapi_locl.h:44, from /local/building/freebsd/HEAD/kerberos5/lib/libgssapi/../../../crypto/heimdal/lib/gssapi/accept_sec_context.c:34: /usr/obj/local/building/freebsd/HEAD/lib32/usr/include/gssapi.h:3:2: warning: #warning "this file includes which is deprecated, use instead" /local/building/freebsd/HEAD/kerberos5/lib/libgssapi/../../../crypto/heimdal/lib/gssapi/accept_sec_context.c: In function `gss_accept_sec_context': /local/building/freebsd/HEAD/kerberos5/lib/libgssapi/../../../crypto/heimdal/lib/gssapi/accept_sec_context.c:98: error: `GSS_KRB5_MECHANISM' undeclared (first use in this function) /local/building/freebsd/HEAD/kerberos5/lib/libgssapi/../../../crypto/heimdal/lib/gssapi/accept_sec_context.c:98: error: (Each undeclared identifier is reported only once /local/building/freebsd/HEAD/kerberos5/lib/libgssapi/../../../crypto/heimdal/lib/gssapi/accept_sec_context.c:98: error: for each function it appears in.) I haven't found any other "easy solution" for now then following change (which I really do not like because of taking file off branch). Anyone with a better idea? A make universe would be good to make sure this does not break anything else and actually solves the problem for lib32 ;) Index: crypto/heimdal/lib/gssapi/gssapi_locl.h =================================================================== RCS file: /shared/mirror/FreeBSD/r/ncvs/src/crypto/heimdal/lib/gssapi/gssapi_locl.h,v retrieving revision 1.1.1.7 diff -u -p -r1.1.1.7 gssapi_locl.h --- crypto/heimdal/lib/gssapi/gssapi_locl.h 3 Apr 2004 21:21:14 -0000 1.1.1.7 +++ crypto/heimdal/lib/gssapi/gssapi_locl.h 1 Jan 2006 05:51:22 -0000 @@ -41,7 +41,7 @@ #endif #include -#include +#include "gssapi.h" #include #include "arcfour.h" -- Bjoern A. Zeeb bzeeb at Zabbadoz dot NeT