[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  48804e4 Fix the build without kerberos
       via  64e84e7 examples: malloc is declared in <stdlib.h>
      from  d5e4f9a s4: Happy New Year 2012

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


- Log -----------------------------------------------------------------
commit 48804e40d4db0423c287f3e30c23e89984f997b2
Author: Volker Lendecke <vlendec at debian6.localdomain>
Date:   Sun Jan 1 21:17:43 2012 +0100

    Fix the build without kerberos
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Sun Jan  1 23:56:24 CET 2012 on sn-devel-104

commit 64e84e7cb4164c02c1489195e98239c127e41cc1
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Dec 30 09:55:55 2011 +0100

    examples: malloc is declared in <stdlib.h>

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

Summary of changes:
 examples/libsmbclient/testbrowse2.c |    1 -
 libcli/smb/smb_seal.c               |    2 ++
 2 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/examples/libsmbclient/testbrowse2.c b/examples/libsmbclient/testbrowse2.c
index fd0a4e8..123660f 100644
--- a/examples/libsmbclient/testbrowse2.c
+++ b/examples/libsmbclient/testbrowse2.c
@@ -5,7 +5,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <malloc.h>
 #include <string.h>
 #include <libsmbclient.h>
 
diff --git a/libcli/smb/smb_seal.c b/libcli/smb/smb_seal.c
index 67a5512..a6cfffb 100644
--- a/libcli/smb/smb_seal.c
+++ b/libcli/smb/smb_seal.c
@@ -19,7 +19,9 @@
 
 #include "includes.h"
 #include "smb_common.h"
+#if HAVE_KRB5
 #include "libcli/auth/krb5_wrap.h"
+#endif
 #include "auth/gensec/gensec.h"
 #include "libcli/smb/smb_seal.h"
 


-- 
Samba Shared Repository