From da41ac6e6b893566738e10f5ed076ac8e99ffe9e Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 2 Jan 2003 19:25:28 +0000 Subject: Merge Andrew Bartletts (size_t)-1 checks. Jeremy. (This used to be commit 339f4fe15efbf67157c8e61b98c6ea983e6b4674) --- source3/nsswitch/winbindd_pam.c | 6 +++--- source3/smbd/mangle_hash.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source3/nsswitch/winbindd_pam.c b/source3/nsswitch/winbindd_pam.c index c5b68ea058..3f079606d0 100644 --- a/source3/nsswitch/winbindd_pam.c +++ b/source3/nsswitch/winbindd_pam.c @@ -185,13 +185,13 @@ enum winbindd_result winbindd_pam_auth_crap(struct winbindd_cli_state *state) goto done; } - if (pull_utf8_talloc(mem_ctx, &user, state->request.data.auth_crap.user) < 0) { + if (pull_utf8_talloc(mem_ctx, &user, state->request.data.auth_crap.user) == (size_t)-1) { DEBUG(0, ("winbindd_pam_auth_crap: pull_utf8_talloc failed!\n")); } if (*state->request.data.auth_crap.domain) { char *dom = NULL; - if (pull_utf8_talloc(mem_ctx, &dom, state->request.data.auth_crap.domain) < 0) { + if (pull_utf8_talloc(mem_ctx, &dom, state->request.data.auth_crap.domain) (size_t)-1) { DEBUG(0, ("winbindd_pam_auth_crap: pull_utf8_talloc failed!\n")); } domain = dom; @@ -215,7 +215,7 @@ enum winbindd_result winbindd_pam_auth_crap(struct winbindd_cli_state *state) if (*state->request.data.auth_crap.workstation) { char *wrk = NULL; - if (pull_utf8_talloc(mem_ctx, &wrk, state->request.data.auth_crap.workstation) < 0) { + if (pull_utf8_talloc(mem_ctx, &wrk, state->request.data.auth_crap.workstation) == (size_t)-1) { DEBUG(0, ("winbindd_pam_auth_crap: pull_utf8_talloc failed!\n")); } workstation = wrk; diff --git a/source3/smbd/mangle_hash.c b/source3/smbd/mangle_hash.c index 0446a953ff..d1c5cf1b5c 100644 --- a/source3/smbd/mangle_hash.c +++ b/source3/smbd/mangle_hash.c @@ -730,7 +730,7 @@ static void name_map(char *OutName, BOOL need83, BOOL cache83) DEBUG(5,("name_map( %s, need83 = %s, cache83 = %s)\n", OutName, need83 ? "True" : "False", cache83 ? "True" : "False")); - if (push_ucs2_allocate(&OutName_ucs2, OutName) < 0) { + if (push_ucs2_allocate(&OutName_ucs2, OutName) == (size_t)-1) { DEBUG(0, ("push_ucs2_allocate failed!\n")); return; } -- cgit