svn commit: samba r15888 - in branches/SAMBA_3_0/source/passdb: .

jra at samba.org jra at samba.org
Thu May 25 15:44:42 GMT 2006


Author: jra
Date: 2006-05-25 15:44:41 +0000 (Thu, 25 May 2006)
New Revision: 15888

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15888

Log:
Fix bug #3804 from jason at ncac.gwu.edu
Invalid comparisons.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/passdb/secrets.c


Changeset:
Modified: branches/SAMBA_3_0/source/passdb/secrets.c
===================================================================
--- branches/SAMBA_3_0/source/passdb/secrets.c	2006-05-25 15:43:12 UTC (rev 15887)
+++ branches/SAMBA_3_0/source/passdb/secrets.c	2006-05-25 15:44:41 UTC (rev 15888)
@@ -404,7 +404,7 @@
 	struct trusted_dom_pass pass;
 	ZERO_STRUCT(pass);
 
-	if (push_ucs2_allocate(&uni_dom_name, domain) < 0) {
+	if (push_ucs2_allocate(&uni_dom_name, domain) == (size_t)-1) {
 		DEBUG(0, ("Could not convert domain name %s to unicode\n",
 			  domain));
 		return False;
@@ -735,7 +735,7 @@
 		}
 
 		if (pull_ucs2_talloc(mem_ctx, &dom_info->name,
-				     pass.uni_name) < 0) {
+				     pass.uni_name) == (size_t)-1) {
 			DEBUG(2, ("pull_ucs2_talloc failed\n"));
 			tdb_search_list_free(keys);
 			return NT_STATUS_NO_MEMORY;



More information about the samba-cvs mailing list