-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 04/24/2012 12:39 PM, Christian PERRIER wrote: > Quoting Nikolaus Rath (nikol...@rath.org): > >> Hmm. I think defaulting to /etc/samba/private now, only to have >> another transition once we've convinced upstream to comply with >> FHS is inviting trouble. >> >> If we have to obey FHS, wouldn't it be much easier to just >> replace fhs-filespaths.patch with a patch that replaces the >> *default* value for "private dir" to /var/lib/samba/private? > > Good idea, indeed. The simplest one and one not involving any > transition, really. You get a GO from my side for this change..:-)
It may be hard to believe, but it gets even better: we can just drop the patch and change the ./configure options to adjust the default private dir. Minimally invasive :-). Patch is attached. Before the patch: # testparm -v --parameter-name "private dir" Load smb config files from /etc/samba/smb.conf rlimit_max: increasing rlimit_max (1024) to minimum Windows limit (16384) Processing section "[homes]" Processing section "[printers]" Processing section "[print$]" Loaded services file OK. Press enter to see a dump of your service definitions /etc/samba After the patch: # testparm -v --parameter-name "private dir" Load smb config files from /etc/samba/smb.conf rlimit_max: increasing rlimit_max (1024) to minimum Windows limit (16384) Processing section "[homes]" Processing section "[printers]" Processing section "[print$]" Loaded services file OK. Press enter to see a dump of your service definitions /var/lib/samba Best, -Nikolaus - -- »Time flies like an arrow, fruit flies like a Banana.« PGP fingerprint: 5B93 61F8 4EA2 E279 ABF6 02CF A9AD B7F8 AE4E 425C -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iGoEARECACoFAk+XB1gjGmh0dHA6Ly93d3cucmF0aC5vcmcvZ3BncG9saWN5Lmh0 bWwACgkQqa23+K5OQlyGFACfX7v6hYmNYYjFlkjaZy41fG245hYAn1ZWX3M7d/XJ lL56VndnxTRcnmni =AP0e -----END PGP SIGNATURE-----
Index: debian/patches/series =================================================================== --- debian/patches/series (revision 4049) +++ debian/patches/series (working copy) @@ -1,6 +1,5 @@ documentation.patch documentation2.patch -fhs-filespaths.patch installswat.sh.patch pam-examples.patch README_nosmbldap-tools.patch Index: debian/changelog =================================================================== --- debian/changelog (revision 4049) +++ debian/changelog (working copy) @@ -1,3 +1,10 @@ +samba (2:3.6.4-2) UNRELEASED; urgency=low + + * Stop ignoring "private dir" configuration option, change default to + /var/lib/samba. Closes: #249873. + + -- Nikolaus Rath <nikol...@rath.org> Tue, 24 Apr 2012 15:00:03 -0400 + samba (2:3.6.4-1) unstable; urgency=low [ Christian Perrier ] Index: debian/NEWS =================================================================== --- debian/NEWS (revision 4049) +++ debian/NEWS (working copy) @@ -1,3 +1,20 @@ +samba (2:3.6.4-2) UNRELEASED; urgency=low + + * "private dir" configuration is no longer ignored. + + Previous samba releases ignored the "private dir" configuration + setting in smb.conf and instead hardcoded the value to + /var/lib/samba. Starting with this version, /var/lib/samba is the + default value, but it can be overriden. This default is different + from upstream (which uses /etc/samba) in order to conform to the + FHS. + + If your setup relied on "private dir" being ignored, you will + need to remove this setting from smb.conf or your system may + behave in unexpected ways. + + -- Nikolaus Rath <nikol...@rath.org> Tue, 24 Apr 2012 15:00:36 -0400 + samba (2:3.4.0-1) unstable; urgency=low * Default passdb backend changed in samba 3.4.0 and above Index: debian/rules =================================================================== --- debian/rules (revision 4049) +++ debian/rules (working copy) @@ -20,7 +20,7 @@ --cache-file=./config.cache \ --with-fhs \ --enable-static \ - --with-privatedir=/etc/samba \ + --with-privatedir=/var/lib/samba \ --with-piddir=/var/run/samba \ --with-rootsbindir=/sbin \ --with-pammodulesdir=/lib/$(DEB_HOST_MULTIARCH)/security \
