[SCM] Samba Shared Repository - branch master updated
Volker Lendecke
vlendec at samba.org
Fri Apr 29 17:53:03 UTC 2016
The branch, master has been updated
via e0d8c6b s3:client:smbspool_krb5_wrapper: fix the non clearenv build.
from d28282c xfs quotas - fix case of no quota for user
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e0d8c6b6b428819206fb6e96c47e952845af0874
Author: Günther Deschner <gd at samba.org>
Date: Fri Apr 29 13:28:42 2016 +0200
s3:client:smbspool_krb5_wrapper: fix the non clearenv build.
Guenther
Signed-off-by: Guenther Deschner <gd at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
Autobuild-User(master): Volker Lendecke <vl at samba.org>
Autobuild-Date(master): Fri Apr 29 19:52:23 CEST 2016 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
source3/client/smbspool_krb5_wrapper.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/client/smbspool_krb5_wrapper.c b/source3/client/smbspool_krb5_wrapper.c
index 89db5e0..d26a7a6 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);
--
Samba Shared Repository
More information about the samba-cvs
mailing list