1
0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00

lib/util_unistr.c:

rewrote unistr2_to_ascii() to correct a bug seen on SGI boxes.

rpc_parse/parse_misc.c:
rpc_parse/parse_prs.c:
        rewrote of BUFFER5 handling to NOT byteswap when it was already in
        network byte order.

rpc_parse/parse_samr.c:
        cleanup of samr_io_q_lookup_domain(), remove the over-parsing by 2
        bytes.

rpc_server/srv_lsa.c:
        UNISTR2 strings need to be NULL terminated to pleased W2K.

rpc_server/srv_spoolss_nt.c:
        use snprintf instead of safe_strcpy as we want the string
        truncated at 32 chars.


That should fix SUN and SGI box not able to act as printserver and the
problem with joining from a W2K wks.

        J.F.
This commit is contained in:
Jean-François Micouleau
-
parent d0d31eead3
commit 69fe739303
7 changed files with 92 additions and 48 deletions

View File

@ -562,6 +562,47 @@ BOOL prs_uint32s(BOOL charmode, char *name, prs_struct *ps, int depth, uint32 *d
return True;
}
/******************************************************************
Stream an array of unicode string, length/buffer specified separately,
in uint16 chars. We use DBG_RW_PCVAL, not DBG_RW_PSVAL here
as the unicode string is already in little-endian format.
********************************************************************/
BOOL prs_buffer5(BOOL charmode, char *name, prs_struct *ps, int depth, BUFFER5 *str)
{
char *p;
char *q = prs_mem_get(ps, str->buf_len * sizeof(uint16));
if (q == NULL)
return False;
if (UNMARSHALLING(ps)) {
str->buffer = (uint16 *)prs_alloc_mem(ps,str->buf_len * sizeof(uint16));
if (str->buffer == NULL)
return False;
memset(str->buffer, '\0', str->buf_len * sizeof(uint16));
}
/* If the string is empty, we don't have anything to stream */
if (str->buf_len==0)
return True;
p = (char *)str->buffer;
/* If we're using big-endian, reverse to get little-endian. */
if(ps->bigendian_data) {
DBG_RW_PSVAL(charmode, name, depth, ps->data_offset,
ps->io, ps->bigendian_data, q, p,
str->buf_len)
} else {
DBG_RW_PCVAL(charmode, name, depth, ps->data_offset,
ps->io, q, p, str->buf_len * sizeof(uint16))
}
ps->data_offset += (str->buf_len * sizeof(uint16));
return True;
}
/******************************************************************
Stream a "not" unicode string, length/buffer specified separately,
in byte chars. String is in little-endian format.