svn commit: trunk/busybox/loginutils

[vda at busybox.net]

Author: vda
Date: 2007-08-22 11:14:44 -0700 (Wed, 22 Aug 2007)
New Revision: 19659

Log:
login: fixes for PAM build



Modified:
   trunk/busybox/loginutils/login.c


Changeset:
Modified: trunk/busybox/loginutils/login.c
===================================================================
--- trunk/busybox/loginutils/login.c	2007-08-22 16:57:32 UTC (rev 19658)
+++ trunk/busybox/loginutils/login.c	2007-08-22 18:14:44 UTC (rev 19659)
@@ -15,8 +15,12 @@
 #endif
 
 #if ENABLE_PAM
-#include <pam/pam_appl.h>
-#include <pam/pam_misc.h>
+/* PAM may include <locale.h>. We may need to undefine bbox's stub define: */
+#undef setlocale
+/* For some obscure reason, PAM is not in pam/xxx, but in security/xxx.
+ * Apparently they like to confuse people. */
+#include <security/pam_appl.h>
+#include <security/pam_misc.h>
 static const struct pam_conv conv = {
 	misc_conv,
 	NULL