diff options
| author | Jeremy Allison <jra@samba.org> | 2014-10-31 11:01:26 -0700 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2014-11-09 20:47:10 +0100 |
| commit | 907e64cc6534933d5da780444e930488ecd8aa42 (patch) | |
| tree | 82911413c4cda2710ee492077c6a58674fe33da4 /source3 | |
| parent | 56ed6003219655443578bb08f24dd5c8587cc85a (diff) | |
| download | samba-907e64cc6534933d5da780444e930488ecd8aa42.tar.gz | |
s3: nmbd: Ensure NetBIOS names are only 15 characters stored.
This screws up if the name is greater than MAX_NETBIOSNAME_LEN-1 in the
unix charset, but less than or equal to MAX_NETBIOSNAME_LEN-1 in the DOS
charset, but this is so old we have to live with that.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10920
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 7467f6e72cba214eeca75c34e9d9fba354c7ef31)
Signed-off-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/lib/util_names.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source3/lib/util_names.c b/source3/lib/util_names.c index cf54a0eece..1392b488e0 100644 --- a/source3/lib/util_names.c +++ b/source3/lib/util_names.c @@ -60,7 +60,15 @@ static bool set_my_netbios_names(const char *name, int i) { SAFE_FREE(smb_my_netbios_names[i]); - smb_my_netbios_names[i] = SMB_STRDUP(name); + /* + * Don't include space for terminating '\0' in strndup, + * it is automatically added. This screws up if the name + * is greater than MAX_NETBIOSNAME_LEN-1 in the unix + * charset, but less than or equal to MAX_NETBIOSNAME_LEN-1 + * in the DOS charset, but this is so old we have to live + * with that. + */ + smb_my_netbios_names[i] = SMB_STRNDUP(name, MAX_NETBIOSNAME_LEN-1); if (!smb_my_netbios_names[i]) return False; return strupper_m(smb_my_netbios_names[i]); |