From owner-svn-src-all@freebsd.org  Tue Dec 15 15:41:10 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E2681A4868C;
 Tue, 15 Dec 2015 15:41:10 +0000 (UTC)
 (envelope-from araujo@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B2BC61B3C;
 Tue, 15 Dec 2015 15:41:10 +0000 (UTC)
 (envelope-from araujo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBFFf9GV080938;
 Tue, 15 Dec 2015 15:41:09 GMT (envelope-from araujo@FreeBSD.org)
Received: (from araujo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBFFf9Rh080937;
 Tue, 15 Dec 2015 15:41:09 GMT (envelope-from araujo@FreeBSD.org)
Message-Id: <201512151541.tBFFf9Rh080937@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: araujo set sender to
 araujo@FreeBSD.org using -f
From: Marcelo Araujo <araujo@FreeBSD.org>
Date: Tue, 15 Dec 2015 15:41:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r292271 - head/usr.sbin/ypldap
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Dec 2015 15:41:11 -0000

Author: araujo
Date: Tue Dec 15 15:41:09 2015
New Revision: 292271
URL: https://svnweb.freebsd.org/changeset/base/292271

Log:
  Remove wrong header and the NULL check before free().
  
  Approved by:	bapt (mentor)
  Obtained from:	OpenBSD
  Differential Revision:	https://reviews.freebsd.org/D4548

Modified:
  head/usr.sbin/ypldap/ber.c

Modified: head/usr.sbin/ypldap/ber.c
==============================================================================
--- head/usr.sbin/ypldap/ber.c	Tue Dec 15 15:37:58 2015	(r292270)
+++ head/usr.sbin/ypldap/ber.c	Tue Dec 15 15:41:09 2015	(r292271)
@@ -27,7 +27,6 @@
 #include <err.h>	/* XXX for debug output */
 #include <stdio.h>	/* XXX for debug output */
 #include <string.h>
-#include <strings.h>
 #include <unistd.h>
 #include <stdarg.h>
 
@@ -1219,8 +1218,7 @@ ber_set_application(struct ber *b, unsig
 void
 ber_free(struct ber *b)
 {
-	if (b->br_wbuf != NULL)
-		free (b->br_wbuf);
+	free(b->br_wbuf);
 }
 
 static ssize_t