/[svn]/ircd-hybrid/branches/8.2.x/src/ircd.c
ViewVC logotype

Diff of /ircd-hybrid/branches/8.2.x/src/ircd.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 6479 by michael, Thu Sep 3 13:07:55 2015 UTC revision 6480 by michael, Thu Sep 3 18:49:44 2015 UTC
# Line 46  Line 46 
46  #include "auth.h"  #include "auth.h"
47  #include "s_bsd.h"  #include "s_bsd.h"
48  #include "log.h"  #include "log.h"
49  #include "server.h"      /* try_connections */  #include "server.h"
50  #include "send.h"  #include "send.h"
51  #include "whowas.h"  #include "whowas.h"
52  #include "modules.h"  #include "modules.h"
# Line 198  set_time(void) Line 198  set_time(void)
198      event_set_back_events(CurrentTime - newtime.tv_sec);      event_set_back_events(CurrentTime - newtime.tv_sec);
199    }    }
200    
201    SystemTime.tv_sec  = newtime.tv_sec;    SystemTime.tv_sec = newtime.tv_sec;
202    SystemTime.tv_usec = newtime.tv_usec;    SystemTime.tv_usec = newtime.tv_usec;
203  }  }
204    
# Line 323  check_pidfile(const char *filename) Line 323  check_pidfile(const char *filename)
323             filename, strerror(errno));             filename, strerror(errno));
324      else      else
325      {      {
326        pid_t pidfromfile = atoi(buf);        pid_t pid = atoi(buf);
327    
328        if (!kill(pidfromfile, 0))        if (!kill(pid, 0))
329        {        {
330          /* log(L_ERROR, "Server is already running"); */          /* log(L_ERROR, "Server is already running"); */
331          printf("ircd: daemon is already running\n");          printf("ircd: daemon is already running\n");
# Line 370  always_accept_verify_cb(int preverify_ok Line 370  always_accept_verify_cb(int preverify_ok
370  }  }
371  #endif  #endif
372    
373  /* init_ssl()  /* ssl_init()
374   *   *
375   * inputs       - nothing   * inputs       - nothing
376   * output       - nothing   * output       - nothing
# Line 531  main(int argc, char *argv[]) Line 531  main(int argc, char *argv[])
531    
532    strlcpy(me.name, ConfigServerInfo.name, sizeof(me.name));    strlcpy(me.name, ConfigServerInfo.name, sizeof(me.name));
533    
534    /* serverinfo{} description must exist.  If not, error out.*/    /* serverinfo {} description must exist.  If not, error out.*/
535    if (EmptyString(ConfigServerInfo.description))    if (EmptyString(ConfigServerInfo.description))
536    {    {
537      ilog(LOG_TYPE_IRCD, "ERROR: No server description specified in serverinfo block.");      ilog(LOG_TYPE_IRCD, "ERROR: No server description specified in serverinfo block.");
# Line 587  main(int argc, char *argv[]) Line 587  main(int argc, char *argv[])
587    
588    event_addish(&event_save_all_databases, NULL);    event_addish(&event_save_all_databases, NULL);
589    
590    if (ConfigServerHide.links_delay > 0)    if (ConfigServerHide.links_delay)
591    {    {
592      event_write_links_file.when = ConfigServerHide.links_delay;      event_write_links_file.when = ConfigServerHide.links_delay;
593      event_addish(&event_write_links_file, NULL);      event_addish(&event_write_links_file, NULL);

Legend:
Removed from v.6479  
changed lines
  Added in v.6480

svnadmin@ircd-hybrid.org
ViewVC Help
Powered by ViewVC 1.1.28