From 637fafa964b160b23bc164999fcfd8a6c3572d6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@des.no>
Date: Wed, 28 Nov 2007 12:26:43 +0000
Subject: [PATCH] Track namespace changes.

git-svn-id: svn+ssh://svn.openpam.org/svn/openpam/trunk@402 185d5e19-27fe-0310-9dcf-9bff6b9f3609
---
 modules/pam_unix/pam_unix.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/pam_unix/pam_unix.c b/modules/pam_unix/pam_unix.c
index 82ca4d2..5fb21c4 100644
--- a/modules/pam_unix/pam_unix.c
+++ b/modules/pam_unix/pam_unix.c
@@ -53,7 +53,7 @@
 #include <security/pam_modules.h>
 #include <security/pam_appl.h>
 
-#ifndef _OPENPAM
+#ifndef OPENPAM
 static char password_prompt[] = "Password:";
 #endif
 
@@ -65,7 +65,7 @@ PAM_EXTERN int
 pam_sm_authenticate(pam_handle_t *pamh, int flags,
 	int argc, const char *argv[])
 {
-#ifndef _OPENPAM
+#ifndef OPENPAM
 	struct pam_conv *conv;
 	struct pam_message msg;
 	const struct pam_message *msgp;
@@ -86,7 +86,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags,
 		return (PAM_USER_UNKNOWN);
 
 	/* get password */
-#ifndef _OPENPAM
+#ifndef OPENPAM
 	pam_err = pam_get_item(pamh, PAM_CONV, (const void **)&conv);
 	if (pam_err != PAM_SUCCESS)
 		return (PAM_SYSTEM_ERR);
@@ -95,7 +95,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags,
 	msgp = &msg;
 #endif
 	for (retry = 0; retry < 3; ++retry) {
-#ifdef _OPENPAM
+#ifdef OPENPAM
 		pam_err = pam_get_authtok(pamh, PAM_AUTHTOK,
 		    (const char **)&password, NULL);
 #else
@@ -124,7 +124,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags,
 		pam_err = PAM_AUTH_ERR;
 	else
 		pam_err = PAM_SUCCESS;
-#ifndef _OPENPAM
+#ifndef OPENPAM
 	free(password);
 #endif
 	return (pam_err);