From c8d881bbe79dc256384e9760a98656df74cf1923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erg=C3=BCn=20Salman?= Date: Sun, 24 Jul 2016 16:51:35 +0300 Subject: [PATCH] Samba version bump to 4.4.5 --- server/samba/comar/service.py | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/server/samba/comar/service.py b/server/samba/comar/service.py index 7da0a25c48..938ff42c70 100644 --- a/server/samba/comar/service.py +++ b/server/samba/comar/service.py @@ -5,9 +5,9 @@ serviceType = "server" serviceDesc = _({"en": "SMB Network Sharing", "tr": "SMB Ağ Paylaşımı"}) -WINBINDD_PIDFILE = "/var/run/samba/winbindd.pid" -NMBD_PIDFILE = "/var/run/samba/nmbd.pid" -SMBD_PIDFILE = "/var/run/samba/smbd.pid" +WINBINDD_PIDFILE = "/run/samba/winbindd.pid" +NMBD_PIDFILE = "/run/samba/nmbd.pid" +SMBD_PIDFILE = "/run/samba/smbd.pid" @synchronized @@ -15,19 +15,14 @@ def start(): startService(command="/usr/sbin/smbd", args="-D", donotify=True) - - startService(command="/usr/sbin/ctdbd", - args="-D", - donotify=True) startService(command="/usr/sbin/nmbd", - args="-D", - donotify=True) + args="-D") + + if config.get("winbind", "no") == "yes": + startService(command="/usr/sbin/winbindd", + args="-D") - startService(command="/usr/sbin/winbindd", - args="-D", - donotify=True) - @synchronized def stop(): stopService(pidfile=WINBINDD_PIDFILE, @@ -49,6 +44,6 @@ def reload(): def status(): result = isServiceRunning(SMBD_PIDFILE) and isServiceRunning(NMBD_PIDFILE) - if config.get(): + if config.get("winbind", "no") == "yes": result = result and isServiceRunning(WINBINDD_PIDFILE) return result