[PC-BSD Commits] r17997 - pcbsd/current/src-qt4/pc-adsldap

[svn at pcbsd.org]

Author: kris
Date: 2012-07-30 19:05:45 +0000 (Mon, 30 Jul 2012)
New Revision: 17997

Modified:
   pcbsd/current/src-qt4/pc-adsldap/adsldap.cpp
   pcbsd/current/src-qt4/pc-adsldap/adsldap.ui
Log:

Remove DomainController, not going to be used. Fix bug stopping service



Modified: pcbsd/current/src-qt4/pc-adsldap/adsldap.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-adsldap/adsldap.cpp	2012-07-30 19:02:51 UTC (rev 17996)
+++ pcbsd/current/src-qt4/pc-adsldap/adsldap.cpp	2012-07-30 19:05:45 UTC (rev 17997)
@@ -46,13 +46,6 @@
    QSettings settings("PCBSD", "ADS");
    settings.setValue("Enabled", groupADS->isChecked());
 
-   // Enable / disable AD service
-   if ( groupADS->isChecked() )
-      Utils::setConfFileValue("/etc/rc.conf", "activedirectory_enable=", "activedirectory_enable=\"YES\"", -1);
-   else
-      Utils::setConfFileValue("/etc/rc.conf", "activedirectory_enable=", "activedirectory_enable=\"NO\"", -1);
-
-   settings.setValue("DomainController", lineADSDomainController->text());
    settings.setValue("DomainName", lineADSDomainName->text());
    settings.setValue("NetBIOS", lineADSNetBIOS->text());
    settings.setValue("Workgroup", lineADSWorkgroup->text());
@@ -91,7 +84,6 @@
   else
     groupADS->setChecked(false);
 
-  lineADSDomainController->setText(settings.value("DomainController", QString()).toString());
   lineADSDomainName->setText(settings.value("DomainName", QString()).toString());
   lineADSNetBIOS->setText(settings.value("NetBIOS", QString()).toString());
   lineADSWorkgroup->setText(settings.value("Workgroup", QString()).toString());
@@ -141,6 +133,11 @@
   
   // Restart AD service if enabled   
   if ( groupADS->isChecked() ) {
+     Utils::setConfFileValue("/etc/rc.conf", "activedirectory_enable=", "activedirectory_enable=\"YES\"", -1);
+     Utils::runShellCommand("/usr/local/etc/rc.d/pc-adctl start");
+  } else {
+     Utils::runShellCommand("/usr/local/etc/rc.d/pc-adctl stop");
+     Utils::setConfFileValue("/etc/rc.conf", "activedirectory_enable=", "activedirectory_enable=\"NO\"", -1);
   }
 
 }

Modified: pcbsd/current/src-qt4/pc-adsldap/adsldap.ui
===================================================================
(Binary files differ)