From owner-svn-src-stable@FreeBSD.ORG  Wed Mar 21 07:05:30 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CCB5A106564A;
	Wed, 21 Mar 2012 07:05:30 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4D8938FC17;
	Wed, 21 Mar 2012 07:05:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2L75UXM058805;
	Wed, 21 Mar 2012 07:05:30 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2L75UbS058802;
	Wed, 21 Mar 2012 07:05:30 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201203210705.q2L75UbS058802@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Wed, 21 Mar 2012 07:05:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r233259 - in stable/9/usr.sbin: ypbind ypserv
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Mar 2012 07:05:30 -0000

Author: glebius
Date: Wed Mar 21 07:05:29 2012
New Revision: 233259
URL: http://svn.freebsd.org/changeset/base/233259

Log:
  Merge 226690 and 226725 from head:
    Protect NIS client with madvise(2) since this daemon is required
    for succesful authentication of users.
  
    Protect NIS server with madvise(2) since this daemon is required
    for succesful authentication of users.

Modified:
  stable/9/usr.sbin/ypbind/ypbind.c
  stable/9/usr.sbin/ypserv/yp_main.c
Directory Properties:
  stable/9/usr.sbin/ypbind/   (props changed)
  stable/9/usr.sbin/ypserv/   (props changed)

Modified: stable/9/usr.sbin/ypbind/ypbind.c
==============================================================================
--- stable/9/usr.sbin/ypbind/ypbind.c	Wed Mar 21 07:02:17 2012	(r233258)
+++ stable/9/usr.sbin/ypbind/ypbind.c	Wed Mar 21 07:05:29 2012	(r233259)
@@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/ioctl.h>
+#include <sys/mman.h>
 #include <sys/signal.h>
 #include <sys/socket.h>
 #include <sys/file.h>
@@ -465,6 +466,9 @@ main(int argc, char *argv[])
 
 	openlog(argv[0], LOG_PID, LOG_DAEMON);
 
+	if (madvise(NULL, 0, MADV_PROTECT) != 0)
+		syslog(LOG_WARNING, "madvise(): %m");
+
 	/* Kick off the default domain */
 	broadcast(ypbindlist);
 

Modified: stable/9/usr.sbin/ypserv/yp_main.c
==============================================================================
--- stable/9/usr.sbin/ypserv/yp_main.c	Wed Mar 21 07:02:17 2012	(r233258)
+++ stable/9/usr.sbin/ypserv/yp_main.c	Wed Mar 21 07:05:29 2012	(r233259)
@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
  */
 
 #include <sys/types.h>
+#include <sys/mman.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
@@ -526,6 +527,9 @@ main(int argc, char *argv[])
 		unregister();
 	}
 
+	if (madvise(NULL, 0, MADV_PROTECT) != 0)
+		_msgout("madvise(): %s", strerror(errno));
+
 	/*
 	 * Create RPC service for each transport.
 	 */