|
From: <tre...@us...> - 2006-05-01 18:40:47
|
Revision: 4 Author: trekkie_lugfl Date: 2006-05-01 11:40:38 -0700 (Mon, 01 May 2006) ViewCVS: http://svn.sourceforge.net/yawcs/?rev=4&view=rev Log Message: ----------- more renamings from mod_vhost_ldap to mod_vhost_ldap_ng.. now apache can load the module.. Modified Paths: -------------- mod_vhost_ldap_ng/trunk/mod_vhost_ldap_ng.c Modified: mod_vhost_ldap_ng/trunk/mod_vhost_ldap_ng.c =================================================================== --- mod_vhost_ldap_ng/trunk/mod_vhost_ldap_ng.c 2006-05-01 18:31:39 UTC (rev 3) +++ mod_vhost_ldap_ng/trunk/mod_vhost_ldap_ng.c 2006-05-01 18:40:38 UTC (rev 4) @@ -58,7 +58,7 @@ #define MIN_UID 100 #define MIN_GID 100 -module AP_MODULE_DECLARE_DATA vhost_ldap_module; +module AP_MODULE_DECLARE_DATA vhost_ldap_ng_module; typedef enum { MVL_UNSET, MVL_DISABLED, MVL_ENABLED @@ -316,7 +316,7 @@ mod_vhost_ldap_ng_config_t *conf = (mod_vhost_ldap_ng_config_t *)ap_get_module_config(cmd->server->module_config, - &vhost_ldap_module); + &vhost_ldap_ng_module); ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, cmd->server, "[mod_vhost_ldap_ng.c] url parse: `%s'", @@ -414,7 +414,7 @@ { mod_vhost_ldap_ng_config_t *conf = (mod_vhost_ldap_ng_config_t *)ap_get_module_config(cmd->server->module_config, - &vhost_ldap_module); + &vhost_ldap_ng_module); conf->enabled = (enabled) ? MVL_ENABLED : MVL_DISABLED; return NULL; @@ -424,7 +424,7 @@ { mod_vhost_ldap_ng_config_t *conf = (mod_vhost_ldap_ng_config_t *)ap_get_module_config(cmd->server->module_config, - &vhost_ldap_module); + &vhost_ldap_ng_module); conf->binddn = apr_pstrdup(cmd->pool, binddn); return NULL; } @@ -433,7 +433,7 @@ { mod_vhost_ldap_ng_config_t *conf = (mod_vhost_ldap_ng_config_t *)ap_get_module_config(cmd->server->module_config, - &vhost_ldap_module); + &vhost_ldap_ng_module); conf->bindpw = apr_pstrdup(cmd->pool, bindpw); return NULL; } @@ -442,7 +442,7 @@ { mod_vhost_ldap_ng_config_t *conf = (mod_vhost_ldap_ng_config_t *)ap_get_module_config (cmd->server->module_config, - &vhost_ldap_module); + &vhost_ldap_ng_module); if (strcmp(deref, "never") == 0 || strcasecmp(deref, "off") == 0) { conf->deref = never; conf->have_deref = 1; @@ -469,7 +469,7 @@ { mod_vhost_ldap_ng_config_t *conf = (mod_vhost_ldap_ng_config_t *)ap_get_module_config(cmd->server->module_config, - &vhost_ldap_module); + &vhost_ldap_ng_module); conf->fallback = apr_pstrdup(cmd->pool, fallback); return NULL; @@ -518,7 +518,7 @@ const char **vals = NULL; char filtbuf[FILTER_LENGTH]; mod_vhost_ldap_ng_config_t *conf = - (mod_vhost_ldap_ng_config_t *)ap_get_module_config(r->server->module_config, &vhost_ldap_module); + (mod_vhost_ldap_ng_config_t *)ap_get_module_config(r->server->module_config, &vhost_ldap_ng_module); core_server_config * core = (core_server_config *) ap_get_module_config(r->server->module_config, &core_module); util_ldap_connection_t *ldc = NULL; @@ -560,7 +560,7 @@ // configured reqc = (mod_vhost_ldap_ng_request_t *)apr_pcalloc(r->pool, sizeof(mod_vhost_ldap_ng_request_t)); - ap_set_module_config(r->request_config, &vhost_ldap_module, reqc); + ap_set_module_config(r->request_config, &vhost_ldap_ng_module, reqc); // mod_vhost_ldap_ng is disabled or we don't have LDAP Url if ((conf->enabled != MVL_ENABLED)||(!conf->have_ldap_url)) { @@ -771,10 +771,10 @@ ap_unix_identity_t *ugid = NULL; mod_vhost_ldap_ng_config_t *conf = (mod_vhost_ldap_ng_config_t *)ap_get_module_config(r->server->module_config, - &vhost_ldap_module); + &vhost_ldap_ng_module); mod_vhost_ldap_ng_request_t *req = (mod_vhost_ldap_ng_request_t *)ap_get_module_config(r->request_config, - &vhost_ldap_module); + &vhost_ldap_ng_module); uid_t uid = -1; gid_t gid = -1; @@ -819,7 +819,7 @@ #endif } -module AP_MODULE_DECLARE_DATA vhost_ldap_module = { +module AP_MODULE_DECLARE_DATA vhost_ldap_ng_module = { STANDARD20_MODULE_STUFF, NULL, NULL, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |