summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2004-08-25 10:21:14 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:58:23 -0500
commit367fe84c8f4cf097b9dccfdfdcdbbbb99686b086 (patch)
treedeee73d200efae92892776326c587b4bc585f752
parent1795dfd4549767bb5920eee0d5af2588d4a8b8ec (diff)
downloadsamba-367fe84c8f4cf097b9dccfdfdcdbbbb99686b086.tar.gz
samba-367fe84c8f4cf097b9dccfdfdcdbbbb99686b086.tar.bz2
samba-367fe84c8f4cf097b9dccfdfdcdbbbb99686b086.zip
r2062: Fix a couple more of the printf warnings (real bugs).
You should never pass a non-constant string as a format for a printf() function - it could contain printf macros, and these need to be checked. Andrew Bartlett (This used to be commit 183622c9f4dfe858564bbcb8c1a930d69b37f7fa)
-rw-r--r--source4/libads/config.m43
-rw-r--r--source4/torture/gentest.c2
-rw-r--r--source4/torture/torture_util.c2
3 files changed, 5 insertions, 2 deletions
diff --git a/source4/libads/config.m4 b/source4/libads/config.m4
index 8c0cc5c121..c48b185728 100644
--- a/source4/libads/config.m4
+++ b/source4/libads/config.m4
@@ -201,6 +201,9 @@ if test x"$with_ads_support" != x"no"; then
ac_save_CPPFLAGS=$CPPFLAGS
ac_save_LDFLAGS=$LDFLAGS
+#MIT needs this, to let us see 'internal' parts of the headers we use
+ KRB5_CFLAGS="${KRB5_CFLAGS} -DKRB5_PRIVATE -DKRB5_DEPRECATED"
+
CFLAGS="$CFLAGS $KRB5_CFLAGS"
CPPFLAGS="$CPPFLAGS $KRB5_CPPFLAGS"
LDFLAGS="$LDFLAGS $KRB5_LDFLAGS"
diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index d414863d82..71e5a8d8f9 100644
--- a/source4/torture/gentest.c
+++ b/source4/torture/gentest.c
@@ -1913,7 +1913,7 @@ static int run_test(void)
current_op.opnum = op;
current_op.name = gen_ops[which_op].name;
current_op.status = NT_STATUS_OK;
- current_op.mem_ctx = talloc_init(current_op.name);
+ current_op.mem_ctx = talloc_init("%s", current_op.name);
ret = gen_ops[which_op].handler(instance);
diff --git a/source4/torture/torture_util.c b/source4/torture/torture_util.c
index c39aa0ad5e..99192536f4 100644
--- a/source4/torture/torture_util.c
+++ b/source4/torture/torture_util.c
@@ -251,7 +251,7 @@ void dump_all_info(TALLOC_CTX *mem_ctx, union smb_fileinfo *finfo)
*/
void torture_all_info(struct smbcli_tree *tree, const char *fname)
{
- TALLOC_CTX *mem_ctx = talloc_init(fname);
+ TALLOC_CTX *mem_ctx = talloc_init("%s", fname);
union smb_fileinfo finfo;
NTSTATUS status;