Attachment #128529 for bug #185899

View | Details | Raw Unified | Return to bug 185899 | Differences between

and this patch





if test "$enable_berkeley_db" != no; then

  AC_CHECK_HEADERS([db.h])
	db4/db.h				\
	db3/db.h				\
	db.h					\
	db_185.h				\
  ])

dnl db_create is used by db3 and db4

  AC_FIND_FUNC_NO_LIBS(db_create, db, [
  #include <stdio.h>
  #ifdef HAVE_DB4_DB_H
  #include <db4/db.h>
  #elif defined(HAVE_DB3_DB_H)
  #include <db3/db.h>
  #else
  #include <db.h>
  #endif
  ],[NULL, NULL, 0])

  if test "$ac_cv_func_db_create" = "yes"; then


dnl dbopen is used by db1/db2

    AC_FIND_FUNC_NO_LIBS(dbopen, db, [
    #include <stdio.h>
    #if defined(HAVE_DB2_DB_H)
    #include <db2/db.h>
    #elif defined(HAVE_DB_185_H)
    #include <db_185.h>
    #elif defined(HAVE_DB_H)
    #include <db.h>
    #else
    #error no db.h
    #endif
    ],[NULL, 0, 0, 0, NULL])

    if test "$ac_cv_func_dbopen" = "yes"; then





#if HAVE_DB3

#ifdef HAVE_DB4_DB_H
#include <db4/db.h>
#elif defined(HAVE_DB3_DB_H)
#include <db3/db.h>
#else
#include <db.h>
#endif

static krb5_error_code
DB_close(krb5_context context, HDB *db)

Lines 37-47 Link Here

(-)heimdal-20060407-old/lib/hdb/db.c (-4 lines)
37		37
38	#if HAVE_DB1	38	#if HAVE_DB1
39		39
40	#if defined(HAVE_DB_185_H)
41	#include <db_185.h>
42	#elif defined(HAVE_DB_H)
43	#include <db.h>	40	#include <db.h>
44	#endif
45		41
46	static krb5_error_code	42	static krb5_error_code
47	DB_close(krb5_context context, HDB *db)	43	DB_close(krb5_context context, HDB *db)




#include "roken.h"
RCSID("$Id: getcap.c,v 1.11 2006/01/13 14:25:32 lha Exp $");

#if defined(HAVE_DBOPEN) && defined(HAVE_DB_H)
#define USE_DB
#endif

#include <sys/types.h>
#include <ctype.h>
#ifdef USE_DB
#include <db_185.h>
#elif defined(HAVE_DB_H)
#include <db.h>
#endif
#include <errno.h>	

static char	*toprec;	/* Additional record specified by cgetset() */
static int	 gottoprec;	/* Flag indicating retrieval of toprecord */

#if 0 /*
       * Don't use db support unless its build into libc but we dont
       * check for that now, so just disable the code.
       */
#if defined(HAVE_DBOPEN) && defined(HAVE_DB_H)
#define USE_DB
#endif
#endif

#ifdef USE_DB
static int	cdbget (DB *, char **, const char *);
#endif

Return to bug 185899

Lines 18-41 Link Here

(-)heimdal-20060407-old/cf/db.m4 (-22 / +3 lines)
18		18
19	if test "$enable_berkeley_db" != no; then	19	if test "$enable_berkeley_db" != no; then
20		20
21	AC_CHECK_HEADERS([ \	21	AC_CHECK_HEADERS([db.h])
22	db4/db.h \
23	db3/db.h \
24	db.h \
25	db_185.h \
26	])
27		22
28	dnl db_create is used by db3 and db4	23	dnl db_create is used by db3 and db4
29		24
30	AC_FIND_FUNC_NO_LIBS(db_create, db4 db3 db, [	25	AC_FIND_FUNC_NO_LIBS(db_create, db, [
31	#include <stdio.h>	26	#include <stdio.h>
32	#ifdef HAVE_DB4_DB_H
33	#include <db4/db.h>
34	#elif defined(HAVE_DB3_DB_H)
35	#include <db3/db.h>
36	#else
37	#include <db.h>	27	#include <db.h>
38	#endif
39	],[NULL, NULL, 0])	28	],[NULL, NULL, 0])
40		29
41	if test "$ac_cv_func_db_create" = "yes"; then	30	if test "$ac_cv_func_db_create" = "yes"; then
Lines 50-66 Link Here
50		39
51	dnl dbopen is used by db1/db2	40	dnl dbopen is used by db1/db2
52		41
53	AC_FIND_FUNC_NO_LIBS(dbopen, db2 db, [	42	AC_FIND_FUNC_NO_LIBS(dbopen, db, [
54	#include <stdio.h>	43	#include <stdio.h>
55	#if defined(HAVE_DB2_DB_H)
56	#include <db2/db.h>
57	#elif defined(HAVE_DB_185_H)
58	#include <db_185.h>
59	#elif defined(HAVE_DB_H)
60	#include <db.h>	44	#include <db.h>
61	#else
62	#error no db.h
63	#endif
64	],[NULL, 0, 0, 0, NULL])	45	],[NULL, 0, 0, 0, NULL])
65		46
66	if test "$ac_cv_func_dbopen" = "yes"; then	47	if test "$ac_cv_func_dbopen" = "yes"; then

Lines 37-49 Link Here

(-)heimdal-20060407-old/lib/hdb/db3.c (-6 lines)
37		37
38	#if HAVE_DB3	38	#if HAVE_DB3
39		39
40	#ifdef HAVE_DB4_DB_H
41	#include <db4/db.h>
42	#elif defined(HAVE_DB3_DB_H)
43	#include <db3/db.h>
44	#else
45	#include <db.h>	40	#include <db.h>
46	#endif
47		41
48	static krb5_error_code	42	static krb5_error_code
49	DB_close(krb5_context context, HDB *db)	43	DB_close(krb5_context context, HDB *db)

Lines 38-48 Link Here

(-)heimdal-20060407-old/lib/roken/getcap.c (-12 / +5 lines)
38	#include "roken.h"	38	#include "roken.h"
39	RCSID("$Id: getcap.c,v 1.11 2006/01/13 14:25:32 lha Exp $");	39	RCSID("$Id: getcap.c,v 1.11 2006/01/13 14:25:32 lha Exp $");
40		40
		41	#if defined(HAVE_DBOPEN) && defined(HAVE_DB_H)
		42	#define USE_DB
		43	#endif
		44
41	#include <sys/types.h>	45	#include <sys/types.h>
42	#include <ctype.h>	46	#include <ctype.h>
43	#if defined(HAVE_DB_185_H)	47	#ifdef USE_DB
44	#include <db_185.h>
45	#elif defined(HAVE_DB_H)
46	#include <db.h>	48	#include <db.h>
47	#endif	49	#endif
48	#include <errno.h>	50	#include <errno.h>
Lines 69-83 Link Here
69	static char toprec; / Additional record specified by cgetset() */	71	static char toprec; / Additional record specified by cgetset() */
70	static int gottoprec; /* Flag indicating retrieval of toprecord */	72	static int gottoprec; /* Flag indicating retrieval of toprecord */
71		73
72	#if 0 /*
73	* Don't use db support unless its build into libc but we dont
74	* check for that now, so just disable the code.
75	*/
76	#if defined(HAVE_DBOPEN) && defined(HAVE_DB_H)
77	#define USE_DB
78	#endif
79	#endif
80
81	#ifdef USE_DB	74	#ifdef USE_DB
82	static int cdbget (DB , char , const char );	75	static int cdbget (DB , char , const char );
83	#endif	76	#endif