OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [email protected] Module: openpkg-src Date: 23-Dec-2008 23:48:51 Branch: HEAD Handle: 2008122322485000 Modified files: openpkg-src/subversion subversion.patch Log: provide a little bit better SASL related error messages Summary: Revision Changes Path 1.27 +41 -0 openpkg-src/subversion/subversion.patch ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/subversion/subversion.patch ============================================================================ $ cvs diff -u -r1.26 -r1.27 subversion.patch --- openpkg-src/subversion/subversion.patch 17 Dec 2008 10:52:52 -0000 1.26 +++ openpkg-src/subversion/subversion.patch 23 Dec 2008 22:48:50 -0000 1.27 @@ -121,3 +121,44 @@ ); } +Index: subversion/libsvn_ra_svn/cyrus_auth.c +--- subversion/libsvn_ra_svn/cyrus_auth.c.orig 2008-12-19 15:51:10 +0100 ++++ subversion/libsvn_ra_svn/cyrus_auth.c 2008-12-23 23:33:57 +0100 +@@ -165,10 +165,13 @@ + + static svn_error_t *sasl_init_cb(apr_pool_t *pool) + { +- if (svn_ra_svn__sasl_common_init(pool) != APR_SUCCESS +- || sasl_client_init(NULL) != SASL_OK) ++ int result; ++ if (svn_ra_svn__sasl_common_init(pool) != APR_SUCCESS) ++ return svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL, ++ _("Could not initialize the SASL library (APR failure)")); ++ if ((result = sasl_client_init(NULL)) != SASL_OK) + return svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL, +- _("Could not initialize the SASL library")); ++ sasl_errstring(result, NULL, NULL)); + return SVN_NO_ERROR; + } + +Index: subversion/svnserve/cyrus_auth.c +--- subversion/svnserve/cyrus_auth.c.orig 2008-03-07 05:09:46 +0100 ++++ subversion/svnserve/cyrus_auth.c 2008-12-23 23:34:54 +0100 +@@ -101,7 +101,7 @@ + status = svn_ra_svn__sasl_common_init(pool); + if (status) + return svn_error_wrap_apr(status, +- _("Could not initialize the SASL library")); ++ _("Could not initialize the SASL library (svnserve: APR failure)")); + + /* The second parameter tells SASL to look for a configuration file + named subversion.conf. */ +@@ -111,7 +111,7 @@ + svn_error_t *err = svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL, + sasl_errstring(result, NULL, NULL)); + return svn_error_quick_wrap(err, +- _("Could not initialize the SASL library")); ++ _("Could not initialize the SASL library (svnserve)")); + } + return SVN_NO_ERROR; + } @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List [email protected]
