Merge branch 'master' of ssh://git.samba.org/data/git/samba into wspp-schema
authorAndrew Bartlett <abartlet@samba.org>
Tue, 31 Mar 2009 23:25:03 +0000 (10:25 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 31 Mar 2009 23:25:03 +0000 (10:25 +1100)
lib/tsocket/tsocket_bsd.c
source3/Makefile.in
source3/libsmb/clitrans.c

index 3d13dfd47dbee149fafa8e1ce6baf2b6dcde0b55..8254f5d9d3ec0018235ef869e43242c8b08dbf2b 100644 (file)
@@ -22,6 +22,7 @@
 */
 
 #include "replace.h"
+#include "system/filesys.h"
 #include "system/network.h"
 #include "tsocket.h"
 #include "tsocket_internal.h"
index 18ee7fec1cac1d37c8757b6c4f1adf1411d02140..27c5fb42240e397d309774232b085bc401430c0d 100644 (file)
@@ -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"; \
index c566972b211102e98efb84da0ae6f248eac2d8fa..91fb6e6296f754dd33297a922face4af4b75b2b4 100644 (file)
@@ -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);