summaryrefslogtreecommitdiff
path: root/source3/rpc_parse/parse_misc.c
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2000-12-08 03:34:00 +0000
committerTim Potter <tpot@samba.org>2000-12-08 03:34:00 +0000
commit3478427f2e5ab634d61e6863f41bba84cce8d05e (patch)
tree6a5d25996210b3ade5e53379b6747b0090d49e3b /source3/rpc_parse/parse_misc.c
parentcf9443677d8e82f978194c43a8275e7e937e890a (diff)
downloadsamba-3478427f2e5ab634d61e6863f41bba84cce8d05e.tar.gz
samba-3478427f2e5ab634d61e6863f41bba84cce8d05e.tar.bz2
samba-3478427f2e5ab634d61e6863f41bba84cce8d05e.zip
Port of lsa_lookup_sids() and lsa_lookup_names() rpc client functions from
TNG branch. Re-instated lsa_lookup_sids and lsa_lookup_names functions in rpcclient. This requires most samba binaries to link in another handful of object files due to uncessary coupling between modules. )-: (This used to be commit 817819d0cc3ecf642be5a1656be3b71bed260ee4)
Diffstat (limited to 'source3/rpc_parse/parse_misc.c')
-rw-r--r--source3/rpc_parse/parse_misc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/rpc_parse/parse_misc.c b/source3/rpc_parse/parse_misc.c
index 859a800771..dd6784a8e7 100644
--- a/source3/rpc_parse/parse_misc.c
+++ b/source3/rpc_parse/parse_misc.c
@@ -321,7 +321,7 @@ void init_uni_hdr(UNIHDR *hdr, int len)
{
hdr->uni_str_len = 2 * len;
hdr->uni_max_len = 2 * len;
- hdr->buffer = len != 0 ? 1 : 0;
+ hdr->buffer = len != 0;
}
/*******************************************************************
@@ -867,7 +867,8 @@ void init_unistr2(UNISTR2 *str, const char *buf, size_t len)
{
ZERO_STRUCTP(str);
- /* set up string lengths. */
+ /* Set up string lengths. */
+
str->uni_max_len = (uint32)len;
str->undoc = 0;
str->uni_str_len = (uint32)len;
@@ -880,8 +881,7 @@ void init_unistr2(UNISTR2 *str, const char *buf, size_t len)
len *= sizeof(uint16);
str->buffer = (uint16 *)talloc(parse_misc_talloc, len);
- if ((str->buffer == NULL) && (len > 0))
- {
+ if ((str->buffer == NULL) && (len > 0)) {
smb_panic("init_unistr2: malloc fail\n");
return;
}