s3-testparm Warn more on incorrect use of 'password server'
Hi Andrew, commit 06435acf3b9afa94019f7654cda4ad9386c6384b Author: Andrew Bartlett abart...@samba.org Date: Wed May 18 11:53:34 2011 +1000 s3-testparm Warn more on incorrect use of 'password server' The usage of password server in security = ads setup is very common. We should really only print a warning, so I guess we need to remove the ret = 1 there. metze signature.asc Description: OpenPGP digital signature
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2011-05-19-1634/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2011-05-19-1634/samba3.stderr http://git.samba.org/autobuild.flakey/2011-05-19-1634/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2011-05-19-1634/samba4.stderr http://git.samba.org/autobuild.flakey/2011-05-19-1634/samba4.stdout The top commit at the time of the failure was: commit 66c3d5d74b25b9b7703c2f48fd02a43f1d2ae9f2 Author: Jeremy Allison j...@samba.org Date: Wed May 18 15:28:28 2011 -0700 Fix bug found when building on an IPv6-only system by Kai Blin. When building on IPv6-only, doing: hints.ai_family = AF_INET; getaddrinfo(0.0.0.0, NULL, hints, ppres) fails as AF_INET is unavailable on an IPv6-only system. This causes us to fallback to our replacement getaddrinfo code which is IPv4-only. As we're only trying to detect a specific AIX bug here, broaden the tests to find that bug, and also test for working getaddrinfo in an IPv6-only safe way. Autobuild-User: Jeremy Allison j...@samba.org Autobuild-Date: Thu May 19 02:21:54 CEST 2011 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via d753b3b fix the WAF build
via 0645deb s3: Do central cli_set_error
via bc7df52 s3: Remove the use of cli-inbuf/outbuf from
cli_session_request
via efbed2c s3: Add sync read_smb
via e7e43ba s3: Make read_smb_send/recv public
from 66c3d5d Fix bug found when building on an IPv6-only system by Kai
Blin.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit d753b3b0639d88579ce4d7118bfb586207017316
Author: Volker Lendecke v...@samba.org
Date: Thu May 19 17:37:19 2011 +0200
fix the WAF build
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Thu May 19 18:46:51 CEST 2011 on sn-devel-104
commit 0645deb1b4a70e45f88116fae16ec7f3a1b4d5ed
Author: Volker Lendecke v...@samba.org
Date: Thu May 19 13:43:15 2011 +0200
s3: Do central cli_set_error
commit bc7df5265345c6dfc32dcdc02826d6c73179805f
Author: Volker Lendecke v...@samba.org
Date: Thu May 19 09:12:13 2011 +0200
s3: Remove the use of cli-inbuf/outbuf from cli_session_request
commit efbed2ce90ff10cd82543f22cba1fe0a4cfbb7fd
Author: Volker Lendecke v...@samba.org
Date: Thu May 19 08:36:54 2011 +0200
s3: Add sync read_smb
commit e7e43ba6a135b23865a7c9363a0ee0f479696067
Author: Volker Lendecke v...@samba.org
Date: Thu May 19 08:23:50 2011 +0200
s3: Make read_smb_send/recv public
---
Summary of changes:
source3/Makefile.in|1 +
source3/libsmb/async_smb.c | 90 +-
source3/libsmb/cliconnect.c| 125 ---
source3/libsmb/clifile.c | 116 -
source3/libsmb/clifsinfo.c |9 --
source3/libsmb/clilist.c |9 --
source3/libsmb/clioplock.c |3 -
source3/libsmb/clirap.c| 12 --
source3/libsmb/clireadwrite.c | 10 --
source3/libsmb/clitrans.c |3 -
source3/libsmb/read_smb.c | 134
.../testspoolss.h = source3/libsmb/read_smb.h | 39 ++
source3/wscript_build |2 +-
13 files changed, 203 insertions(+), 350 deletions(-)
create mode 100644 source3/libsmb/read_smb.c
copy testprogs/win32/spoolss/testspoolss.h = source3/libsmb/read_smb.h (58%)
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 847f811..03b4273 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -595,6 +595,7 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o
libsmb/clifile.o \
libsmb/clistr.o libsmb/cliquota.o libsmb/clifsinfo.o
libsmb/clidfs.o \
libsmb/clioplock.o libsmb/clirap2.o \
libsmb/smb_seal.o libsmb/async_smb.o \
+libsmb/read_smb.o \
libsmb/cli_np_tstream.o \
libsmb/smbsock_connect.o \
$(LIBSAMBA_OBJ) \
diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index 82dbc74..dfab82a 100644
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -25,93 +25,7 @@
#include async_smb.h
#include smb_crypt.h
#include libsmb/nmblib.h
-
-/*
- * Read an smb packet asynchronously, discard keepalives
- */
-
-struct read_smb_state {
- struct tevent_context *ev;
- int fd;
- uint8_t *buf;
-};
-
-static ssize_t read_smb_more(uint8_t *buf, size_t buflen, void *private_data);
-static void read_smb_done(struct tevent_req *subreq);
-
-static struct tevent_req *read_smb_send(TALLOC_CTX *mem_ctx,
- struct tevent_context *ev,
- int fd)
-{
- struct tevent_req *result, *subreq;
- struct read_smb_state *state;
-
- result = tevent_req_create(mem_ctx, state, struct read_smb_state);
- if (result == NULL) {
- return NULL;
- }
- state-ev = ev;
- state-fd = fd;
-
- subreq = read_packet_send(state, ev, fd, 4, read_smb_more, NULL);
- if (subreq == NULL) {
- goto fail;
- }
- tevent_req_set_callback(subreq, read_smb_done, result);
- return result;
- fail:
- TALLOC_FREE(result);
- return NULL;
-}
-
-static ssize_t read_smb_more(uint8_t *buf, size_t buflen, void *private_data)
-{
- if (buflen 4) {
- return 0; /* We've been here, we're done */
- }
- return smb_len_large(buf);
-}
-
-static void read_smb_done(struct tevent_req *subreq)
-{
- struct tevent_req *req = tevent_req_callback_data(
- subreq, struct tevent_req);
- struct read_smb_state *state = tevent_req_data(
- req, struct
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 58b77f2 s3: Remove a use of cli_send_smb
from d753b3b fix the WAF build
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 58b77f226767f5641a3fc0ecd557b613c6441c66
Author: Volker Lendecke v...@samba.org
Date: Thu May 19 18:48:09 2011 +0200
s3: Remove a use of cli_send_smb
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Thu May 19 20:11:33 CEST 2011 on sn-devel-104
---
Summary of changes:
source3/torture/torture.c | 99 -
1 files changed, 53 insertions(+), 46 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index c3497f7..a28078f 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -37,6 +37,7 @@
#include libsmb/nmblib.h
#include ../lib/util/tevent_ntstatus.h
#include util_tdb.h
+#include libsmb/read_smb.h
extern char *optarg;
extern int optind;
@@ -237,75 +238,81 @@ static struct cli_state *open_nbt_connection(void)
static bool cli_bad_session_request(struct cli_state *cli,
struct nmb_name *calling, struct nmb_name *called)
{
-char *p;
-int len = 4;
-int namelen = 0;
-char *tmp;
+ TALLOC_CTX *frame;
+ uint8_t len_buf[4];
+ struct iovec iov[3];
+ ssize_t len;
+ uint8_t *inbuf;
+ int err;
+ bool ret = false;
memcpy((cli-calling), calling, sizeof(*calling));
memcpy((cli-called ), called , sizeof(*called ));
-/* put in the destination name */
+ /* 445 doesn't have session request */
+ if (cli-port == 445)
+ return True;
-tmp = name_mangle(talloc_tos(), cli-called.name,
- cli-called.name_type);
-if (tmp == NULL) {
-return false;
-}
+ frame = talloc_stackframe();
-p = cli-outbuf+len;
-namelen = name_len((unsigned char *)tmp, talloc_get_size(tmp));
-if (namelen 0) {
-memcpy(p, tmp, namelen);
-len += namelen;
-}
-TALLOC_FREE(tmp);
+ iov[0].iov_base = len_buf;
+ iov[0].iov_len = sizeof(len_buf);
- /* Deliberately corrupt the name len (first byte) */
- *p = 100;
+ /* put in the destination name */
-/* and my name */
+ iov[1].iov_base = name_mangle(talloc_tos(), called-name,
+ called-name_type);
+ if (iov[1].iov_base == NULL) {
+ goto fail;
+ }
+ iov[1].iov_len = name_len((unsigned char *)iov[1].iov_base,
+ talloc_get_size(iov[1].iov_base));
-tmp = name_mangle(talloc_tos(), cli-calling.name,
- cli-calling.name_type);
-if (tmp == NULL) {
-return false;
-}
+ /* and my name */
+
+ iov[2].iov_base = name_mangle(talloc_tos(), calling-name,
+ calling-name_type);
+ if (iov[2].iov_base == NULL) {
+ goto fail;
+ }
+ iov[2].iov_len = name_len((unsigned char *)iov[2].iov_base,
+ talloc_get_size(iov[2].iov_base));
-p = cli-outbuf+len;
-namelen = name_len((unsigned char *)tmp, talloc_get_size(tmp));
-if (namelen 0) {
-memcpy(p, tmp, namelen);
-len += namelen;
-}
-TALLOC_FREE(tmp);
/* Deliberately corrupt the name len (first byte) */
- *p = 100;
+ *((uint8_t *)iov[2].iov_base) = 100;
-/* send a session request (RFC 1002) */
-/* setup the packet length
+ /* send a session request (RFC 1002) */
+ /* setup the packet length
* Remove four bytes from the length count, since the length
* field in the NBT Session Service header counts the number
* of bytes which follow. The cli_send_smb() function knows
* about this and accounts for those four bytes.
* CRH.
*/
-len -= 4;
-_smb_setlen(cli-outbuf,len);
-SCVAL(cli-outbuf,0,0x81);
-cli_send_smb(cli);
-DEBUG(5,(Sent session request\n));
+ _smb_setlen(len_buf, iov[1].iov_len + iov[2].iov_len);
+ SCVAL(len_buf,0,0x81);
-if (!cli_receive_smb(cli))
-return False;
+ len = write_data_iov(cli-fd, iov, 3);
+ if (len == -1) {
+ goto fail;
+ }
+ len = read_smb(cli-fd, talloc_tos(), inbuf, err);
+ if (len == -1) {
+ errno = err;
+ goto fail;
+ }
-if (CVAL(cli-inbuf,0) != 0x82) {
+if (CVAL(inbuf,0) != 0x82) {
/* This is the
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 642c6ba Fix Bug 8152 - smbd crash in release_ip()
from 58b77f2 s3: Remove a use of cli_send_smb
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 642c6ba2b9c581bacfcb9a6cb4c5c95d446263ce
Author: Christian Ambach a...@samba.org
Date: Thu May 19 18:13:40 2011 +0200
Fix Bug 8152 - smbd crash in release_ip()
release_ip() needs the private_data, but it was never saved away
to feed it into release_ip() later
Autobuild-User: Christian Ambach a...@samba.org
Autobuild-Date: Thu May 19 21:21:14 CEST 2011 on sn-devel-104
---
Summary of changes:
source3/lib/ctdbd_conn.c |5 +
source3/smbd/process.c |3 +++
2 files changed, 8 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index d271869..f422906 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -1358,6 +1358,11 @@ NTSTATUS ctdbd_register_ips(struct ctdbd_connection
*conn,
}
conn-release_ip_handler = release_ip_handler;
+ /*
+* store the IP address of the server socket for later
+* comparison in release_ip()
+*/
+ conn-release_ip_priv = private_data;
/*
* We want to be told about IP releases
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index d58baeb..5f9845c 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2358,6 +2358,9 @@ static void release_ip(const char *ip, void *priv)
p = addr + 7;
}
+ DEBUG(10, (Got release IP message for %s,
+ our address is %s\n, ip, p));
+
if ((strcmp(p, ip) == 0) || ((p != addr) strcmp(addr, ip) == 0)) {
/* we can't afford to do a clean exit - that involves
database writes, which would potentially mean we
--
Samba Shared Repository
