Commit 65728e50 authored by Per Cederqvist's avatar Per Cederqvist
Browse files

(isc_initialize): Expect master config version 1006 and session config

	1002.  Handle fd_relocate.
parent 28e9cf69
......@@ -48,7 +48,7 @@ isc_initialize(IscConfig * cfg)
case 0:
break;
case 1005:
case 1006:
mcfg = &cfg->master;
switch (mcfg->version)
......@@ -89,12 +89,13 @@ isc_initialize(IscConfig * cfg)
mcb->scfg.max.dequeuelen = ISC_DEFAULT_MAX_DEQUEUE_LEN;
mcb->scfg.max.openretries = ISC_DEFAULT_MAX_OPEN_RETRIES;
mcb->scfg.max.backlog = ISC_DEFAULT_MAX_BACKLOG;
mcb->scfg.fd_relocate = 0;
/* Handle user specified defaults */
if (cfg)
switch (cfg->version)
{
case 1005:
case 1006:
scfg = &cfg->session;
switch (scfg->version)
......@@ -102,7 +103,7 @@ isc_initialize(IscConfig * cfg)
case 0:
break;
case 1001:
case 1002:
if (scfg->max.msgsize >= 0)
mcb->scfg.max.msgsize = scfg->max.msgsize;
if (scfg->max.queuedsize >= 0)
......@@ -113,6 +114,8 @@ isc_initialize(IscConfig * cfg)
mcb->scfg.max.openretries = scfg->max.openretries;
if (scfg->max.backlog >= 0)
mcb->scfg.max.backlog = scfg->max.backlog;
if (scfg->fd_relocate > 0)
mcb->scfg.fd_relocate = scfg->fd_relocate;
break;
default:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment