[PC-BSD Commits] r20160 - pcbsd/current/src-qt4/pc-adsldap
svn at pcbsd.org
svn at pcbsd.org
Sat Nov 10 16:23:21 PST 2012
Author: kris
Date: 2012-11-11 00:23:21 +0000 (Sun, 11 Nov 2012)
New Revision: 20160
Modified:
pcbsd/current/src-qt4/pc-adsldap/adsldap.cpp
Log:
Use the right rc.conf hooks
Modified: pcbsd/current/src-qt4/pc-adsldap/adsldap.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-adsldap/adsldap.cpp 2012-11-11 00:21:01 UTC (rev 20159)
+++ pcbsd/current/src-qt4/pc-adsldap/adsldap.cpp 2012-11-11 00:23:21 UTC (rev 20160)
@@ -76,7 +76,7 @@
void pcADSLDAP::loadSettings()
{
QSettings settings("PCBSD", "ADS");
- QString tmp = Utils::getConfFileValue("/etc/rc.conf", "activedirectory_enable=", 1) ;
+ QString tmp = Utils::getConfFileValue("/etc/rc.conf", "pc_activedirectory_enable=", 1) ;
if ( tmp == "YES" )
groupADS->setChecked(true);
else
@@ -185,22 +185,22 @@
exportAD();
// Restart AD service if enabled
qDebug() << "Enabling AD";
- Utils::setConfFileValue("/etc/rc.conf", "activedirectory_enable=", "activedirectory_enable=\"YES\"", -1);
+ Utils::setConfFileValue("/etc/rc.conf", "pc_activedirectory_enable=", "pc_activedirectory_enable=\"YES\"", -1);
Utils::runShellCommand("/usr/local/etc/rc.d/pc-adctl start");
} else {
qDebug() << "Disabling AD";
Utils::runShellCommand("/usr/local/etc/rc.d/pc-adctl stop");
- Utils::setConfFileValue("/etc/rc.conf", "activedirectory_enable=", "activedirectory_enable=\"NO\"", -1);
+ Utils::setConfFileValue("/etc/rc.conf", "pc_activedirectory_enable=", "pc_activedirectory_enable=\"NO\"", -1);
}
// Enable the LDAP service
if ( groupLDAP->isChecked() ) {
exportLDAP();
- Utils::setConfFileValue("/etc/rc.conf", "ldapclient_enable=", "ldapclient_enable=\"YES\"", -1);
+ Utils::setConfFileValue("/etc/rc.conf", "pc_ldapclient_enable=", "pc_ldapclient_enable=\"YES\"", -1);
Utils::runShellCommand("/usr/local/etc/rc.d/pc-ldap start");
} else {
qDebug() << "Disabling LDAP";
Utils::runShellCommand("/usr/local/etc/rc.d/pc-ldap stop");
- Utils::setConfFileValue("/etc/rc.conf", "ldapclient_enable=", "ldapclient_enable=\"NO\"", -1);
+ Utils::setConfFileValue("/etc/rc.conf", "pc_ldapclient_enable=", "pc_ldapclient_enable=\"NO\"", -1);
}
}
More information about the Commits
mailing list