cvs commit: src/etc/rc.d Makefile auditd

[Robert Watson]

On Sun, 5 Mar 2006, Giorgos Keramidas wrote:

>> I have a couple concerns about this. First the more general, I'm not sure 
>> that /etc/security is a reasonable place for your config files. That's a 
>> very general name, and the audit stuff is a very specific project. That 
>> said, I'm not sure that we need yet another directory under /etc, but I'm 
>> curious about what others think about this issue.
>
> Should we also add a $FreeBSD$ id line to these scripts to ease merging any 
> local changes with mergemaster?

By scripts, I assume you mean files generally, since only one file in 
/etc/security is actually a script.  Right now, those files are on the vendor 
branch in contrib/openbsm/etc, since they are distributed as part of OpenBSM. 
I think merging $FreeBSD$ strings into the OpenBSM distribution probably 
doesn't make sense.  So it comes down to how and whether we want to maintain 
local modifications (such as adding $FreeBSD$).  My hope has been to avoid 
requiring any FreeBSD src changes to files in OpenBSM, given that I am the 
vendor, and can loop changes back, but obviously $FreeBSD$ is a bit of a 
special case.  How do we normally handle this sort of thing?  It looks like 
for OpenSSL and OpenSSH, at least, we opt to take files off the vendor branch?

Robert N M Watson