Commit b05c8e97 authored by rswindell's avatar rswindell
Browse files

Decided to be more consistent with the node option naming, renamed [BinkP]:

CryptSupport (default true), to:
PlainTextOnly (default false).
parent dc9ccaa5
......@@ -367,7 +367,7 @@ function BinkITCfg()
this.caps = f.iniGetValue('BinkP', 'Capabilities');
this.sysop = f.iniGetValue('BinkP', 'Sysop', system.operator);
this.plain_auth_only = f.iniGetValue('BinkP', 'PlainAuthOnly', false);
this.crypt_support = f.iniGetValue('BinkP', 'CryptSupport', true);
this.crypt_support = !f.iniGetValue('BinkP', 'PlainTextOnly', false);
sects = f.iniGetSections('node:');
sects.forEach(function(section) {
var addr = section.substr(5);
......
......@@ -94,7 +94,7 @@ void global_settings(void)
sprintf(opt[i++], "%-25s %s", "BinkP Capabilities", cfg.binkp_caps);
sprintf(opt[i++], "%-25s %s", "BinkP Sysop Name", cfg.binkp_sysop);
sprintf(opt[i++], "%-25s %s", "BinkP Authentication", cfg.binkp_plainAuthOnly ? "Plain Only" : "Plain or CRAM-MD5");
sprintf(opt[i++], "%-25s %s", "BinkP Encryption", cfg.binkp_cryptSupport && !cfg.binkp_plainAuthOnly ? "Supported" : "Unsupported");
sprintf(opt[i++], "%-25s %s", "BinkP Encryption", !cfg.binkp_plainTextOnly && !cfg.binkp_plainAuthOnly ? "Supported" : "Unsupported");
}
opt[i][0] = 0;
uifc.helpbuf=
......@@ -294,14 +294,14 @@ void global_settings(void)
uifc.msg("CRAM-MD5 authentication/encryption has been disabled globally");
break;
}
int k = !cfg.binkp_cryptSupport;
int k = cfg.binkp_plainTextOnly;
switch(uifc.list(WIN_MID|WIN_SAV,0,0,0,&k,0
,"BinkP Encryption Supported",uifcYesNoOpts)) {
case 0:
cfg.binkp_cryptSupport = true;
cfg.binkp_plainTextOnly = false;
break;
case 1:
cfg.binkp_cryptSupport = false;
cfg.binkp_plainTextOnly = true;
break;
}
break;
......@@ -399,7 +399,7 @@ void binkp_settings(nodecfg_t* node)
char* auth = "Plain Only";
char* crypt = "Unsupported";
if(!cfg.binkp_plainAuthOnly && !node->binkp_plainAuthOnly) {
if(cfg.binkp_cryptSupport)
if(!cfg.binkp_plainTextOnly)
crypt = node->binkp_allowPlainText ? "Supported" : "Required";
if(node->binkp_allowPlainAuth)
auth = "Plain or CRAM-MD5";
......@@ -499,7 +499,7 @@ void binkp_settings(nodecfg_t* node)
}
break;
case 4:
if(!cfg.binkp_cryptSupport) {
if(cfg.binkp_plainTextOnly) {
uifc.msg("BinkP encryption has been disabled globally");
break;
}
......
......@@ -312,7 +312,7 @@ bool sbbsecho_read_ini(sbbsecho_cfg_t* cfg)
SAFECOPY(cfg->binkp_caps, iniGetString(ini, "BinkP", "Capabilities", "", value));
SAFECOPY(cfg->binkp_sysop, iniGetString(ini, "BinkP", "Sysop", "", value));
cfg->binkp_plainAuthOnly = iniGetBool(ini, "BinkP", "PlainAuthOnly", FALSE);
cfg->binkp_cryptSupport = iniGetBool(ini, "BinkP", "CryptSupport", TRUE);
cfg->binkp_plainTextOnly = iniGetBool(ini, "BinkP", "PlainTextOnly", FALSE);
/******************/
/* Archive Types: */
......@@ -549,7 +549,7 @@ bool sbbsecho_write_ini(sbbsecho_cfg_t* cfg)
iniSetString(&ini, "BinkP" , "Capabilities" ,cfg->binkp_caps ,&style);
iniSetString(&ini, "BinkP" , "Sysop" ,cfg->binkp_sysop ,&style);
iniSetBool(&ini, "BinkP" , "PlainAuthOnly" ,cfg->binkp_plainAuthOnly ,&style);
iniSetBool(&ini, "BinkP" , "CryptSupport" ,cfg->binkp_cryptSupport ,&style);
iniSetBool(&ini, "BinkP" , "PlainTextOnly" ,cfg->binkp_plainTextOnly ,&style);
/******************/
/* Archive Types: */
......
......@@ -222,7 +222,7 @@ typedef struct {
char binkp_caps[64];
char binkp_sysop[64];
bool binkp_plainAuthOnly;
bool binkp_cryptSupport;
bool binkp_plainTextOnly;
} sbbsecho_cfg_t;
char* pktTypeStringList[PKT_TYPES_SUPPORTED+1];
......
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