The branch, master has been updated
via 126f87e s3: Fix some DEBUG msgs
via da09021 s3: Package tdbrestore in RHEL-CTDB
via 7aa45b0 s3: Pass tdb_flags to ctdbd when attaching to a db
from 33f65a9 s4:samr RPC server -
"dcesrv_samr_info_DomGeneralInformation" - count always all type of groups
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 126f87e6a51bf330b7cdc631804a61e29c3116f7
Author: Volker Lendecke <v...@samba.org>
Date: Tue Oct 26 16:36:38 2010 +0200
s3: Fix some DEBUG msgs
Autobuild-User: Volker Lendecke <vlen...@samba.org>
Autobuild-Date: Tue Oct 26 15:20:01 UTC 2010 on sn-devel-104
commit da09021bf3da65c94cf25c8e6033d010c6780b4a
Author: Volker Lendecke <v...@samba.org>
Date: Tue Oct 26 09:17:57 2010 -0600
s3: Package tdbrestore in RHEL-CTDB
commit 7aa45b06c04cdeea44ab474581fc97360cecccde
Author: Volker Lendecke <v...@samba.org>
Date: Mon Oct 25 11:07:36 2010 +0200
s3: Pass tdb_flags to ctdbd when attaching to a db
This is required to make ctdb create databases with INCOMPATIBLE_HASH
-----------------------------------------------------------------------
Summary of changes:
packaging/RHEL-CTDB/samba.spec.tmpl | 1 +
source3/lib/ctdbd_conn.c | 2 +-
source3/smbd/dosmode.c | 10 +++++-----
3 files changed, 7 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl
b/packaging/RHEL-CTDB/samba.spec.tmpl
index 00f85af..2f32d3d 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -463,6 +463,7 @@ exit 0
%{_bindir}/tdbbackup
%{_bindir}/tdbtool
%{_bindir}/tdbdump
+%{_bindir}/tdbrestore
%{_bindir}/eventlogadm
%{_libarchdir}/samba/auth/script.so
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 101ab30..f8d6245 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -886,7 +886,7 @@ NTSTATUS ctdbd_db_attach(struct ctdbd_connection *conn,
persistent
? CTDB_CONTROL_DB_ATTACH_PERSISTENT
: CTDB_CONTROL_DB_ATTACH,
- 0, 0, data, NULL, &data, &cstatus);
+ tdb_flags, 0, data, NULL, &data, &cstatus);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, (__location__ " ctdb_control for db_attach "
"failed: %s\n", nt_errstr(status)));
diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index e69a953..7faeb44 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -249,7 +249,7 @@ static bool get_ea_dos_attribute(connection_struct *conn,
#else
) {
#endif
- DEBUG(1,("get_ea_dos_attributes: Cannot get attribute "
+ DEBUG(1,("get_ea_dos_attribute: Cannot get attribute "
"from EA on file %s: Error = %s\n",
smb_fname_str_dbg(smb_fname),
strerror(errno)));
@@ -265,7 +265,7 @@ static bool get_ea_dos_attribute(connection_struct *conn,
(ndr_pull_flags_fn_t)ndr_pull_xattr_DOSATTRIB);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
- DEBUG(1,("get_ea_dos_attributes: bad ndr decode "
+ DEBUG(1,("get_ea_dos_attribute: bad ndr decode "
"from EA on file %s: Error = %s\n",
smb_fname_str_dbg(smb_fname),
ndr_errstr(ndr_err)));
@@ -289,7 +289,7 @@ static bool get_ea_dos_attribute(connection_struct *conn,
update_stat_ex_create_time(&smb_fname->st,
create_time);
- DEBUG(10,("get_ea_dos_attributes: file %s case
1 "
+ DEBUG(10,("get_ea_dos_attribute: file %s case 1
"
"set btime %s\n",
smb_fname_str_dbg(smb_fname),
time_to_asc(convert_timespec_to_time_t(
@@ -311,7 +311,7 @@ static bool get_ea_dos_attribute(connection_struct *conn,
update_stat_ex_create_time(&smb_fname->st,
create_time);
- DEBUG(10,("get_ea_dos_attributes: file %s case
3 "
+ DEBUG(10,("get_ea_dos_attribute: file %s case 3
"
"set btime %s\n",
smb_fname_str_dbg(smb_fname),
time_to_asc(convert_timespec_to_time_t(
@@ -319,7 +319,7 @@ static bool get_ea_dos_attribute(connection_struct *conn,
}
break;
default:
- DEBUG(1,("get_ea_dos_attributes: Badly formed
DOSATTRIB on "
+ DEBUG(1,("get_ea_dos_attribute: Badly formed
DOSATTRIB on "
"file %s - %s\n",
smb_fname_str_dbg(smb_fname),
attrstr));
return false;
--
Samba Shared Repository
