diff options
author | des <des@FreeBSD.org> | 2008-01-29 20:22:00 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2008-01-29 20:22:00 +0000 |
commit | 5bb985da807ca1473ce8a14def069f52914bce8e (patch) | |
tree | 1c33e06620be8ddbfce211f3f8e5820e6e3675ee | |
parent | 274f594de64562e3d95e9bc17f169c3ab963ffc3 (diff) | |
download | FreeBSD-src-5bb985da807ca1473ce8a14def069f52914bce8e.zip FreeBSD-src-5bb985da807ca1473ce8a14def069f52914bce8e.tar.gz |
Merge r412 from vendor, which reintroduces _OPENPAM. See comment in the
code for explanation. Hopefully, this will forestall any reports of
breakage in OpenPAM-aware ports.
MFC after: 3 days
-rw-r--r-- | contrib/openpam/include/security/openpam_version.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/openpam/include/security/openpam_version.h b/contrib/openpam/include/security/openpam_version.h index 1a3b153..5f9d0f2 100644 --- a/contrib/openpam/include/security/openpam_version.h +++ b/contrib/openpam/include/security/openpam_version.h @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam_version.h 409 2007-12-21 11:38:50Z des $ + * $Id: openpam_version.h 412 2008-01-29 19:31:46Z des $ */ #ifndef SECURITY_OPENPAM_VERSION_H_INCLUDED @@ -42,4 +42,7 @@ #define OPENPAM_VERSION 20071221 #define OPENPAM_RELEASE "Hydrangea" +/* violates reserved namespace, but can't be removed for legacy reasons */ +#define _OPENPAM + #endif /* !SECURITY_OPENPAM_VERSION_H_INCLUDED */ |