Received: by mail.netbsd.org (Postfix, from userid 605) id CBDDC14A158; Fri, 28 Oct 2011 07:12:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9538614A15D for ; Fri, 28 Oct 2011 07:12:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at NetBSD.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.NetBSD.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id FEVT0yhqpDq1 for ; Fri, 28 Oct 2011 07:12:18 +0000 (UTC) Received: from cvs.netbsd.org (cvs.NetBSD.org [IPv6:2001:4f8:3:7:2e0:81ff:fe30:95bd]) by mail.netbsd.org (Postfix) with ESMTP id 2436314A147 for ; Fri, 28 Oct 2011 07:12:18 +0000 (UTC) Received: by cvs.netbsd.org (Postfix, from userid 500) id 1167D175DD; Fri, 28 Oct 2011 07:12:18 +0000 (UTC) MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Date: Fri, 28 Oct 2011 07:12:18 +0000 From: "Matthias Scheler" Subject: CVS commit: src/external/ibm-public/postfix/dist/src/smtpd To: source-changes@NetBSD.org X-Mailer: log_accum Message-Id: <20111028071218.1167D175DD@cvs.netbsd.org> Sender: source-changes-owner@NetBSD.org List-Id: source-changes.NetBSD.org Precedence: bulk Reply-To: source-changes-d@NetBSD.org Mail-Reply-To: "Matthias Scheler" Mail-Followup-To: source-changes-d@NetBSD.org Module Name: src Committed By: tron Date: Fri Oct 28 07:12:17 UTC 2011 Modified Files: src/external/ibm-public/postfix/dist/src/smtpd: smtpd.c Log Message: Resolve conflicts from last import. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/external/ibm-public/postfix/dist/src/smtpd/smtpd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.