diff options
| author | Jeremy Allison <jra@samba.org> | 2003-08-27 01:25:01 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2003-08-27 01:25:01 +0000 |
| commit | 9fdc1363bec6ae9a0a0f9a37130b98a92ebe8ce2 (patch) | |
| tree | a3f5b31cb23487dab3c01bb3eeb1a65c5a675afe /source3/libsmb/nmblib.c | |
| parent | 7e27147422e78125c2bb5b8115bd9084a657e084 (diff) | |
| download | samba-9fdc1363bec6ae9a0a0f9a37130b98a92ebe8ce2.tar.gz samba-9fdc1363bec6ae9a0a0f9a37130b98a92ebe8ce2.tar.bz2 samba-9fdc1363bec6ae9a0a0f9a37130b98a92ebe8ce2.zip | |
Fix the character set handling properly in nmbd. Also fix bug where
iconv wasn't re-initialised on reading of "charset" parameters. This
caused workgroup name to be set incorrectly if it contained an
extended character.
Jeremy.
(This used to be commit 84ae44678a6c59c999bc1023fdd9b7ad87f4ec18)
Diffstat (limited to 'source3/libsmb/nmblib.c')
| -rw-r--r-- | source3/libsmb/nmblib.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source3/libsmb/nmblib.c b/source3/libsmb/nmblib.c index 23eac9ad7c..ff38245435 100644 --- a/source3/libsmb/nmblib.c +++ b/source3/libsmb/nmblib.c @@ -825,8 +825,7 @@ void make_nmb_name( struct nmb_name *n, const char *name, int type) memset( (char *)n, '\0', sizeof(struct nmb_name) ); push_ascii(n->name, name, sizeof(n->name), STR_TERMINATE|STR_UPPER); n->name_type = (unsigned int)type & 0xFF; - StrnCpy( n->scope, global_scope(), 63 ); - strupper_m( n->scope ); + push_ascii(n->scope, global_scope(), 64, STR_TERMINATE); } /******************************************************************* |