Fixed invalid cookie in pagedResults control (ITS#3089)

[openldap] / servers / slapd / back-bdb / error.c

diff --git a/servers/slapd/back-bdb/error.c b/servers/slapd/back-bdb/error.c
index aced7cf0dacf787b14ec54bbe6be56efcd9d4645..4b58c834c2cc9c21e318abf68ede21b8aa993ee8 100644 (file)
--- a/servers/slapd/back-bdb/error.c
+++ b/servers/slapd/back-bdb/error.c
@@ -1,14 +1,22 @@
-/* error.c - BDB errcall routine  */
+/* error.c - BDB errcall routine */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2000-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
 
 #include <stdio.h>
-
 #include <ac/string.h>
 
 #include "slap.h"
@@ -16,5 +24,28 @@
 
 void bdb_errcall( const char *pfx, char * msg )
 {
-       Debug( LDAP_DEBUG_ANY, "bdb(%s): %s", pfx, msg, 0 );
+#ifdef HAVE_EBCDIC
+       if ( msg[0] > 0x7f )
+               __etoa( msg );
+#endif
+#ifdef NEW_LOGGING
+       LDAP_LOG ( OPERATION, INFO, "bdb(%s): %s\n", pfx, msg, 0 );
+#else
+       Debug( LDAP_DEBUG_ANY, "bdb(%s): %s\n", pfx, msg, 0 );
+#endif
+}
+
+#ifdef HAVE_EBCDIC
+
+#undef db_strerror
+
+/* Not re-entrant! */
+char *ebcdic_dberror( int rc )
+{
+       static char msg[1024];
+
+       strcpy( msg, db_strerror( rc ) );
+       __etoa( msg );
+       return msg;
 }
+#endif