svn commit: r358660 - stable/11/contrib/ntp/ntpd

[Cy Schubert]

Author: cy
Date: Thu Mar  5 00:18:09 2020
New Revision: 358660
URL: https://svnweb.freebsd.org/changeset/base/358660

Log:
  This is a direct commit to stable/11:
  
  Stack gap is not supported on stable/11.

Modified:
  stable/11/contrib/ntp/ntpd/ntpd.c

Modified: stable/11/contrib/ntp/ntpd/ntpd.c
==============================================================================
--- stable/11/contrib/ntp/ntpd/ntpd.c	Wed Mar  4 23:54:13 2020	(r358659)
+++ stable/11/contrib/ntp/ntpd/ntpd.c	Thu Mar  5 00:18:09 2020	(r358660)
@@ -424,18 +424,6 @@ main(
 	char *argv[]
 	)
 {
-#   ifdef __FreeBSD__
-	{
-		/*
-		 * We Must disable ASLR stack gap on FreeBSD to avoid a
-		 * segfault. See PR/241421 and PR/241960.
-		 */
-		int aslr_var = PROC_STACKGAP_DISABLE;
-
-		pid_t my_pid = getpid();
-		procctl(P_PID, my_pid, PROC_STACKGAP_CTL, &aslr_var); 
-	}
-#   endif
 	return ntpdmain(argc, argv);
 }
 #endif /* !SYS_WINNT */