diff options
| author | Jeremy Allison <jeremy@jeremy-desktop.(none)> | 2008-12-23 10:42:38 -0800 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-01-02 12:44:23 +0100 |
| commit | 31c1e2433a55317bfa8b6d73e66374db2d612612 (patch) | |
| tree | f0454c247bfed4f5f50aeb02ca403f7f70592b79 | |
| parent | fe13b229aa6d3e271f633ba64e05f72d63031a1d (diff) | |
| download | samba-31c1e2433a55317bfa8b6d73e66374db2d612612.tar.gz | |
Fix more ‘asprintf’, declared with attribute warn_unused_result.
Jeremy.
(cherry picked from commit 9ebaf67d1dce717cafd5761b2f66296712a09957)
| -rw-r--r-- | source/passdb/pdb_interface.c | 22 | ||||
| -rw-r--r-- | source/passdb/pdb_ldap.c | 7 |
2 files changed, 18 insertions, 11 deletions
diff --git a/source/passdb/pdb_interface.c b/source/passdb/pdb_interface.c index 5a79f09db06..b13644bac36 100644 --- a/source/passdb/pdb_interface.c +++ b/source/passdb/pdb_interface.c @@ -179,20 +179,26 @@ static struct pdb_methods *pdb_get_methods_reload( bool reload ) pdb->free_private_data( &(pdb->private_data) ); if ( !NT_STATUS_IS_OK( make_pdb_method_name( &pdb, lp_passdb_backend() ) ) ) { char *msg = NULL; - asprintf(&msg, "pdb_get_methods_reload: " - "failed to get pdb methods for backend %s\n", - lp_passdb_backend()); - smb_panic(msg); + if (asprintf(&msg, "pdb_get_methods_reload: " + "failed to get pdb methods for backend %s\n", + lp_passdb_backend()) > 0) { + smb_panic(msg); + } else { + smb_panic("pdb_get_methods_reload"); + } } } if ( !pdb ) { if ( !NT_STATUS_IS_OK( make_pdb_method_name( &pdb, lp_passdb_backend() ) ) ) { char *msg = NULL; - asprintf(&msg, "pdb_get_methods_reload: " - "failed to get pdb methods for backend %s\n", - lp_passdb_backend()); - smb_panic(msg); + if (asprintf(&msg, "pdb_get_methods_reload: " + "failed to get pdb methods for backend %s\n", + lp_passdb_backend()) > 0) { + smb_panic(msg); + } else { + smb_panic("pdb_get_methods_reload"); + } } } diff --git a/source/passdb/pdb_ldap.c b/source/passdb/pdb_ldap.c index 95e9a01ba31..f031483ea15 100644 --- a/source/passdb/pdb_ldap.c +++ b/source/passdb/pdb_ldap.c @@ -4184,9 +4184,10 @@ static char *get_ldap_filter(TALLOC_CTX *mem_ctx, const char *username) char *escaped = NULL; char *result = NULL; - asprintf(&filter, "(&%s(objectclass=%s))", - "(uid=%u)", LDAP_OBJ_SAMBASAMACCOUNT); - if (filter == NULL) goto done; + if (asprintf(&filter, "(&%s(objectclass=%s))", + "(uid=%u)", LDAP_OBJ_SAMBASAMACCOUNT) < 0) { + goto done; + } escaped = escape_ldap_string_alloc(username); if (escaped == NULL) goto done; |