aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2008-01-29 20:22:00 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2008-01-29 20:22:00 +0000
commitbb9740d80ee20034bd9cc0fb30e973231e060360 (patch)
tree1c33e06620be8ddbfce211f3f8e5820e6e3675ee
parentdd63c4e8947b3783a162e4cd28d41b0b96d09d96 (diff)
downloadsrc-bb9740d80ee20034bd9cc0fb30e973231e060360.tar.gz
src-bb9740d80ee20034bd9cc0fb30e973231e060360.zip
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
Notes
Notes: svn path=/vendor/openpam/dist/; revision=175801
-rw-r--r--contrib/openpam/include/security/openpam_version.h5
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 1a3b153bd3b0..5f9d0f23b54d 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 */