Changeset 1616


Ignore:
Timestamp:
02/19/10 16:19:58 (11 years ago)
Author:
merek
Message:

Revert Changes from r1542, this causes problems with config prio's

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/oscam-config.c

    r1615 r1616  
    517517    cfg->ncd_keepalive=atoi(value);
    518518    return;
    519   }
    520   else
    521   {
    522     cfg->ncd_keepalive = 1;
    523519  }
    524520  if (token[0] != '#')
     
    753749  strcpy(cfg->ac_logfile, "./oscam_ac.log");
    754750#endif
     751  cfg->ncd_keepalive=1;
    755752  sprintf(token, "%s%s", cs_confdir, cs_conf);
    756753  if (!(fp=fopen(token, "r")))
     
    952949            memset(account, 0, sizeof(struct s_auth));
    953950            account->au = (-1);
    954             account->ncd_keepalive = 1;
     951            account->monlvl = cfg->mon_level;
     952            account->tosleep = cfg->tosleep;
     953            account->c35_suppresscmd08 = cfg->c35_suppresscmd08;
     954            account->ncd_keepalive = cfg->ncd_keepalive;
    955955            for (i = 1; i < CS_MAXCAIDTAB; account->ctab.mask[i++] = 0xffff);
    956956            for (i = 1; i < CS_MAXTUNTAB; account->ttab.bt_srvid[i++] = 0x0000);
  • trunk/oscam.c

    r1601 r1616  
    355355                client[i].autoau    = account->autoau;
    356356                client[i].expirationdate = account->expirationdate;
    357 
    358                 //set first to global value and then to specific (higher prio)
    359                 client[i].ncd_keepalive = cfg->ncd_keepalive;
    360357                client[i].ncd_keepalive = account->ncd_keepalive;
    361 
    362                 //set first to global value and then to specific (higher prio)
    363                 client[i].c35_suppresscmd08 = cfg->c35_suppresscmd08;
    364358                client[i].c35_suppresscmd08 = account->c35_suppresscmd08;
    365 
    366                 //set first to global value and then to specific (higher prio)
    367                 client[i].tosleep   = (60*cfg->tosleep);
    368359                client[i].tosleep   = (60*account->tosleep);
    369 
    370                 //set first to global value and then to specific (higher prio)
    371                 client[i].monlvl    = cfg->mon_level;
    372360                client[i].monlvl    = account->monlvl;
    373 
    374361                client[i].disabled  = account->disabled;
    375362                client[i].fchid     = account->fchid;  // CHID filters
Note: See TracChangeset for help on using the changeset viewer.