summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--security/vlock/files/patch-ae34
1 files changed, 31 insertions, 3 deletions
diff --git a/security/vlock/files/patch-ae b/security/vlock/files/patch-ae
index 8a04046..28e0d50 100644
--- a/security/vlock/files/patch-ae
+++ b/security/vlock/files/patch-ae
@@ -1,6 +1,34 @@
---- input.c.orig Wed Jan 13 16:19:14 1999
-+++ input.c Sun Oct 22 08:22:42 2000
-@@ -291,7 +291,7 @@
+--- input.c.orig Thu Jan 14 03:19:14 1999
++++ input.c Fri Feb 28 13:48:38 2003
+@@ -60,11 +60,27 @@
+ #error "Shadow and PAM don't mix!"
+ #endif
+
++#if (__FreeBSD__ == 0) /* 1.0 did not define __FreeBSD__ */
++#define __FreeBSD_version 199401
++#elsif __FreeBSD__ == 1 /* 1.1 defined it to be 1 */
++#define __FreeBSD_version 199405
++#else /* 2.0 and higher define it to be 2 */
++#include <osreldate.h> /* and this works */
++#endif
++
+ #include <security/pam_appl.h>
++#if defined (__FreeBSD_version) && (__FreeBSD_version > 500030)
++#include <security/openpam.h>
++#else
+ #include <security/pam_misc.h>
++#endif
+
+ static struct pam_conv PAM_conversation = {
++#if defined (__FreeBSD_version) && (__FreeBSD_version > 500030)
++ openpam_ttyconv,
++#else
+ &misc_conv,
++#endif
+ NULL
+ };
+
+@@ -291,7 +307,7 @@
setuid(getuid());
setgid(getgid());
OpenPOWER on IntegriCloud