From 2d9ef362782b9003e5777411500a61521072b178 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank@brehm-online.com>
Date: Tue, 5 Apr 2016 22:31:35 +0200
Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run

---
 conf.d/samba                                         | 12 +++++++++++-
 .../etc/conf.d/{samba.dist.new => samba.dist}        | 12 +++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)
 rename config-archive/etc/conf.d/{samba.dist.new => samba.dist} (64%)

diff --git a/conf.d/samba b/conf.d/samba
index c5d99293..b252e943 100644
--- a/conf.d/samba
+++ b/conf.d/samba
@@ -1,4 +1,9 @@
-#add "winbind" to the daemon_list if you also want winbind to start
+# Add "winbind" to the daemon_list if you also want winbind to start.
+# Replace "smbd nmbd" by "samba4" if you want the active directory domain controller part or the ntvfs
+# file server part or the rpc proxy to start.
+# Note that samba4 controls 'smbd' by itself, thus it can't be started manually. You can, however,
+# tweak the behaviour of a samba4-controlled smbd by modifying your '/etc/samba/smb.conf' file
+# accordingly.
 daemon_list="smbd nmbd winbind"
 
 #----------------------------------------------------------------------------
@@ -21,6 +26,11 @@ nmbd_start="start-stop-daemon --start --exec /usr/sbin/nmbd -- ${nmbd_start_opti
 nmbd_stop="start-stop-daemon --stop --exec /usr/sbin/nmbd"
 nmbd_reload="killall -HUP nmbd"
 
+samba4_start_options=""
+samba4_start="start-stop-daemon --start --exec /usr/sbin/samba -- ${samba4_start_options}"
+samba4_stop="start-stop-daemon --stop --exec /usr/sbin/samba"
+samba4_reload="killall -HUP samba"
+
 winbind_start_options=""
 winbind_start="start-stop-daemon --start --exec /usr/sbin/winbindd -- ${winbind_start_options}"
 winbind_stop="start-stop-daemon --stop --exec /usr/sbin/winbindd"
diff --git a/config-archive/etc/conf.d/samba.dist.new b/config-archive/etc/conf.d/samba.dist
similarity index 64%
rename from config-archive/etc/conf.d/samba.dist.new
rename to config-archive/etc/conf.d/samba.dist
index 1b329dae..58b2c782 100644
--- a/config-archive/etc/conf.d/samba.dist.new
+++ b/config-archive/etc/conf.d/samba.dist
@@ -1,4 +1,9 @@
-#add "winbind" to the daemon_list if you also want winbind to start
+# Add "winbind" to the daemon_list if you also want winbind to start.
+# Replace "smbd nmbd" by "samba4" if you want the active directory domain controller part or the ntvfs
+# file server part or the rpc proxy to start.
+# Note that samba4 controls 'smbd' by itself, thus it can't be started manually. You can, however,
+# tweak the behaviour of a samba4-controlled smbd by modifying your '/etc/samba/smb.conf' file
+# accordingly.
 daemon_list="smbd nmbd"
 
 #----------------------------------------------------------------------------
@@ -21,6 +26,11 @@ nmbd_start="start-stop-daemon --start --exec /usr/sbin/nmbd -- ${nmbd_start_opti
 nmbd_stop="start-stop-daemon --stop --exec /usr/sbin/nmbd"
 nmbd_reload="killall -HUP nmbd"
 
+samba4_start_options=""
+samba4_start="start-stop-daemon --start --exec /usr/sbin/samba -- ${samba4_start_options}"
+samba4_stop="start-stop-daemon --stop --exec /usr/sbin/samba"
+samba4_reload="killall -HUP samba"
+
 winbind_start_options=""
 winbind_start="start-stop-daemon --start --exec /usr/sbin/winbindd -- ${winbind_start_options}"
 winbind_stop="start-stop-daemon --stop --exec /usr/sbin/winbindd"
-- 
2.39.5