1 files changed, 47 insertions, 21 deletions
diff --git a/samba/smb-shares.m4 b/samba/smb-shares.m4
index ac40e03..814b55c 100644
--- a/samba/smb-shares.m4
+++ b/samba/smb-shares.m4
@@ -1,33 +1,56 @@
 define(_veto_mac,/.AppleDouble/.AppleDesktop/Network Trash Folder/DesktopFolderDB/resource.frk/Icon^M/TheVolumeSettingsFolder/)dnl
-define(_share_logon,[netlogon]
-	comment = $1
-	path = $2
-	browsable = no
-	writeable = no
-	share modes = no
+dnl
+dnl Common share options
+dnl --------------------
+dnl
+dnl	$1 Share name
+dnl	$2 Description
+dnl	$3 Path
+dnl
+define(_share_logon,[$1]
+	comment = $2
+	path = $3
 )dnl
-define(_share_profiles,[userprofiles]
-	path = $1
+define(_share_profiles,[$1]
+	comment = $2
+	path = $3
 	force user = %u
 	writable = yes
 	browsable = yes
-	root preexec = '/bin/mkdir $1/%U \
-		    /bin/chown %U $1/%U \
-		    /bin/chmod 700 $1/%U'
+	root preexec = '/bin/mkdir $3/%U \
+		    /bin/chown %U $3/%U \
+		    /bin/chmod 700 $3/%U'
 )dnl
-define(_share_home,[homes]
-	path = %H/$1
-	browsable = no
+define(_share_reference,[$1]
+	comment = $2
+	path = $3
+	guest ok = yes
+)dnl
+dnl
+define(_share_home,[$1]
+	comment = $2
+	path = $3
 	writeable = yes
-	root preexec = '/bin/mkdir %H/$1 \
-		    /bin/chown %S %H/$1 \
-		    /bin/chmod 700 %H/$1'
+	root preexec = '/bin/mkdir $3 \
+		    /bin/chown %S $3 \
+		    /bin/chmod 700 $3'
 )dnl
+define(_share_home,[home_mac]
+	comment = $1
+	path = $2
+)dnl
+define(_share_home_web,[$1]
+	comment = $2
+	path = $3
+	writeable = yes
+	create mask = 0644
+	directory mask = 0755
+)dnl
+dnl
 define(_share_pc,[$1]
 	comment = $2
 	path = $3
 	browsable = yes
-	guest ok = no
 	writeable = yes
 	create mask = 0660
 	directory mask = 0770
@@ -38,8 +61,6 @@ define(_share_mac,[$1]
 	comment = $2
 	path = $3
 	browsable = yes
-	guest ok = no
-	writeable = no
 	valid users = @$4
 	veto files = _veto_mac
 )dnl
@@ -47,7 +68,6 @@ define(_share_common,[$1]
 	comment = $2
 	path = $3
 	browsable = yes
-	guest ok = no
 	writeable = yes
 	create mask = 0660
 	directory mask = 0770
@@ -56,3 +76,9 @@ define(_share_common,[$1]
 	delete veto files = Yes
 	veto files = _veto_mac
 )dnl
+define(_share_printer,[$1]
+	comment = $2
+	path = $3
+	printable = yes
+	printer name = $4
+)dnl