Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/openldap/include merge conflicts.



details:   https://anonhg.NetBSD.org/src/rev/27a0b65b8e00
branches:  trunk
changeset: 964598:27a0b65b8e00
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Aug 08 13:50:56 2019 +0000

description:
merge conflicts.

diffstat:

 external/bsd/openldap/dist/build/mkversion                           |    11 +-
 external/bsd/openldap/dist/clients/tools/common.c                    |     6 +-
 external/bsd/openldap/dist/doc/man/man5/slapd-ldbm.5                 |    20 -
 external/bsd/openldap/dist/include/Makefile.in                       |     4 +-
 external/bsd/openldap/dist/include/ldap_pvt.h                        |     5 +-
 external/bsd/openldap/dist/include/ldap_queue.h                      |     4 +-
 external/bsd/openldap/dist/include/portable.hin                      |     4 +-
 external/bsd/openldap/dist/libraries/libldap/os-ip.c                 |    11 +-
 external/bsd/openldap/dist/libraries/libldap/os-local.c              |    10 +-
 external/bsd/openldap/dist/libraries/libldap/tls_o.c                 |   161 +-
 external/bsd/openldap/dist/libraries/liblutil/detach.c               |     6 +-
 external/bsd/openldap/dist/libraries/liblutil/md5.c                  |     6 +-
 external/bsd/openldap/dist/libraries/liblutil/passwd.c               |     6 +-
 external/bsd/openldap/dist/libraries/librewrite/session.c            |     4 +-
 external/bsd/openldap/dist/servers/slapd/filter.c                    |     6 +-
 external/bsd/openldap/dist/servers/slapd/overlays/deref.c            |     6 +-
 external/bsd/openldap/dist/tests/scripts/test058-syncrepl-asymmetric |  2471 ----------
 external/bsd/openldap/include/ldap_features.h                        |     4 +-
 external/bsd/openldap/include/portable.h                             |     8 +-
 19 files changed, 181 insertions(+), 2572 deletions(-)

diffs (truncated from 3195 to 300 lines):

diff -r 278a8ca26362 -r 27a0b65b8e00 external/bsd/openldap/dist/build/mkversion
--- a/external/bsd/openldap/dist/build/mkversion        Thu Aug 08 13:45:19 2019 +0000
+++ b/external/bsd/openldap/dist/build/mkversion        Thu Aug 08 13:50:56 2019 +0000
@@ -3,7 +3,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2017 The OpenLDAP Foundation.
+## Copyright 1998-2019 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -50,11 +50,16 @@
 fi
 
 APPLICATION=$1
+#if [ -n "${SOURCE_DATE_EPOCH}" ]; then
+   WHOWHERE="openldap"
+#else
+#   WHOWHERE="$USER@$(uname -n):$(pwd)"
+#fi
 
 cat << __EOF__
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2017 The OpenLDAP Foundation.
+ * Copyright 1998-2019 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -67,7 +72,7 @@
  */
 
 static const char copyright[] =
-"Copyright 1998-2017 The OpenLDAP Foundation.  All rights reserved.\n"
+"Copyright 1998-2019 The OpenLDAP Foundation.  All rights reserved.\n"
 "COPYING RESTRICTIONS APPLY\n";
 
 $static $const char $SYMBOL[] =
diff -r 278a8ca26362 -r 27a0b65b8e00 external/bsd/openldap/dist/clients/tools/common.c
--- a/external/bsd/openldap/dist/clients/tools/common.c Thu Aug 08 13:45:19 2019 +0000
+++ b/external/bsd/openldap/dist/clients/tools/common.c Thu Aug 08 13:50:56 2019 +0000
@@ -1,10 +1,10 @@
-/*     $NetBSD: common.c,v 1.7 2018/02/06 01:57:23 christos Exp $      */
+/*     $NetBSD: common.c,v 1.8 2019/08/08 13:50:56 christos Exp $      */
 
 /* common.c - common routines for the ldap client tools */
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2017 The OpenLDAP Foundation.
+ * Copyright 1998-2019 The OpenLDAP Foundation.
  * Portions Copyright 2003 Kurt D. Zeilenga.
  * Portions Copyright 2003 IBM Corporation.
  * All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: common.c,v 1.7 2018/02/06 01:57:23 christos Exp $");
+__RCSID("$NetBSD: common.c,v 1.8 2019/08/08 13:50:56 christos Exp $");
 
 #include "portable.h"
 
diff -r 278a8ca26362 -r 27a0b65b8e00 external/bsd/openldap/dist/doc/man/man5/slapd-ldbm.5
--- a/external/bsd/openldap/dist/doc/man/man5/slapd-ldbm.5      Thu Aug 08 13:45:19 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-.TH SLAPD-LDBM 5 "RELEASEDATE" "OpenLDAP LDVERSION"
-.\" Copyright 1998-2017 The OpenLDAP Foundation All Rights Reserved.
-.\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
-.\" $OpenLDAP$
-.SH NAME
-slapd\-ldbm \- Discontinued LDBM backend to slapd
-.SH SYNOPSIS
-ETCDIR/slapd.conf
-.SH DESCRIPTION
-LDBM was the original database backend to
-.BR slapd (8),
-and was supported up to OpenLDAP 2.3.
-It has been superseded by the more robust BDB and HDB backends.
-
-.SH SEE ALSO
-.BR slapd (8),
-.BR slapd\-bdb (5),
-.BR slapd.backends (5).
-.SH ACKNOWLEDGEMENTS
-.so ../Project
diff -r 278a8ca26362 -r 27a0b65b8e00 external/bsd/openldap/dist/include/Makefile.in
--- a/external/bsd/openldap/dist/include/Makefile.in    Thu Aug 08 13:45:19 2019 +0000
+++ b/external/bsd/openldap/dist/include/Makefile.in    Thu Aug 08 13:50:56 2019 +0000
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2017 The OpenLDAP Foundation.
+## Copyright 1998-2019 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -21,7 +21,7 @@
                $(srcdir)/ldap.h $(srcdir)/ldap_cdefs.h \
                $(srcdir)/ldap_schema.h $(srcdir)/ldap_utf8.h \
                $(srcdir)/slapi-plugin.h ldap_features.h \
-               $(srcdir)/ldif.h ; \
+               $(srcdir)/ldif.h $(srcdir)/openldap.h ; \
        do \
                $(INSTALL) $(INSTALLFLAGS) -m 644 $$header $(DESTDIR)$(includedir); \
        done
diff -r 278a8ca26362 -r 27a0b65b8e00 external/bsd/openldap/dist/include/ldap_pvt.h
--- a/external/bsd/openldap/dist/include/ldap_pvt.h     Thu Aug 08 13:45:19 2019 +0000
+++ b/external/bsd/openldap/dist/include/ldap_pvt.h     Thu Aug 08 13:50:56 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ldap_pvt.h,v 1.1.1.7 2019/08/08 13:31:03 christos Exp $        */
+/*     $NetBSD: ldap_pvt.h,v 1.2 2019/08/08 13:50:57 christos Exp $    */
 
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
@@ -270,6 +270,9 @@
 LDAP_F (int) ldap_pvt_sasl_install LDAP_P(( struct sockbuf *, void * ));
 LDAP_F (void) ldap_pvt_sasl_remove LDAP_P(( struct sockbuf * ));
 
+LDAP_F (int) ldap_pvt_tls_check_hostname LDAP_P(( LDAP *, void *, const char *));
+
+
 /*
  * SASL encryption support for LBER Sockbufs
  */
diff -r 278a8ca26362 -r 27a0b65b8e00 external/bsd/openldap/dist/include/ldap_queue.h
--- a/external/bsd/openldap/dist/include/ldap_queue.h   Thu Aug 08 13:45:19 2019 +0000
+++ b/external/bsd/openldap/dist/include/ldap_queue.h   Thu Aug 08 13:50:56 2019 +0000
@@ -1,10 +1,10 @@
-/*     $NetBSD: ldap_queue.h,v 1.5 2018/02/06 01:57:23 christos Exp $  */
+/*     $NetBSD: ldap_queue.h,v 1.6 2019/08/08 13:50:57 christos Exp $  */
 
 /* ldap_queue.h -- queue macros */
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2001-2017 The OpenLDAP Foundation.
+ * Copyright 2001-2019 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff -r 278a8ca26362 -r 27a0b65b8e00 external/bsd/openldap/dist/include/portable.hin
--- a/external/bsd/openldap/dist/include/portable.hin   Thu Aug 08 13:45:19 2019 +0000
+++ b/external/bsd/openldap/dist/include/portable.hin   Thu Aug 08 13:50:56 2019 +0000
@@ -4,7 +4,7 @@
 /* begin of portable.h.pre */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2017 The OpenLDAP Foundation
+ * Copyright 1998-2019 The OpenLDAP Foundation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1006,7 +1006,7 @@
 /* define for Referential Integrity overlay */
 #undef SLAPD_OVER_REFINT
 
-/* define for Referential Integrity overlay */
+/* define for Return Code Integrity overlay */
 #undef SLAPD_OVER_RETCODE
 
 /* define for Rewrite/Remap overlay */
diff -r 278a8ca26362 -r 27a0b65b8e00 external/bsd/openldap/dist/libraries/libldap/os-ip.c
--- a/external/bsd/openldap/dist/libraries/libldap/os-ip.c      Thu Aug 08 13:45:19 2019 +0000
+++ b/external/bsd/openldap/dist/libraries/libldap/os-ip.c      Thu Aug 08 13:50:56 2019 +0000
@@ -1,10 +1,10 @@
-/*     $NetBSD: os-ip.c,v 1.8 2018/02/06 01:57:23 christos Exp $       */
+/*     $NetBSD: os-ip.c,v 1.9 2019/08/08 13:50:57 christos Exp $       */
 
 /* os-ip.c -- platform-specific TCP & UDP related code */
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2017 The OpenLDAP Foundation.
+ * Copyright 1998-2019 The OpenLDAP Foundation.
  * Portions Copyright 1999 Lars Uffmann.
  * All rights reserved.
  *
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: os-ip.c,v 1.8 2018/02/06 01:57:23 christos Exp $");
+__RCSID("$NetBSD: os-ip.c,v 1.9 2019/08/08 13:50:57 christos Exp $");
 
 #include "portable.h"
 
@@ -448,7 +448,7 @@
                if ( connect(s, sin, addrlen) != AC_SOCKET_ERROR ) {
                        osip_debug(ld, "connect success\n", 0, 0, 0);
 
-                       if ( opt_tv && ldap_pvt_ndelay_off(ld, s) == -1 )
+                       if ( !async && opt_tv && ldap_pvt_ndelay_off(ld, s) == -1 )
                                return ( -1 );
                        return ( 0 );
                }
@@ -628,6 +628,9 @@
                        continue;
                }
 
+#ifndef LDAP_PF_INET6
+               if ( sai->ai_family == AF_INET6 ) continue;
+#endif
                /* we assume AF_x and PF_x are equal for all x */
                s = ldap_int_socket( ld, sai->ai_family, socktype );
                if ( s == AC_SOCKET_INVALID ) {
diff -r 278a8ca26362 -r 27a0b65b8e00 external/bsd/openldap/dist/libraries/libldap/os-local.c
--- a/external/bsd/openldap/dist/libraries/libldap/os-local.c   Thu Aug 08 13:45:19 2019 +0000
+++ b/external/bsd/openldap/dist/libraries/libldap/os-local.c   Thu Aug 08 13:50:56 2019 +0000
@@ -1,10 +1,10 @@
-/*     $NetBSD: os-local.c,v 1.9 2018/02/06 01:57:23 christos Exp $    */
+/*     $NetBSD: os-local.c,v 1.10 2019/08/08 13:50:57 christos Exp $   */
 
 /* os-local.c -- platform-specific domain socket code */
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2017 The OpenLDAP Foundation.
+ * Copyright 1998-2019 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: os-local.c,v 1.9 2018/02/06 01:57:23 christos Exp $");
+__RCSID("$NetBSD: os-local.c,v 1.10 2019/08/08 13:50:57 christos Exp $");
 
 #include "portable.h"
 
@@ -114,7 +114,7 @@
 #define TRACE do { \
        char ebuf[128]; \
        oslocal_debug(ld, \
-               "ldap_is_socket_ready: errror on socket %d: errno: %d (%s)\n", \
+               "ldap_is_socket_ready: error on socket %d: errno: %d (%s)\n", \
                s, \
                errno, \
                AC_STRERROR_R(errno, ebuf, sizeof ebuf)); \
@@ -364,5 +364,5 @@
        return rc;
 }
 #else
-static int dummy;
+static int dummy; /* generate also a warning: 'dummy' defined but not used (at least here) */
 #endif /* LDAP_PF_LOCAL */
diff -r 278a8ca26362 -r 27a0b65b8e00 external/bsd/openldap/dist/libraries/libldap/tls_o.c
--- a/external/bsd/openldap/dist/libraries/libldap/tls_o.c      Thu Aug 08 13:45:19 2019 +0000
+++ b/external/bsd/openldap/dist/libraries/libldap/tls_o.c      Thu Aug 08 13:50:56 2019 +0000
@@ -1,10 +1,10 @@
-/*     $NetBSD: tls_o.c,v 1.6 2018/02/06 01:57:23 christos Exp $       */
+/*     $NetBSD: tls_o.c,v 1.7 2019/08/08 13:50:57 christos Exp $       */
 
 /* tls_o.c - Handle tls/ssl using OpenSSL */
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2008-2017 The OpenLDAP Foundation.
+ * Copyright 2008-2019 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: tls_o.c,v 1.6 2018/02/06 01:57:23 christos Exp $");
+__RCSID("$NetBSD: tls_o.c,v 1.7 2019/08/08 13:50:57 christos Exp $");
 
 #include "portable.h"
 
@@ -48,6 +48,9 @@
 #include <openssl/err.h>
 #include <openssl/rand.h>
 #include <openssl/safestack.h>
+#include <openssl/bn.h>
+#include <openssl/rsa.h>
+#include <openssl/dh.h>
 #elif defined( HAVE_SSL_H )
 #include <ssl.h>
 #endif
@@ -59,6 +62,9 @@
 typedef SSL_CTX tlso_ctx;
 typedef SSL tlso_session;
 
+static BIO_METHOD * tlso_bio_method = NULL;
+static BIO_METHOD * tlso_bio_setup( void );
+
 static int  tlso_opt_trace = 1;
 
 static void tlso_report_error( void );
@@ -88,6 +94,13 @@
        }
 }
 
+#if OPENSSL_VERSION_NUMBER >= 0x0909000



Home | Main Index | Thread Index | Old Index