You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2002/12/11 07:11:11 UTC
cvs commit: httpd-2.0/modules/experimental mod_auth_ldap.c
wrowe 2002/12/10 22:11:11
Modified: modules/experimental mod_auth_ldap.c
Log:
The only code change required for Win32 ldap to build... these are
all abstracted in apr_ldap_uri.h ... which is grabbed by apr_ldap.h.
Revision Changes Path
1.9 +3 -3 httpd-2.0/modules/experimental/mod_auth_ldap.c
Index: mod_auth_ldap.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_auth_ldap.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mod_auth_ldap.c 27 Sep 2002 08:49:48 -0000 1.8
+++ mod_auth_ldap.c 11 Dec 2002 06:11:11 -0000 1.9
@@ -642,7 +642,7 @@
const char *url)
{
int result;
- LDAPURLDesc *urld;
+ apr_ldap_url_desc_t *urld;
mod_auth_ldap_config_t *sec = config;
@@ -650,7 +650,7 @@
cmd->server, "[%d] auth_ldap url parse: `%s'",
getpid(), url);
- result = ldap_url_parse(url, &(urld));
+ result = apr_ldap_url_parse(url, &(urld));
if (result != LDAP_SUCCESS) {
switch (result) {
case LDAP_URL_ERR_NOTLDAP:
@@ -755,7 +755,7 @@
}
sec->have_ldap_url = 1;
- ldap_free_urldesc(urld);
+ apr_ldap_free_urldesc(urld);
return NULL;
}
Re: cvs commit: httpd-2.0/modules/experimental mod_auth_ldap.c
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
Presuming my apr-util/ldap changes took hold, and don't prove too
disruptive, I'll backport this to 2.0 once folks have a few days for
bugs to settle out.
As the module is experimental, I'd like to get the 'experiment' going
by distributing util_ldap/auth_ldap with future 2.0 releases.
Bill
At 12:11 AM 12/11/2002, wrowe@apache.org wrote:
>wrowe 2002/12/10 22:11:11
>
> Modified: modules/experimental mod_auth_ldap.c
> Log:
> The only code change required for Win32 ldap to build... these are
> all abstracted in apr_ldap_uri.h ... which is grabbed by apr_ldap.h.
>
> Revision Changes Path
> 1.9 +3 -3 httpd-2.0/modules/experimental/mod_auth_ldap.c
>
> Index: mod_auth_ldap.c
> ===================================================================
> RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_auth_ldap.c,v
> retrieving revision 1.8
> retrieving revision 1.9
> diff -u -r1.8 -r1.9
> --- mod_auth_ldap.c 27 Sep 2002 08:49:48 -0000 1.8
> +++ mod_auth_ldap.c 11 Dec 2002 06:11:11 -0000 1.9
> @@ -642,7 +642,7 @@
> const char *url)
> {
> int result;
> - LDAPURLDesc *urld;
> + apr_ldap_url_desc_t *urld;
>
> mod_auth_ldap_config_t *sec = config;
>
> @@ -650,7 +650,7 @@
> cmd->server, "[%d] auth_ldap url parse: `%s'",
> getpid(), url);
>
> - result = ldap_url_parse(url, &(urld));
> + result = apr_ldap_url_parse(url, &(urld));
> if (result != LDAP_SUCCESS) {
> switch (result) {
> case LDAP_URL_ERR_NOTLDAP:
> @@ -755,7 +755,7 @@
> }
>
> sec->have_ldap_url = 1;
> - ldap_free_urldesc(urld);
> + apr_ldap_free_urldesc(urld);
> return NULL;
> }
>
>
>
>
Re: cvs commit: httpd-2.0/modules/experimental mod_auth_ldap.c
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
Presuming my apr-util/ldap changes took hold, and don't prove too
disruptive, I'll backport this to 2.0 once folks have a few days for
bugs to settle out.
As the module is experimental, I'd like to get the 'experiment' going
by distributing util_ldap/auth_ldap with future 2.0 releases.
Bill
At 12:11 AM 12/11/2002, wrowe@apache.org wrote:
>wrowe 2002/12/10 22:11:11
>
> Modified: modules/experimental mod_auth_ldap.c
> Log:
> The only code change required for Win32 ldap to build... these are
> all abstracted in apr_ldap_uri.h ... which is grabbed by apr_ldap.h.
>
> Revision Changes Path
> 1.9 +3 -3 httpd-2.0/modules/experimental/mod_auth_ldap.c
>
> Index: mod_auth_ldap.c
> ===================================================================
> RCS file: /home/cvs/httpd-2.0/modules/experimental/mod_auth_ldap.c,v
> retrieving revision 1.8
> retrieving revision 1.9
> diff -u -r1.8 -r1.9
> --- mod_auth_ldap.c 27 Sep 2002 08:49:48 -0000 1.8
> +++ mod_auth_ldap.c 11 Dec 2002 06:11:11 -0000 1.9
> @@ -642,7 +642,7 @@
> const char *url)
> {
> int result;
> - LDAPURLDesc *urld;
> + apr_ldap_url_desc_t *urld;
>
> mod_auth_ldap_config_t *sec = config;
>
> @@ -650,7 +650,7 @@
> cmd->server, "[%d] auth_ldap url parse: `%s'",
> getpid(), url);
>
> - result = ldap_url_parse(url, &(urld));
> + result = apr_ldap_url_parse(url, &(urld));
> if (result != LDAP_SUCCESS) {
> switch (result) {
> case LDAP_URL_ERR_NOTLDAP:
> @@ -755,7 +755,7 @@
> }
>
> sec->have_ldap_url = 1;
> - ldap_free_urldesc(urld);
> + apr_ldap_free_urldesc(urld);
> return NULL;
> }
>
>
>
>