From owner-cvs-src@FreeBSD.ORG  Sat Sep 30 17:46:36 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
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 3269616A47E
	for <cvs-src@freebsd.org>; Sat, 30 Sep 2006 17:46:36 +0000 (UTC)
	(envelope-from pawel.worach@gmail.com)
Received: from ug-out-1314.google.com (ug-out-1314.google.com [66.249.92.172])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BC04E43D64
	for <cvs-src@freebsd.org>; Sat, 30 Sep 2006 17:46:29 +0000 (GMT)
	(envelope-from pawel.worach@gmail.com)
Received: by ug-out-1314.google.com with SMTP id m2so349008uge
	for <cvs-src@freebsd.org>; Sat, 30 Sep 2006 10:46:25 -0700 (PDT)
DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com;
	h=received:message-id:date:from:user-agent:mime-version:to:cc:subject:references:in-reply-to:content-type:content-transfer-encoding;
	b=M/PLOobDcHj8OJqdRdj0FDnbFWRG+FkJVgX7Go70SHAGF6zBO7bkhhP2u3C+75497Og6nltBjS2NCUVqDp0VytIFnI6OA/2uAumjuGPnZhwq2JsH9JDWwKLUAfIh1MunH8Q1KZrplxwg1q7qmos8VK6HVnuPXGMcZ/keiMFxtas=
Received: by 10.67.21.11 with SMTP id y11mr1102249ugi;
	Sat, 30 Sep 2006 10:46:25 -0700 (PDT)
Received: from ?192.168.1.200? ( [80.217.194.157])
	by mx.gmail.com with ESMTP id k30sm3332006ugc.2006.09.30.10.46.23;
	Sat, 30 Sep 2006 10:46:24 -0700 (PDT)
Message-ID: <451EAD6D.30905@gmail.com>
Date: Sat, 30 Sep 2006 19:46:21 +0200
From: Pawel Worach <pawel.worach@gmail.com>
User-Agent: Thunderbird 1.5.0.7 (X11/20060921)
MIME-Version: 1.0
To: Dag-Erling Smorgrav <des@FreeBSD.org>
References: <200609301330.k8UDU1mw065334@repoman.freebsd.org>
	<451EA9F3.1040908@gmail.com>
In-Reply-To: <451EA9F3.1040908@gmail.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/crypto/openssh - Imported sources
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Sep 2006 17:46:36 -0000

Pawel Worach wrote:
> Dag-Erling Smorgrav wrote:
>> des         2006-09-30 13:30:01 UTC
>>
>>   FreeBSD src repository
>>
>>   src/crypto/openssh - Imported sources
>>   Update of /home/ncvs/src/crypto/openssh
>>   In directory repoman.freebsd.org:/tmp/cvs-serv65300
>>     Log Message:
>>   Vendor import of OpenSSH 4.4p1.
>>   
> 
> Hi,
> 
> Seems like this broke the pam_ssh build.
> 
> cc -O2 -fno-strict-aliasing -pipe -march=pentium-m 
> -I/usr/src/lib/libpam/modules/pam_ssh/../../../../crypto/openssh 
> -include ssh_namespace.h 
> -I/usr/src/lib/libpam/modules/pam_ssh/../../../../contrib/openpam/include 
> -I/usr/src/lib/libpam/modules/pam_ssh/../../libpam  -c 
> /usr/src/lib/libpam/modules/pam_ssh/pam_ssh.c
> In file included from /usr/src/lib/libpam/modules/pam_ssh/pam_ssh.c:60:
> /usr/src/lib/libpam/modules/pam_ssh/../../../../crypto/openssh/authfd.h:65: 
> error: syntax error before "Buffer"
> *** Error code 1
> 
> Stop in /usr/src/lib/libpam/modules/pam_ssh.
> 

Fix:
--- pam_ssh.c.orig	Sat Sep 30 19:44:43 2006
+++ pam_ssh.c	Sat Sep 30 19:44:56 2006
@@ -57,6 +57,7 @@
  #include <openssl/evp.h>

  #include "key.h"
+#include "buffer.h"
  #include "authfd.h"
  #include "authfile.h"


-- 
Pawel