#
# Fixed a crash that was caused, when options set in the smb.conf do
# not exist in the corresponding ComboBoxes of the GUI.
# BUG: 166106
#

Index: filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp
===================================================================
--- filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp	(revision 949232)
+++ filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp	(revision 949233)
@@ -708,7 +708,7 @@
   _dictMngr->add("server schannel",_interface->serverSchannelCombo,
                  new QStringList(QStringList() << "Yes" << "No" << "Auto" ));
   _dictMngr->add("server signing",_interface->serverSigningCombo,
-                 new QStringList(QStringList() << "Auto" << "Mandatory" << "Disabled" ));
+                 new QStringList(QStringList() << "Auto" << "Mandatory" << "No" ));
 
   _dictMngr->add("client lanman auth",_interface->clientLanmanAuthChk);
   _dictMngr->add("client plaintext auth",_interface->clientPlaintextAuthChk);
@@ -717,7 +717,7 @@
   _dictMngr->add("client schannel",_interface->clientSchannelCombo,
                  new QStringList(QStringList() << "Yes" << "No" << "Auto" ));
   _dictMngr->add("client signing",_interface->clientSigningCombo,
-                 new QStringList(QStringList() << "Auto" << "Mandatory" << "Disabled" ));
+                 new QStringList(QStringList() << "Auto" << "Mandatory" << "No" ));
 
 
 
@@ -863,13 +863,13 @@
                  new QStringList(QStringList() << "NT" << "NT workstation" << "win95" << "WfW"));
 
   _dictMngr->add("protocol", _interface->protocolCombo,
-                 new QStringList(QStringList() << "NT" << "lanman2" << "lanman1" << "core" << "coreplus" ));
+                 new QStringList(QStringList() << "NT1" << "lanman2" << "lanman1" << "core" << "coreplus" ));
 
   _dictMngr->add("max protocol", _interface->maxProtocolCombo,
-                 new QStringList(QStringList() << "NT" << "lanman2" << "lanman1" << "core" << "coreplus"));
+                 new QStringList(QStringList() << "NT1" << "lanman2" << "lanman1" << "core" << "coreplus"));
 
   _dictMngr->add("min protocol", _interface->minProtocolCombo,
-                 new QStringList(QStringList() << "NT" << "lanman2" << "lanman1" << "core" << "coreplus"));
+                 new QStringList(QStringList() << "NT1" << "lanman2" << "lanman1" << "core" << "coreplus"));
 
 }
 
@@ -985,7 +985,7 @@
 
   _dictMngr->add("winbind cache time", _interface->winbindCacheTimeSpin);
   _dictMngr->add("acl compatibility",_interface->aclCompatibilityCombo,
-                 new QStringList(QStringList() << "winnt" << "win2k" << ""));
+                 new QStringList(QStringList() << "auto" << "winnt" << "win2k" << ""));
 
   _dictMngr->add("winbind enum users",_interface->winbindEnumUsersChk);
   _dictMngr->add("winbind enum groups",_interface->winbindEnumGroupsChk);
Index: filesharing/advanced/kcm_sambaconf/common.cpp
===================================================================
--- filesharing/advanced/kcm_sambaconf/common.cpp	(revision 949232)
+++ filesharing/advanced/kcm_sambaconf/common.cpp	(revision 949233)
@@ -54,7 +54,8 @@
     if (lower=="no" ||
         lower=="0" ||
         lower=="false" ||
-        lower=="off")
+        lower=="off" ||
+        lower=="disabled")
       return false;
     else
       return true;
Index: filesharing/advanced/kcm_sambaconf/sambashare.cpp
===================================================================
--- filesharing/advanced/kcm_sambaconf/sambashare.cpp	(revision 949232)
+++ filesharing/advanced/kcm_sambaconf/sambashare.cpp	(revision 949233)
@@ -167,7 +167,6 @@
   if (lname == "idmap gid") return "winbind gid";
   if (lname == "vfs object") return "vfs objects";
 
-
   return lname;
 }
 
Index: filesharing/advanced/kcm_sambaconf/dictmanager.cpp
===================================================================
--- filesharing/advanced/kcm_sambaconf/dictmanager.cpp	(revision 949232)
+++ filesharing/advanced/kcm_sambaconf/dictmanager.cpp	(revision 949233)
@@ -25,8 +25,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA  *
  *                                                                            *
  ******************************************************************************/
+
  
- 
 #include <qlineedit.h>
 #include <qcheckbox.h>
 #include <qspinbox.h>
@@ -208,8 +208,12 @@
     QStringList* values = comboBoxValuesDict[comboBoxIt.currentKey()];
     
     int i = comboBoxIt.current()->currentItem();
-    share->setValue(comboBoxIt.currentKey(),(*values)[i], globalValue, defaultValue );
-  }
+    if (i >= 0) {
+      share->setValue(comboBoxIt.currentKey(),(*values)[i], globalValue, defaultValue );
+    } else {
+      kDebug(DEBUG) << comboBoxIt.currentKey() << " not set! " << endl;
+    }
+  }  
     
 }