From 785bc19867ea0a48ef4a282bceda26ccf55c557b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@des.no>
Date: Mon, 11 Mar 2013 14:10:13 +0000
Subject: [PATCH] Move openpam_policy_path into openpam_constants.c, and add a
 corresponding openpam_module_path.

git-svn-id: svn+ssh://svn.openpam.org/svn/openpam/trunk@659 185d5e19-27fe-0310-9dcf-9bff6b9f3609
---
 lib/libpam/openpam_configure.c |  8 --------
 lib/libpam/openpam_constants.c | 14 ++++++++++++++
 lib/libpam/openpam_constants.h |  3 +++
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/lib/libpam/openpam_configure.c b/lib/libpam/openpam_configure.c
index 9974ac2..3569a64 100644
--- a/lib/libpam/openpam_configure.c
+++ b/lib/libpam/openpam_configure.c
@@ -308,14 +308,6 @@ fail:
 	return (-1);
 }
 
-static const char *openpam_policy_path[] = {
-	"/etc/pam.d/",
-	"/etc/pam.conf",
-	"/usr/local/etc/pam.d/",
-	"/usr/local/etc/pam.conf",
-	NULL
-};
-
 /*
  * Read the specified chains from the specified file.
  *
diff --git a/lib/libpam/openpam_constants.c b/lib/libpam/openpam_constants.c
index 56d0bfc..ee86fc7 100644
--- a/lib/libpam/openpam_constants.c
+++ b/lib/libpam/openpam_constants.c
@@ -125,3 +125,17 @@ const char *pam_sm_func_name[PAM_NUM_PRIMITIVES] = {
 	"pam_sm_close_session",
 	"pam_sm_chauthtok"
 };
+
+const char *openpam_policy_path[] = {
+	"/etc/pam.d/",
+	"/etc/pam.conf",
+	"/usr/local/etc/pam.d/",
+	"/usr/local/etc/pam.conf",
+	NULL
+};
+
+const char *openpam_module_path[] = {
+	"/usr/lib",
+	"/usr/local/lib",
+	NULL
+};
diff --git a/lib/libpam/openpam_constants.h b/lib/libpam/openpam_constants.h
index 8b9bdde..0f6a706 100644
--- a/lib/libpam/openpam_constants.h
+++ b/lib/libpam/openpam_constants.h
@@ -39,4 +39,7 @@ extern const char *pam_control_flag_name[PAM_NUM_CONTROL_FLAGS];
 extern const char *pam_func_name[PAM_NUM_PRIMITIVES];
 extern const char *pam_sm_func_name[PAM_NUM_PRIMITIVES];
 
+extern const char *openpam_policy_path[];
+extern const char *openpam_module_path[];
+
 #endif