Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/openldap merge conflicts
details: https://anonhg.NetBSD.org/src/rev/c9678c390819
branches: trunk
changeset: 351293:c9678c390819
user: christos <christos%NetBSD.org@localhost>
date: Thu Feb 09 01:53:50 2017 +0000
description:
merge conflicts
diffstat:
external/bsd/openldap/dist/build/mkversion | 6 +-
external/bsd/openldap/dist/clients/tools/common.c | 9 +-
external/bsd/openldap/dist/include/Makefile.in | 2 +-
external/bsd/openldap/dist/include/ldap_queue.h | 4 +-
external/bsd/openldap/dist/include/portable.hin | 2 +-
external/bsd/openldap/dist/libraries/libldap/os-ip.c | 7 +-
external/bsd/openldap/dist/libraries/libldap/os-local.c | 7 +-
external/bsd/openldap/dist/libraries/libldap/tls_o.c | 7 +-
external/bsd/openldap/dist/libraries/liblmdb/sample-bdb.c | 73 ---------------
external/bsd/openldap/dist/libraries/liblmdb/sample-mdb.c | 62 ------------
external/bsd/openldap/dist/libraries/liblutil/detach.c | 7 +-
external/bsd/openldap/dist/libraries/liblutil/md5.c | 7 +-
external/bsd/openldap/dist/libraries/liblutil/passwd.c | 39 ++++---
external/bsd/openldap/dist/libraries/librewrite/session.c | 11 +-
external/bsd/openldap/dist/servers/slapd/filter.c | 14 ++-
external/bsd/openldap/dist/servers/slapd/overlays/deref.c | 7 +-
external/bsd/openldap/openldap2netbsd | 28 +++-
17 files changed, 103 insertions(+), 189 deletions(-)
diffs (truncated from 664 to 300 lines):
diff -r fd51dc9f78dc -r c9678c390819 external/bsd/openldap/dist/build/mkversion
--- a/external/bsd/openldap/dist/build/mkversion Thu Feb 09 01:46:41 2017 +0000
+++ b/external/bsd/openldap/dist/build/mkversion Thu Feb 09 01:53:50 2017 +0000
@@ -3,7 +3,7 @@
# $OpenLDAP$
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
##
-## Copyright 1998-2014 The OpenLDAP Foundation.
+## Copyright 1998-2016 The OpenLDAP Foundation.
## All rights reserved.
##
## Redistribution and use in source and binary forms, with or without
@@ -54,7 +54,7 @@
cat << __EOF__
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2014 The OpenLDAP Foundation.
+ * Copyright 1998-2016 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -67,7 +67,7 @@
*/
static const char copyright[] =
-"Copyright 1998-2014 The OpenLDAP Foundation. All rights reserved.\n"
+"Copyright 1998-2016 The OpenLDAP Foundation. All rights reserved.\n"
"COPYING RESTRICTIONS APPLY\n";
$static $const char $SYMBOL[] =
diff -r fd51dc9f78dc -r c9678c390819 external/bsd/openldap/dist/clients/tools/common.c
--- a/external/bsd/openldap/dist/clients/tools/common.c Thu Feb 09 01:46:41 2017 +0000
+++ b/external/bsd/openldap/dist/clients/tools/common.c Thu Feb 09 01:53:50 2017 +0000
@@ -1,10 +1,10 @@
-/* $NetBSD: common.c,v 1.5 2016/11/02 13:15:53 joerg Exp $ */
+/* $NetBSD: common.c,v 1.6 2017/02/09 01:53:50 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-2014 The OpenLDAP Foundation.
+ * Copyright 1998-2016 The OpenLDAP Foundation.
* Portions Copyright 2003 Kurt D. Zeilenga.
* Portions Copyright 2003 IBM Corporation.
* All rights reserved.
@@ -24,6 +24,9 @@
* Kurt D. Zeilenga (additional common argument and control support)
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: common.c,v 1.6 2017/02/09 01:53:50 christos Exp $");
+
#include "portable.h"
#include <stdio.h>
@@ -68,7 +71,7 @@
int referrals = 0;
int verbose = 0;
int ldif = 0;
-ber_len_t ldif_wrap = LDIF_LINE_WIDTH;
+ber_len_t ldif_wrap = 0;
char *prog = NULL;
/* connection */
diff -r fd51dc9f78dc -r c9678c390819 external/bsd/openldap/dist/include/Makefile.in
--- a/external/bsd/openldap/dist/include/Makefile.in Thu Feb 09 01:46:41 2017 +0000
+++ b/external/bsd/openldap/dist/include/Makefile.in Thu Feb 09 01:53:50 2017 +0000
@@ -2,7 +2,7 @@
# $OpenLDAP$
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
##
-## Copyright 1998-2014 The OpenLDAP Foundation.
+## Copyright 1998-2016 The OpenLDAP Foundation.
## All rights reserved.
##
## Redistribution and use in source and binary forms, with or without
diff -r fd51dc9f78dc -r c9678c390819 external/bsd/openldap/dist/include/ldap_queue.h
--- a/external/bsd/openldap/dist/include/ldap_queue.h Thu Feb 09 01:46:41 2017 +0000
+++ b/external/bsd/openldap/dist/include/ldap_queue.h Thu Feb 09 01:53:50 2017 +0000
@@ -1,10 +1,10 @@
-/* $NetBSD: ldap_queue.h,v 1.3 2014/05/28 10:12:43 tron Exp $ */
+/* $NetBSD: ldap_queue.h,v 1.4 2017/02/09 01:53:50 christos Exp $ */
/* ldap_queue.h -- queue macros */
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2001-2014 The OpenLDAP Foundation.
+ * Copyright 2001-2016 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff -r fd51dc9f78dc -r c9678c390819 external/bsd/openldap/dist/include/portable.hin
--- a/external/bsd/openldap/dist/include/portable.hin Thu Feb 09 01:46:41 2017 +0000
+++ b/external/bsd/openldap/dist/include/portable.hin Thu Feb 09 01:53:50 2017 +0000
@@ -4,7 +4,7 @@
/* begin of portable.h.pre */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2014 The OpenLDAP Foundation
+ * Copyright 1998-2016 The OpenLDAP Foundation
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff -r fd51dc9f78dc -r c9678c390819 external/bsd/openldap/dist/libraries/libldap/os-ip.c
--- a/external/bsd/openldap/dist/libraries/libldap/os-ip.c Thu Feb 09 01:46:41 2017 +0000
+++ b/external/bsd/openldap/dist/libraries/libldap/os-ip.c Thu Feb 09 01:53:50 2017 +0000
@@ -1,10 +1,10 @@
-/* $NetBSD: os-ip.c,v 1.6 2014/05/28 10:12:43 tron Exp $ */
+/* $NetBSD: os-ip.c,v 1.7 2017/02/09 01:53:51 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-2014 The OpenLDAP Foundation.
+ * Copyright 1998-2016 The OpenLDAP Foundation.
* Portions Copyright 1999 Lars Uffmann.
* All rights reserved.
*
@@ -23,6 +23,9 @@
* Lars Uffman
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: os-ip.c,v 1.7 2017/02/09 01:53:51 christos Exp $");
+
#include "portable.h"
#include <stdio.h>
diff -r fd51dc9f78dc -r c9678c390819 external/bsd/openldap/dist/libraries/libldap/os-local.c
--- a/external/bsd/openldap/dist/libraries/libldap/os-local.c Thu Feb 09 01:46:41 2017 +0000
+++ b/external/bsd/openldap/dist/libraries/libldap/os-local.c Thu Feb 09 01:53:50 2017 +0000
@@ -1,10 +1,10 @@
-/* $NetBSD: os-local.c,v 1.7 2014/05/28 10:12:43 tron Exp $ */
+/* $NetBSD: os-local.c,v 1.8 2017/02/09 01:53:51 christos Exp $ */
/* os-local.c -- platform-specific domain socket code */
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2014 The OpenLDAP Foundation.
+ * Copyright 1998-2016 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -25,6 +25,9 @@
* is provided ``as is'' without express or implied warranty.
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: os-local.c,v 1.8 2017/02/09 01:53:51 christos Exp $");
+
#include "portable.h"
#ifdef LDAP_PF_LOCAL
diff -r fd51dc9f78dc -r c9678c390819 external/bsd/openldap/dist/libraries/libldap/tls_o.c
--- a/external/bsd/openldap/dist/libraries/libldap/tls_o.c Thu Feb 09 01:46:41 2017 +0000
+++ b/external/bsd/openldap/dist/libraries/libldap/tls_o.c Thu Feb 09 01:53:50 2017 +0000
@@ -1,10 +1,10 @@
-/* $NetBSD: tls_o.c,v 1.4 2014/05/28 10:12:43 tron Exp $ */
+/* $NetBSD: tls_o.c,v 1.5 2017/02/09 01:53:51 christos Exp $ */
/* tls_o.c - Handle tls/ssl using OpenSSL */
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2008-2014 The OpenLDAP Foundation.
+ * Copyright 2008-2016 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -18,6 +18,9 @@
/* ACKNOWLEDGEMENTS: Rewritten by Howard Chu
*/
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: tls_o.c,v 1.5 2017/02/09 01:53:51 christos Exp $");
+
#include "portable.h"
#ifdef HAVE_OPENSSL
diff -r fd51dc9f78dc -r c9678c390819 external/bsd/openldap/dist/libraries/liblmdb/sample-bdb.c
--- a/external/bsd/openldap/dist/libraries/liblmdb/sample-bdb.c Thu Feb 09 01:46:41 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/* $NetBSD: sample-bdb.c,v 1.1.1.1 2014/05/28 09:58:42 tron Exp $ */
-
-/* sample-bdb.c - BerkeleyDB toy/sample
- *
- * Do a line-by-line comparison of this and sample-mdb.c
- */
-/*
- * Copyright 2012 Howard Chu, Symas Corp.
- * 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 <stdio.h>
-#include <string.h>
-#include <db.h>
-
-int main(int argc,char * argv[])
-{
- int rc;
- DB_ENV *env;
- DB *dbi;
- DBT key, data;
- DB_TXN *txn;
- DBC *cursor;
- char sval[32], kval[32];
-
-#define FLAGS (DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_TXN|DB_INIT_MPOOL|DB_CREATE|DB_THREAD)
- rc = db_env_create(&env, 0);
- rc = env->open(env, "./testdb", FLAGS, 0664);
- rc = db_create(&dbi, env, 0);
- rc = env->txn_begin(env, NULL, &txn, 0);
- rc = dbi->open(dbi, txn, "test.bdb", NULL, DB_BTREE, DB_CREATE, 0664);
-
- memset(&key, 0, sizeof(DBT));
- memset(&data, 0, sizeof(DBT));
- key.size = sizeof(int);
- key.data = sval;
- data.size = sizeof(sval);
- data.data = sval;
-
- sprintf(sval, "%03x %d foo bar", 32, 3141592);
- rc = dbi->put(dbi, txn, &key, &data, 0);
- rc = txn->commit(txn, 0);
- if (rc) {
- fprintf(stderr, "txn->commit: (%d) %s\n", rc, db_strerror(rc));
- goto leave;
- }
- rc = env->txn_begin(env, NULL, &txn, 0);
- rc = dbi->cursor(dbi, txn, &cursor, 0);
- key.flags = DB_DBT_USERMEM;
- key.data = kval;
- key.ulen = sizeof(kval);
- data.flags = DB_DBT_USERMEM;
- data.data = sval;
- data.ulen = sizeof(sval);
- while ((rc = cursor->c_get(cursor, &key, &data, DB_NEXT)) == 0) {
- printf("key: %p %.*s, data: %p %.*s\n",
- key.data, (int) key.size, (char *) key.data,
- data.data, (int) data.size, (char *) data.data);
- }
- rc = cursor->c_close(cursor);
- rc = txn->abort(txn);
-leave:
- rc = dbi->close(dbi, 0);
- rc = env->close(env, 0);
- return rc;
-}
diff -r fd51dc9f78dc -r c9678c390819 external/bsd/openldap/dist/libraries/liblmdb/sample-mdb.c
--- a/external/bsd/openldap/dist/libraries/liblmdb/sample-mdb.c Thu Feb 09 01:46:41 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/* $NetBSD: sample-mdb.c,v 1.1.1.1 2014/05/28 09:58:42 tron Exp $ */
-
-/* sample-mdb.c - MDB toy/sample
- *
- * Do a line-by-line comparison of this and sample-bdb.c
- */
-/*
- * Copyright 2012 Howard Chu, Symas Corp.
- * 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 <stdio.h>
-#include "lmdb.h"
-
-int main(int argc,char * argv[])
-{
- int rc;
- MDB_env *env;
- MDB_dbi dbi;
- MDB_val key, data;
- MDB_txn *txn;
- MDB_cursor *cursor;
- char sval[32];
-
- rc = mdb_env_create(&env);
- rc = mdb_env_open(env, "./testdb", 0, 0664);
- rc = mdb_txn_begin(env, NULL, 0, &txn);
- rc = mdb_open(txn, NULL, 0, &dbi);
-
Home |
Main Index |
Thread Index |
Old Index