[SCM] Samba Shared Repository - branch master updated - 7e1f0e272ca2db577a929a2bbef651cf5759535e

[Jeremy Allison]

The branch, master has been updated
       via  7e1f0e272ca2db577a929a2bbef651cf5759535e (commit)
       via  aa4abac6b73db7be694bc9f6f097092271357d20 (commit)
      from  5dce4148a3d30cbc0ca434049761434c5cc8cb33 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 7e1f0e272ca2db577a929a2bbef651cf5759535e
Merge: aa4abac6b73db7be694bc9f6f097092271357d20 5dce4148a3d30cbc0ca434049761434c5cc8cb33
Author: Jeremy Allison <jeremy at jeremy-desktop.(none)>
Date:   Tue Dec 23 10:43:02 2008 -0800

    Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba

commit aa4abac6b73db7be694bc9f6f097092271357d20
Author: Jeremy Allison <jeremy at jeremy-desktop.(none)>
Date:   Tue Dec 23 10:42:25 2008 -0800

    Fix more ‘asprintf’, declared with attribute warn_unused_result.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source3/passdb/pdb_interface.c |   22 ++++++++++++++--------
 source3/passdb/pdb_ldap.c      |    7 ++++---
 2 files changed, 18 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index 5a79f09..b13644b 100644
--- a/source3/passdb/pdb_interface.c
+++ b/source3/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/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 95e9a01..f031483 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/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;


-- 
Samba Shared Repository