apply FreeBSD changes to main branch

diff --cc servers/slapd/regex.c
index 42d2f4152e229d7fc28f1751b8e013d7d5e9d0eb,42d2f4152e229d7fc28f1751b8e013d7d5e9d0eb..02a3c4c8ffe7f518b8921611376d59988cd6424d
--- 1/servers/slapd/regex.c
--- 2/servers/slapd/regex.c
+++ b/servers/slapd/regex.c
@@@ -20,9 -20,9 +20,8 @@@
   * see Henry Spencer's regexp routines, or GNU Emacs pattern
   * matching module.
   *
-- * Modification history:
++ * Vendor Modification history:
   *
-- * $Log: regex.c,v $
   * Revision 1.2  1996/04/25  16:24:11  mcs
   * make re_exec() match "" with ".*" and similar patterns
   * hopefully this change doesn't break anything else!