s3:client:smbspool_krb5_wrapper: fix the non clearenv build.

Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Fri Apr 29 19:52:23 CEST 2016 on sn-devel-144

(cherry picked from commit e0d8c6b6b428819206fb6e96c47e952845af0874)

Autobuild-User(v4-3-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-3-test): Wed Jun  1 15:01:03 CEST 2016 on sn-devel-104

diff --git a/source3/client/smbspool_krb5_wrapper.c b/source3/client/smbspool_krb5_wrapper.c
index 89db5e056178c63d9c64eb6a8e2e880761fc5bf6..d26a7a6a128ae441e4a3f90f411e0dea70b0fed2 100644 (file)
--- a/source3/client/smbspool_krb5_wrapper.c
+++ b/source3/client/smbspool_krb5_wrapper.c
@@ -31,6 +31,8 @@
 
 #include "dynconfig/dynconfig.h"
 
+#undef calloc
+
 enum cups_smb_dbglvl_e {
        CUPS_SMB_LOG_DEBUG = 0,
        CUPS_SMB_LOG_ERROR,
@@ -199,8 +201,10 @@ int main(int argc, char *argv[])
 #ifdef HAVE_CLEARENV
        clearenv();
 #else
-       extern char **environ;
-       environ = calloc(1, sizeof(*environ));
+       {
+               extern char **environ;
+               environ = calloc(1, sizeof(*environ));
+       }
 #endif
 
        CUPS_SMB_DEBUG("Setting KRB5CCNAME to '%s'", gen_cc);