]>
Commit | Line | Data |
---|---|---|
2566fb4c JB |
1 | diff -Nur inn-2.3.4.orig/authprogs/ckpasswd.c inn-2.3.4/authprogs/ckpasswd.c |
2 | --- inn-2.3.4.orig/authprogs/ckpasswd.c Mon Dec 23 00:00:38 2002 | |
3 | +++ inn-2.3.4/authprogs/ckpasswd.c Tue Jan 14 22:01:31 2003 | |
4 | @@ -14,19 +14,8 @@ | |
03da3507 JB |
5 | # include <fcntl.h> |
6 | #endif | |
7 | ||
8 | -#if HAVE_DBM | |
9 | -# ifdef HAVE_NDBM_H | |
10 | -# include <ndbm.h> | |
11 | -# else | |
2566fb4c JB |
12 | -# ifdef HAVE_GDBM_NDBM_H |
13 | -# include <gdbm-ndbm.h> | |
14 | -# else | |
15 | -# ifdef HAVE_DB1_NDBM_H | |
16 | -# include <db1/ndbm.h> | |
17 | -# endif | |
03da3507 JB |
18 | -# endif |
19 | -# endif | |
20 | -#endif | |
2566fb4c | 21 | +#define DB_DBM_HSEARCH1 |
03da3507 JB |
22 | +#include <db.h> |
23 | ||
24 | #ifdef HAVE_GETSPNAM | |
25 | # include <shadow.h> | |
2566fb4c JB |
26 | diff -Nur inn-2.3.4.orig/configure.in inn-2.3.4/configure.in |
27 | --- inn-2.3.4.orig/configure.in Tue Jan 14 22:00:39 2003 | |
28 | +++ inn-2.3.4/configure.in Tue Jan 14 22:03:08 2003 | |
03da3507 JB |
29 | @@ -762,12 +762,7 @@ |
30 | AC_CHECK_LIB(regex, regexec) | |
31 | ||
f02d900e | 32 | dnl Some of the authentication programs want to be able to open dbm files. |
03da3507 JB |
33 | -inn_save_LIBS=$LIBS |
34 | -LIBS= | |
35 | -AC_SEARCH_LIBS(dbm_open, ndbm dbm, | |
36 | - [DBM_LIB=$LIBS | |
37 | - AC_DEFINE(HAVE_DBM, 1, [Define if you have a dbm library.])]) | |
38 | -LIBS=$inn_save_LIBS | |
f02d900e JR |
39 | +DBM_LIB="-ldb" |
40 | AC_SUBST(DBM_LIB) | |
41 | ||
42 | dnl Libraries and flags for embedded Perl. Some distributions of Linux have | |
2566fb4c | 43 | @@ -1001,16 +996,10 @@ |
f02d900e JR |
44 | |
45 | dnl Generic checks for header files. | |
46 | dnl NOTUSED: sys/file.h sys/ioctl.h | |
47 | -AC_CHECK_HEADERS(crypt.h fcntl.h limits.h ndbm.h stddef.h stdint.h \ | |
48 | +AC_CHECK_HEADERS(crypt.h fcntl.h limits.h stddef.h stdint.h \ | |
49 | sys/bitypes.h sys/file.h sys/filio.h sys/ioctl.h \ | |
50 | sys/select.h sys/sysinfo.h sys/time.h unistd.h) | |
03da3507 | 51 | |
2566fb4c JB |
52 | -dnl Some Linux systems have db1/ndbm.h instead of ndbm.h. Others have |
53 | -dnl gdbm-ndbm.h instead. | |
f02d900e | 54 | -if test x"$ac_cv_header_ndbm_h" = xno ; then |
2566fb4c | 55 | - AC_CHECK_HEADERS(db1/ndbm.h gdbm-ndbm.h) |
f02d900e | 56 | -fi |
03da3507 | 57 | - |
f02d900e JR |
58 | dnl Checks for typedefs, structures, and compiler characteristics. |
59 | AC_STRUCT_ST_BLKSIZE | |
03da3507 | 60 | AC_STRUCT_TM |