[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH]: tentative fix for libsvn_ra_dav request_auth-bug (issue 1005)

From: Marcus Comstedt <marcus_at_mc.pp.se>
Date: 2002-11-22 17:58:04 CET

Hello.

Here is a patch that fixes the bug I just filed an issue for (1005).
It would be _really_ nice if you were able to attach stuff to the
issues you have created yourself...

  // Marcus

Log message:

---------------

* subversion/libsvn_ra_dav/session.c
  (request_auth): Respect the documented methods the callbacks have of
  telling us it doesn't want to provide a username and password.

---------------

Index: subversion/libsvn_ra_dav/session.c
===================================================================
--- subversion/libsvn_ra_dav/session.c (revision 3840)
+++ subversion/libsvn_ra_dav/session.c (working copy)
@@ -68,15 +68,23 @@
      get_authenticator, get_username, get_password... */
 
   /* pull the username and password from the client */
- ras->callbacks->get_authenticator (&a, &auth_baton,
- svn_ra_auth_simple_password,
- ras->callback_baton, ras->pool);
+ if (ras->callbacks->get_authenticator (&a, &auth_baton,
+ svn_ra_auth_simple_password,
+ ras->callback_baton, ras->pool))
+ return -1;
+
   authenticator = (svn_ra_simple_password_authenticator_t *) a;
- authenticator->get_user_and_pass (&uname, &pword,
- auth_baton,
- /* possibly force a user-prompt: */
- attempt ? TRUE : FALSE,
- ras->pool);
+
+ /* if the authenticator doesn't want to tell us, abort */
+ if (authenticator->get_user_and_pass == NULL)
+ return -1;
+
+ if (authenticator->get_user_and_pass (&uname, &pword,
+ auth_baton,
+ /* possibly force a user-prompt: */
+ attempt ? TRUE : FALSE,
+ ras->pool))
+ return -1;
 
   /* ### silently truncates username/password to 256 chars. */
   apr_cpystrn(username, uname, NE_ABUFSIZ);

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Nov 22 17:59:36 2002

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.