diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-04-01 10:25:03 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-04-01 10:25:03 +1100 |
| commit | 8680be7059280186e59cf4a995f249b62a5a36d4 (patch) | |
| tree | 55d091a58efc08fc99b44e7704f883108fdaca5e | |
| parent | 2fe17ae61e4f80b7c864bd6777c71557c97c0125 (diff) | |
| parent | 62f12e2322f1f14cf359fa39a822cd478256cf01 (diff) | |
| download | samba-8680be7059280186e59cf4a995f249b62a5a36d4.tar.gz samba-8680be7059280186e59cf4a995f249b62a5a36d4.tar.bz2 samba-8680be7059280186e59cf4a995f249b62a5a36d4.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into wspp-schema
| -rw-r--r-- | lib/tsocket/tsocket_bsd.c | 1 | ||||
| -rw-r--r-- | source3/Makefile.in | 28 | ||||
| -rw-r--r-- | source3/libsmb/clitrans.c | 4 |
3 files changed, 29 insertions, 4 deletions
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" diff --git a/source3/Makefile.in b/source3/Makefile.in index 18ee7fec1c..27c5fb4224 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)\" \ @@ -851,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 \ @@ -1296,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"; \ 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); |