svn commit: samba r4004 - in trunk/source: libsmb rpc_parse
jra at samba.org
jra at samba.org
Mon Nov 29 19:28:04 GMT 2004
Author: jra
Date: 2004-11-29 19:28:04 +0000 (Mon, 29 Nov 2004)
New Revision: 4004
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4004
Log:
Fix for bug #2071 reported by Jason Mader <jason at ncac.gwu.edu>.
Use correct enum type for comparisons.
Jeremy.
Modified:
trunk/source/libsmb/samlogon_cache.c
trunk/source/rpc_parse/parse_misc.c
Changeset:
Modified: trunk/source/libsmb/samlogon_cache.c
===================================================================
--- trunk/source/libsmb/samlogon_cache.c 2004-11-29 17:51:13 UTC (rev 4003)
+++ trunk/source/libsmb/samlogon_cache.c 2004-11-29 19:28:04 UTC (rev 4004)
@@ -136,7 +136,7 @@
/* 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 );
}
Modified: trunk/source/rpc_parse/parse_misc.c
===================================================================
--- trunk/source/rpc_parse/parse_misc.c 2004-11-29 17:51:13 UTC (rev 4003)
+++ trunk/source/rpc_parse/parse_misc.c 2004-11-29 19:28:04 UTC (rev 4004)
@@ -934,7 +934,7 @@
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++;
}
}
More information about the samba-cvs
mailing list