nmbd_packets.c: nmbd_subnetdb.c: Patch from Andrey Alekseyev <fetch@muffin.arcadia.spb.ru>

to fix the fact that retransmit_or_expire_response_records() wasn't looking
at the WINS subnet.
server.c: Patch from jkf@soton.ac.uk to add %p (NIS server path) substitution.
smbpass.c: Fix to stop parsing failing on non-valid lines.
trans2.c: Fix for volume serial number code.
util.c:  Patch from jkf@soton.ac.uk to add %p (NIS server path) substitution.
         Fix for warnings under RH5. gcc 2.8.
Jeremy.
(This used to be commit e58ab3bbe6e939ba678ad5482e58e0191c8dcbcb)

1 files changed, 9 insertions, 0 deletions

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index c2880b0e890..9c25a21000f 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -4569,6 +4569,15 @@ void standard_sub(int cnum,char *str)
         case 'S' : string_sub(p,"%S",lp_servicename(Connections[cnum].service)); break;
         case 'g' : string_sub(p,"%g",gidtoname(Connections[cnum].gid)); break;
         case 'u' : string_sub(p,"%u",Connections[cnum].user); break;
+	/* 
+         * Patch from jkf@soton.ac.uk
+	 * Left the %N (NIS server name) in standard_sub_basic as it 
+	 * is a feature for logon servers, hence uses the username. 
+	 * The %p (NIS server path) code is here as it is used
+	 * instead of the default "path =" string in [homes] and so
+	 * needs the service name, not the username. 
+         */
+	case 'p' : string_sub(p,"%p",automount_path(lp_servicename(Connections[cnum].service))); break;
         case '\0' : p++; break; /* don't run off the end of the string */
         default  : p+=2; break;
       }