mirror of
https://github.com/samba-team/samba.git
synced 2025-03-03 12:58:35 +03:00
40665edf5e
Jeremy: requires your eyes... If the remote connection timed out while cli_list() was retrieving its list of files, the error was not returned to the user, e.g. via smbc_opendir(), so the user didn't have a way to know to set the timeout longer and try again. This problem would occur when a very large directory is being read with a too-small timeout on the cli. Jeremy, although there were a couple of areas that needed to be handled, I needed to make one change that you should bless, in libsmb/clientgen.c. It was setting cli->smb_rw_error = smb_read_error; but smb_read_error is zero, so this had no effect. I'm now doing cli->smb_rw_error = READ_TIMEOUT; instead, and according to the OP, these (cumulative) changes (in a slightly different form) solve the problem. Please confirm this smb_rw_error change will have no other adverse effects that you can see. Derrell (This used to be commit fa664b24b829f973156486896575c1007b6d7b01)
75 lines
1.7 KiB
Makefile
75 lines
1.7 KiB
Makefile
#
|
|
CC = gcc
|
|
|
|
SAMBA_INCL = ../../source/include
|
|
EXTLIB_INCL = -I/usr/include/gtk-1.2 \
|
|
-I/usr/include/glib-1.2 \
|
|
-I/usr/lib/glib/include
|
|
|
|
|
|
DEFS = -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
|
|
CFLAGS = -O0 -g -I$(SAMBA_INCL) $(EXTLIB_INCL) $(DEFS)
|
|
|
|
LDFLAGS = -L/usr/local/samba/lib
|
|
LIBSMBCLIENT = /usr/local/samba/lib/libsmbclient.so
|
|
|
|
TESTS= testsmbc \
|
|
tree \
|
|
testacl \
|
|
testbrowse \
|
|
testbrowse2 \
|
|
teststat \
|
|
teststat2 \
|
|
testchmod \
|
|
testutime \
|
|
testread
|
|
|
|
all: $(TESTS) smbsh
|
|
|
|
testsmbc: testsmbc.o
|
|
@echo Linking testsmbc
|
|
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBSMBCLIENT)
|
|
|
|
tree: tree.o
|
|
@echo Linking tree
|
|
@$(CC) `gtk-config --cflags` $(CFLAGS) $(LDFLAGS) -o $@ `gtk-config --libs` $(LIBSMBCLIENT) $<
|
|
|
|
testacl: testacl.o
|
|
@echo Linking testacl
|
|
@$(CC) `gtk-config --cflags` $(CFLAGS) $(LDFLAGS) -o $@ `gtk-config --libs` $(LIBSMBCLIENT) -lpopt $<
|
|
|
|
testbrowse: testbrowse.o
|
|
@echo Linking testbrowse
|
|
@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBSMBCLIENT) -lpopt $<
|
|
|
|
testbrowse2: testbrowse2.o
|
|
@echo Linking testbrowse2
|
|
@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBSMBCLIENT) -lpopt $<
|
|
|
|
teststat: teststat.o
|
|
@echo Linking teststat
|
|
@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBSMBCLIENT) -lpopt $<
|
|
|
|
teststat2: teststat2.o
|
|
@echo Linking teststat2
|
|
@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBSMBCLIENT) -lpopt $<
|
|
|
|
testchmod: testchmod.o
|
|
@echo Linking testchmod
|
|
@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBSMBCLIENT) -lpopt $<
|
|
|
|
testutime: testutime.o
|
|
@echo Linking testutime
|
|
@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBSMBCLIENT) -lpopt $<
|
|
|
|
testread: testread.o
|
|
@echo Linking testread
|
|
@$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBSMBCLIENT) -lpopt $<
|
|
|
|
smbsh:
|
|
make -C smbwrapper
|
|
|
|
clean:
|
|
@rm -f *.o *~ $(TESTS)
|
|
@make -C smbwrapper clean
|