| 331 |
|
{ |
| 332 |
|
add_capability("QS", CAP_QS, 1); |
| 333 |
|
add_capability("EOB", CAP_EOB, 1); |
| 334 |
< |
|
| 335 |
< |
if (ServerInfo.sid != NULL) /* only enable TS6 if we have an SID */ |
| 336 |
< |
add_capability("TS6", CAP_TS6, 0); |
| 337 |
< |
|
| 334 |
> |
add_capability("TS6", CAP_TS6, 0); |
| 335 |
|
add_capability("ZIP", CAP_ZIP, 0); |
| 336 |
|
add_capability("CLUSTER", CAP_CLUSTER, 1); |
| 337 |
|
#ifdef HALFOPS |
| 580 |
|
init_auth(); /* Initialise the auth code */ |
| 581 |
|
init_resolver(); /* Needs to be setup before the io loop */ |
| 582 |
|
read_conf_files(1); /* cold start init conf files */ |
| 586 |
– |
me.id[0] = '\0'; |
| 583 |
|
init_uid(); |
| 584 |
|
initialize_server_capabs(); /* Set up default_server_capabs */ |
| 585 |
|
initialize_global_set_options(); |
| 586 |
|
init_channels(); |
| 587 |
|
|
| 588 |
< |
if (ServerInfo.name == NULL) |
| 588 |
> |
if (EmptyString(ServerInfo.sid)) |
| 589 |
> |
{ |
| 590 |
> |
ilog(L_CRIT, "ERROR: No server id specified in serverinfo block."); |
| 591 |
> |
exit(EXIT_FAILURE); |
| 592 |
> |
} |
| 593 |
> |
|
| 594 |
> |
strlcpy(me.id, ServerInfo.sid, sizeof(me.id)); |
| 595 |
> |
|
| 596 |
> |
if (EmptyString(ServerInfo.name)) |
| 597 |
|
{ |
| 598 |
< |
ilog(L_CRIT, "No server name specified in serverinfo block."); |
| 598 |
> |
ilog(L_CRIT, "ERROR: No server name specified in serverinfo block."); |
| 599 |
|
exit(EXIT_FAILURE); |
| 600 |
|
} |
| 601 |
|
|
| 602 |
|
strlcpy(me.name, ServerInfo.name, sizeof(me.name)); |
| 603 |
|
|
| 604 |
|
/* serverinfo{} description must exist. If not, error out.*/ |
| 605 |
< |
if (ServerInfo.description == NULL) |
| 605 |
> |
if (EmptyString(ServerInfo.description)) |
| 606 |
|
{ |
| 607 |
< |
ilog(L_CRIT, |
| 604 |
< |
"ERROR: No server description specified in serverinfo block."); |
| 607 |
> |
ilog(L_CRIT, "ERROR: No server description specified in serverinfo block."); |
| 608 |
|
exit(EXIT_FAILURE); |
| 609 |
|
} |
| 610 |
|
|
| 617 |
|
make_server(&me); |
| 618 |
|
|
| 619 |
|
me.lasttime = me.since = me.firsttime = CurrentTime; |
| 620 |
+ |
|
| 621 |
+ |
hash_add_id(&me); |
| 622 |
|
hash_add_client(&me); |
| 623 |
|
|
| 624 |
|
/* add ourselves to global_serv_list */ |
| 627 |
|
#ifndef STATIC_MODULES |
| 628 |
|
if (chdir(MODPATH)) |
| 629 |
|
{ |
| 630 |
< |
ilog (L_CRIT, "Could not load core modules. Terminating!"); |
| 630 |
> |
ilog(L_CRIT, "Could not load core modules. Terminating!"); |
| 631 |
|
exit(EXIT_FAILURE); |
| 632 |
|
} |
| 633 |
|
|
| 634 |
|
load_all_modules(1); |
| 635 |
|
load_conf_modules(); |
| 636 |
|
load_core_modules(1); |
| 637 |
+ |
|
| 638 |
|
/* Go back to DPATH after checking to see if we can chdir to MODPATH */ |
| 639 |
< |
chdir(ConfigFileEntry.dpath); |
| 639 |
> |
if (chdir(ConfigFileEntry.dpath)) |
| 640 |
> |
{ |
| 641 |
> |
perror("chdir"); |
| 642 |
> |
exit(EXIT_FAILURE); |
| 643 |
> |
} |
| 644 |
|
#else |
| 645 |
|
load_all_modules(1); |
| 646 |
|
#endif |
