On Sat, Dec 13, 2003 at 03:42:04PM +0100, Tobias Ringström wrote:
> And here is the patch. It looks big, but it's mostly code that's been
> moved and reindented. The patch does not touch code outside the SSL
> client certificate functionality, so I think it's quite safe.
>
> Is this code desirable/acceptable for 1.0?
Looks good to me. We're going to need to make this API change sooner or
later. I'd say we should make it now. It'll be painful later, painless
now. +1
Because you added the realm parameter if this goes in the perl binding
patch that's pending above to add the support for the prompt function
needs a patch. Attached is what should be applied on top of it if this
goes in first or later if this goes in after.
Ignore the revs they're from my own repo. But the patch should apply
properly anyway.
[[[
Fix prompt functions to match API for the retry patch for
client certs.
* subversion/bindings/swig/swigutil_pl.c
* subversion/bindings/swig/swigutil_pl.h
(svn_swig_pl_thunk_ssl_client_cert_pw_prompt,
svn_swig_pl_thunk_ssl_client_cert_prompt):
Add realm parameter and pass it through to
the perl side.
]]]
Index: subversion/bindings/swig/swigutil_pl.c
===================================================================
--- subversion/bindings/swig/swigutil_pl.c (revision 106)
+++ subversion/bindings/swig/swigutil_pl.c (revision 107)
@@ -995,6 +995,7 @@
svn_error_t *svn_swig_pl_thunk_ssl_client_cert_prompt(
svn_auth_cred_ssl_client_cert_t **cred,
void *baton,
+ const char * realm,
apr_pool_t *pool)
{
SV *result;
@@ -1011,8 +1012,8 @@
perl_callback_thunk (CALL_CV,
baton, &result,
- "SS", *cred, credinfo,
- pool, poolinfo);
+ "SsS", *cred, credinfo,
+ realm, pool, poolinfo);
return SVN_NO_ERROR;
}
@@ -1020,6 +1021,7 @@
svn_error_t *svn_swig_pl_thunk_ssl_client_cert_pw_prompt(
svn_auth_cred_ssl_client_cert_pw_t **cred,
void *baton,
+ const char *realm,
apr_pool_t *pool)
{
SV *result;
@@ -1036,8 +1038,8 @@
perl_callback_thunk (CALL_CV,
baton, &result,
- "SS", *cred, credinfo,
- pool, poolinfo);
+ "SsS", *cred, credinfo,
+ realm, pool, poolinfo);
return SVN_NO_ERROR;
}
Index: subversion/bindings/swig/swigutil_pl.h
===================================================================
--- subversion/bindings/swig/swigutil_pl.h (revision 106)
+++ subversion/bindings/swig/swigutil_pl.h (revision 107)
@@ -155,12 +155,14 @@
svn_error_t *svn_swig_pl_thunk_ssl_client_cert_prompt (
svn_auth_cred_ssl_client_cert_t **cred,
void *baton,
+ const char *realm,
apr_pool_t *pool);
/* thunked ssl_client_cert_pw callback function */
svn_error_t *svn_swig_pl_thunk_ssl_client_cert_pw_prompt (
svn_auth_cred_ssl_client_cert_pw_t **cred,
void *baton,
+ const char *realm,
apr_pool_t *pool);
/* thunked callback for svn_ra_get_wc_prop_func_t */
--
Ben Reser <ben@reser.org>
http://ben.reser.org
"Conscience is the inner voice which warns us somebody may be looking."
- H.L. Mencken
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Dec 14 02:57:34 2003