[patch] 9999_all_6.8.99.5-openpam.patch

9999_all_6.8.99.5-openpam.patch (text/plain), 1.02 KB, created by Diego Elio Pettenò (RETIRED) on 2005-05-14 18:47:46 UTC

diff -ur xc/config/cf/FreeBSD.cf xc-6.8.99.5/config/cf/FreeBSD.cf
--- xc/config/cf/FreeBSD.cf	2004-08-15 02:03:36.000000000 +0200
+++ xc-6.8.99.5/config/cf/FreeBSD.cf	2005-05-05 15:28:57.904091152 +0200
@@ -529,6 +529,10 @@
 #define PamLibraries		-lpam DlLibrary
 #endif
 
+#ifndef PamMiscLibraries
+#define PamMiscLibraries
+#endif
+
 #ifndef SharedLibXdmGreet
 # define SharedLibXdmGreet		NO
 #endif
diff -ur xc/programs/Xserver/os/utils.c xc-6.8.99.5/programs/Xserver/os/utils.c
--- xc/programs/Xserver/os/utils.c	2005-04-27 17:42:15.000000000 +0200
+++ xc-6.8.99.5/programs/Xserver/os/utils.c	2005-05-05 13:00:56.456276448 +0200
@@ -2193,7 +2193,12 @@
 
 #ifdef USE_PAM
 #include <security/pam_appl.h>
+#ifdef LINUX_PAM
 #include <security/pam_misc.h>
+#endif
+#ifdef _OPENPAM
+#include <security/pam_types.h>
+#endif
 #include <pwd.h>
 #endif /* USE_PAM */
 
@@ -2202,7 +2207,9 @@
 {
 #ifdef USE_PAM
     static struct pam_conv conv = {
+#ifdef PAM_LINUX
 	misc_conv,
+#endif
 	NULL
     };
 
Only in xc-6.8.99.5/programs/Xserver/os: utils.c~