Adopted from NixOS pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch =================================================================== --- kio-5.17.0.orig/src/core/ksambashare.cpp +++ kio-5.17.0/src/core/ksambashare.cpp @@ -67,13 +67,18 @@ KSambaSharePrivate::~KSambaSharePrivate( bool KSambaSharePrivate::isSambaInstalled() { - if (QFile::exists(QStringLiteral("/usr/sbin/smbd")) - || QFile::exists(QStringLiteral("/usr/local/sbin/smbd"))) { - return true; + const QByteArray pathEnv = qgetenv("PATH"); + if (!pathEnv.isEmpty()) { + QLatin1Char pathSep(':'); + QStringList paths = QFile::decodeName(pathEnv).split(pathSep, QString::SkipEmptyParts); + for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) { + it->append(QStringLiteral("/smbd")); + if (QFile::exists(*it)) { + return true; + } + } } - //qDebug() << "Samba is not installed!"; - return false; } >
aboutsummaryrefslogtreecommitdiff
path: root/tests/networking.scm
AgeCommit message (Collapse)Author
2021-01-16services: openntpd: Remove support for deprecated "-s" option.Simon South
* gnu/services/networking.scm (openntpd-configuration): Remove "allow-large-adjustment?" field. (openntpd-shepherd-service): Remove use of "allow-large-adjustment?" configuration field and "-s" daemon option. * tests/networking.scm (%openntpd-conf-sample): Remove "allow-large-adjustment?" field. * doc/guix.texi (Networking Services)[openntpd-service-type]: Remove "allow-large-adjustment?" field from sample configuration. [openntpd-configuration]: Remove description of "allow-large-adjustment?" field. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2019-10-30services: ntp: Ensure no double quotes are output to config file.Maxim Cournoyer
* gnu/services/networking.scm (ntp-server->string): Use the textual representation of the values as printed by 'display' rather than 'write', to avoid inserting double quotes in the generated config. * tests/networking.scm (%ntp-server-sample): Add a comment and make one of the options a string, to exercise the fix. ("ntp-server->string"): Move the expected value to the first argument. ("ntp configuration servers deprecated form"): Likewise. ("openntpd generated config string ends with a newline"): Likewise.
2019-09-08services: openntpd: Add test for issue #3731.Maxim Cournoyer
See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=37318. * gnu/services/networking.scm (openntpd-configuration->string): New procedure, extracted from top of the `openntpd-shepherd-service' to make it testable. (openntpd-shepherd-service): Adapt following the move of the code to the above procedure. * tests/networking.scm: Add a test for the `openntpd-configuration->string' procedure.
2019-09-08services: ntp: Support different NTP server types and options.Maxim Cournoyer
* gnu/services/networking.scm (ntp-server-types): New enum. (<ntp-server>): New record type. (ntp-server->string): New procedure. (%ntp-servers): Define in terms of <htp-server> records. Use the first entrypoint server as a pool instead of a list of static servers. This is more resilient since a new server of the pool can be interrogated on every request. Add the 'iburst' options. (ntp-configuration-servers): Define a custom accessor that warns but honors the now deprecated server format. (<ntp-configuration>): Use it. (%openntpd-servers): New variable, (<openntpd-configuration>): Use it, as a pool ('servers' field) instead of a regular server. * tests/networking.scm: New file. * Makefile.am (SCM_TESTS): Register it. * doc/guix.texi: Update documentation.