|
Lines 1-6
Link Here
|
| 1 |
--- input.c.orig Wed Jan 13 16:19:14 1999 |
1 |
--- input.c.orig Thu Jan 14 03:19:14 1999 |
| 2 |
+++ input.c Sun Oct 22 08:22:42 2000 |
2 |
+++ input.c Fri Feb 28 13:48:38 2003 |
| 3 |
@@ -291,7 +291,7 @@ |
3 |
@@ -60,11 +60,27 @@ |
|
|
4 |
#error "Shadow and PAM don't mix!" |
| 5 |
#endif |
| 6 |
|
| 7 |
+#if (__FreeBSD__ == 0) /* 1.0 did not define __FreeBSD__ */ |
| 8 |
+#define __FreeBSD_version 199401 |
| 9 |
+#elsif __FreeBSD__ == 1 /* 1.1 defined it to be 1 */ |
| 10 |
+#define __FreeBSD_version 199405 |
| 11 |
+#else /* 2.0 and higher define it to be 2 */ |
| 12 |
+#include <osreldate.h> /* and this works */ |
| 13 |
+#endif |
| 14 |
+ |
| 15 |
#include <security/pam_appl.h> |
| 16 |
+#if defined (__FreeBSD_version) && (__FreeBSD_version > 500030) |
| 17 |
+#include <security/openpam.h> |
| 18 |
+#else |
| 19 |
#include <security/pam_misc.h> |
| 20 |
+#endif |
| 21 |
|
| 22 |
static struct pam_conv PAM_conversation = { |
| 23 |
+#if defined (__FreeBSD_version) && (__FreeBSD_version > 500030) |
| 24 |
+ openpam_ttyconv, |
| 25 |
+#else |
| 26 |
&misc_conv, |
| 27 |
+#endif |
| 28 |
NULL |
| 29 |
}; |
| 30 |
|
| 31 |
@@ -291,7 +307,7 @@ |
| 4 |
setuid(getuid()); |
32 |
setuid(getuid()); |
| 5 |
setgid(getgid()); |
33 |
setgid(getgid()); |