Better explanation message for dmalloc.

Also more insertion of parenthesis to handle struct members called
'free'.

You can now get useful dmalloc output, as long as it is compatible
with your C library.  On RH7.1 it looks like you have to rebuild
dmalloc to allow free(0) by default, because something in libcrypt
does that. (sigh)

3 files changed, 7 insertions, 7 deletions

diff --git a/source/smbd/negprot.c b/source/smbd/negprot.c
index 52ba5e97892..af2f91936e1 100644
--- a/source/smbd/negprot.c
+++ b/source/smbd/negprot.c
@@ -37,7 +37,7 @@ static void get_challange(char buff[8])
 	/* We might be called more than once, muliple negprots are premitted */
 	if (negprot_global_auth_context) {
 		DEBUG(3, ("get challange: is this a secondary negprot?  negprot_global_auth_context is non-NULL!\n"));
-		negprot_global_auth_context->free(&negprot_global_auth_context);
+		(negprot_global_auth_context->free)(&negprot_global_auth_context);
 	}
 
 	DEBUG(10, ("get challange: creating negprot_global_auth_context\n"));
diff --git a/source/smbd/server.c b/source/smbd/server.c
index a8c1bc5c15e..b523659dbf5 100644
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -486,7 +486,7 @@ void exit_server(char *reason)
 	DEBUG(2,("Closing connections\n"));
 
 	if (negprot_global_auth_context) {
-		negprot_global_auth_context->free(&negprot_global_auth_context);
+		(negprot_global_auth_context->free)(&negprot_global_auth_context);
 	}
 
 	conn_close_all();
diff --git a/source/smbd/sesssetup.c b/source/smbd/sesssetup.c
index a1591113190..f809f9ca0c3 100644
--- a/source/smbd/sesssetup.c
+++ b/source/smbd/sesssetup.c
@@ -87,12 +87,12 @@ static NTSTATUS check_guest_password(auth_serversupplied_info **server_info)
 	}
 
 	if (!make_user_info_guest(&user_info)) {
-		auth_context->free(&auth_context);
+		(auth_context->free)(&auth_context);
 		return NT_STATUS_NO_MEMORY;
 	}
 	
 	nt_status = auth_context->check_ntlm_password(auth_context, user_info, server_info);
-	auth_context->free(&auth_context);
+	(auth_context->free)(&auth_context);
 	free_user_info(&user_info);
 	return nt_status;
 }
@@ -289,7 +289,7 @@ static int reply_spnego_negotiate(connection_struct *conn,
 	DEBUG(3,("Got neg_flags=%08x\n", neg_flags));
 
 	if (ntlmssp_auth_context) {
-		ntlmssp_auth_context->free(&ntlmssp_auth_context);
+		(ntlmssp_auth_context->free)(&ntlmssp_auth_context);
 	}
 
 	if (!NT_STATUS_IS_OK(nt_status = make_auth_context_subsystem(&ntlmssp_auth_context))) {
@@ -400,7 +400,7 @@ static int reply_spnego_auth(connection_struct *conn, char *inbuf, char *outbuf,
 	SAFE_FREE(workgroup);
 	SAFE_FREE(machine);
 			
-	ntlmssp_auth_context->free(&ntlmssp_auth_context);
+	(ntlmssp_auth_context->free)(&ntlmssp_auth_context);
 
 	free_user_info(&user_info);
 	
@@ -741,7 +741,7 @@ int reply_sesssetup_and_X(connection_struct *conn, char *inbuf,char *outbuf,
 											user_info, 
 											&server_info); 
 				
-				plaintext_auth_context->free(&plaintext_auth_context);
+				(plaintext_auth_context->free)(&plaintext_auth_context);
 			}
 		}
 	}