samba: m4 script: Rewrite option 'private'. fileshares now default to r/o private (clarify in documentation).

1 files changed, 24 insertions, 14 deletions

diff --git a/samba/smb-shares.conf.m4 b/samba/smb-shares.conf.m4
index a8bc8ae..f4375ca 100644
--- a/samba/smb-shares.conf.m4
+++ b/samba/smb-shares.conf.m4
@@ -2,7 +2,7 @@ ifelse(`
 /etc/samba/smb-shares.m4
 Copyright 2002 Jonas Smedegaard <dr@jones.dk>
 
-$Id: smb-shares.conf.m4,v 1.9 2002-07-07 14:25:53 jonas Exp $
+$Id: smb-shares.conf.m4,v 1.10 2002-07-07 16:04:40 jonas Exp $
 
 m4 share definitions for generating Samba server smb.conf include file
 
@@ -22,16 +22,16 @@ where
 					"userprofiles" sets "force user" and pre-creates user subdirectory mode 700
 					"reference" allows guests
 					"homes" pre-creates directory mode 750
-				_homefiles shares have browseing disabled
 	<desc>:		Mount point description (iso8859-1 is (fully?) supported)
 	<path>:		Full path to mount point directory
 	<uid>:		user name of owner of mount point directory
 	<gid>:		group name of owner of mount point directory
 	<modes>:	Numeric access modes of mount point directory
-	ro|rw <group>:	Primary group with access to mountpoint. Public readonly access if omitted (except mount points mentioned above)
+	ro|rw|rop|rwp:	Read-only or read/write access to mount point, and wether it should be private (not publically announced).
+			Private read-only access if undefined.
+			_homefiles are always private.
+	<group>:	Primary group with access to mountpoint. If mount point is r/w then primary group has r/w access as well.
 	<othergroup>:	Secondary group with readonly access
-	private:	Do not announce mount point
-			Samba:	Disable browseing
 
 Example:
 
@@ -46,6 +46,7 @@ Example:
 
 TODO:
 	Support for netatalk is not yet implemented.
+	Get rid of <os>: <othergroup> is now 10nth parameter which is only available in GNU m4.
 
 ')dnl
 changequote(<, >)dnl
@@ -107,16 +108,28 @@ ifdef($8,
 <dnl
 define(<_group_read>)dnl
 >,
+    $8,rop,
+<dnl
+define(<_group_read>)dnl
+define(<_private>)dnl
+>,
     $8,rw,
-	ifdef($9,
-	    ifelse($9,,
-		_warn(<share group is "rw" but no group specified>),
 <dnl
 define(<_user_write>)dnl
-define(<_group_write>)dnl
->)),
-    _warn(<share group is wrong. Must be "ro" or "rw">)dnl
+>,
+    $8,rwp,
+<dnl
+define(<_user_write>)dnl
+define(<_private>)dnl
+>,
+    _warn(<share access is wrong. Must be either "ro", "rop", "rw" or "rwp">)dnl
 ))dnl
+ifdef($9,
+    ifelse($9,,
+	_warn(<share group is "rw" or "rwp" but no group is specified>),
+	ifdef(<_user_write>,
+define(<_group_write>)dnl
+)))dnl
 ifdef(<_user_write>,
 <	writeable = yes
 >ifdef(<_group_write>,
@@ -140,9 +153,6 @@ ifelse($9,,,
 >ifdef(<_group_write>,
 <	force group = +$9
 >))dnl
-ifelse($10,,,
-define(<_private>)dnl
-)dnl
 ifdef(<_private>,
 <	browseable = no
 >)dnl