r4005: Fix for bug #2071 reported by Jason Mader <jason@ncac.gwu.edu>.

Use correct enum type for comparisons.
Jeremy.

diff --git a/source/libsmb/samlogon_cache.c b/source/libsmb/samlogon_cache.c
index 0105bc08c3a112b23836d4427df9a520046e5b8e..ed2283725c891f3f30c05920e60d11ae4faaa8dc 100644 (file)
--- a/source/libsmb/samlogon_cache.c
+++ b/source/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/source/rpc_parse/parse_misc.c b/source/rpc_parse/parse_misc.c
index cea31c88a80353eff2c8698182a139d2d42f7e91..c6f05df0c479b3b845acbaa5ca7d02d9b5581850 100644 (file)
--- a/source/rpc_parse/parse_misc.c
+++ b/source/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++;
                }
        }