From owner-svn-ports-head@freebsd.org Sat Jan 13 05:57:27 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 72208E762C3; Sat, 13 Jan 2018 05:57:27 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BE6475845; Sat, 13 Jan 2018 05:57:27 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 93D396E5F; Sat, 13 Jan 2018 05:57:26 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0D5vQ3M063041; Sat, 13 Jan 2018 05:57:26 GMT (envelope-from ume@FreeBSD.org) Received: (from ume@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0D5vQw1063039; Sat, 13 Jan 2018 05:57:26 GMT (envelope-from ume@FreeBSD.org) Message-Id: <201801130557.w0D5vQw1063039@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ume set sender to ume@FreeBSD.org using -f From: Hajimu UMEMOTO Date: Sat, 13 Jan 2018 05:57:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458890 - in head/security/cyrus-sasl2: . files X-SVN-Group: ports-head X-SVN-Commit-Author: ume X-SVN-Commit-Paths: in head/security/cyrus-sasl2: . files X-SVN-Commit-Revision: 458890 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Jan 2018 05:57:27 -0000 Author: ume Date: Sat Jan 13 05:57:26 2018 New Revision: 458890 URL: https://svnweb.freebsd.org/changeset/ports/458890 Log: Make local DB-errors more descriptive. This patch will be included into comming 2.1.27. PR: 198323 Submitted by: Mikhail Teterin Added: head/security/cyrus-sasl2/files/patch-sasldb_db__ndbm.c (contents, props changed) Modified: head/security/cyrus-sasl2/Makefile Modified: head/security/cyrus-sasl2/Makefile ============================================================================== --- head/security/cyrus-sasl2/Makefile Sat Jan 13 03:55:00 2018 (r458889) +++ head/security/cyrus-sasl2/Makefile Sat Jan 13 05:57:26 2018 (r458890) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 12 +PORTREVISION= 13 COMMENT= RFC 2222 SASL (Simple Authentication and Security Layer) Added: head/security/cyrus-sasl2/files/patch-sasldb_db__ndbm.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/cyrus-sasl2/files/patch-sasldb_db__ndbm.c Sat Jan 13 05:57:26 2018 (r458890) @@ -0,0 +1,43 @@ +--- sasldb/db_ndbm.c.orig 2012-01-27 23:31:36 UTC ++++ sasldb/db_ndbm.c +@@ -44,6 +44,7 @@ + */ + + #include ++#include + #include + #include + #include +@@ -101,7 +102,8 @@ int _sasldb_getdata(const sasl_utils_t * + } + db = dbm_open(path, O_RDONLY, S_IRUSR | S_IWUSR); + if (! db) { +- utils->seterror(cntxt, 0, "Could not open db"); ++ utils->seterror(cntxt, 0, "Could not open db `%s': %s", ++ path, strerror(errno)); + result = SASL_FAIL; + goto cleanup; + } +@@ -182,10 +184,11 @@ int _sasldb_putdata(const sasl_utils_t * + O_RDWR | O_CREAT, + S_IRUSR | S_IWUSR); + if (! db) { ++ utils->seterror(conn, 0, "Could not open db `%s' for writing: %s", ++ path, strerror(errno)); + utils->log(conn, SASL_LOG_ERR, + "SASL error opening password file. " + "Do you have write permissions?\n"); +- utils->seterror(conn, 0, "Could not open db for write"); + goto cleanup; + } + dkey.dptr = key; +@@ -322,7 +325,8 @@ sasldb_handle _sasldb_getkeyhandle(const + db = dbm_open(path, O_RDONLY, S_IRUSR | S_IWUSR); + + if(!db) { +- utils->seterror(conn, 0, "Could not open db"); ++ utils->seterror(conn, 0, "Could not open db `%s': %s", ++ path, strerror(errno)); + return NULL; + } +