1 files changed, 20 insertions, 1 deletions

diff --git a/noncore/settings/networksettings/ppp/pppdata.cpp b/noncore/settings/networksettings/ppp/pppdata.cpp
index 59d68c9..7a6524f 100644
--- a/noncore/settings/networksettings/ppp/pppdata.cpp
+++ b/noncore/settings/networksettings/ppp/pppdata.cpp
@@ -121,25 +121,25 @@ void PPPData::save()
 // cancel changes
 //
 void PPPData::cancel() {
     stringEntries.clear();
     intEntries.clear();
     listEntries.clear();
 }
 
 // functions to read/write date to configuration file
 QString PPPData::readConfig(const QString &group, const QString &key,
                             const QString &defvalue = "")
 {
-//    qDebug("PPPData::readConfig key >%s< group >%s<",key.latin1(), group.latin1());
+    qDebug("PPPData::readConfig key >%s< group >%s<",key.latin1(), group.latin1());
     QString idx = SEP.arg(group).arg(key);
     if (stringEntries.find(idx) != stringEntries.end())
         return stringEntries[idx];
     Config cfg = config();
     cfg.setGroup(group);
     return cfg.readEntry(key, defvalue);
 }
 
 
 int PPPData::readNumConfig(const QString &group, const QString &key,
 			   int defvalue)
 {
@@ -338,31 +338,33 @@ int PPPData::pppdTimeout() {
 
 void PPPData::setpppdTimeout(int n) {
   writeConfig(GENERAL_GRP, PPPDTIMEOUT_KEY, n);
 }
 
 
 const QString PPPData::modemDevice() {
   return readConfig (modemGroup(), MODEMDEV_KEY, devices[DEV_DEFAULT]);
 }
 
 
 bool PPPData::setModemDevice(const QString &n) {
+    qDebug("Setting modem dev to >%s<", n.latin1());
     bool ret = false;
     for (int i = 0; devices[i]; i++)
         if (devices[i] == n){
             modemDeviceGroup = i;
             writeConfig(modemGroup(), MODEMDEV_KEY, n);
             ret = true;
         }
+    qDebug(ret?"SUCCESS":"FAILURE");
     return ret;
 }
 
 
 const QString PPPData::flowcontrol() {
   return readConfig(modemGroup(), FLOWCONTROL_KEY, "CRTSCTS");
 }
 
 
 void PPPData::setFlowcontrol(const QString &n) {
   writeConfig(modemGroup(), FLOWCONTROL_KEY, n);
 }
@@ -703,31 +705,34 @@ void PPPData::setEnter(const QString &n) {
 
 //
 // functions to set/return account information
 //
 
 //returns number of accounts
 int PPPData::count() const {
   return highcount + 1;
 }
 
 
 bool PPPData::setAccount(const QString &aname) {
+    qDebug("setting account to >%s<", aname.latin1());
   for(int i = 0; i <= highcount; i++) {
     setAccountbyIndex(i);
     if(accname() == aname) {
       caccount = i;
+      qDebug("SUCCESS");
       return true;
     }
   }
+  qDebug("FAILURE");
   return false;
 }
 
 
 bool PPPData::setAccountbyIndex(int i) {
   if(i >= 0 && i <= highcount) {
     caccount = i;
     cgroup.sprintf("%s%i", ACCOUNT_GRP, i);
     return true;
   }
   return false;
 }
@@ -901,24 +906,27 @@ void PPPData::setAuthMethod(int value) {
 
 const QString  PPPData::storedUsername() {
   return readConfig(cgroup, STORED_USERNAME_KEY, "");
 }
 
 
 void PPPData::setStoredUsername(const QString &b) {
   writeConfig(cgroup, STORED_USERNAME_KEY, b);
 }
 
 
 const QString  PPPData::storedPassword() {
+    qDebug("getting stored pw");
+    qDebug("g %s", cgroup.latin1() );
+    qDebug("k %s", STORED_PASSWORD_KEY);
   return readConfig(cgroup, STORED_PASSWORD_KEY, "");
 }
 
 
 void PPPData::setStoredPassword(const QString &b) {
   writeConfig(cgroup, STORED_PASSWORD_KEY, b);
 }
 
 
 bool PPPData::storePassword() {
   return (bool)readNumConfig(cgroup, STORE_PASSWORD_KEY, 1);
 }
@@ -1265,12 +1273,23 @@ void PPPData::setConfiguredInterfaces( QMap<QString,QString> ifaces )
     QMap<QString,QString>::Iterator it;
     int i = 0;
     Config cfg = config();
     for( it = ifaces.begin(); it != ifaces.end(); ++it, ++i ){
         cfg.setGroup(QString("%1_%1").arg(ACCLIST_GRP).arg(i));
         cfg.writeEntry( ACOUNTS_DEV, it.key() );
         cfg.writeEntry( ACOUNTS_ACC, it.data() );
     }
     cfg.setGroup( ACCLIST_GRP );
     cfg.writeEntry( ACCOUNTS_COUNT, i );
 
 }
+
+/**
+ * pppd's getword() function knows about escape characters.
+ * If we write the username and password to the secrets file
+ * we'll therefore have to escape back slashes.
+ */
+QString PPPData::encodeWord(const QString &s) {
+    QString r = s;
+    r.replace(QRegExp("\\"), "\\\\");
+    return r;
+}