From owner-p4-projects@FreeBSD.ORG Mon Feb 26 11:59:33 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E746016A406; Mon, 26 Feb 2007 11:59:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9236016A404 for ; Mon, 26 Feb 2007 11:59:32 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8328713C4A7 for ; Mon, 26 Feb 2007 11:59:32 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1QBxWrC040419 for ; Mon, 26 Feb 2007 11:59:32 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1QBxW1c040416 for perforce@freebsd.org; Mon, 26 Feb 2007 11:59:32 GMT (envelope-from bushman@freebsd.org) Date: Mon, 26 Feb 2007 11:59:32 GMT Message-Id: <200702261159.l1QBxW1c040416@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 115056 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Feb 2007 11:59:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=115056 Change 115056 by bushman@bushman_nss_ldap_cached on 2007/02/26 11:59:13 Minor fixes Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.c#19 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.h#16 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.c#17 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.h#14 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.c#22 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.h#16 edit .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/port/Makefile#2 edit .. //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/Makefile#5 edit .. //depot/projects/soc2006/nss_ldap_cached_openldap/update_branches.sh#2 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.c#19 (text+ko) ==== @@ -726,7 +726,6 @@ conf->port = LDAP_PORT; conf->proto_version = NSS_LDAP_PROTO_VERSION_3; conf->ssl_mode = NSS_LDAP_SSL_OFF; - conf->search_limit = 0; conf->bind_timelimit = 30; conf->idle_timelimit = 0; conf->search_timelimit = 0; ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.h#16 (text+ko) ==== @@ -85,7 +85,6 @@ char *bind_dn; char *bind_pw; char *logdir; - size_t search_limit; time_t bind_timelimit; time_t idle_timelimit; time_t search_timelimit; ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.c#17 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.h#14 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.c#22 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.h#16 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/port/Makefile#2 (text+ko) ==== @@ -1,7 +1,7 @@ # nss_ldap port stub PORTNAME= nss_ldap_bsd -PORTVERSION= 0.22 +PORTVERSION= 0.24 CATEGORIES= net MASTER_SITES= http://rsu.ru/~bushman/nss_ldap/ \ ${MASTER_SITE_LOCAL} ==== //depot/projects/soc2006/nss_ldap_cached_openldap/nss_ldap_port/src/Makefile#5 (text+ko) ==== @@ -13,12 +13,9 @@ CFLAGS+= -DLDAP_DEPRECATED LDADD+= -lldap -.if ${MK_INET6_SUPPORT} != "no" CFLAGS+=-DINET6 -I${PREFIX}/include\ -DNSS_LDAP_CONF_PATH=\"${PREFIX}/etc/nss_ldap.conf\" LDFLAGS+= -L${PREFIX}/lib -.endif - CFLAGS+= -DNSS_LDAP_START_TLS_ENABLED -DNSS_LDAP_SSL_ENABLED USE_OPENSSL= yes ==== //depot/projects/soc2006/nss_ldap_cached_openldap/update_branches.sh#2 (text+ko) ==== @@ -82,6 +82,6 @@ done if [ $resolve_error -eq 1 ]; then - echo " + echo "Resolve errors occured" exit 1 fi