The branch, master has been updated
via 32fd6e3... s3: Fix some 64-bit warnings
via a7e6b2a... s3: Right now we do not have includes in Makefile.in
from b7a1dd6... s4 pam_winbind: don't build if pam header are not
installed
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 32fd6e3c252d7c63252c5e8bbf39dcd52865d839
Author: Volker Lendecke <[email protected]>
Date: Sat Jul 17 17:20:03 2010 +0200
s3: Fix some 64-bit warnings
commit a7e6b2aeb4a5ae3bf575c14bf866544b975d5f0b
Author: Volker Lendecke <[email protected]>
Date: Sat Jul 17 17:08:30 2010 +0200
s3: Right now we do not have includes in Makefile.in
Skip the expansion step on non-GNU-make systems
-----------------------------------------------------------------------
Summary of changes:
source3/configure.in | 12 +-----------
source3/rpc_client/cli_pipe.c | 4 +++-
2 files changed, 4 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/configure.in b/source3/configure.in
index 4c17e4c..6157f37 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6855,17 +6855,7 @@ if test -f Makefile-noincludes -a ! -f Makefile -a ! -h
Makefile ; then
fi
])
-AC_SUBST(MAKEFILE)
-if test x$samba_cv_gnu_make = xyes; then
- MAKEFILE=Makefile
-else
- # When we don't have GNU Make, generate a copy of Makefile.in
- # that doesn't have the "include " statements but just includes
- # the files verbatim.
- MAKEFILE=Makefile-noincludes
- $PERL ./script/expand-includes.pl Makefile.in > $MAKEFILE.in
-fi
-AC_OUTPUT($MAKEFILE
+AC_OUTPUT(Makefile
script/findsmb smbadduser script/gen-8bit-gap.sh script/installbin.sh
script/uninstallbin.sh
lib/netapi/examples/Makefile
lib/netapi/tests/Makefile
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index b1f893f..9a1aba7 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -976,7 +976,9 @@ static NTSTATUS cli_pipe_validate_current_pdu(TALLOC_CTX
*mem_ctx,
}
DEBUG(10, ("Got pdu len %lu, data_len %lu, ss_len %u\n",
- pdu->length, rdata->length, ss_padding_len));
+ (long unsigned int)pdu->length,
+ (long unsigned int)rdata->length,
+ (long unsigned int)ss_padding_len));
/*
* If this is the first reply, and the allocation hint is
--
Samba Shared Repository
