diff -urN pxes-1.0.orig/stock/dist/bin/parsetemplate pxes-1.0/stock/dist/bin/parsetemplate
--- pxes-1.0.orig/stock/dist/bin/parsetemplate	2005-04-20 04:51:57.000000000 +0000
+++ pxes-1.0/stock/dist/bin/parsetemplate	2005-08-31 11:10:54.000000000 +0000
@@ -110,6 +110,9 @@
 		echo s@\${LOCAL_ERR}@`escape ${LOCAL_ERR}`@g
 		echo s@\${SESSION_DEFAULT}@`escape ${SESSION_DEFAULT}`@g
 		echo s@\${SAMBA_LOG_FILE}@`escape ${SAMBA_LOG_FILE}`@g
+		echo s/\${SAMBA_NETBIOS_DOMAIN}/`escape ${SAMBA_NETBIOS_DOMAIN}`/g
+		echo s/\${SAMBA_NETBIOS_NAME_ENABLED}/`escape ${SAMBA_NETBIOS_NAME_ENABLED}`/g
+		echo s/\${SAMBA_NETBIOS_NAME}/`escape ${SAMBA_NETBIOS_NAME}`/g
 		echo s/\${SAMBA_HARDDISK_ENABLED}/`escape ${SAMBA_HARDDISK_ENABLED}`/g
 		echo s/\${SAMBA_USBFLASHDISK_ENABLED}/`escape ${SAMBA_USBFLASHDISK_ENABLED}`/g
 		echo s/\${SAMBA_DVDCDROM_ENABLED}/`escape ${SAMBA_DVDCDROM_ENABLED}`/g
@@ -216,6 +219,7 @@
 
 		# local devices
 		echo s@\${LOCAL_PRINTER_DEVICE}@`escape ${LOCAL_PRINTER_DEVICE}`@g
+		echo s/\${LOCAL_PRINTER_NAME}/`escape ${LOCAL_PRINTER_NAME}`/g
 
 		# local services
 		echo s@\${LOCAL_TFTPD_OPTIONS}@`escape ${LOCAL_TFTPD_OPTIONS}`@g
diff -urN pxes-1.0.orig/stock/dist/etc/printcap.tpl pxes-1.0/stock/dist/etc/printcap.tpl
--- pxes-1.0.orig/stock/dist/etc/printcap.tpl	2005-04-08 20:32:09.000000000 +0000
+++ pxes-1.0/stock/dist/etc/printcap.tpl	2005-08-31 10:19:38.000000000 +0000
@@ -2,7 +2,7 @@
 # $Id: printcap.tpl 863 2005-04-08 20:32:08Z diego $
 # Parsed: ${DATE}
 
-printer|${HOSTNAME} printer:\
+${LOCAL_PRINTER_NAME}|${HOSTNAME} printer:\
 	:ml#0:\
 	:mx#0:\
 	:sd=/var/spool/printer:\
diff -urN pxes-1.0.orig/stock/extra/samba/etc/samba/smb.conf.tpl pxes-1.0/stock/extra/samba/etc/samba/smb.conf.tpl
--- pxes-1.0.orig/stock/extra/samba/etc/samba/smb.conf.tpl	2005-04-08 20:32:09.000000000 +0000
+++ pxes-1.0/stock/extra/samba/etc/samba/smb.conf.tpl	2005-08-31 11:27:49.000000000 +0000
@@ -18,7 +18,9 @@
 [global]
 
 # workgroup = NT-Domain-Name or Workgroup-Name
-   workgroup = THINCLIENT
+   workgroup = ${SAMBA_NETBIOS_DOMAIN}
+
+${SAMBA_NETBIOS_NAME_ENABLED}  netbios name = ${SAMBA_NETBIOS_NAME}
 
 # server string is the equivalent of the NT Description field
    server string = Thin client
@@ -56,7 +58,7 @@
 
 # Security mode. Most people will want user level security. See
 # security_level.txt for details.
-   security = user
+   security = share
 
 # Use password server option only with security = server
 # The argument list may include:
@@ -219,7 +221,7 @@
 ${SAMBA_PRINTERS_ENABLED}   path = /var/spool/printer
 ${SAMBA_PRINTERS_ENABLED}   browseable = no
 ## Set public = yes to allow user 'guest account' to print
-${SAMBA_PRINTERS_ENABLED}   guest ok = no
+${SAMBA_PRINTERS_ENABLED}   guest ok = yes
 ${SAMBA_PRINTERS_ENABLED}   writable = no
 ${SAMBA_PRINTERS_ENABLED}   printable = yes