[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-808-gabac431
The branch, v3-4-test has been updated via abac431ce164c3ce3fcf53fbc77d0486347e22f1 (commit) from 5d8f374ad75e06354ac27f34e3f44b3d459ac2ef (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit abac431ce164c3ce3fcf53fbc77d0486347e22f1 Author: Günther Deschner g...@samba.org Date: Wed Apr 22 23:48:24 2009 +0200 s3-selftest: test wbinfo --allocate-uid/gid. Guenther (cherry picked from commit 59fe99027d0ac972d0d74a24842d6423119c0d21) --- Summary of changes: source3/script/tests/test_wbinfo_s3.sh |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/script/tests/test_wbinfo_s3.sh b/source3/script/tests/test_wbinfo_s3.sh index fa6e20f..d47953e 100755 --- a/source3/script/tests/test_wbinfo_s3.sh +++ b/source3/script/tests/test_wbinfo_s3.sh @@ -36,6 +36,8 @@ tests=$tests:--domain-groups tests=$tests:--name-to-sid=$username #Didn't pass yet# tests=$tests:--user-info=$username tests=$tests:--user-groups=$username +tests=$tests:--allocate-uid +tests=$tests:--allocate-gid failed=0 -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5235-gc3843c4
The branch, v3-3-test has been updated via c3843c40b5c426910a184dcef3b17283e6e224e9 (commit) from df44b4f2f6a5e83115e1e04883c94f89fdc9a28f (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit c3843c40b5c426910a184dcef3b17283e6e224e9 Author: Günther Deschner g...@samba.org Date: Wed Apr 22 23:48:24 2009 +0200 s3-selftest: test wbinfo --allocate-uid/gid. Guenther --- Summary of changes: source/script/tests/test_wbinfo_s3.sh |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source/script/tests/test_wbinfo_s3.sh b/source/script/tests/test_wbinfo_s3.sh index e3bf1b9..b24343e 100755 --- a/source/script/tests/test_wbinfo_s3.sh +++ b/source/script/tests/test_wbinfo_s3.sh @@ -34,6 +34,8 @@ tests=$tests:--domain-groups tests=$tests:--name-to-sid=$username #Didn't pass yet# tests=$tests:--user-info=$username tests=$tests:--user-groups=$username +tests=$tests:--allocate-uid +tests=$tests:--allocate-gid failed=0 -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3567-g679be14
The branch, v3-2-test has been updated via 679be14a080dfcbbbc9403ff0fc67b61073a357e (commit) from 8e438431a1447fd482c107fbe0aee3af49afe068 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 679be14a080dfcbbbc9403ff0fc67b61073a357e Author: Günther Deschner g...@samba.org Date: Wed Apr 22 23:48:24 2009 +0200 s3-selftest: test wbinfo --allocate-uid/gid. Guenther (cherry picked from commit c3843c40b5c426910a184dcef3b17283e6e224e9) --- Summary of changes: source/script/tests/test_wbinfo_s3.sh |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source/script/tests/test_wbinfo_s3.sh b/source/script/tests/test_wbinfo_s3.sh index e3bf1b9..b24343e 100755 --- a/source/script/tests/test_wbinfo_s3.sh +++ b/source/script/tests/test_wbinfo_s3.sh @@ -34,6 +34,8 @@ tests=$tests:--domain-groups tests=$tests:--name-to-sid=$username #Didn't pass yet# tests=$tests:--user-info=$username tests=$tests:--user-groups=$username +tests=$tests:--allocate-uid +tests=$tests:--allocate-gid failed=0 -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1231-g1e315b0
The branch, master has been updated
via 1e315b0013701737437c1562dc2b9f70dc9679ab (commit)
from 59fe99027d0ac972d0d74a24842d6423119c0d21 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1e315b0013701737437c1562dc2b9f70dc9679ab
Author: Jeremy Allison j...@samba.org
Date: Thu Apr 23 01:38:21 2009 -0700
Fix coverity #910, uninitialized variable.
Jeremy.
---
Summary of changes:
source3/rpc_server/srv_spoolss_nt.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/srv_spoolss_nt.c
b/source3/rpc_server/srv_spoolss_nt.c
index 64f1853..962b729 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -8429,7 +8429,7 @@ WERROR _spoolss_SetForm(pipes_struct *p,
{
struct spoolss_AddFormInfo1 *form = r-in.info.info1;
nt_forms_struct tmpForm;
- int snum;
+ int snum = -1;
WERROR status = WERR_OK;
NT_PRINTER_INFO_LEVEL *printer = NULL;
SE_PRIV se_printop = SE_PRINT_OPERATOR;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-809-g7310c25
The branch, v3-4-test has been updated
via 7310c258a07f9f9da0ba736919f9021ab8125f66 (commit)
from abac431ce164c3ce3fcf53fbc77d0486347e22f1 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit 7310c258a07f9f9da0ba736919f9021ab8125f66
Author: Jeremy Allison j...@samba.org
Date: Thu Apr 23 01:38:21 2009 -0700
Fix coverity #910, uninitialized variable.
Jeremy.
---
Summary of changes:
source3/rpc_server/srv_spoolss_nt.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/srv_spoolss_nt.c
b/source3/rpc_server/srv_spoolss_nt.c
index 014c1cf..a5a7368 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -8243,7 +8243,7 @@ WERROR _spoolss_SetForm(pipes_struct *p,
{
struct spoolss_AddFormInfo1 *form = r-in.info.info1;
nt_forms_struct tmpForm;
- int snum;
+ int snum = -1;
WERROR status = WERR_OK;
NT_PRINTER_INFO_LEVEL *printer = NULL;
SE_PRIV se_printop = SE_PRINT_OPERATOR;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1232-g5abdc58
The branch, master has been updated
via 5abdc58f9822edbbf291c625dec7304c09f12e28 (commit)
from 1e315b0013701737437c1562dc2b9f70dc9679ab (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 5abdc58f9822edbbf291c625dec7304c09f12e28
Author: Volker Lendecke v...@samba.org
Date: Thu Apr 23 10:42:43 2009 +0200
Fix Coverity ID 884: DEADCODE
---
Summary of changes:
source3/lib/fault.c |7 ---
1 files changed, 4 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/fault.c b/source3/lib/fault.c
index efd1ddd..51fc53b 100644
--- a/source3/lib/fault.c
+++ b/source3/lib/fault.c
@@ -194,17 +194,18 @@ static char *get_freebsd_corepath(void)
*/
static char *get_corepath(const char *logbase, const char *progname)
{
- char *tmp_corepath = NULL;
+#if (defined(FREEBSD) defined(HAVE_SYSCTLBYNAME))
/* @todo: Add support for the linux corepath. */
-#if (defined(FREEBSD) defined(HAVE_SYSCTLBYNAME))
+
+ char *tmp_corepath = NULL;
tmp_corepath = get_freebsd_corepath();
-#endif
/* If this has been set correctly, we're done. */
if (tmp_corepath) {
return tmp_corepath;
}
+#endif
/* Fall back to the default. */
return get_default_corepath(logbase, progname);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-810-gcb8c7f2
The branch, v3-4-test has been updated
via cb8c7f2291897cc6d9bffdb48f4baca80161c2f8 (commit)
from 7310c258a07f9f9da0ba736919f9021ab8125f66 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit cb8c7f2291897cc6d9bffdb48f4baca80161c2f8
Author: Volker Lendecke v...@samba.org
Date: Thu Apr 23 10:42:43 2009 +0200
Fix Coverity ID 884: DEADCODE
---
Summary of changes:
source3/lib/fault.c |7 ---
1 files changed, 4 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/fault.c b/source3/lib/fault.c
index efd1ddd..51fc53b 100644
--- a/source3/lib/fault.c
+++ b/source3/lib/fault.c
@@ -194,17 +194,18 @@ static char *get_freebsd_corepath(void)
*/
static char *get_corepath(const char *logbase, const char *progname)
{
- char *tmp_corepath = NULL;
+#if (defined(FREEBSD) defined(HAVE_SYSCTLBYNAME))
/* @todo: Add support for the linux corepath. */
-#if (defined(FREEBSD) defined(HAVE_SYSCTLBYNAME))
+
+ char *tmp_corepath = NULL;
tmp_corepath = get_freebsd_corepath();
-#endif
/* If this has been set correctly, we're done. */
if (tmp_corepath) {
return tmp_corepath;
}
+#endif
/* Fall back to the default. */
return get_default_corepath(logbase, progname);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-811-g7f8e21a
The branch, v3-4-test has been updated
via 7f8e21ad459dbe5fdd20d3040d017787198de21d (commit)
from cb8c7f2291897cc6d9bffdb48f4baca80161c2f8 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit 7f8e21ad459dbe5fdd20d3040d017787198de21d
Author: Jeremy Allison j...@samba.org
Date: Thu Apr 23 01:47:04 2009 -0700
Fix coverity #908, #909, uninitialized variable.
Jeremy.
---
Summary of changes:
source3/rpc_server/srv_spoolss_nt.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/srv_spoolss_nt.c
b/source3/rpc_server/srv_spoolss_nt.c
index a5a7368..f66c193 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -8078,7 +8078,7 @@ WERROR _spoolss_AddForm(pipes_struct *p,
{
struct spoolss_AddFormInfo1 *form = r-in.info.info1;
nt_forms_struct tmpForm;
- int snum;
+ int snum = -1;
WERROR status = WERR_OK;
NT_PRINTER_INFO_LEVEL *printer = NULL;
SE_PRIV se_printop = SE_PRINT_OPERATOR;
@@ -8166,7 +8166,7 @@ WERROR _spoolss_DeleteForm(pipes_struct *p,
int count=0;
nt_forms_struct *list=NULL;
Printer_entry *Printer = find_printer_index_by_hnd(p, r-in.handle);
- int snum;
+ int snum = -1;
WERROR status = WERR_OK;
NT_PRINTER_INFO_LEVEL *printer = NULL;
SE_PRIV se_printop = SE_PRINT_OPERATOR;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1234-g951de68
The branch, master has been updated
via 951de687216b13e35876325e7b3c8081ea725dc8 (commit)
from 20127703938d10b05765e2cba85dbd3ad33a4fdb (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 951de687216b13e35876325e7b3c8081ea725dc8
Author: Volker Lendecke v...@samba.org
Date: Thu Apr 23 10:49:41 2009 +0200
Fix Coverity ID 628, Andrew B., please check!
---
Summary of changes:
source4/rpc_server/lsa/dcesrv_lsa.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c
b/source4/rpc_server/lsa/dcesrv_lsa.c
index 1f1f6af..cbadf65 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -933,7 +933,7 @@ static NTSTATUS dcesrv_lsa_CreateTrustedDomain_base(struct
dcesrv_call_state *dc
if (r-in.info-trust_direction LSA_TRUST_DIRECTION_INBOUND) {
msg_user = ldb_msg_new(mem_ctx);
- if (msg == NULL) {
+ if (msg_user == NULL) {
ldb_transaction_cancel(trusted_domain_state-policy-sam_ldb);
return NT_STATUS_NO_MEMORY;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-812-gd8703a0
The branch, v3-4-test has been updated
via d8703a064e70bd56b2f0ddcde73af14045deed8c (commit)
from 7f8e21ad459dbe5fdd20d3040d017787198de21d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit d8703a064e70bd56b2f0ddcde73af14045deed8c
Author: Volker Lendecke v...@samba.org
Date: Thu Apr 23 10:49:41 2009 +0200
Fix Coverity ID 628, Andrew B., please check!
---
Summary of changes:
source4/rpc_server/lsa/dcesrv_lsa.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c
b/source4/rpc_server/lsa/dcesrv_lsa.c
index 1f1f6af..cbadf65 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -933,7 +933,7 @@ static NTSTATUS dcesrv_lsa_CreateTrustedDomain_base(struct
dcesrv_call_state *dc
if (r-in.info-trust_direction LSA_TRUST_DIRECTION_INBOUND) {
msg_user = ldb_msg_new(mem_ctx);
- if (msg == NULL) {
+ if (msg_user == NULL) {
ldb_transaction_cancel(trusted_domain_state-policy-sam_ldb);
return NT_STATUS_NO_MEMORY;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1230-g59fe990
The branch, master has been updated via 59fe99027d0ac972d0d74a24842d6423119c0d21 (commit) from c93e2d9d43ad9e16ccce2ca3e13a7d2000bd0f06 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 59fe99027d0ac972d0d74a24842d6423119c0d21 Author: Günther Deschner g...@samba.org Date: Wed Apr 22 23:48:24 2009 +0200 s3-selftest: test wbinfo --allocate-uid/gid. Guenther --- Summary of changes: source3/script/tests/test_wbinfo_s3.sh |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/script/tests/test_wbinfo_s3.sh b/source3/script/tests/test_wbinfo_s3.sh index fa6e20f..d47953e 100755 --- a/source3/script/tests/test_wbinfo_s3.sh +++ b/source3/script/tests/test_wbinfo_s3.sh @@ -36,6 +36,8 @@ tests=$tests:--domain-groups tests=$tests:--name-to-sid=$username #Didn't pass yet# tests=$tests:--user-info=$username tests=$tests:--user-groups=$username +tests=$tests:--allocate-uid +tests=$tests:--allocate-gid failed=0 -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1233-g2012770
The branch, master has been updated
via 20127703938d10b05765e2cba85dbd3ad33a4fdb (commit)
from 5abdc58f9822edbbf291c625dec7304c09f12e28 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 20127703938d10b05765e2cba85dbd3ad33a4fdb
Author: Jeremy Allison j...@samba.org
Date: Thu Apr 23 01:47:04 2009 -0700
Fix coverity #908, #909, uninitialized variable.
Jeremy.
---
Summary of changes:
source3/rpc_server/srv_spoolss_nt.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/srv_spoolss_nt.c
b/source3/rpc_server/srv_spoolss_nt.c
index 962b729..9ad509e 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -8264,7 +8264,7 @@ WERROR _spoolss_AddForm(pipes_struct *p,
{
struct spoolss_AddFormInfo1 *form = r-in.info.info1;
nt_forms_struct tmpForm;
- int snum;
+ int snum = -1;
WERROR status = WERR_OK;
NT_PRINTER_INFO_LEVEL *printer = NULL;
SE_PRIV se_printop = SE_PRINT_OPERATOR;
@@ -8352,7 +8352,7 @@ WERROR _spoolss_DeleteForm(pipes_struct *p,
int count=0;
nt_forms_struct *list=NULL;
Printer_entry *Printer = find_printer_index_by_hnd(p, r-in.handle);
- int snum;
+ int snum = -1;
WERROR status = WERR_OK;
NT_PRINTER_INFO_LEVEL *printer = NULL;
SE_PRIV se_printop = SE_PRINT_OPERATOR;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1235-g6610327
The branch, master has been updated
via 6610327770f3e7dd3e7a9b71d34b82f1f198a8a4 (commit)
from 951de687216b13e35876325e7b3c8081ea725dc8 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 6610327770f3e7dd3e7a9b71d34b82f1f198a8a4
Author: Jeremy Allison j...@samba.org
Date: Thu Apr 23 02:02:28 2009 -0700
Fix Coverity bug #902, uninitialized variable.
Jeremy.
---
Summary of changes:
source3/nmbd/nmbd_packets.c |4 +++-
source3/nmbd/nmbd_processlogon.c |2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/nmbd/nmbd_packets.c b/source3/nmbd/nmbd_packets.c
index f69845b..4045184 100644
--- a/source3/nmbd/nmbd_packets.c
+++ b/source3/nmbd/nmbd_packets.c
@@ -1936,7 +1936,9 @@ bool send_mailslot(bool unique, const char *mailslot,char
*buf, size_t len,
DEBUG(0, (send_mailslot: Cannot write beyond end of
packet\n));
return False;
} else {
- memcpy(p2,buf,len);
+ if (len) {
+ memcpy(p2,buf,len);
+ }
p2 += len;
}
diff --git a/source3/nmbd/nmbd_processlogon.c b/source3/nmbd/nmbd_processlogon.c
index 8173337..43e80af 100644
--- a/source3/nmbd/nmbd_processlogon.c
+++ b/source3/nmbd/nmbd_processlogon.c
@@ -267,7 +267,7 @@ static void nmbd_proxy_logon_done(struct tevent_req *subreq)
tevent_req_callback_data(subreq,
struct nmbd_proxy_logon_state);
NTSTATUS status;
- DATA_BLOB response;
+ DATA_BLOB response = data_blob_null;
status = cldap_netlogon_recv(subreq, NULL, state, state-io);
if (!NT_STATUS_IS_OK(status)) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1236-g0accf2c
The branch, master has been updated
via 0accf2cf0f5890c9adf17c3d738bdf6cb46841a4 (commit)
from 6610327770f3e7dd3e7a9b71d34b82f1f198a8a4 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 0accf2cf0f5890c9adf17c3d738bdf6cb46841a4
Author: Volker Lendecke v...@samba.org
Date: Thu Apr 23 11:05:49 2009 +0200
Fix Coverity ID 626: DEADCODE
---
Summary of changes:
nsswitch/libwbclient/wbc_pam.c |5 -
1 files changed, 0 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/libwbclient/wbc_pam.c b/nsswitch/libwbclient/wbc_pam.c
index 92c6643..61ce2a1 100644
--- a/nsswitch/libwbclient/wbc_pam.c
+++ b/nsswitch/libwbclient/wbc_pam.c
@@ -810,11 +810,6 @@ wbcErr wbcChangeUserPasswordEx(const struct
wbcChangePasswordParams *params,
break;
}
- if (cmd == 0) {
- wbc_status = WBC_ERR_INVALID_PARAM;
- BAIL_ON_WBC_ERROR(wbc_status);
- }
-
/* Send request */
wbc_status = wbcRequestResponse(cmd,
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-813-geb247d6
The branch, v3-4-test has been updated
via eb247d6eb727b451727f454b0ec207f255341671 (commit)
from d8703a064e70bd56b2f0ddcde73af14045deed8c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit eb247d6eb727b451727f454b0ec207f255341671
Author: Volker Lendecke v...@samba.org
Date: Thu Apr 23 11:05:49 2009 +0200
Fix Coverity ID 626: DEADCODE
---
Summary of changes:
nsswitch/libwbclient/wbc_pam.c |5 -
1 files changed, 0 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/libwbclient/wbc_pam.c b/nsswitch/libwbclient/wbc_pam.c
index 92c6643..61ce2a1 100644
--- a/nsswitch/libwbclient/wbc_pam.c
+++ b/nsswitch/libwbclient/wbc_pam.c
@@ -810,11 +810,6 @@ wbcErr wbcChangeUserPasswordEx(const struct
wbcChangePasswordParams *params,
break;
}
- if (cmd == 0) {
- wbc_status = WBC_ERR_INVALID_PARAM;
- BAIL_ON_WBC_ERROR(wbc_status);
- }
-
/* Send request */
wbc_status = wbcRequestResponse(cmd,
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1237-g9693259
The branch, master has been updated
via 96932593df6db7a0084c87238b5c044e1a80a049 (commit)
from 0accf2cf0f5890c9adf17c3d738bdf6cb46841a4 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 96932593df6db7a0084c87238b5c044e1a80a049
Author: Jeremy Allison j...@samba.org
Date: Thu Apr 23 02:51:55 2009 -0700
Fix coverity #901 - uninitialized data.
Jeremy.
---
Summary of changes:
source3/libads/ldap_printer.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libads/ldap_printer.c b/source3/libads/ldap_printer.c
index 9be366d..7fec58c 100644
--- a/source3/libads/ldap_printer.c
+++ b/source3/libads/ldap_printer.c
@@ -372,7 +372,7 @@ WERROR get_remote_printer_publishing_data(struct
rpc_pipe_client *cli,
} else {
for (i=0; i count; i++) {
REGISTRY_VALUE v;
- DATA_BLOB blob;
+ DATA_BLOB blob = data_blob_null;
result = push_spoolss_PrinterData(mem_ctx, blob,
info[i].type,
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-814-gaa09344
The branch, v3-4-test has been updated
via aa09344a77a686466371725e6f1c3f2ebaca684a (commit)
from eb247d6eb727b451727f454b0ec207f255341671 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit aa09344a77a686466371725e6f1c3f2ebaca684a
Author: Jeremy Allison j...@samba.org
Date: Thu Apr 23 02:51:55 2009 -0700
Fix coverity #901 - uninitialized data.
Jeremy.
---
Summary of changes:
source3/libads/ldap_printer.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libads/ldap_printer.c b/source3/libads/ldap_printer.c
index 9be366d..7fec58c 100644
--- a/source3/libads/ldap_printer.c
+++ b/source3/libads/ldap_printer.c
@@ -372,7 +372,7 @@ WERROR get_remote_printer_publishing_data(struct
rpc_pipe_client *cli,
} else {
for (i=0; i count; i++) {
REGISTRY_VALUE v;
- DATA_BLOB blob;
+ DATA_BLOB blob = data_blob_null;
result = push_spoolss_PrinterData(mem_ctx, blob,
info[i].type,
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1238-g546d165
The branch, master has been updated
via 546d16500d0dce4d451efb7793065b323bf8edbd (commit)
from 96932593df6db7a0084c87238b5c044e1a80a049 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 546d16500d0dce4d451efb7793065b323bf8edbd
Author: Volker Lendecke v...@samba.org
Date: Wed Apr 22 11:54:13 2009 +0200
Fix a pointless static
---
Summary of changes:
source3/torture/torture.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index c6efa80..49150c3 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -3452,7 +3452,7 @@ static bool run_deletetest(int dummy)
*/
static bool run_properties(int dummy)
{
- static struct cli_state *cli;
+ struct cli_state *cli;
bool correct = True;
printf(starting properties test\n);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1241-g2146310
The branch, master has been updated
via 2146310fb75b743d383aeeae3ac121e37903f229 (commit)
via b8cd1cff2dfad726cf6dab368dfcc31a29952889 (commit)
via d7208577f2a3f612dc851b3d9010f34ae4cc65b4 (commit)
from 546d16500d0dce4d451efb7793065b323bf8edbd (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 2146310fb75b743d383aeeae3ac121e37903f229
Author: Volker Lendecke v...@samba.org
Date: Thu Apr 23 14:24:16 2009 +0200
Fix a couple of warnings
commit b8cd1cff2dfad726cf6dab368dfcc31a29952889
Author: Volker Lendecke v...@samba.org
Date: Thu Apr 23 14:23:23 2009 +0200
Fix an uninitialized variable
commit d7208577f2a3f612dc851b3d9010f34ae4cc65b4
Author: Volker Lendecke v...@samba.org
Date: Thu Apr 23 14:14:37 2009 +0200
Fix a type-punned warning
---
Summary of changes:
libcli/auth/msrpc_parse.c | 25 +++--
libcli/auth/ntlm_check.c|2 +-
libcli/auth/smbencrypt.c|8
libcli/ldap/ldap_message.c |4 ++--
source3/lib/eventlog/eventlog.c |2 +-
source3/lib/util_reg_api.c |2 +-
source3/libnet/libnet_dssync.c |2 ++
7 files changed, 26 insertions(+), 19 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/auth/msrpc_parse.c b/libcli/auth/msrpc_parse.c
index 2f78f5f..9125c1c 100644
--- a/libcli/auth/msrpc_parse.c
+++ b/libcli/auth/msrpc_parse.c
@@ -66,8 +66,10 @@ bool msrpc_gen(TALLOC_CTX *mem_ctx,
case 'U':
s = va_arg(ap, char *);
head_size += 8;
- ret = push_ucs2_talloc(pointers, (smb_ucs2_t
**)pointers[i].data,
- s, n);
+ ret = push_ucs2_talloc(
+ pointers,
+ (smb_ucs2_t **)(void *)pointers[i].data,
+ s, n);
if (!ret) {
return false;
}
@@ -78,8 +80,9 @@ bool msrpc_gen(TALLOC_CTX *mem_ctx,
case 'A':
s = va_arg(ap, char *);
head_size += 8;
- ret = push_ascii_talloc(pointers, (char
**)pointers[i].data, s,
- n);
+ ret = push_ascii_talloc(
+ pointers, (char **)(void *)pointers[i].data,
+ s, n);
if (!ret) {
return false;
}
@@ -91,8 +94,10 @@ bool msrpc_gen(TALLOC_CTX *mem_ctx,
j = va_arg(ap, int);
intargs[i] = j;
s = va_arg(ap, char *);
- ret = push_ucs2_talloc(pointers, (smb_ucs2_t
**)pointers[i].data,
- s, n);
+ ret = push_ucs2_talloc(
+ pointers,
+ (smb_ucs2_t **)(void *)pointers[i].data,
+ s, n);
if (!ret) {
return false;
}
@@ -230,7 +235,7 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx,
ps = va_arg(ap, char **);
if (len1 == 0 len2 == 0) {
- *ps = discard_const();
+ *ps = (char *)discard_const();
} else {
/* make sure its in the right format - be
strict */
if ((len1 != len2) || (ptr + len1 ptr) ||
(ptr + len1 len1) || (ptr + len1 blob-length)) {
@@ -257,7 +262,7 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx,
goto cleanup;
}
} else {
- (*ps) = discard_const();
+ (*ps) = (char *)discard_const();
}
}
break;
@@ -270,7 +275,7 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx,
ps = (char **)va_arg(ap, char **);
/* make sure its in the right format - be strict */
if (len1 == 0 len2 == 0) {
- *ps = discard_const();
+ *ps = (char *)discard_const();
} else {
if ((len1 != len2) || (ptr + len1 ptr) ||
(ptr + len1 len1) || (ptr + len1 blob-length)) {
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1242-g1722859
The branch, master has been updated
via 1722859abd169f2949b5822f97c810f2b8d162da (commit)
from 2146310fb75b743d383aeeae3ac121e37903f229 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1722859abd169f2949b5822f97c810f2b8d162da
Author: Volker Lendecke v...@samba.org
Date: Thu Apr 23 14:54:52 2009 +0200
Revert Do not use the file system GET_REAL_FILENAME for mangled names
This reverts commit b5b6ecb58aeba196c28370cde21a0826f81d8da6.
---
Summary of changes:
source3/smbd/filename.c | 30 +++---
1 files changed, 7 insertions(+), 23 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index e35f23e..80722a7 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -33,9 +33,6 @@ static NTSTATUS build_stream_path(TALLOC_CTX *mem_ctx,
const char *streamname,
SMB_STRUCT_STAT *pst,
char **path);
-static int get_real_filename_mangled(connection_struct *conn, const char *path,
-const char *name, TALLOC_CTX *mem_ctx,
-char **found_name);
/
Mangle the 2nd name and check if it is then equal to the first name.
@@ -450,7 +447,7 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
*/
if (name_has_wildcard ||
- (get_real_filename_mangled(
+ (SMB_VFS_GET_REAL_FILENAME(
conn, dirpath, start,
talloc_tos(), found_name) == -1)) {
char *unmangled;
@@ -792,12 +789,15 @@ static bool fname_equal(const char *name1, const char
*name2,
If the name looks like a mangled name then try via the mangling functions
/
-static int get_real_filename_mangled(connection_struct *conn, const char *path,
-const char *name, TALLOC_CTX *mem_ctx,
-char **found_name)
+int get_real_filename(connection_struct *conn, const char *path,
+ const char *name, TALLOC_CTX *mem_ctx,
+ char **found_name)
{
+ struct smb_Dir *cur_dir;
+ const char *dname;
bool mangled;
char *unmangled_name = NULL;
+ long curpos;
mangled = mangle_is_mangled(name, conn-params);
@@ -838,24 +838,8 @@ static int get_real_filename_mangled(connection_struct
*conn, const char *path,
/* Name is now unmangled. */
name = unmangled_name;
}
- return get_real_filename(conn, path, name, mem_ctx,
-found_name);
}
- return SMB_VFS_GET_REAL_FILENAME(conn, path, name, mem_ctx,
-found_name);
-}
-
-int get_real_filename(connection_struct *conn, const char *path,
- const char *name, TALLOC_CTX *mem_ctx,
- char **found_name)
-{
- struct smb_Dir *cur_dir;
- const char *dname;
- bool mangled;
- char *unmangled_name = NULL;
- long curpos;
-
/* open the directory */
if (!(cur_dir = OpenDir(talloc_tos(), conn, path, NULL, 0))) {
DEBUG(3,(scan dir didn't open dir [%s]\n,path));
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-815-gc7d5e04
The branch, v3-4-test has been updated
via c7d5e046d8fa4097fc16a3dee10e95b83a8c8e55 (commit)
from aa09344a77a686466371725e6f1c3f2ebaca684a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit c7d5e046d8fa4097fc16a3dee10e95b83a8c8e55
Author: Volker Lendecke v...@samba.org
Date: Thu Apr 23 14:56:55 2009 +0200
Revert Do not use the file system GET_REAL_FILENAME for mangled names
This reverts commit c8cc6da0ab4441ce7b22cf00eed05290e91530c4.
---
Summary of changes:
source3/smbd/filename.c | 30 +++---
1 files changed, 7 insertions(+), 23 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index e35f23e..80722a7 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -33,9 +33,6 @@ static NTSTATUS build_stream_path(TALLOC_CTX *mem_ctx,
const char *streamname,
SMB_STRUCT_STAT *pst,
char **path);
-static int get_real_filename_mangled(connection_struct *conn, const char *path,
-const char *name, TALLOC_CTX *mem_ctx,
-char **found_name);
/
Mangle the 2nd name and check if it is then equal to the first name.
@@ -450,7 +447,7 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
*/
if (name_has_wildcard ||
- (get_real_filename_mangled(
+ (SMB_VFS_GET_REAL_FILENAME(
conn, dirpath, start,
talloc_tos(), found_name) == -1)) {
char *unmangled;
@@ -792,12 +789,15 @@ static bool fname_equal(const char *name1, const char
*name2,
If the name looks like a mangled name then try via the mangling functions
/
-static int get_real_filename_mangled(connection_struct *conn, const char *path,
-const char *name, TALLOC_CTX *mem_ctx,
-char **found_name)
+int get_real_filename(connection_struct *conn, const char *path,
+ const char *name, TALLOC_CTX *mem_ctx,
+ char **found_name)
{
+ struct smb_Dir *cur_dir;
+ const char *dname;
bool mangled;
char *unmangled_name = NULL;
+ long curpos;
mangled = mangle_is_mangled(name, conn-params);
@@ -838,24 +838,8 @@ static int get_real_filename_mangled(connection_struct
*conn, const char *path,
/* Name is now unmangled. */
name = unmangled_name;
}
- return get_real_filename(conn, path, name, mem_ctx,
-found_name);
}
- return SMB_VFS_GET_REAL_FILENAME(conn, path, name, mem_ctx,
-found_name);
-}
-
-int get_real_filename(connection_struct *conn, const char *path,
- const char *name, TALLOC_CTX *mem_ctx,
- char **found_name)
-{
- struct smb_Dir *cur_dir;
- const char *dname;
- bool mangled;
- char *unmangled_name = NULL;
- long curpos;
-
/* open the directory */
if (!(cur_dir = OpenDir(talloc_tos(), conn, path, NULL, 0))) {
DEBUG(3,(scan dir didn't open dir [%s]\n,path));
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1245-g53d491c
The branch, master has been updated
via 53d491c9a4011a7d9ad69db52fb91d163f3f990a (commit)
via af6298a84dffb400551861c6dc34591f1473830c (commit)
via 0d4bd2c3971dcd69442a9f12598cf62187bc854f (commit)
from 1722859abd169f2949b5822f97c810f2b8d162da (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 53d491c9a4011a7d9ad69db52fb91d163f3f990a
Merge: af6298a84dffb400551861c6dc34591f1473830c
1722859abd169f2949b5822f97c810f2b8d162da
Author: Andrew Bartlett abart...@samba.org
Date: Thu Apr 23 15:12:35 2009 +0200
Merge branch 'master' of ssh://git.samba.org/data/git/samba into
abartlet-devel
commit af6298a84dffb400551861c6dc34591f1473830c
Author: Andrew Bartlett abart...@samba.org
Date: Thu Apr 23 15:11:04 2009 +0200
s4:test Fix 'make lcov' in Samba4
commit 0d4bd2c3971dcd69442a9f12598cf62187bc854f
Author: Andrew Bartlett abart...@samba.org
Date: Thu Apr 23 12:19:10 2009 +0200
s4:samr Use ldb_context * rather than void *
---
Summary of changes:
source4/rpc_server/samr/dcesrv_samr.h |2 +-
source4/torture/config.mk |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/rpc_server/samr/dcesrv_samr.h
b/source4/rpc_server/samr/dcesrv_samr.h
index a28a4be..7d12d3c 100644
--- a/source4/rpc_server/samr/dcesrv_samr.h
+++ b/source4/rpc_server/samr/dcesrv_samr.h
@@ -37,7 +37,7 @@ enum samr_handle {
state asscoiated with a samr_Connect*() operation
*/
struct samr_connect_state {
- void *sam_ctx;
+ struct ldb_context *sam_ctx;
uint32_t access_mask;
};
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index bec2a06..12cf62f 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -352,8 +352,8 @@ gcov: test
done
samba.info: test
- -rm heimdal/lib/*/{lex,parse}.{gcda,gcno}
- lcov --base-directory `pwd` --directory . --capture --output-file
samba.info
+ -rm heimdal/lib/*/{lex,parse,sel-lex}.{gcda,gcno}
+ lcov --base-directory `pwd` --directory ../nsswitch --directory
../libcli --directory ../librpc --directory ../lib --capture --output-file
samba.info
lcov: samba.info
genhtml -o coverage $
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1246-g652dc40
The branch, master has been updated via 652dc40f0d535b333f8dd6a15fe699438176c53b (commit) from 53d491c9a4011a7d9ad69db52fb91d163f3f990a (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 652dc40f0d535b333f8dd6a15fe699438176c53b Author: Volker Lendecke v...@samba.org Date: Thu Apr 23 16:17:18 2009 +0200 Add missing prototypes --- Summary of changes: source3/include/proto.h | 20 1 files changed, 20 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/proto.h b/source3/include/proto.h index 518c3a7..de2847b 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -2337,7 +2337,17 @@ bool cli_ntrename(struct cli_state *cli, const char *fname_src, const char *fnam bool cli_nt_hardlink(struct cli_state *cli, const char *fname_src, const char *fname_dst); bool cli_unlink_full(struct cli_state *cli, const char *fname, uint16 attrs); bool cli_unlink(struct cli_state *cli, const char *fname); +struct tevent_req *cli_mkdir_send(TALLOC_CTX *mem_ctx, + struct event_context *ev, + struct cli_state *cli, + const char *dname); +NTSTATUS cli_mkdir_recv(struct tevent_req *req); NTSTATUS cli_mkdir(struct cli_state *cli, const char *dname); +struct tevent_req *cli_rmdir_send(TALLOC_CTX *mem_ctx, + struct event_context *ev, + struct cli_state *cli, + const char *dname); +NTSTATUS cli_rmdir_recv(struct tevent_req *req); NTSTATUS cli_rmdir(struct cli_state *cli, const char *dname); int cli_nt_delete_on_close(struct cli_state *cli, int fnum, bool flag); int cli_nt_create_full(struct cli_state *cli, const char *fname, @@ -2416,7 +2426,17 @@ bool cli_setattrE(struct cli_state *cli, int fd, time_t access_time, time_t write_time); bool cli_setatr(struct cli_state *cli, const char *fname, uint16 attr, time_t t); +struct tevent_req *cli_chkpath_send(TALLOC_CTX *mem_ctx, + struct event_context *ev, + struct cli_state *cli, + const char *fname); +NTSTATUS cli_chkpath_recv(struct tevent_req *req); NTSTATUS cli_chkpath(struct cli_state *cli, const char *path); +struct tevent_req *cli_dskattr_send(TALLOC_CTX *mem_ctx, + struct event_context *ev, + struct cli_state *cli); +NTSTATUS cli_dskattr_recv(struct tevent_req *req, int *bsize, int *total, + int *avail); NTSTATUS cli_dskattr(struct cli_state *cli, int *bsize, int *total, int *avail); int cli_ctemp(struct cli_state *cli, const char *path, char **tmp_path); NTSTATUS cli_raw_ioctl(struct cli_state *cli, int fnum, uint32 code, DATA_BLOB *blob); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1247-g176302d
The branch, master has been updated
via 176302dc05cd67d013f3d153b9816329a175167e (commit)
from 652dc40f0d535b333f8dd6a15fe699438176c53b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 176302dc05cd67d013f3d153b9816329a175167e
Author: Sam Liddicott s...@liddicott.com
Date: Thu Apr 23 13:47:59 2009 +0100
Add async support for reply_tcon* and ntvfs_connect
smbsrv_tcon_backend no longer creates the ntvfs_request wrapper,
so smbsrv_reply_tcon* can now do this and then invoke ntvfs_connect
in the typical manner using SMBSRV_SETUP_NTVFS_REQUEST and
SMBSRV_CALL_NTVFS_BACKEND
Previously smbsrv_tcon_backend has been responsible for instantiating
the ntvfs_module_context to service a tree-connect request, and
then create an ntvfs_request wrapper around the smbsrv_request
and pass this to ntvfs_connect for the newly created ntvfs.
These actions could not be invoked asynchronously.
This meant that any client requests made while instantiating the
ntvfs module, including any composite's used during authentication
(or related client connections for the case of proxy modules)
would block other ntvfs modules and requests in the current process as
they executed a nested event loop to await completion.
Signed-off-by: Sam Liddicott s...@liddicott.com
Signed-off-by: Stefan Metzmacher me...@samba.org
---
Summary of changes:
source4/smb_server/smb/reply.c | 154 +
source4/smb_server/smb/service.c | 21 +-
2 files changed, 105 insertions(+), 70 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/smb_server/smb/reply.c b/source4/smb_server/smb/reply.c
index 9c4ee99..1b309a0 100644
--- a/source4/smb_server/smb/reply.c
+++ b/source4/smb_server/smb/reply.c
@@ -44,114 +44,168 @@ static void reply_simple_send(struct ntvfs_request *ntvfs)
/
+ Reply to a tcon (async reply)
+/
+static void reply_tcon_send(struct ntvfs_request *ntvfs)
+{
+ struct smbsrv_request *req;
+ union smb_tcon *con;
+
+ SMBSRV_CHECK_ASYNC_STATUS(con, union smb_tcon);
+
+ if (con-generic.level == RAW_TCON_TCON) {
+ con-tcon.out.max_xmit = req-smb_conn-negotiate.max_recv;
+ con-tcon.out.tid = req-tcon-tid;
+ } else {
+ /* TODO: take a look at tconx.in.flags! */
+ con-tconx.out.tid = req-tcon-tid;
+ con-tconx.out.dev_type = talloc_strdup(req,
req-tcon-ntvfs-dev_type);
+ con-tconx.out.fs_type = talloc_strdup(req,
req-tcon-ntvfs-fs_type);
+ }
+
+ /* construct reply */
+ smbsrv_setup_reply(req, 2, 0);
+
+ SSVAL(req-out.vwv, VWV(0), con-tcon.out.max_xmit);
+ SSVAL(req-out.vwv, VWV(1), con-tcon.out.tid);
+ SSVAL(req-out.hdr, HDR_TID, req-tcon-tid);
+
+ smbsrv_send_reply(req);
+}
+
+/
Reply to a tcon.
/
void smbsrv_reply_tcon(struct smbsrv_request *req)
{
- union smb_tcon con;
+ union smb_tcon *con;
NTSTATUS status;
uint8_t *p;
/* parse request */
SMBSRV_CHECK_WCT(req, 0);
- con.tcon.level = RAW_TCON_TCON;
+ SMBSRV_TALLOC_IO_PTR(con, union smb_tcon);
+
+ con-tcon.level = RAW_TCON_TCON;
p = req-in.data;
- p += req_pull_ascii4(req-in.bufinfo, con.tcon.in.service, p,
STR_TERMINATE);
- p += req_pull_ascii4(req-in.bufinfo, con.tcon.in.password, p,
STR_TERMINATE);
- p += req_pull_ascii4(req-in.bufinfo, con.tcon.in.dev, p,
STR_TERMINATE);
+ p += req_pull_ascii4(req-in.bufinfo, con-tcon.in.service, p,
STR_TERMINATE);
+ p += req_pull_ascii4(req-in.bufinfo, con-tcon.in.password, p,
STR_TERMINATE);
+ p += req_pull_ascii4(req-in.bufinfo, con-tcon.in.dev, p,
STR_TERMINATE);
- if (!con.tcon.in.service || !con.tcon.in.password || !con.tcon.in.dev) {
+ if (!con-tcon.in.service || !con-tcon.in.password ||
!con-tcon.in.dev) {
smbsrv_send_error(req, NT_STATUS_INVALID_PARAMETER);
return;
}
- /* call backend */
- status = smbsrv_tcon_backend(req, con);
-
+ /* Instantiate backend */
+ status = smbsrv_tcon_backend(req, con);
if (!NT_STATUS_IS_OK(status)) {
smbsrv_send_error(req, status);
return;
}
- /* construct reply */
- smbsrv_setup_reply(req, 2, 0);
+ SMBSRV_SETUP_NTVFS_REQUEST(reply_tcon_send,
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1249-gae6af9e
The branch, master has been updated
via ae6af9ecbfce559a50d95853d6e66b8aa8788741 (commit)
via f5dfd1a9a68fda488c96176754a3b6462e8e4dba (commit)
from 176302dc05cd67d013f3d153b9816329a175167e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit ae6af9ecbfce559a50d95853d6e66b8aa8788741
Merge: f5dfd1a9a68fda488c96176754a3b6462e8e4dba
176302dc05cd67d013f3d153b9816329a175167e
Author: Andrew Bartlett abart...@samba.org
Date: Thu Apr 23 17:38:42 2009 +0200
Merge branch 'master' of ssh://git.samba.org/data/git/samba into
abartlet-devel
commit f5dfd1a9a68fda488c96176754a3b6462e8e4dba
Author: Andrew Bartlett abart...@samba.org
Date: Thu Apr 23 16:46:47 2009 +0200
s4:test Include 'source4' in directories to find lcov in
---
Summary of changes:
source4/torture/config.mk |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 12cf62f..49830d2 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -353,7 +353,7 @@ gcov: test
samba.info: test
-rm heimdal/lib/*/{lex,parse,sel-lex}.{gcda,gcno}
- lcov --base-directory `pwd` --directory ../nsswitch --directory
../libcli --directory ../librpc --directory ../lib --capture --output-file
samba.info
+ lcov --base-directory `pwd` --directory . --directory ../nsswitch
--directory ../libcli --directory ../librpc --directory ../lib --capture
--output-file samba.info
lcov: samba.info
genhtml -o coverage $
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1252-g3cf48ee
The branch, master has been updated
via 3cf48ee05ae99fb99d1b7b7204f9b8c444907a4a (commit)
via 598f78bd1f3c59cfdca91a590bd95298b7d28d9e (commit)
via 80420745ff2998626a302b5f863db8364e858f8f (commit)
from ae6af9ecbfce559a50d95853d6e66b8aa8788741 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 3cf48ee05ae99fb99d1b7b7204f9b8c444907a4a
Author: Jelmer Vernooij jel...@samba.org
Date: Thu Apr 23 17:46:54 2009 +0200
Fix push_codepoint function without iconv_convenience.
commit 598f78bd1f3c59cfdca91a590bd95298b7d28d9e
Author: Jelmer Vernooij jel...@samba.org
Date: Thu Apr 23 16:03:19 2009 +0200
charcnv: Import push_codepoint().
commit 80420745ff2998626a302b5f863db8364e858f8f
Author: Jelmer Vernooij jel...@samba.org
Date: Thu Apr 23 15:24:38 2009 +0200
Add a new non-convenience version of push_codepoint.
---
Summary of changes:
lib/util/charset/charcnv.c|4 ++-
lib/util/charset/charset.h|3 +-
lib/util/charset/tests/iconv.c|2 +-
lib/util/charset/util_unistr.c| 13 +--
source3/lib/charcnv.c | 61 +
source4/lib/registry/patchfile_preg.c | 38 ++---
source4/ntvfs/posix/pvfs_rename.c |4 +-
7 files changed, 96 insertions(+), 29 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/charset/charcnv.c b/lib/util/charset/charcnv.c
index 94d47a9..a479f44 100644
--- a/lib/util/charset/charcnv.c
+++ b/lib/util/charset/charcnv.c
@@ -430,7 +430,7 @@ _PUBLIC_ codepoint_t next_codepoint_convenience(struct
smb_iconv_convenience *ic
return the number of bytes occupied by the CH_UNIX character, or
-1 on failure
*/
-_PUBLIC_ ssize_t push_codepoint(struct smb_iconv_convenience *ic,
+_PUBLIC_ ssize_t push_codepoint_convenience(struct smb_iconv_convenience *ic,
char *str, codepoint_t c)
{
smb_iconv_t descriptor;
@@ -478,3 +478,5 @@ _PUBLIC_ ssize_t push_codepoint(struct
smb_iconv_convenience *ic,
}
return 5 - olen;
}
+
+
diff --git a/lib/util/charset/charset.h b/lib/util/charset/charset.h
index 37c5aca..2c8aa41 100644
--- a/lib/util/charset/charset.h
+++ b/lib/util/charset/charset.h
@@ -151,11 +151,12 @@ ssize_t iconv_talloc(TALLOC_CTX *mem_ctx,
extern struct smb_iconv_convenience *global_iconv_convenience;
codepoint_t next_codepoint(const char *str, size_t *size);
+ssize_t push_codepoint(char *str, codepoint_t c);
/* codepoints */
codepoint_t next_codepoint_convenience(struct smb_iconv_convenience *ic,
const char *str, size_t *size);
-ssize_t push_codepoint(struct smb_iconv_convenience *ic,
+ssize_t push_codepoint_convenience(struct smb_iconv_convenience *ic,
char *str, codepoint_t c);
codepoint_t toupper_m(codepoint_t val);
codepoint_t tolower_m(codepoint_t val);
diff --git a/lib/util/charset/tests/iconv.c b/lib/util/charset/tests/iconv.c
index 091876f..e8d7bc1 100644
--- a/lib/util/charset/tests/iconv.c
+++ b/lib/util/charset/tests/iconv.c
@@ -288,7 +288,7 @@ static bool test_codepoint(struct torture_context *tctx,
unsigned int codepoint)
size_t size, size2;
codepoint_t c;
- size = push_codepoint(lp_iconv_convenience(tctx-lp_ctx), (char *)buf,
codepoint);
+ size = push_codepoint_convenience(lp_iconv_convenience(tctx-lp_ctx),
(char *)buf, codepoint);
torture_assert(tctx, size != -1 || (codepoint = 0xd800 codepoint =
0x1),
Invalid Codepoint range);
diff --git a/lib/util/charset/util_unistr.c b/lib/util/charset/util_unistr.c
index ea2bfea..024dc70 100644
--- a/lib/util/charset/util_unistr.c
+++ b/lib/util/charset/util_unistr.c
@@ -444,7 +444,7 @@ _PUBLIC_ char *strlower_talloc(TALLOC_CTX *ctx, const char
*src)
c = tolower_m(c);
- c_size = push_codepoint(iconv_convenience, dest+size, c);
+ c_size = push_codepoint_convenience(iconv_convenience,
dest+size, c);
if (c_size == -1) {
talloc_free(dest);
return NULL;
@@ -490,7 +490,7 @@ _PUBLIC_ char *strupper_talloc_n(TALLOC_CTX *ctx, const
char *src, size_t n)
c = toupper_m(c);
- c_size = push_codepoint(iconv_convenience, dest+size, c);
+ c_size = push_codepoint_convenience(iconv_convenience,
dest+size, c);
if (c_size == -1) {
talloc_free(dest);
return NULL;
@@ -551,7 +551,7 @@ _PUBLIC_ void strlower_m(char *s)
while (*s) {
size_t c_size, c_size2;
codepoint_t c = next_codepoint_convenience(iconv_convenience,
s, c_size);
- c_size2 =
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1253-g90cc5e7
The branch, master has been updated via 90cc5e72ba0cf4b5261be2f2aa9db87bd011fbb0 (commit) from 3cf48ee05ae99fb99d1b7b7204f9b8c444907a4a (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 90cc5e72ba0cf4b5261be2f2aa9db87bd011fbb0 Author: nadezhda ivanova nivan...@ved.salsa.postpath.local Date: Thu Apr 23 17:18:23 2009 +0300 Fix of a bug in the security.descriptor.as_sddl() method security.descriptor.as_sddl() method did not work correctly when invoked without supplying the domain sid. Returned the same value as when the sid was provided. Test added for this case in libcli/security/tests/bindings.py Signed-off-by: Jelmer Vernooij jel...@samba.org --- Summary of changes: source4/libcli/security/tests/bindings.py |6 ++ source4/librpc/ndr/py_security.c |2 +- 2 files changed, 7 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/libcli/security/tests/bindings.py b/source4/libcli/security/tests/bindings.py index 5c15305..f0d55f1 100644 --- a/source4/libcli/security/tests/bindings.py +++ b/source4/libcli/security/tests/bindings.py @@ -77,6 +77,12 @@ class SecurityDescriptorTests(unittest.TestCase): self.assertEquals(desc1.sacl, desc2.sacl) self.assertEquals(desc1.type, desc2.type) +def test_domsid_nodomsid_as_sddl(self): +dom = security.dom_sid(S-2-0-0) +text = O:AOG:DAD:(A;;RPWPCCDCLCSWRCWDWOGA;;;S-1-0-0) +desc1 = security.descriptor.from_sddl(text, dom) +self.assertNotEqual(desc1.as_sddl(), desc1.as_sddl(dom)) + class DomSidTests(unittest.TestCase): def test_parse_sid(self): diff --git a/source4/librpc/ndr/py_security.c b/source4/librpc/ndr/py_security.c index 43c1d50..1b54aab 100644 --- a/source4/librpc/ndr/py_security.c +++ b/source4/librpc/ndr/py_security.c @@ -198,7 +198,7 @@ static PyObject *py_descriptor_as_sddl(PyObject *self, PyObject *args) if (!PyArg_ParseTuple(args, |O, py_sid)) return NULL; - if (py_sid == Py_None) + if (py_sid != Py_None) sid = py_talloc_get_ptr(py_sid); else sid = NULL; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1256-gaf6316d
The branch, master has been updated
via af6316d1500cfcedd5fd59ed0ddbba9aec9c3756 (commit)
via b6981e79dfb22819f48edcd4041b00f9b8cd7a93 (commit)
via 9b64073cf733588b75c3780f2c18728ff3009500 (commit)
from 90cc5e72ba0cf4b5261be2f2aa9db87bd011fbb0 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit af6316d1500cfcedd5fd59ed0ddbba9aec9c3756
Author: Jelmer Vernooij jel...@samba.org
Date: Thu Apr 23 18:59:37 2009 +0200
Provide a ldb_global_init() function for compatibility with older versions
of LDB
(including the one in Samba 3).
commit b6981e79dfb22819f48edcd4041b00f9b8cd7a93
Author: Jelmer Vernooij jel...@samba.org
Date: Thu Apr 23 14:31:45 2009 +0200
samba3/ldb: Update the ldb_dn API to match that of the Samba 4 LDB:
* ldb_dn_new() now takes an initial DN string
* ldb_dn_string_compose() - ldb_dn_new_fmt()
* dummy ldb_dn_validate(), since LDB DNs in the current implementation
are always valid if they could be created.
commit 9b64073cf733588b75c3780f2c18728ff3009500
Author: Jelmer Vernooij jel...@samba.org
Date: Thu Apr 23 14:27:59 2009 +0200
ldb/samba3: Support event context argument to ldb_init().
This argument is ignored (Samba3's LDB is synchronous) but having it
there is useful for API compatibility with the LDB used by Samba 4 and
available on some systems.
---
Summary of changes:
source3/groupdb/mapping_ldb.c | 10 +++---
source3/lib/ldb/common/ldb.c |6 ++--
source3/lib/ldb/common/ldb_dn.c | 53 ++--
source3/lib/ldb/include/ldb.h |9 +-
source3/lib/ldb/tools/ldbadd.c|2 +-
source3/lib/ldb/tools/ldbdel.c|2 +-
source3/lib/ldb/tools/ldbedit.c |2 +-
source3/lib/ldb/tools/ldbmodify.c |2 +-
source3/lib/ldb/tools/ldbrename.c |2 +-
source3/lib/ldb/tools/ldbsearch.c |2 +-
source3/libads/ldap.c | 22 ---
source4/lib/ldb/common/ldb.c |6
12 files changed, 77 insertions(+), 41 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/groupdb/mapping_ldb.c b/source3/groupdb/mapping_ldb.c
index a162c19..7ad0bbb 100644
--- a/source3/groupdb/mapping_ldb.c
+++ b/source3/groupdb/mapping_ldb.c
@@ -23,7 +23,7 @@
#include includes.h
#include groupdb/mapping.h
-#include lib/ldb/include/includes.h
+#include lib/ldb/include/ldb.h
#include lib/ldb/include/ldb_errors.h
static struct ldb_context *ldb;
@@ -57,7 +57,7 @@ static bool init_group_mapping(void)
db_path = state_path(group_mapping.ldb);
- ldb = ldb_init(NULL);
+ ldb = ldb_init(NULL, NULL);
if (ldb == NULL) goto failed;
/* Ensure this db is created read/write for root only. */
@@ -133,8 +133,8 @@ static struct ldb_dn *mapping_dn(TALLOC_CTX *mem_ctx, const
DOM_SID *sid)
}
/* we split by domain and rid so we can do a subtree search
when we only want one domain */
- return ldb_dn_string_compose(mem_ctx, NULL, rid=%u,domain=%s,
-rid, string_sid);
+ return ldb_dn_new_fmt(mem_ctx, ldb, rid=%u,domain=%s,
+ rid, string_sid);
}
/*
@@ -328,7 +328,7 @@ static bool enum_group_mapping(const DOM_SID *domsid, enum
lsa_SidType sid_name_
/* we do a subtree search on the domain */
if (domsid != NULL) {
sid_to_fstring(name, domsid);
- basedn = ldb_dn_string_compose(tmp_ctx, NULL, domain=%s,
name);
+ basedn = ldb_dn_new_fmt(tmp_ctx, ldb, domain=%s, name);
if (basedn == NULL) goto failed;
}
diff --git a/source3/lib/ldb/common/ldb.c b/source3/lib/ldb/common/ldb.c
index cef7373..791c186 100644
--- a/source3/lib/ldb/common/ldb.c
+++ b/source3/lib/ldb/common/ldb.c
@@ -39,7 +39,7 @@
initialise a ldb context
The mem_ctx is optional
*/
-struct ldb_context *ldb_init(void *mem_ctx)
+struct ldb_context *ldb_init(void *mem_ctx, struct tevent_context *tev_ctx)
{
struct ldb_context *ldb = talloc_zero(mem_ctx, struct ldb_context);
int ret;
@@ -166,7 +166,7 @@ static const struct ldb_dn *ldb_set_default_basedn(struct
ldb_context *ldb)
}
tmp_ctx = talloc_new(ldb);
- ret = ldb_search(ldb, ldb, res, ldb_dn_new(tmp_ctx), LDB_SCOPE_BASE,
+ ret = ldb_search(ldb, ldb, res, ldb_dn_new(tmp_ctx, ldb, NULL),
LDB_SCOPE_BASE,
attrs, (objectClass=*));
if (ret == LDB_SUCCESS) {
if (res-count == 1) {
@@ -601,7 +601,7 @@ int ldb_build_search_req(struct ldb_request **ret_req,
req-operation = LDB_SEARCH;
if (base == NULL) {
- req-op.search.base = ldb_dn_new(req);
+ req-op.search.base = ldb_dn_new(req, ldb, NULL);
Build status as of Fri Apr 24 00:00:02 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-04-23 00:00:19.0 + +++ /home/build/master/cache/broken_results.txt 2009-04-24 00:00:23.0 + @@ -1,22 +1,22 @@ -Build status as of Thu Apr 23 00:00:02 2009 +Build status as of Fri Apr 24 00:00:02 2009 Build counts: Tree Total Broken Panic build_farm 0 0 0 ccache 31 6 0 distcc 0 0 0 -ldb 31 31 0 +ldb 29 31 0 libreplace 31 12 0 lorikeet 0 0 0 pidl 21 3 0 ppp 13 0 0 -rsync30 12 0 +rsync31 12 0 samba-docs 0 0 0 samba-web0 0 0 -samba_3_current 29 19 0 -samba_3_master 30 29 1 -samba_3_next 30 29 1 -samba_4_0_test 31 29 4 +samba_3_current 29 21 0 +samba_3_master 30 30 1 +samba_3_next 30 29 0 +samba_4_0_test 31 30 5 talloc 31 31 0 tdb 29 13 0
[SCM] CTDB repository - branch 1.0.69 updated - ctdb-1.0.69-8-gac55576
The branch, 1.0.69 has been updated
via ac5557659e667da5f3a33cc612e06a21396fce2d (commit)
via 968739ea9af2aaba90e6bb4569ae4d9fb60b79aa (commit)
via 2031fd8b83bd832d1104128c3faddf209e6bb23e (commit)
via 0563b3c6d9787164475538fbc1342f8c6be62eac (commit)
via 3aba067b7fa7d77836901f82deee441a07b3a15d (commit)
via 0a7dbe56d1b4545e9f45c29ea719d24b3b3ada3e (commit)
from 767e92f64b63a6bcaa36efe633e8a3e55a803e79 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=1.0.69
- Log -
commit ac5557659e667da5f3a33cc612e06a21396fce2d
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Fri Apr 24 14:43:48 2009 +1000
new version 1.0.69-3
commit 968739ea9af2aaba90e6bb4569ae4d9fb60b79aa
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Fri Apr 24 14:41:21 2009 +1000
tweak some timeouts so that we do trigger a banning even if the control
hangs/timesout
commit 2031fd8b83bd832d1104128c3faddf209e6bb23e
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Fri Apr 24 13:58:32 2009 +1000
If we can not pull a database from a node during recovery, mark this node
as a culprit so that it will eventually become banned.
commit 0563b3c6d9787164475538fbc1342f8c6be62eac
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Thu Apr 23 09:31:44 2009 +1000
new version 1.0.69-2
commit 3aba067b7fa7d77836901f82deee441a07b3a15d
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Mon Apr 6 12:00:22 2009 +1000
We dont need to verify the nodemap on remote nodes that are banned
commit 0a7dbe56d1b4545e9f45c29ea719d24b3b3ada3e
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Thu Apr 2 14:50:43 2009 +1100
if we cant pull the remote nodemap off a node we should mark it as a
culprit so it eventually becomes banned.
---
Summary of changes:
packaging/RPM/ctdb.spec |8 +++-
server/ctdb_recoverd.c | 32 +++-
server/ctdb_tunables.c |4 ++--
3 files changed, 36 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index aaa8a07..8572ab0 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -5,7 +5,7 @@ Vendor: Samba Team
Packager: Samba Team sa...@samba.org
Name: ctdb
Version: 1.0
-Release: 69_1
+Release: 69_3
Epoch: 0
License: GNU GPL version 3
Group: System Environment/Daemons
@@ -121,6 +121,12 @@ fi
%{_includedir}/ctdb_private.h
%changelog
+* Fri Apr 24 2009 : Version 1.0.69_3
+ - Make sure that if during recovery a node is stuck and does not reply to
+ pull_db requests that we eventually ban this node from the recovery master.
+* Thu Apr 23 2009 : Version 1.0.69_2
+ - In the recovery daemon we dont need to check the nodemap status
+ of banned nodes.
* Wed Feb 5 2009 : Version 1.0.69_1
- Dont check the result of the modflags control, to allow compatibility
with earlier versions of ctdb
diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c
index 540749d..2e460dd 100644
--- a/server/ctdb_recoverd.c
+++ b/server/ctdb_recoverd.c
@@ -244,6 +244,23 @@ static void ctdb_set_culprit(struct ctdb_recoverd *rec,
uint32_t culprit)
rec-culprit_counter++;
}
+/*
+ remember the trouble maker
+ */
+static void ctdb_set_culprit_count(struct ctdb_recoverd *rec, uint32_t
culprit, uint32_t count)
+{
+ struct ctdb_context *ctdb = rec-ctdb;
+
+ if (rec-last_culprit != culprit ||
+ timeval_elapsed(rec-first_recover_time)
ctdb-tunable.recovery_grace_period) {
+ DEBUG(DEBUG_NOTICE,(New recovery culprit %u\n, culprit));
+ /* either a new node is the culprit, or we've decided to
forgive them */
+ rec-last_culprit = culprit;
+ rec-first_recover_time = timeval_current();
+ rec-culprit_counter = 0;
+ }
+ rec-culprit_counter += count;
+}
/* this callback is called for every node that failed to execute the
start recovery event
@@ -612,7 +629,9 @@ static int pull_one_remote_database(struct ctdb_context
*ctdb, uint32_t srcnode,
/*
pull all the remote database contents into the recdb
*/
-static int pull_remote_database(struct ctdb_context *ctdb, struct
ctdb_node_map *nodemap,
+static int pull_remote_database(struct ctdb_context *ctdb,
+ struct ctdb_recoverd *rec,
+ struct ctdb_node_map *nodemap,
struct tdb_wrap *recdb, uint32_t dbid)
{
int j;
@@ -628,6 +647,7 @@ static int pull_remote_database(struct ctdb_context *ctdb,
struct ctdb_node_map
if (pull_one_remote_database(ctdb, nodemap-nodes[j].pnn,
recdb, dbid) != 0) {
DEBUG(DEBUG_ERR,(__location__ Failed to pull remote
database from node
[SCM] CTDB repository - branch master updated - ctdb-1.0.79-7-g1860a36
The branch, master has been updated
via 1860a365e6ba8212e15c33016c80a2adcf8d10f4 (commit)
via 69dc3bf60b86d8df6dc5c7c6ebf303e847fb2ba9 (commit)
via 2f952af1a12e81a652ec9a4794db96f9593f2676 (commit)
via 373a04d6a47a5c7cf8d822d60be1d9b9ab4df784 (commit)
via 43c718ebd402abe2e1e6360ce21b08cc13030c88 (commit)
via 0f2664a82128e38ac49c6e8e784129b779616a27 (commit)
via 1a110993af1706e0c5df500fa7d14e16c0668372 (commit)
from 6c900aa343096c5e1e297e055c36832ffa5028dd (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit 1860a365e6ba8212e15c33016c80a2adcf8d10f4
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Fri Apr 24 14:41:21 2009 +1000
tweak some timeouts so that we do trigger a banning even if the control
hangs/timesout
commit 69dc3bf60b86d8df6dc5c7c6ebf303e847fb2ba9
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Fri Apr 24 13:58:32 2009 +1000
If we can not pull a database from a node during recovery, mark this node
as a culprit so that it will eventually become banned.
commit 2f952af1a12e81a652ec9a4794db96f9593f2676
Author: Andrew Tridgell tri...@samba.org
Date: Thu Apr 23 11:35:42 2009 +1000
change shutdown level for ctdb to be 01
We want ctdb to shutdown first, as it manages many other
services. With the old level of 32 the NFS service would shutdown
first, and that would trigger ctdb to do a recovery. Then ctdb itself
would be shutdown a few seconds later, which causes a lot of error
messages in the other nodes logs
commit 373a04d6a47a5c7cf8d822d60be1d9b9ab4df784
Merge: 43c718ebd402abe2e1e6360ce21b08cc13030c88
6c900aa343096c5e1e297e055c36832ffa5028dd
Author: Andrew Tridgell tri...@samba.org
Date: Thu Apr 23 11:00:16 2009 +1000
Merge commit 'ronnie/master'
commit 43c718ebd402abe2e1e6360ce21b08cc13030c88
Merge: 0f2664a82128e38ac49c6e8e784129b779616a27
13e2c9044950f21918e4610726e73ed3d8f76920
Author: Andrew Tridgell tri...@samba.org
Date: Tue Apr 7 17:07:41 2009 +1000
Merge commit 'ronnie/master'
commit 0f2664a82128e38ac49c6e8e784129b779616a27
Merge: 1a110993af1706e0c5df500fa7d14e16c0668372
ecf26af22245d0f55aded50e8768b0c21495f98c
Author: Andrew Tridgell tri...@samba.org
Date: Fri Mar 6 11:26:20 2009 +1100
Merge commit 'ronnie/master'
commit 1a110993af1706e0c5df500fa7d14e16c0668372
Merge: 4777b74b1e2eebe54cf27f3303f60e49023e7f6a
59a04a50e64aae0a89b165d0428e23a8bcf8eb24
Author: Andrew Tridgell tri...@samba.org
Date: Mon Feb 9 10:53:47 2009 +1100
Merge commit 'ronnie/master'
---
Summary of changes:
config/ctdb.init |2 +-
server/ctdb_recoverd.c | 28
server/ctdb_tunables.c |4 ++--
3 files changed, 27 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/ctdb.init b/config/ctdb.init
index 24a206d..0903c91 100755
--- a/config/ctdb.init
+++ b/config/ctdb.init
@@ -3,7 +3,7 @@
##
# ctdb:Starts the clustered tdb daemon
#
-# chkconfig: - 90 36
+# chkconfig: - 90 01
#
# description: Starts and stops the clustered tdb daemon
# pidfile: /var/run/ctdbd/ctdbd.pid
diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c
index 86f7a46..c6d0a7a 100644
--- a/server/ctdb_recoverd.c
+++ b/server/ctdb_recoverd.c
@@ -244,6 +244,23 @@ static void ctdb_set_culprit(struct ctdb_recoverd *rec,
uint32_t culprit)
rec-culprit_counter++;
}
+/*
+ remember the trouble maker
+ */
+static void ctdb_set_culprit_count(struct ctdb_recoverd *rec, uint32_t
culprit, uint32_t count)
+{
+ struct ctdb_context *ctdb = rec-ctdb;
+
+ if (rec-last_culprit != culprit ||
+ timeval_elapsed(rec-first_recover_time)
ctdb-tunable.recovery_grace_period) {
+ DEBUG(DEBUG_NOTICE,(New recovery culprit %u\n, culprit));
+ /* either a new node is the culprit, or we've decided to
forgive them */
+ rec-last_culprit = culprit;
+ rec-first_recover_time = timeval_current();
+ rec-culprit_counter = 0;
+ }
+ rec-culprit_counter += count;
+}
/* this callback is called for every node that failed to execute the
start recovery event
@@ -612,7 +629,9 @@ static int pull_one_remote_database(struct ctdb_context
*ctdb, uint32_t srcnode,
/*
pull all the remote database contents into the recdb
*/
-static int pull_remote_database(struct ctdb_context *ctdb, struct
ctdb_node_map *nodemap,
+static int pull_remote_database(struct ctdb_context *ctdb,
+ struct ctdb_recoverd *rec,
+ struct ctdb_node_map *nodemap,
struct tdb_wrap *recdb, uint32_t dbid)
{
