Merge pull request #196 from jevolk/master
I typed MODRESTART by accident
This commit is contained in:
commit
c642292f25
3 changed files with 20 additions and 3 deletions
|
@ -71,7 +71,7 @@ capability_put(struct CapabilityIndex *idx, const char *cap, void *ownerdata)
|
||||||
}
|
}
|
||||||
|
|
||||||
entry = rb_malloc(sizeof(struct CapabilityEntry));
|
entry = rb_malloc(sizeof(struct CapabilityEntry));
|
||||||
entry->cap = cap;
|
entry->cap = rb_strdup(cap);
|
||||||
entry->flags = 0;
|
entry->flags = 0;
|
||||||
entry->value = idx->highest_bit;
|
entry->value = idx->highest_bit;
|
||||||
entry->ownerdata = ownerdata;
|
entry->ownerdata = ownerdata;
|
||||||
|
@ -133,7 +133,9 @@ capability_destroy(rb_dictionary_element *delem, void *privdata)
|
||||||
{
|
{
|
||||||
s_assert(delem != NULL);
|
s_assert(delem != NULL);
|
||||||
|
|
||||||
rb_free(delem->data);
|
struct CapabilityEntry *entry = delem->data;
|
||||||
|
rb_free((char *)entry->cap);
|
||||||
|
rb_free(entry);
|
||||||
}
|
}
|
||||||
|
|
||||||
struct CapabilityIndex *
|
struct CapabilityIndex *
|
||||||
|
|
|
@ -294,6 +294,9 @@ unload_one_module(const char *name, bool warn)
|
||||||
if((mod = findmodule_byname(name)) == NULL)
|
if((mod = findmodule_byname(name)) == NULL)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
if(mod->core)
|
||||||
|
return false;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** XXX - The type system in C does not allow direct conversion between
|
** XXX - The type system in C does not allow direct conversion between
|
||||||
** data and function pointers, but as it happens, most C compilers will
|
** data and function pointers, but as it happens, most C compilers will
|
||||||
|
|
|
@ -349,7 +349,19 @@ do_modrestart(struct Client *source_p)
|
||||||
RB_DLINK_FOREACH_SAFE(ptr, nptr, module_list.head)
|
RB_DLINK_FOREACH_SAFE(ptr, nptr, module_list.head)
|
||||||
{
|
{
|
||||||
struct module *mod = ptr->data;
|
struct module *mod = ptr->data;
|
||||||
unload_one_module(mod->name, false);
|
if(!unload_one_module(mod->name, false))
|
||||||
|
{
|
||||||
|
ilog(L_MAIN, "Module Restart: %s was not unloaded %s",
|
||||||
|
mod->name,
|
||||||
|
mod->core? "(core module)" : "");
|
||||||
|
|
||||||
|
if(!mod->core)
|
||||||
|
sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
|
||||||
|
"Module Restart: %s failed to unload",
|
||||||
|
mod->name);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
modnum++;
|
modnum++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue