diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-02-04 04:58:48 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:32 -0500 |
| commit | db4ba6e6909b4cf80b2b18f1a0d34b613de4be25 (patch) | |
| tree | db881cfc782a369ba4d80b8500b24c0c164b2578 /source4/libads/ldap.c | |
| parent | 567b7a90f6c968bbe09115bb38da9c781c669a50 (diff) | |
| download | samba-db4ba6e6909b4cf80b2b18f1a0d34b613de4be25.tar.gz samba-db4ba6e6909b4cf80b2b18f1a0d34b613de4be25.tar.bz2 samba-db4ba6e6909b4cf80b2b18f1a0d34b613de4be25.zip | |
r5221: replace the str_list_*() code with new code based on talloc(). This is
a precursor to adding the wins client code in the nbt server.
(This used to be commit e8e499755ab667015740b35a7787134ebe852954)
Diffstat (limited to 'source4/libads/ldap.c')
| -rw-r--r-- | source4/libads/ldap.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/libads/ldap.c b/source4/libads/ldap.c index d63d667777..f760843b59 100644 --- a/source4/libads/ldap.c +++ b/source4/libads/ldap.c @@ -391,7 +391,8 @@ ADS_STATUS ads_do_paged_search(ADS_STRUCT *ads, const char *bind_path, else { /* This would be the utf8-encoded version...*/ /* if (!(search_attrs = ads_push_strvals(ctx, attrs))) */ - if (!(str_list_copy(&search_attrs, attrs))) { + search_attrs = str_list_copy(ctx, attrs); + if (search_attrs == NULL) { rc = LDAP_NO_MEMORY; goto done; } @@ -616,8 +617,8 @@ ADS_STATUS ads_do_search(ADS_STRUCT *ads, const char *bind_path, int scope, else { /* This would be the utf8-encoded version...*/ /* if (!(search_attrs = ads_push_strvals(ctx, attrs))) */ - if (!(str_list_copy(&search_attrs, attrs))) - { + search_attrs = str_list_copy(ctx, attrs); + if (search_attrs == NULL) { DEBUG(1,("ads_do_search: str_list_copy() failed!")); rc = LDAP_NO_MEMORY; goto done; |