[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-unstable-199-ge2ffc60
Michael Adam
obnox at samba.org
Tue Nov 6 00:10:40 GMT 2007
The branch, v3-2-test has been updated
via e2ffc6053dc9453fc49545db47374ed42e8efecd (commit)
via 98225a075226e78f7ce64787dd29122fda3d6924 (commit)
via 1f0fcc3e4ef7526cbf0a5a5fc96708238d0efdeb (commit)
from d140d68537225b6a6a99be3d9b09354e3f6ad8c9 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit e2ffc6053dc9453fc49545db47374ed42e8efecd
Author: Michael Adam <obnox at samba.org>
Date: Tue Nov 6 01:09:24 2007 +0100
Fix another segfault and make smbfilter run again.
This fix is not complete yet (loop after "client closed connection")
but at least it starts again...
Micheal
commit 98225a075226e78f7ce64787dd29122fda3d6924
Author: Michael Adam <obnox at samba.org>
Date: Tue Nov 6 01:07:12 2007 +0100
Fix a segfault.
Michael
commit 1f0fcc3e4ef7526cbf0a5a5fc96708238d0efdeb
Author: Michael Adam <obnox at samba.org>
Date: Tue Nov 6 01:06:06 2007 +0100
Try to fix the build. There was one forgotten caller
of receive_smb. Jeremy: please check!
Michael
-----------------------------------------------------------------------
Summary of changes:
source/utils/smbfilter.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/utils/smbfilter.c b/source/utils/smbfilter.c
index 706b24a..79b8873 100644
--- a/source/utils/smbfilter.c
+++ b/source/utils/smbfilter.c
@@ -145,7 +145,7 @@ static void filter_child(int c, struct sockaddr_storage *dest_ss)
if (num <= 0) continue;
if (c != -1 && FD_ISSET(c, &fds)) {
- if (!receive_smb(c, packet, 0)) {
+ if (!receive_smb(c, packet, 0, NULL)) {
d_printf("client closed connection\n");
exit(0);
}
@@ -156,7 +156,7 @@ static void filter_child(int c, struct sockaddr_storage *dest_ss)
}
}
if (s != -1 && FD_ISSET(s, &fds)) {
- if (!receive_smb(s, packet, 0)) {
+ if (!receive_smb(s, packet, 0, NULL)) {
d_printf("server closed connection\n");
exit(0);
}
@@ -176,11 +176,13 @@ static void start_filter(char *desthost)
{
int s, c;
struct sockaddr_storage dest_ss;
+ struct sockaddr_storage my_ss;
CatchChild();
/* start listening on port 445 locally */
- s = open_socket_in(SOCK_STREAM, 445, 0, 0, True);
+ my_ss.ss_family = AF_INET;
+ s = open_socket_in(SOCK_STREAM, 445, 0, &my_ss, True);
if (s == -1) {
d_printf("bind failed\n");
@@ -228,6 +230,8 @@ int main(int argc, char *argv[])
pstring configfile;
TALLOC_CTX *frame = talloc_stackframe();
+ load_case_tables();
+
setup_logging(argv[0],True);
pstrcpy(configfile,dyn_CONFIGFILE);
--
Samba Shared Repository
More information about the samba-cvs
mailing list