Samba version bump to 4.4.5 service.py fix

This commit is contained in:
Ergün Salman
2016-07-24 15:56:12 +03:00
committed by GitHub
parent 202b4bbce9
commit 449ed91328
+14 -9
View File
@@ -5,9 +5,9 @@ serviceType = "server"
serviceDesc = _({"en": "SMB Network Sharing", serviceDesc = _({"en": "SMB Network Sharing",
"tr": "SMB Ağ Paylaşımı"}) "tr": "SMB Ağ Paylaşımı"})
WINBINDD_PIDFILE = "/run/samba/winbindd.pid" WINBINDD_PIDFILE = "/var/run/samba/winbindd.pid"
NMBD_PIDFILE = "/run/samba/nmbd.pid" NMBD_PIDFILE = "/var/run/samba/nmbd.pid"
SMBD_PIDFILE = "/run/samba/smbd.pid" SMBD_PIDFILE = "/var/run/samba/smbd.pid"
@synchronized @synchronized
@@ -16,12 +16,17 @@ def start():
args="-D", args="-D",
donotify=True) donotify=True)
startService(command="/usr/sbin/nmbd", startService(command="/usr/sbin/ctdbd",
args="-D") args="-D",
donotify=True)
if config.get("winbind", "no") == "yes": startService(command="/usr/sbin/nmbd",
startService(command="/usr/sbin/winbindd", args="-D",
args="-D") donotify=True)
startService(command="/usr/sbin/winbindd",
args="-D",
donotify=True)
@synchronized @synchronized
def stop(): def stop():
@@ -44,6 +49,6 @@ def reload():
def status(): def status():
result = isServiceRunning(SMBD_PIDFILE) and isServiceRunning(NMBD_PIDFILE) result = isServiceRunning(SMBD_PIDFILE) and isServiceRunning(NMBD_PIDFILE)
if config.get("winbind", "no") == "yes": if config.get():
result = result and isServiceRunning(WINBINDD_PIDFILE) result = result and isServiceRunning(WINBINDD_PIDFILE)
return result return result