Fixed comments in conf.d file (bug #444016)

Package-Manager: portage-2.2.0_alpha143/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

3 files changed, 26 insertions, 9 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index a00d0fb75f61..db00e538a85a 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.541 2012/11/29 15:39:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.542 2012/11/30 11:31:58 polynomial-c Exp $
+
+  30 Nov 2012; Lars Wendler <polynomial-c@gentoo.org> files/4.0/samba4.confd:
+  Fixed comments in conf.d file. Thanks to Torsten Kurbad for providing a patch
+  in bug #444016.
 
   29 Nov 2012; Jeroen Roovers <jer@gentoo.org> samba-3.6.9.ebuild:
   Stable for HPPA (bug #432754).
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index d1c3dd739d5a..5ce073e82aa6 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -23,7 +23,7 @@ AUX 3.6/smbusers 217 SHA256 c4e808dc0d0a397e777225c6f2b4008d52979b2a4969ceee3211
 AUX 3.6/swat.xinetd 526 SHA256 59dbb1e4669cfd5c72dacc8d8aed269f169e827338e6d6e92fa2a8e445a3ceac SHA512 37f8ac63f7eacf69b2610c2036ff9af3fcab46a1e74eaa50203db66c550c122337a19c2d87be955cd8c8a02ccb659af7ac1be35f49ab8add128601eef5c5ad72 WHIRLPOOL 89daaaa72a101112dcb2b2f007c10128f647846b509159770d6ff6726d22ccc66b2a2f03c09f2af9691ec956f59f1b43e499f1239a3a407db1d9029f3e920a8f
 AUX 3.6/system-auth-winbind.pam 704 SHA256 42c80d953da2472d789c3de1311045285428a15562f7ad2371ef214d8ea7bf56 SHA512 a93a491736299a67ec39eb06fa6b14e48038f618a4812ef9b2b46bf20ef9600ca4e0f44997d8e7c7e838760c3c53a739ebcdf1bb017a5f49b005b4470afb65f6 WHIRLPOOL 0601c6866bb15779bb7f5d7286902b1a5137435a92963a60734de98ca9ce95d220dfa456dfd4a229176e3a2be7afb9097bcffcfbd8b98be9bf206dded8054ad4
 AUX 4.0/com_err.patch 1276 SHA256 f0dc953202603a5f8c0625921cd89cd59e9ca74a61302bdf07e591836e6bda31 SHA512 62800c962cfb613b11c77ae9360f6c3c610bb1551f9ac3673ab814f6f8e1f589d1192fb3019f1afdc8becf8e692c8d19f4dcaa8b00aeeeb282642327c959c27e WHIRLPOOL 37d06f7f6d7d77acd9e5d794a6b2512aa092f04c553853045fa42e11f850a91912239385b21f8d76694e37d21d63405ea864ea0627a40aa72850b1fe4b8f4b3b
-AUX 4.0/samba4.confd 1572 SHA256 738d37dcd63d043ceae0ca641e3beea9394485e7851d7ec09dec54392d5ef519 SHA512 acd8c2151b619b030b1fc707de3252a65975a3af16e013816ed4b64b6581d873ede2dddfdc9b5522723ba938e51984cb8131f0f7531f24f32cc6829a234eb017 WHIRLPOOL daee50e72d79cb5b43760d7b2f3a35a6eeffaea4aac099f7d755c305e6023e0f235edd0de8bd7bee4e7fca0e26a5a139b75384690075b4380f72c50ce8a6c6ba
+AUX 4.0/samba4.confd 1783 SHA256 53755809cc27fdbaf98752cd3da45b5c2bda62dd46fcc37570c6e237f7954ffa SHA512 6fc7edf192957f97b171c97482317bf563385917cfdbf950ed28d9387961bd16f82844c6f9b5c430508ec6dc7331ecdf5f81fa3135663316061c1d0b1808f53d WHIRLPOOL 868539ecf658f9da3574847cb1447dafe422c60a9208de5580cf7f53e4346e9c7d1c6b3e7ea5c684b83e613dd912c5245ffce6a43bc8bd9bf8417a9c7a5f2557
 AUX 4.0/samba4.initd 813 SHA256 8435ddeac4d064ada92664df03c46ee3aa0096692d5900478a86f8319acc55b2 SHA512 9cde8e5eb3f4ea7731489d96ff9025f9d03a6108ea68b70620bd9e0689a5c28349a478623e526ab7c436afc0252e32b21d1ab79810581242e3314c853268f78f WHIRLPOOL 30d3c3c3011eb94f5754e52bd4e2d3a7ae2920e9776ec66feccde2d89d6e867e08370254858bafbae06f8b8174a167e83d22dcbfa531c7dfb5b2ea0d37611a27
 AUX 4.0/samba4.initd-r1 1575 SHA256 4d00243dbd85ee81e2e989f1ac8035c1c1b9379133584291b959bb7bc45fe780 SHA512 941a4f8e6c839d11140c4caa3efd65176e11f07194e43f37e4f97f9c0e7ee4e8696093876c4b21f808cedcd80d3f7810b3fdcd126a8a0fa87e922299ea605e2c WHIRLPOOL 379166290c15c405c7ff50f6bf2654607282bff71546aa79279bdcd2a00cbb21989f42bb2d0be0588c174db2712b39b4e3eece56104b2ebe6ebbedccb69eb354
 AUX samba-3.4.2-lib.tevent.python.mk 177 SHA256 3eab52d42a0cbc070d011a131f9a56f4b3da10b2791fec514948fd8d2d013153 SHA512 0bd691d7678737fa815da9e1934db056fa833aa6d6d2d48cf8da559987a899ae4c5ac18e4b3594d634363f515028a3d30711484dbda578aa7506fbe2df55197c WHIRLPOOL 061b3e33b327563f52648931428cce433505353e73bf9851abb33f4f13e7c723c17c3413442dd343477bb0c49fd3284c0155ff59829df448952a6e1d07475251
@@ -43,12 +43,22 @@ EBUILD samba-3.6.6.ebuild 11629 SHA256 ed6805f64cc43a221048de65d1967a694896bec97
 EBUILD samba-3.6.9.ebuild 11823 SHA256 2bb856b477e03fa841e290ccdb06f47e6185a5e9decf9b0429c3f95e23e3ca6d SHA512 00e6b81186544825efb2eb6de43c3a6af5713e386433c38a8b7c9208b63858a99284a1e53da67c25cd5233c50a323b333b65dfe9346bd498059950979020beef WHIRLPOOL 499001288cd74a3ca3a9a2f7e74f8130c80898c4629e74ca64b8c72693b565ec3f693e6ee5d41d55b475190f6b9fffce11382f53624938156d63972d698ed8b1
 EBUILD samba-4.0.0_rc4.ebuild 4145 SHA256 b28ae387e3b85f9dac0a7845c0aa41a4d316242e049f285ecf8ebbf3a9992fde SHA512 1d3c6cc513a2ed19c754a651259746805099d405aac12ef66a09871d62264e3abfe94679746cb44ff209c0f516d6926e53d54c26a75d9a13d5aa966027d7c465 WHIRLPOOL 7169e755a85a4bec99f25e2f9a430dfb994f76487b8ffda999be242029a963a015573fcf894d9dfef347f544d35973939a3f92a84828afe6721f82a266cde161
 EBUILD samba-4.0.0_rc5.ebuild 4235 SHA256 b68ed65c086f5e4829d1f1379d00870feeff45683239feec6245ad325d14f08b SHA512 7c03174e4cd2db111dd24512a12366a3104e437ebeceeae734f80caa2379958551ac949bc9d62523fcab5b9f71050aa4493ebc5921703c4b0607edb7611ea13c WHIRLPOOL aad45799e65ac5de203b6bf4cd28d69691beb7ecc5eef190bd53c0cef97ac1fade99e1c8394b21f7deac595f9293c4b4f6ad4014ddc79d95483c1b61293cffa6
-MISC ChangeLog 89857 SHA256 da3e1248f1c17ed7a3c6a97877c8f1ac2d03a61a6e00d39a0cc329532b1d8307 SHA512 d03051642e432b27567c20de606867442503676339f56d3f2321449213c3a80fc69cd5b61b7185a8bc08f319bbea5f98bb38e53942f0aaa479797326f2fbe06f WHIRLPOOL 127bb69d1fdaab88e0c4334a6fa65a8a9a3d827d129d2ac110f1ab8d1b58df8a72040f793159b2d9edcd9d2a3e5898a5e823daf925d11c7394177fb96ff124b2
+MISC ChangeLog 90043 SHA256 7cbe6b53a703bb3087af7386005b8d439a95dcb4360bb0a8d4d41d4fcb250604 SHA512 c1ff7a639b3ea159ff6bb776a84d6cf9145ae887adff952b5366dd97539e828b3aa02613dbf460c607adf5ee4e06de96e0082aaf5f81db371d144d82c08fade7 WHIRLPOOL e32caaab29936e5fc032fbf74f17a5f9b271ab33f766d06ac2c222e19fcc1f89a23bf466e98b97d069ad82eca30fce9410110712a4e8529c4accdf775549e3f8
 MISC metadata.xml 1580 SHA256 bcce2c1233c04b8066d36ca7aae3027c8618eebeea88ebe82e54cbb536c2a0e7 SHA512 38c688ed70818517bb21870872b39e478651b93d380cb36acd8b30c4db691d8157776a3f8eebf93731e6b7c2b5f06d96e202331d585e266a0fd3b12b890697aa WHIRLPOOL b8c85e3168186acd9c157b2e4541c6518a06fba8f319bea38f58078c0bd4a4dd6482a1f1a0eefda4d0cc41c4b4f22e215f15f48244a32e1e7710e71c8b3b8bce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlC3gc8ACgkQVWmRsqeSphP/kgCfeFXI880IdDmJmD2cfe2gNmAL
-n0sAn1DmGM4KU6cs+4jfYX6EKHucou58
-=f1zw
+iQIcBAEBCAAGBQJQuJkwAAoJEPiazRVxLXTFXvgP/1m9GX1C/VPiMhn0+7jQTG6n
+Pd9L6g/09tCEuS9Gh0cT0/keuDEm7vUFazwE9tdFGs/CIO0Yd/6MD5QkErETwyih
+D5F6QU9OHkwyuveWCTlIt3Ss8L0IYVRbNNPAGnQcX2gcnud5K0o2lAUerLxSVnAD
+jbK8xQTq7ySCG/boH9WrjuepAK6Q+LeuxgA9xI2ANEU+rwyU9052SQvUHMiTRKPm
+6KHwzg0WQoeP3+KHU9jBT2ZM+Yhlr40pbk7wLRhvMItFBpM8y34qA0trkhm6YmBq
+WxVR3AFtDds21BmU+kgdytdpKMKXqV/GBwhzoOfgsBeUEII+dnQygQxlsNlR+KXa
+LLaU3tHdu0M+yl9/Gs1/DsdFtVxoLYXL9tbyizXG5qXGHhYostsTdVyydeoaHGWL
+rXhahj9SbEC/qoS8hNf03KK/AhMOkx/2SpSBDQ4Cz5oq5lzXqzcxiWdPU9hk1F4c
+G1ZzDjBJxfwCaJKjBoONMwKTcDM35vLfdgf7ubKpxJ+KCwPZsasUmqvuKqjfQNNe
+OhKWHTzT6WGFsx54JY92v8me94K73acrZ37B4Jf/rxrx3n1WYu0MmhWY4gKdhT6D
+6QleL3iKAUHIBVKcMIa8O0xgdRtRrumA4XwPq29L14r5E6MMNaJ37UNK27IYM51k
+ChXx/e0bMgitNX9qPmJ0
+=hezC
 -----END PGP SIGNATURE-----
diff --git a/net-fs/samba/files/4.0/samba4.confd b/net-fs/samba/files/4.0/samba4.confd
index 4f6ee39a73a9..58b2c7827bdf 100644
--- a/net-fs/samba/files/4.0/samba4.confd
+++ b/net-fs/samba/files/4.0/samba4.confd
@@ -1,6 +1,9 @@
-#add "winbind" to the daemon_list if you also want winbind to start
-#add "samba4" to the daemon_list if you also want \
-#active directory domain controller or to access the ntvfs file server or the rpc proxy 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"
 
 #----------------------------------------------------------------------------