[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-373-g3088bc7

[Volker Lendecke]

The branch, v3-2-test has been updated
       via  3088bc76f1ceffecaa5aea039be79973c9876f0c (commit)
      from  8bcd2df841bae63e7d58c35d4728b7d853471697 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 3088bc76f1ceffecaa5aea039be79973c9876f0c
Author: Volker Lendecke <vl at sernet.de>
Date:   Sat Nov 24 17:27:19 2007 +0100

    Remove a global

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

Summary of changes:
 source/libads/ads_status.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libads/ads_status.c b/source/libads/ads_status.c
index 3f0ab57..ecef9d2 100644
--- a/source/libads/ads_status.c
+++ b/source/libads/ads_status.c
@@ -99,10 +99,6 @@ NTSTATUS ads_ntstatus(ADS_STATUS status)
 */
 const char *ads_errstr(ADS_STATUS status)
 {
-	static char *ret;
-
-	SAFE_FREE(ret);
-
 	switch (status.error_type) {
 	case ENUM_ADS_ERROR_SYSTEM:
 		return strerror(status.err.rc);
@@ -117,6 +113,7 @@ const char *ads_errstr(ADS_STATUS status)
 #ifdef HAVE_GSSAPI
 	case ENUM_ADS_ERROR_GSS:
 	{
+		char *ret;
 		uint32 msg_ctx;
 		uint32 minor;
 		gss_buffer_desc msg1, msg2;
@@ -129,7 +126,9 @@ const char *ads_errstr(ADS_STATUS status)
 				   GSS_C_NULL_OID, &msg_ctx, &msg1);
 		gss_display_status(&minor, status.minor_status, GSS_C_MECH_CODE,
 				   GSS_C_NULL_OID, &msg_ctx, &msg2);
-		asprintf(&ret, "%s : %s", (char *)msg1.value, (char *)msg2.value);
+		ret = talloc_asprintf(talloc_tos(), "%s : %s",
+				      (char *)msg1.value, (char *)msg2.value);
+		SMB_ASSERT(ret != NULL);
 		gss_release_buffer(&minor, &msg1);
 		gss_release_buffer(&minor, &msg2);
 		return ret;


-- 
Samba Shared Repository