From b2e8bc28a5f589b86269907ff384a9e4c1f3aaca Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 31 Mar 2009 08:50:16 +0200 Subject: s3:build: line-wrap assignment of FLAGS for readability Michael --- source3/Makefile.in | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/source3/Makefile.in b/source3/Makefile.in index 18ee7fec1c..a830033f7a 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -159,7 +159,16 @@ CODEPAGEDIR = @codepagedir@ # the directory where pid files go PIDDIR = @piddir@ -FLAGS = -I. -I$(srcdir) @FLAGS1@ @SAMBA_CPPFLAGS@ $(CPPFLAGS) $(ISA) -I$(srcdir)/lib -I.. -D_SAMBA_BUILD_=3 -I../source4 +FLAGS = -I. \ + -I$(srcdir) \ + @FLAGS1@ \ + @SAMBA_CPPFLAGS@ \ + $(CPPFLAGS) \ + $(ISA) \ + -I$(srcdir)/lib \ + -I.. \ + -I../source4 \ + -D_SAMBA_BUILD_=3 PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \ -DPRIVATE_DIR=\"$(PRIVATE_DIR)\" \ -- cgit From 9aab2631c6294ebc3e4a7ab2367e22e3d552d41b Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 31 Mar 2009 08:50:57 +0200 Subject: s3:build: add a SHOWCFLAGS target for debugging how CFLAGS are assebled Michael --- source3/Makefile.in | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/source3/Makefile.in b/source3/Makefile.in index a830033f7a..6434f90389 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -1305,6 +1305,21 @@ SHOWFLAGS:: @echo " SHLIBEXT = @SHLIBEXT@" @echo " SONAMEFLAG = @SONAMEFLAG@" +# "showcflags" target for debuggin how CFLAGS are composed: + +.PHONY: showcflags SHOWCFLAGS + +showcflags: SHOWCFLAGS + +SHOWCFLAGS:: + @echo "CFLAGS = $(CFLAGS)" + @echo "FLAGS = $(FLAGS)" + @echo "" + @echo "FLAGS1 = @FLAGS1@" + @echo "SAMBA_CPPFLAGS = @SAMBA_CPPFLAGS@" + @echo "CPPFLAGS = $(CPPFLAGS)" + @echo "ISA = $(ISA)" + MAKEDIR = || exec false; \ if test -d "$$dir"; then :; else \ echo mkdir "$$dir"; \ -- cgit From d8425032ccf53a65512b30e8068401e51dba8f20 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 31 Mar 2009 16:45:07 +0200 Subject: s3:build: fix build of pam_winbind.so with static linking Static talloc libs were missing since conversion to talloc. Michael --- source3/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source3/Makefile.in b/source3/Makefile.in index 6434f90389..27c5fb4224 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -860,7 +860,7 @@ RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \ $(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(LDB_OBJ) PAM_WINBIND_OBJ = ../nsswitch/pam_winbind.o localedir.o $(WBCOMMON_OBJ) \ - $(LIBREPLACE_OBJ) @BUILD_INIPARSER@ + $(LIBREPLACE_OBJ) @BUILD_INIPARSER@ @LIBTALLOC_STATIC@ LIBSMBCLIENT_OBJ0 = \ libsmb/libsmb_cache.o \ -- cgit From c200e8632f70dfbdf67279ed5c621d0fe97e1d2d Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 31 Mar 2009 20:33:33 +0200 Subject: tsocket: try to fix the build on solaris FIONREAD was missing metze --- lib/tsocket/tsocket_bsd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/tsocket/tsocket_bsd.c b/lib/tsocket/tsocket_bsd.c index 3d13dfd47d..8254f5d9d3 100644 --- a/lib/tsocket/tsocket_bsd.c +++ b/lib/tsocket/tsocket_bsd.c @@ -22,6 +22,7 @@ */ #include "replace.h" +#include "system/filesys.h" #include "system/network.h" #include "tsocket.h" #include "tsocket_internal.h" -- cgit From 62f12e2322f1f14cf359fa39a822cd478256cf01 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 29 Mar 2009 21:35:57 +0200 Subject: Fix an uninitialized variable valgrind error Signed-off-by: Stefan Metzmacher --- source3/libsmb/clitrans.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source3/libsmb/clitrans.c b/source3/libsmb/clitrans.c index c566972b21..91fb6e6296 100644 --- a/source3/libsmb/clitrans.c +++ b/source3/libsmb/clitrans.c @@ -166,7 +166,7 @@ bool cli_receive_trans(struct cli_state *cli,int trans, *data_len = *param_len = 0; - mid = SVAL(cli->inbuf,smb_mid); + mid = SVAL(cli->outbuf,smb_mid); if (!cli_receive_smb(cli)) { cli_state_seqnum_remove(cli, mid); @@ -487,7 +487,7 @@ bool cli_receive_nt_trans(struct cli_state *cli, *data_len = *param_len = 0; - mid = SVAL(cli->inbuf,smb_mid); + mid = SVAL(cli->outbuf,smb_mid); if (!cli_receive_smb(cli)) { cli_state_seqnum_remove(cli, mid); -- cgit