Author: jfrederic.clere(a)jboss.com Date: 2008-07-16 08:32:34 -0400 (Wed, 16 Jul 2008) New Revision: 1753 Modified: trunk/mod_cluster/native/advertise/mod_advertise.c Log: Allow AdvertiseSecurityKey and AdvertiseManagerUrl in VirtualHost but allow them only once. Modified: trunk/mod_cluster/native/advertise/mod_advertise.c =================================================================== --- trunk/mod_cluster/native/advertise/mod_advertise.c 2008-07-16 12:15:46 UTC (rev 1752) +++ trunk/mod_cluster/native/advertise/mod_advertise.c 2008-07-16 12:32:34 UTC (rev 1753) @@ -218,10 +218,8 @@ static const char *cmd_advertise_k(cmd_parms *cmd, void *dummy, const char *arg) { - const char *errs = ap_check_cmd_context(cmd, GLOBAL_ONLY); - - if (errs != NULL) - return errs; + if (ma_advertise_skey != NULL) + return "Duplicate AdvertiseSecurityKey directives are not allowed"; ma_advertise_skey = apr_pstrdup(cmd->pool, arg); return NULL; } @@ -234,10 +232,8 @@ static const char *cmd_advertise_h(cmd_parms *cmd, void *dummy, const char *arg) { - const char *errs = ap_check_cmd_context(cmd, GLOBAL_ONLY); - - if (errs != NULL) - return errs; + if (ma_advertise_srvh != NULL) + return "Duplicate AdvertiseManagerUrl directives are not allowed"; ma_advertise_srvh = apr_pstrdup(cmd->pool, arg); return NULL; }