diff options
| author | Jeremy Allison <jra@samba.org> | 2003-09-25 21:26:16 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2003-09-25 21:26:16 +0000 |
| commit | d3b9384308e4b5130c9455b853edc4702d7af303 (patch) | |
| tree | 026331069404a2dfd74d5d1443cf416d9ccaaa09 /source3/rpc_parse/parse_ds.c | |
| parent | 6c623b55bd023d9b2afa6ac3d69d814475a493e4 (diff) | |
| download | samba-d3b9384308e4b5130c9455b853edc4702d7af303.tar.gz samba-d3b9384308e4b5130c9455b853edc4702d7af303.tar.bz2 samba-d3b9384308e4b5130c9455b853edc4702d7af303.zip | |
Fix for #480. Change the interface for init_unistr2 to not take a length
but a flags field. We were assuming that 2*strlen(mb_string) == length of ucs2-le string.
This is not the case. Count it after conversion.
Jeremy.
(This used to be commit f82c273a42f930c7152cfab84394781744815e0e)
Diffstat (limited to 'source3/rpc_parse/parse_ds.c')
| -rw-r--r-- | source3/rpc_parse/parse_ds.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source3/rpc_parse/parse_ds.c b/source3/rpc_parse/parse_ds.c index f954806036..26dcdb34b8 100644 --- a/source3/rpc_parse/parse_ds.c +++ b/source3/rpc_parse/parse_ds.c @@ -138,8 +138,6 @@ BOOL ds_io_r_getprimdominfo( const char *desc, prs_struct *ps, int depth, DS_R_G BOOL init_q_ds_enum_domain_trusts( DS_Q_ENUM_DOM_TRUSTS *q, const char *server, uint32 flags ) { - int len; - q->flags = flags; if ( server && *server ) @@ -147,9 +145,7 @@ BOOL init_q_ds_enum_domain_trusts( DS_Q_ENUM_DOM_TRUSTS *q, const char *server, else q->server_ptr = 0; - len = q->server_ptr ? strlen(server)+1 : 0; - - init_unistr2( &q->server, server, len ); + init_unistr2( &q->server, server, UNI_STR_TERMINATE); return True; } |