diff options
| author | Jeremy Allison <jra@samba.org> | 2004-11-29 19:28:12 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:53:27 -0500 |
| commit | b9fcb5b961fc4165899487c7cb368ab2d8d15e8a (patch) | |
| tree | d00577613317aaf45c60fd7e3d46a447cb738aa6 /source3 | |
| parent | 86d528928d672e8ff95f4876e4285a178a051bf1 (diff) | |
| download | samba-b9fcb5b961fc4165899487c7cb368ab2d8d15e8a.tar.gz samba-b9fcb5b961fc4165899487c7cb368ab2d8d15e8a.tar.bz2 samba-b9fcb5b961fc4165899487c7cb368ab2d8d15e8a.zip | |
r4005: Fix for bug #2071 reported by Jason Mader <jason@ncac.gwu.edu>.
Use correct enum type for comparisons.
Jeremy.
(This used to be commit b926480d053e42205e959b9808a6e3bb90db9ce5)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/libsmb/samlogon_cache.c | 2 | ||||
| -rw-r--r-- | source3/rpc_parse/parse_misc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c index 0105bc08c3..ed2283725c 100644 --- a/source3/libsmb/samlogon_cache.c +++ b/source3/libsmb/samlogon_cache.c @@ -136,7 +136,7 @@ BOOL netsamlogon_cache_store(TALLOC_CTX *mem_ctx, const char * username, NET_USE /* so we fill it in since winbindd_getpwnam() makes use of it */ if ( !user->uni_user_name.buffer ) { - init_unistr2( &user->uni_user_name, username, STR_TERMINATE ); + init_unistr2( &user->uni_user_name, username, UNI_STR_TERMINATE ); init_uni_hdr( &user->hdr_user_name, &user->uni_user_name ); } diff --git a/source3/rpc_parse/parse_misc.c b/source3/rpc_parse/parse_misc.c index cea31c88a8..c6f05df0c4 100644 --- a/source3/rpc_parse/parse_misc.c +++ b/source3/rpc_parse/parse_misc.c @@ -934,7 +934,7 @@ void init_unistr2(UNISTR2 *str, const char *buf, enum unistr2_term_codes flags) if (buf) { rpcstr_push((char *)str->buffer, buf, len, STR_TERMINATE); num_chars = strlen_w(str->buffer); - if (flags == STR_TERMINATE || flags == UNI_MAXLEN_TERMINATE) { + if (flags == UNI_STR_TERMINATE || flags == UNI_MAXLEN_TERMINATE) { num_chars++; } } |