sync further changes from uts/aslr

@@ -183,21 +183,19 @@
                         return (EPERM);
                 if ((secpolicy_psecflags(CRED(), p, p) != 0) &&
                     secflag_isset(p->p_secflags.psf_inherit, flag))
                         return (EPERM);
 
-                secflag_clear(&p->p_secflags.psf_inherit, flag);
                 secflag_clear(&p->p_secflags.psf_effective, flag);
         } else {
                 if (!secflag_isset(p->p_secflags.psf_upper, flag))
                         return (EPERM);
 
                 if ((secpolicy_psecflags(CRED(), p, p) != 0) &&
                     !secflag_isset(p->p_secflags.psf_inherit, flag))
                         return (EPERM);
 
-                secflag_set(&p->p_secflags.psf_inherit, flag);
                 secflag_set(&p->p_secflags.psf_effective, flag);
         }
 
         return (0);
 }