summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/security/security.cpp134
1 files changed, 67 insertions, 67 deletions
diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp
index f4116b0..6c1931a 100644
--- a/core/settings/security/security.cpp
+++ b/core/settings/security/security.cpp
@@ -39,3 +39,3 @@ Security::Security( QWidget* parent, const char* name, WFlags fl )
cfg.setGroup("Sync");
- int auth_peer = cfg.readNumEntry("auth_peer",0xc0a80100);
+ int auth_peer = cfg.readNumEntry("auth_peer",0xc0a88100);//new default 192.168.129.0/24
int auth_peer_bits = cfg.readNumEntry("auth_peer_bits",24);
@@ -43,3 +43,3 @@ Security::Security( QWidget* parent, const char* name, WFlags fl )
connect(syncnet, SIGNAL(textChanged(const QString&)),
- this, SLOT(setSyncNet(const QString&)));
+ this, SLOT(setSyncNet(const QString&)));
@@ -48,10 +48,10 @@ Security::Security( QWidget* parent, const char* name, WFlags fl )
if ( telnetAvailable() )
- telnet->setChecked(cfg.readEntry("allow_telnet"));
+ telnet->setChecked(cfg.readEntry("allow_telnet"));
else
- telnet->hide();
+ telnet->hide();
if ( sshAvailable() )
- ssh->setChecked(cfg.readEntry("allow_ssh"));
+ ssh->setChecked(cfg.readEntry("allow_ssh"));
else
- ssh->hide();
+ ssh->hide();
*/
@@ -75,3 +75,3 @@ void Security::updateGUI()
changepasscode->setText( empty ? tr("Set passcode" )
- : tr("Change passcode" ) );
+ : tr("Change passcode" ) );
passcode_poweron->setEnabled( !empty );
@@ -87,14 +87,14 @@ void Security::show()
if ( passcode.isEmpty() ) {
- // could insist...
- //changePassCode();
- //if ( passcode.isEmpty() )
- //reject();
+ // could insist...
+ //changePassCode();
+ //if ( passcode.isEmpty() )
+ //reject();
} else {
- QString pc = enterPassCode(tr("Enter passcode"));
- if ( pc != passcode ) {
- QMessageBox::critical(this, tr("Passcode incorrect"),
- tr("The passcode entered is incorrect.\nAccess denied"));
- reject();
- return;
- }
+ QString pc = enterPassCode(tr("Enter passcode"));
+ if ( pc != passcode ) {
+ QMessageBox::critical(this, tr("Passcode incorrect"),
+ tr("The passcode entered is incorrect.\nAccess denied"));
+ reject();
+ return;
+ }
}
@@ -120,18 +120,18 @@ void Security::selectNet(int auth_peer,int auth_peer_bits)
if ( auth_peer_bits == 0 && auth_peer == 0 ) {
- sn = tr("Any");
+ sn = tr("Any");
} else if ( auth_peer_bits == 32 && auth_peer == 0 ) {
- sn = tr("None");
+ sn = tr("None");
} else {
- sn =
- QString::number((auth_peer>>24)&0xff) + "."
- + QString::number((auth_peer>>16)&0xff) + "."
- + QString::number((auth_peer>>8)&0xff) + "."
- + QString::number((auth_peer>>0)&0xff) + "/"
- + QString::number(auth_peer_bits);
+ sn =
+ QString::number((auth_peer>>24)&0xff) + "."
+ + QString::number((auth_peer>>16)&0xff) + "."
+ + QString::number((auth_peer>>8)&0xff) + "."
+ + QString::number((auth_peer>>0)&0xff) + "/"
+ + QString::number(auth_peer_bits);
}
for (int i=0; i<syncnet->count(); i++) {
- if ( syncnet->text(i).left(sn.length()) == sn ) {
- syncnet->setCurrentItem(i);
- return;
- }
+ if ( syncnet->text(i).left(sn.length()) == sn ) {
+ syncnet->setCurrentItem(i);
+ return;
+ }
}
@@ -144,16 +144,16 @@ void Security::parseNet(const QString& sn,int& auth_peer,int& auth_peer_bits)
if ( sn == tr("Any") ) {
- auth_peer = 0;
- auth_peer_bits = 0;
+ auth_peer = 0;
+ auth_peer_bits = 0;
} else if ( sn == tr("None") ) {
- auth_peer = 0;
- auth_peer_bits = 32;
+ auth_peer = 0;
+ auth_peer_bits = 32;
} else {
- int x=0;
- for (int i=0; i<4; i++) {
- int nx = sn.find(QChar(i==3 ? '/' : '.'),x);
- auth_peer = (auth_peer<<8)|sn.mid(x,nx-x).toInt();
- x = nx+1;
- }
- uint n = (uint)sn.find(' ',x)-x;
- auth_peer_bits = sn.mid(x,n).toInt();
+ int x=0;
+ for (int i=0; i<4; i++) {
+ int nx = sn.find(QChar(i==3 ? '/' : '.'),x);
+ auth_peer = (auth_peer<<8)|sn.mid(x,nx-x).toInt();
+ x = nx+1;
+ }
+ uint n = (uint)sn.find(' ',x)-x;
+ auth_peer_bits = sn.mid(x,n).toInt();
}
@@ -171,21 +171,21 @@ void Security::applySecurity()
if ( valid ) {
- Config cfg("Security");
- cfg.setGroup("Passcode");
- cfg.writeEntry("passcode",passcode);
- cfg.writeEntry("passcode_poweron",passcode_poweron->isChecked());
- cfg.setGroup("Sync");
- int auth_peer=0;
- int auth_peer_bits;
- QString sn = syncnet->currentText();
- parseNet(sn,auth_peer,auth_peer_bits);
- cfg.writeEntry("auth_peer",auth_peer);
- cfg.writeEntry("auth_peer_bits",auth_peer_bits);
- /*
- cfg.setGroup("Remote");
- if ( telnetAvailable() )
- cfg.writeEntry("allow_telnet",telnet->isChecked());
- if ( sshAvailable() )
- cfg.writeEntry("allow_ssh",ssh->isChecked());
- // ### write ssh/telnet sys config files
- */
+ Config cfg("Security");
+ cfg.setGroup("Passcode");
+ cfg.writeEntry("passcode",passcode);
+ cfg.writeEntry("passcode_poweron",passcode_poweron->isChecked());
+ cfg.setGroup("Sync");
+ int auth_peer=0;
+ int auth_peer_bits;
+ QString sn = syncnet->currentText();
+ parseNet(sn,auth_peer,auth_peer_bits);
+ cfg.writeEntry("auth_peer",auth_peer);
+ cfg.writeEntry("auth_peer_bits",auth_peer_bits);
+ /*
+ cfg.setGroup("Remote");
+ if ( telnetAvailable() )
+ cfg.writeEntry("allow_telnet",telnet->isChecked());
+ if ( sshAvailable() )
+ cfg.writeEntry("allow_ssh",ssh->isChecked());
+ // ### write ssh/telnet sys config files
+ */
}
@@ -199,8 +199,8 @@ void Security::changePassCode()
do {
- new1 = enterPassCode("Enter new passcode");
- if ( new1.isNull() )
- return;
- new2 = enterPassCode("Re-enter new passcode");
- if ( new2.isNull() )
- return;
+ new1 = enterPassCode("Enter new passcode");
+ if ( new1.isNull() )
+ return;
+ new2 = enterPassCode("Re-enter new passcode");
+ if ( new2.isNull() )
+ return;
} while (new1 != new2);