Module Name: src Committed By: adam Date: Sun Dec 12 15:46:33 UTC 2010
Modified Files: src/external/bsd/openldap/dist/build: mkversion src/external/bsd/openldap/dist/clients/tools: common.c src/external/bsd/openldap/dist/include: Makefile.in portable.hin src/external/bsd/openldap/dist/libraries/libldap: os-ip.c os-local.c tls_o.c src/external/bsd/openldap/dist/libraries/liblutil: passwd.c Removed Files: src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd: AUTHORS COPYING ChangeLog HACKING INSTALL Makefile.am Makefile.in NEWS README TODO aclocal.m4 compile config.guess config.h.in config.sub configure configure.ac depcomp install-sh missing mkinstalldirs nslcd-common.h nslcd.h nss-ldapd.conf src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/common: Makefile.am Makefile.in dict.c dict.h set.c set.h tio.c tio.h src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/compat: Makefile.am Makefile.in attrs.h daemon.c daemon.h ether.c ether.h getopt_long.c getopt_long.h getpeercred.c getpeercred.h pagectrl.c pagectrl.h src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/m4: acx_pthread.m4 src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/man: Makefile.am Makefile.in nslcd.8 nslcd.8.xml nss-ldapd.conf.5 nss-ldapd.conf.5.xml src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nslcd: Makefile.am Makefile.in alias.c attmap.c attmap.h cfg.c cfg.h common.c common.h ether.c group.c host.c log.c log.h myldap.c myldap.h netgroup.c network.c nslcd.c passwd.c protocol.c rpc.c service.c shadow.c src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nss: Makefile.am Makefile.in aliases.c common.c common.h ethers.c exports.linux group.c hosts.c netgroup.c networks.c pam.c passwd.c protocols.c prototypes.h rpc.c services.c shadow.c src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/tests: Makefile.am Makefile.in nss-ldapd-test.conf test_aliases.c test_cfg.c test_dict.c test_ethers.c test_group.c test_hosts.c test_myldap.c test_myldap.sh test_netgroup.c test_networks.c test_nslcd_group.c test_nsscmds.sh test_passwd.c test_protocols.c test_rpc.c test_services.c test_set.c test_shadow.c test_tio.c usernames.txt src/external/bsd/openldap/dist/doc/drafts: draft-zeilenga-ldap-txn-xx.txt src/external/bsd/openldap/dist/libraries/liblutil: csn.c src/external/bsd/openldap/dist/tests/scripts: acfilter.sh Log Message: Merge 2.4.23 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/dist/build/mkversion cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/openldap/dist/clients/tools/common.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/AUTHORS \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/COPYING \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/ChangeLog \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/HACKING \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/INSTALL \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/Makefile.am \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/Makefile.in \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/NEWS \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/README \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/TODO \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/aclocal.m4 \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/compile \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/config.guess \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/config.h.in \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/config.sub \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/configure \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/configure.ac \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/depcomp \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/install-sh \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/missing \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/mkinstalldirs \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nss-ldapd.conf cvs rdiff -u -r1.1.1.2 -r0 \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nslcd-common.h \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nslcd.h cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/common/Makefile.am \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/common/Makefile.in cvs rdiff -u -r1.1.1.2 -r0 \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/common/dict.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/common/dict.h \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/common/set.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/common/set.h \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/common/tio.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/common/tio.h cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/compat/Makefile.am \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/compat/Makefile.in cvs rdiff -u -r1.1.1.2 -r0 \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/compat/attrs.h \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/compat/daemon.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/compat/daemon.h \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/compat/ether.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/compat/ether.h \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/compat/getopt_long.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/compat/getopt_long.h \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/compat/getpeercred.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/compat/getpeercred.h \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/compat/pagectrl.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/compat/pagectrl.h cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/m4/acx_pthread.m4 cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/man/Makefile.am \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/man/Makefile.in \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/man/nslcd.8 \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/man/nslcd.8.xml \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/man/nss-ldapd.conf.5 \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/man/nss-ldapd.conf.5.xml cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nslcd/Makefile.am \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nslcd/Makefile.in cvs rdiff -u -r1.1.1.2 -r0 \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nslcd/alias.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nslcd/attmap.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nslcd/attmap.h \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nslcd/cfg.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nslcd/cfg.h \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nslcd/common.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nslcd/common.h \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nslcd/ether.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nslcd/group.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nslcd/host.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nslcd/log.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nslcd/log.h \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nslcd/myldap.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nslcd/myldap.h \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nslcd/netgroup.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nslcd/network.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nslcd/nslcd.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nslcd/passwd.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nslcd/protocol.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nslcd/rpc.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nslcd/service.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nslcd/shadow.c cvs rdiff -u -r1.1.1.2 -r0 \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nss/Makefile.am \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nss/Makefile.in \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nss/aliases.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nss/common.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nss/common.h \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nss/ethers.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nss/exports.linux \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nss/group.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nss/hosts.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nss/netgroup.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nss/networks.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nss/passwd.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nss/protocols.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nss/prototypes.h \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nss/rpc.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nss/services.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nss/shadow.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nss/pam.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/tests/Makefile.am \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/tests/Makefile.in \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/tests/nss-ldapd-test.conf \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/tests/test_myldap.sh \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/tests/test_nsscmds.sh \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/tests/usernames.txt cvs rdiff -u -r1.1.1.2 -r0 \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/tests/test_aliases.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/tests/test_cfg.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/tests/test_dict.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/tests/test_ethers.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/tests/test_group.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/tests/test_hosts.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/tests/test_myldap.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/tests/test_netgroup.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/tests/test_networks.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/tests/test_nslcd_group.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/tests/test_passwd.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/tests/test_protocols.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/tests/test_rpc.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/tests/test_services.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/tests/test_set.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/tests/test_shadow.c \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/tests/test_tio.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/openldap/dist/doc/drafts/draft-zeilenga-ldap-txn-xx.txt cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/dist/include/Makefile.in cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openldap/dist/include/portable.hin cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/openldap/dist/libraries/libldap/os-ip.c cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/openldap/dist/libraries/libldap/os-local.c cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/openldap/dist/libraries/libldap/tls_o.c cvs rdiff -u -r1.1.1.2 -r0 \ src/external/bsd/openldap/dist/libraries/liblutil/csn.c cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/openldap/dist/libraries/liblutil/passwd.c cvs rdiff -u -r1.1.1.2 -r0 \ src/external/bsd/openldap/dist/tests/scripts/acfilter.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/bsd/openldap/dist/build/mkversion diff -u src/external/bsd/openldap/dist/build/mkversion:1.3 src/external/bsd/openldap/dist/build/mkversion:1.4 --- src/external/bsd/openldap/dist/build/mkversion:1.3 Mon Mar 8 03:47:40 2010 +++ src/external/bsd/openldap/dist/build/mkversion Sun Dec 12 15:46:27 2010 @@ -1,9 +1,9 @@ #! /bin/sh # Create a version.c file -# OpenLDAP: pkg/ldap/build/mkversion,v 1.14.2.4 2009/01/22 00:00:41 kurt Exp +# OpenLDAP: pkg/ldap/build/mkversion,v 1.14.2.5 2010/04/13 20:22:21 kurt Exp ## This work is part of OpenLDAP Software <http://www.openldap.org/>. ## -## Copyright 1998-2009 The OpenLDAP Foundation. +## Copyright 1998-2010 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-2009 The OpenLDAP Foundation. + * Copyright 1998-2010 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-2009 The OpenLDAP Foundation. All rights reserved.\n" +"Copyright 1998-2010 The OpenLDAP Foundation. All rights reserved.\n" "COPYING RESTRICTIONS APPLY\n"; $static $const char $SYMBOL[] = Index: src/external/bsd/openldap/dist/clients/tools/common.c diff -u src/external/bsd/openldap/dist/clients/tools/common.c:1.2 src/external/bsd/openldap/dist/clients/tools/common.c:1.3 --- src/external/bsd/openldap/dist/clients/tools/common.c:1.2 Sun Jul 11 00:47:36 2010 +++ src/external/bsd/openldap/dist/clients/tools/common.c Sun Dec 12 15:46:28 2010 @@ -1,10 +1,10 @@ -/* $NetBSD: common.c,v 1.2 2010/07/11 00:47:36 mrg Exp $ */ +/* $NetBSD: common.c,v 1.3 2010/12/12 15:46:28 adam Exp $ */ /* common.c - common routines for the ldap client tools */ -/* OpenLDAP: pkg/ldap/clients/tools/common.c,v 1.78.2.29 2009/09/29 21:47:37 quanah Exp */ +/* OpenLDAP: pkg/ldap/clients/tools/common.c,v 1.78.2.31 2010/04/15 22:16:49 quanah Exp */ /* This work is part of OpenLDAP Software <http://www.openldap.org/>. * - * Copyright 1998-2009 The OpenLDAP Foundation. + * Copyright 1998-2010 The OpenLDAP Foundation. * Portions Copyright 2003 Kurt D. Zeilenga. * Portions Copyright 2003 IBM Corporation. * All rights reserved. @@ -262,11 +262,13 @@ ber_memfree( binddn ); } -#if 0 /* not yet */ if ( passwd.bv_val != NULL ) { ber_memfree( passwd.bv_val ); } -#endif + + if ( infile != NULL ) { + ber_memfree( infile ); + } } void @@ -1361,6 +1363,23 @@ assert( nsctrls < (int) (sizeof(sctrls)/sizeof(sctrls[0])) ); + if ( pw_file || want_bindpw ) { + assert( passwd.bv_val == NULL && passwd.bv_len == 0 ); + + if ( pw_file ) { + if ( lutil_get_filed_password( pw_file, &passwd ) ) { + exit( EXIT_FAILURE ); + } + + } else { + char *pw = getpassphrase( _("Enter LDAP Password: ") ); + if ( pw ) { + passwd.bv_val = ber_strdup( pw ); + passwd.bv_len = strlen( passwd.bv_val ); + } + } + } + if ( authmethod == LDAP_AUTH_SASL ) { #ifdef HAVE_CYRUS_SASL void *defaults; Index: src/external/bsd/openldap/dist/include/Makefile.in diff -u src/external/bsd/openldap/dist/include/Makefile.in:1.3 src/external/bsd/openldap/dist/include/Makefile.in:1.4 --- src/external/bsd/openldap/dist/include/Makefile.in:1.3 Mon Mar 8 03:47:40 2010 +++ src/external/bsd/openldap/dist/include/Makefile.in Sun Dec 12 15:46:32 2010 @@ -1,8 +1,8 @@ # include Makefile.in for OpenLDAP -# OpenLDAP: pkg/ldap/include/Makefile.in,v 1.33.2.4 2009/01/22 00:00:51 kurt Exp +# OpenLDAP: pkg/ldap/include/Makefile.in,v 1.33.2.5 2010/04/13 20:22:47 kurt Exp ## This work is part of OpenLDAP Software <http://www.openldap.org/>. ## -## Copyright 1998-2009 The OpenLDAP Foundation. +## Copyright 1998-2010 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without Index: src/external/bsd/openldap/dist/include/portable.hin diff -u src/external/bsd/openldap/dist/include/portable.hin:1.2 src/external/bsd/openldap/dist/include/portable.hin:1.3 --- src/external/bsd/openldap/dist/include/portable.hin:1.2 Mon Mar 8 05:07:16 2010 +++ src/external/bsd/openldap/dist/include/portable.hin Sun Dec 12 15:46:32 2010 @@ -4,7 +4,7 @@ /* begin of portable.h.pre */ /* This work is part of OpenLDAP Software <http://www.openldap.org/>. * - * Copyright 1998-2009 The OpenLDAP Foundation + * Copyright 1998-2010 The OpenLDAP Foundation * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -48,9 +48,6 @@ /* end of portable.h.pre */ -/* Define if building universal (internal helper macro) */ -#undef AC_APPLE_UNIVERSAL_BUILD - /* define to use both <string.h> and <strings.h> */ #undef BOTH_STRINGS_H @@ -243,6 +240,9 @@ /* Define to 1 if you have the <gmp.h> header file. */ #undef HAVE_GMP_H +/* Define to 1 if you have the `gmtime_r' function. */ +#undef HAVE_GMTIME_R + /* define if you have GNUtls */ #undef HAVE_GNUTLS @@ -321,6 +321,9 @@ /* Define to 1 if you have the <locale.h> header file. */ #undef HAVE_LOCALE_H +/* Define to 1 if you have the `localtime_r' function. */ +#undef HAVE_LOCALTIME_R + /* Define to 1 if you have the `lockf' function. */ #undef HAVE_LOCKF @@ -366,9 +369,6 @@ /* define this if you have mkversion */ #undef HAVE_MKVERSION -/* define if you have MozNSS */ -#undef HAVE_MOZNSS - /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ #undef HAVE_NDIR_H @@ -378,9 +378,6 @@ /* define if strerror_r returns char* instead of int */ #undef HAVE_NONPOSIX_STRERROR_R -/* Define to 1 if you have the <nssutil.h> header file. */ -#undef HAVE_NSSUTIL_H - /* if you have NT Event Log */ #undef HAVE_NT_EVENT_LOG @@ -1078,17 +1075,9 @@ /* define to use 'long long' for MP */ #undef USE_MP_LONG_LONG -/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most - significant byte first (like Motorola and SPARC, unlike Intel). */ -#if defined AC_APPLE_UNIVERSAL_BUILD -# if defined __BIG_ENDIAN__ -# define WORDS_BIGENDIAN 1 -# endif -#else -# ifndef WORDS_BIGENDIAN -# undef WORDS_BIGENDIAN -# endif -#endif +/* Define to 1 if your processor stores words with the most significant byte + first (like Motorola and SPARC, unlike Intel and VAX). */ +#undef WORDS_BIGENDIAN /* Define to the type of arg 3 for `accept'. */ #undef ber_socklen_t Index: src/external/bsd/openldap/dist/libraries/libldap/os-ip.c diff -u src/external/bsd/openldap/dist/libraries/libldap/os-ip.c:1.3 src/external/bsd/openldap/dist/libraries/libldap/os-ip.c:1.4 --- src/external/bsd/openldap/dist/libraries/libldap/os-ip.c:1.3 Mon Mar 8 03:47:40 2010 +++ src/external/bsd/openldap/dist/libraries/libldap/os-ip.c Sun Dec 12 15:46:33 2010 @@ -1,10 +1,10 @@ -/* $NetBSD: os-ip.c,v 1.3 2010/03/08 03:47:40 lukem Exp $ */ +/* $NetBSD: os-ip.c,v 1.4 2010/12/12 15:46:33 adam Exp $ */ /* os-ip.c -- platform-specific TCP & UDP related code */ -/* OpenLDAP: pkg/ldap/libraries/libldap/os-ip.c,v 1.118.2.19 2009/08/14 20:31:32 quanah Exp */ +/* OpenLDAP: pkg/ldap/libraries/libldap/os-ip.c,v 1.118.2.20 2010/04/13 20:22:58 kurt Exp */ /* This work is part of OpenLDAP Software <http://www.openldap.org/>. * - * Copyright 1998-2009 The OpenLDAP Foundation. + * Copyright 1998-2010 The OpenLDAP Foundation. * Portions Copyright 1999 Lars Uffmann. * All rights reserved. * Index: src/external/bsd/openldap/dist/libraries/libldap/os-local.c diff -u src/external/bsd/openldap/dist/libraries/libldap/os-local.c:1.4 src/external/bsd/openldap/dist/libraries/libldap/os-local.c:1.5 --- src/external/bsd/openldap/dist/libraries/libldap/os-local.c:1.4 Mon Mar 8 03:47:40 2010 +++ src/external/bsd/openldap/dist/libraries/libldap/os-local.c Sun Dec 12 15:46:33 2010 @@ -1,10 +1,10 @@ -/* $NetBSD: os-local.c,v 1.4 2010/03/08 03:47:40 lukem Exp $ */ +/* $NetBSD: os-local.c,v 1.5 2010/12/12 15:46:33 adam Exp $ */ /* os-local.c -- platform-specific domain socket code */ -/* OpenLDAP: pkg/ldap/libraries/libldap/os-local.c,v 1.44.2.9 2009/08/12 23:48:32 quanah Exp */ +/* OpenLDAP: pkg/ldap/libraries/libldap/os-local.c,v 1.44.2.10 2010/04/13 20:22:59 kurt Exp */ /* This work is part of OpenLDAP Software <http://www.openldap.org/>. * - * Copyright 1998-2009 The OpenLDAP Foundation. + * Copyright 1998-2010 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without Index: src/external/bsd/openldap/dist/libraries/libldap/tls_o.c diff -u src/external/bsd/openldap/dist/libraries/libldap/tls_o.c:1.2 src/external/bsd/openldap/dist/libraries/libldap/tls_o.c:1.3 --- src/external/bsd/openldap/dist/libraries/libldap/tls_o.c:1.2 Mon Mar 8 05:00:51 2010 +++ src/external/bsd/openldap/dist/libraries/libldap/tls_o.c Sun Dec 12 15:46:33 2010 @@ -1,10 +1,10 @@ -/* $NetBSD: tls_o.c,v 1.2 2010/03/08 05:00:51 lukem Exp $ */ +/* $NetBSD: tls_o.c,v 1.3 2010/12/12 15:46:33 adam Exp $ */ /* tls_o.c - Handle tls/ssl using OpenSSL */ -/* OpenLDAP: pkg/ldap/libraries/libldap/tls_o.c,v 1.5.2.10 2009/10/30 17:55:19 quanah Exp */ +/* OpenLDAP: pkg/ldap/libraries/libldap/tls_o.c,v 1.5.2.12 2010/04/15 21:25:28 quanah Exp */ /* This work is part of OpenLDAP Software <http://www.openldap.org/>. * - * Copyright 2008-2009 The OpenLDAP Foundation. + * Copyright 2008-2010 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -1081,7 +1081,7 @@ RSA *tmp_rsa; /* FIXME: Pregenerate the key on startup */ /* FIXME: Who frees the key? */ -#if OPENSSL_VERSION_NUMBER > 0x00908000 +#if OPENSSL_VERSION_NUMBER >= 0x00908000 BIGNUM *bn = BN_new(); tmp_rsa = NULL; if ( bn ) { Index: src/external/bsd/openldap/dist/libraries/liblutil/passwd.c diff -u src/external/bsd/openldap/dist/libraries/liblutil/passwd.c:1.2 src/external/bsd/openldap/dist/libraries/liblutil/passwd.c:1.3 --- src/external/bsd/openldap/dist/libraries/liblutil/passwd.c:1.2 Mon Mar 8 04:58:18 2010 +++ src/external/bsd/openldap/dist/libraries/liblutil/passwd.c Sun Dec 12 15:46:33 2010 @@ -1,9 +1,9 @@ -/* $NetBSD: passwd.c,v 1.2 2010/03/08 04:58:18 lukem Exp $ */ +/* $NetBSD: passwd.c,v 1.3 2010/12/12 15:46:33 adam Exp $ */ -/* OpenLDAP: pkg/ldap/libraries/liblutil/passwd.c,v 1.104.2.9 2009/08/30 22:55:47 quanah Exp */ +/* OpenLDAP: pkg/ldap/libraries/liblutil/passwd.c,v 1.104.2.10 2010/04/13 20:23:06 kurt Exp */ /* This work is part of OpenLDAP Software <http://www.openldap.org/>. * - * Copyright 1998-2009 The OpenLDAP Foundation. + * Copyright 1998-2010 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without