Author: jra Date: 2004-08-26 21:39:10 +0000 (Thu, 26 Aug 2004) New Revision: 2082
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_3_0/source/smbd&rev=2082&nolog=1 Log: lp_path should be lp_pathname. Paranoia fix on mangle prefix. Jeremy. Modified: branches/SAMBA_3_0/source/smbd/mangle_hash2.c branches/SAMBA_3_0/source/smbd/password.c Changeset: Modified: branches/SAMBA_3_0/source/smbd/mangle_hash2.c =================================================================== --- branches/SAMBA_3_0/source/smbd/mangle_hash2.c 2004-08-26 21:38:50 UTC (rev 2081) +++ branches/SAMBA_3_0/source/smbd/mangle_hash2.c 2004-08-26 21:39:10 UTC (rev 2082) @@ -119,7 +119,7 @@ this hash needs to be fast with a low collision rate (what hash doesn't?) */ -static u32 mangle_hash(const char *key, unsigned length) +static u32 mangle_hash(const char *key, unsigned int length) { u32 value; u32 i; @@ -129,6 +129,7 @@ doesn't depend on the case of the long name. Note that this is the only place where we need to use a multi-byte string function */ + length = MIN(length,sizeof(fstring)-1); strncpy(str, key, length); str[length] = 0; strupper_m(str); Modified: branches/SAMBA_3_0/source/smbd/password.c =================================================================== --- branches/SAMBA_3_0/source/smbd/password.c 2004-08-26 21:38:50 UTC (rev 2081) +++ branches/SAMBA_3_0/source/smbd/password.c 2004-08-26 21:39:10 UTC (rev 2082) @@ -272,7 +272,7 @@ vuser->user.unix_name, vuser->unix_homedir); } else { DEBUG(3, ("Using static (or previously created) service for user '%s'; path = '%s'\n", - vuser->user.unix_name, lp_path(servicenumber) )); + vuser->user.unix_name, lp_pathname(servicenumber) )); vuser->homes_snum = servicenumber; } }
