summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2016-04-29 13:28:42 +0200
committerVolker Lendecke <vl@samba.org>2016-04-29 19:52:23 +0200
commite0d8c6b6b428819206fb6e96c47e952845af0874 (patch)
tree782ef3b176b99f6da4eb2194eeb2d6b573a88414 /source3
parentd28282ce573380f230bd683e655bfc77d358a706 (diff)
downloadsamba-e0d8c6b6b428819206fb6e96c47e952845af0874.tar.gz
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
Diffstat (limited to 'source3')
-rw-r--r--source3/client/smbspool_krb5_wrapper.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/source3/client/smbspool_krb5_wrapper.c b/source3/client/smbspool_krb5_wrapper.c
index 89db5e05617..d26a7a6a128 100644
--- 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);