samba: m4 script: New option 'private' - used to disable browseing (added to all _homefiles lines).

1 files changed, 18 insertions, 7 deletions

diff --git a/samba/smb-shares.conf.m4 b/samba/smb-shares.conf.m4
index dddbed5..a8bc8ae 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.8 2002-07-07 13:56:04 jonas Exp $
+$Id: smb-shares.conf.m4,v 1.9 2002-07-07 14:25:53 jonas Exp $
 
 m4 share definitions for generating Samba server smb.conf include file
 
@@ -12,7 +12,7 @@ Depend on file /etc/local-COMMON/file-<FQDN>.m4 containing lines of
 the following syntax:
 	_dir(<path>,<uid>,<gid>,<modes>)dnl
 	_homefiles(<os>,<mount>,<desc>,<path>[,ro])dnl
-	_files(<os>,<mount>,<desc>,<path>,<uid>,<gid>,<modes>[,ro[,<group>]|,rw,<group>[,<othergroup>]])dnl
+	_files(<os>,<mount>,<desc>,<path>,<uid>,<gid>,<modes>[[,ro[,<group>]|,rw,<group>[,<othergroup>]][,private]])dnl
 where
 	<os>:		Client operating systems (mac|win|any)
 	<mount>:	Mount point name
@@ -21,7 +21,8 @@ where
 					"netlogon" has browsing and share modes disabled
 					"userprofiles" sets "force user" and pre-creates user subdirectory mode 700
 					"reference" allows guests
-					"homes" has browseing disabled and pre-creates directory mode 750
+					"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
@@ -29,6 +30,8 @@ where
 	<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)
 	<othergroup>:	Secondary group with readonly access
+	private:	Do not announce mount point
+			Samba:	Disable browseing
 
 Example:
 
@@ -67,13 +70,14 @@ undefine(<_group_read>)dnl
 undefine(<_world_read>)dnl
 undefine(<_user_write>)dnl
 undefine(<_group_write>)dnl
+undefine(<_private>)dnl
 [$2]
 	path = $4
 ifelse($3,,,
 <	comment = $3
 >)ifelse($2,<netlogon>,
-<	browseable = no
-	share modes = no
+<	share modes = no
+define(<_private>)dnl
 >,
     $2,<userprofiles>,
 <	force user = %u
@@ -86,12 +90,13 @@ define(<_chmod>, <700>)dnl
 <	guest ok = yes
 >,
     $2,<homes>,
-<	browseable = no
+<dnl
 define(<_mkdir>, <$4>)dnl
 define(<_chown>, <%S>)dnl
 define(<_chmod>, <750>)dnl
 define(<_user_write>)dnl
 define(<_group_read>)dnl
+define(<_private>)dnl
 >,
 <>)dnl
 ifdef(<_mkdir>,
@@ -135,6 +140,12 @@ ifelse($9,,,
 >ifdef(<_group_write>,
 <	force group = +$9
 >))dnl
+ifelse($10,,,
+define(<_private>)dnl
+)dnl
+ifdef(<_private>,
+<	browseable = no
+>)dnl
 ifdef(<_veto>,
 <	veto files = _veto_mac
 >)dnl
@@ -142,7 +153,7 @@ ifdef(<_veto>,
 >)dnl
 define(<_homefiles>,
 <ifelse($1,win,
-<_files($1,$2,$3,$4)>)>)dnl
+<_files($1,$2,$3,$4,,,,,,private)>)>)dnl
 define(<_printer>,
 <ifelse($1,win,
 [$2]