[Samba] Samba 3.6 and server string formatting
I am Samba 3.6 up and running and I have a question on the implementation of the server string command. Specifically, I wanted to use this string to identify the share window on the PC side. I have tried to use: server string = %S on server %L, to display the share name and server name. Though I cannot seem to get the option to work with anything other than %h. Derek -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba-winbind 3.5.4 primary group is always domainusers!!!???
-Original Message- From: Andrew Lyon [mailto:andrew.l...@gmail.com] Sent: Freitag, 22. Oktober 2010 11:50 To: Oliver Weinmann Cc: samba@lists.samba.org Subject: Re: [Samba] Samba-winbind 3.5.4 primary group is always domainusers!!!??? On Wed, Oct 20, 2010 at 12:36 PM, Oliver Weinmann oliver.weinm...@vega.de wrote: Hi, Any news regarding this problem? I have testet samba 3.5.6 and the problem still persists. I had to downgrade to 3.3 on a few machines now. Regards, Oliver -Original Message- From: samba-boun...@lists.samba.org [mailto:samba-boun...@lists.samba.org] On Behalf Of Oliver Weinmann Sent: Donnerstag, 9. September 2010 13:13 To: samba@lists.samba.org Subject: [Samba] Samba-winbind 3.5.4 primary group is always domainusers!!!??? Dear All, I stepped over a strange issue today. I have one installation of samba winbind 3.3.2 on a Ubuntu machine. Changing the primary unix group of a user is updated immediately. On a newer samba 3.5.4 installation the primary group is not updated at all. It always displays domain users. Is there a new setting for the smb.conf? Here is my smb.conf: [global] netbios name = gedail1 realm = SOMEDOMAIN.NET workgroup = SOMEDOMAIN security = ADS encrypt passwords = true password server = server1.somedomain.net server2.somedomain.net os level = 20 idmap backend = ad idmap config SOMEDOMAIN : backend = ad idmap config SOMEDOMAIN : schema_mode = sfu idmap config SOMEDOMAIN : range = 0- winbind nss info = sfu winbind enum users = yes winbind enum groups = yes preferred master = no winbind nested groups = Yes winbind use default domain = Yes max log size = 50 log level = 10 log file = /var/log/samba/log.%m dns proxy = no wins server = 172.20.200.18 172.18.200.20 allow trusted domains = no client use spnego = Yes use kerberos keytab = true winbind refresh tickets = yes idmap cache time = 1 winbind cache time = 1 It's a W2k3 AD Domain. Regards, Oliver -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba __ This email has been scanned by the MessageLabs Email Security System. For more information please visit http://www.messagelabs.com/email __ -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba I've noticed the same with samba 3.5.6, our administrator user has primary group name/gid Domain Admins but the primary group on our linux systems is domain users. I've noticed that searching AD for users with rfc2307/sfu attributes shows the correct gid: net ads search '(|(uidNumber=*)(gidNumber=*))' objectCategory sAMAccountName uidNumber gidNumber -P sAMAccountName: Domain Users objectCategory: CN=Group,CN=Schema,CN=Configuration,DC=josims,DC=local gidNumber: 1 sAMAccountName: test objectCategory: CN=Person,CN=Schema,CN=Configuration,DC=josims,DC=local uidNumber: 10009 gidNumber: 10010 The gid returned is correct, and if I change it and remove the cache file it updates, so it is definitely being read from AD, but all users have gid domain users: wbinfo -i test test:*:10009:1:test:/home/test:/bin/bash Andy __ This email has been scanned by the MessageLabs Email Security System. For more information please visit http://www.messagelabs.com/email __ On Fri, Oct 22, 2010 at 10:55 AM, Oliver Weinmann oliver.weinm...@vega.de wrote: Good to know that I'm not the only one facing this serious problem. I would really like to know why this is not the case under samba 3.3. Currently I have stopped upgrading from 3.3 to 3.5.x because this problem is generating a lot of trouble for us when users of different projects create files and they are read/write for all members of domain users. The only way around this is to use the SGID on the folder to inherit the project group. Hi, I've been looking at this again and found that the primary gid is read from the users primary windows group, not the one set in the UNIX attributes tab which is added by registering nisprop.dll. To change the windows primary group go to the Member Of tab in ADUC, highlight the group and click Set Primary Group, for example I set user test to have domain admins as primary group: uid=10009(test) gid=10010(domain_admins) groups=10010(domain_admins),1(domain_users) The Primary group name/GID in UNIX Attributes seems to be unused by winbind with
Re: [Samba] Samba-winbind 3.5.4 primary group is always domainusers!!!???
On Sun, Oct 24, 2010 at 2:46 PM, Andrew Lyon andrew.l...@gmail.com wrote: -Original Message- From: Andrew Lyon [mailto:andrew.l...@gmail.com] Sent: Freitag, 22. Oktober 2010 11:50 To: Oliver Weinmann Cc: samba@lists.samba.org Subject: Re: [Samba] Samba-winbind 3.5.4 primary group is always domainusers!!!??? On Wed, Oct 20, 2010 at 12:36 PM, Oliver Weinmann oliver.weinm...@vega.de wrote: Hi, Any news regarding this problem? I have testet samba 3.5.6 and the problem still persists. I had to downgrade to 3.3 on a few machines now. Regards, Oliver -Original Message- From: samba-boun...@lists.samba.org [mailto:samba-boun...@lists.samba.org] On Behalf Of Oliver Weinmann Sent: Donnerstag, 9. September 2010 13:13 To: samba@lists.samba.org Subject: [Samba] Samba-winbind 3.5.4 primary group is always domainusers!!!??? Dear All, I stepped over a strange issue today. I have one installation of samba winbind 3.3.2 on a Ubuntu machine. Changing the primary unix group of a user is updated immediately. On a newer samba 3.5.4 installation the primary group is not updated at all. It always displays domain users. Is there a new setting for the smb.conf? Here is my smb.conf: [global] netbios name = gedail1 realm = SOMEDOMAIN.NET workgroup = SOMEDOMAIN security = ADS encrypt passwords = true password server = server1.somedomain.net server2.somedomain.net os level = 20 idmap backend = ad idmap config SOMEDOMAIN : backend = ad idmap config SOMEDOMAIN : schema_mode = sfu idmap config SOMEDOMAIN : range = 0- winbind nss info = sfu winbind enum users = yes winbind enum groups = yes preferred master = no winbind nested groups = Yes winbind use default domain = Yes max log size = 50 log level = 10 log file = /var/log/samba/log.%m dns proxy = no wins server = 172.20.200.18 172.18.200.20 allow trusted domains = no client use spnego = Yes use kerberos keytab = true winbind refresh tickets = yes idmap cache time = 1 winbind cache time = 1 It's a W2k3 AD Domain. Regards, Oliver -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba __ This email has been scanned by the MessageLabs Email Security System. For more information please visit http://www.messagelabs.com/email __ -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba I've noticed the same with samba 3.5.6, our administrator user has primary group name/gid Domain Admins but the primary group on our linux systems is domain users. I've noticed that searching AD for users with rfc2307/sfu attributes shows the correct gid: net ads search '(|(uidNumber=*)(gidNumber=*))' objectCategory sAMAccountName uidNumber gidNumber -P sAMAccountName: Domain Users objectCategory: CN=Group,CN=Schema,CN=Configuration,DC=josims,DC=local gidNumber: 1 sAMAccountName: test objectCategory: CN=Person,CN=Schema,CN=Configuration,DC=josims,DC=local uidNumber: 10009 gidNumber: 10010 The gid returned is correct, and if I change it and remove the cache file it updates, so it is definitely being read from AD, but all users have gid domain users: wbinfo -i test test:*:10009:1:test:/home/test:/bin/bash Andy __ This email has been scanned by the MessageLabs Email Security System. For more information please visit http://www.messagelabs.com/email __ On Fri, Oct 22, 2010 at 10:55 AM, Oliver Weinmann oliver.weinm...@vega.de wrote: Good to know that I'm not the only one facing this serious problem. I would really like to know why this is not the case under samba 3.3. Currently I have stopped upgrading from 3.3 to 3.5.x because this problem is generating a lot of trouble for us when users of different projects create files and they are read/write for all members of domain users. The only way around this is to use the SGID on the folder to inherit the project group. Hi, I've been looking at this again and found that the primary gid is read from the users primary windows group, not the one set in the UNIX attributes tab which is added by registering nisprop.dll. To change the windows primary group go to the Member Of tab in ADUC, highlight the group and click Set Primary Group, for example I set user test to have domain admins as primary group: uid=10009(test) gid=10010(domain_admins) groups=10010(domain_admins),1(domain_users)
[Samba] SAMBA weird situation
Samba: Version 2.2.10 Kernel: 2.4.31 There is share on the server (for DBASE app) with following config: comment = zwierzaki 2.5.04N path = /pub/zwierz/ force user = smbguest read only = No guest only = Yes guest ok = Yes dos filetime resolution = Yes I have found weird situation: - not every file in shared dir is visible under windows but all files are visable under unix - file created under linux is not visable under windows - file created under windows is not visable under linux I know it sounds weird, like DBASE shouldn work... but it does. I will try to restart server on maintenance window as the uptime is 223d 11:11:17.69 - maybe it helps. Any other ideas what may be wrong ? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] SAMBA weird situation
In windows, do you change the folder settings so that any hidden files and system files are displayed. In Linux, are you using ls -a to show any hidden files? In Linux/unix, if you have r rights on the parent directory you should be able to see all files with ls -a, even the hidden ones (which have a . in front of the file name.) Depending on how samba is configured the x bits on Linux may be used as the DOS hidden or system flags. What version of Linux? What file system on linux? It looks like it is probably old enough that you are NOT using extended file systems acl's (beyond the basic ugo and rwx.) What version of Windows? Can you recreate this with non dbase files? -Original Message- From: samba-boun...@lists.samba.org [mailto:samba-boun...@lists.samba.org] On Behalf Of czezz Sent: Sunday, October 24, 2010 3:53 PM To: samba@lists.samba.org Subject: [Samba] SAMBA weird situation Samba: Version 2.2.10 Kernel: 2.4.31 There is share on the server (for DBASE app) with following config: comment = zwierzaki 2.5.04N path = /pub/zwierz/ force user = smbguest read only = No guest only = Yes guest ok = Yes dos filetime resolution = Yes I have found weird situation: - not every file in shared dir is visible under windows but all files are visable under unix - file created under linux is not visable under windows - file created under windows is not visable under linux I know it sounds weird, like DBASE shouldn work... but it does. I will try to restart server on maintenance window as the uptime is 223d 11:11:17.69 - maybe it helps. Any other ideas what may be wrong ? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Build status as of Sun Oct 24 06:00:11 2010
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2010-10-23 00:00:02.0 -0600 +++ /home/build/master/cache/broken_results.txt 2010-10-24 00:00:34.0 -0600 @@ -1,4 +1,4 @@ -Build status as of Sat Oct 23 06:00:01 2010 +Build status as of Sun Oct 24 06:00:11 2010 Build counts: Tree Total Broken Panic @@ -16,7 +16,7 @@ samba_3_current 31 30 3 samba_3_master 32 20 0 samba_3_next 32 32 0 -samba_4_0_test 37 33 0 +samba_4_0_test 37 31 0 talloc 32 6 0 -tdb 30 12 0 +tdb 30 11 0
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 005b50a s4:librpc: we don't need dcerpc client bindings for dns.idl
from 09a1075 s3: Remove unused cli_get_ea_list_fnum
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 005b50ad68c5a18d9e34e9c46f67750a67472634
Author: Stefan Metzmacher me...@samba.org
Date: Sun Oct 24 12:31:03 2010 +0200
s4:librpc: we don't need dcerpc client bindings for dns.idl
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Sun Oct 24 11:23:50 UTC 2010 on sn-devel-104
---
Summary of changes:
source4/librpc/wscript_build | 16
1 files changed, 0 insertions(+), 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index 1fc1d2b..56e8f77 100755
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -161,16 +161,6 @@ bld.SAMBA_LIBRARY('dcerpc_samr',
header_path='gen_ndr'
)
-
-bld.SAMBA_LIBRARY('dcerpc_dns',
- source='../../librpc/gen_ndr/ndr_dns_c.c',
- vnum='0.0.1',
- public_deps='dcerpc NDR_STANDARD',
- public_headers='../../librpc/gen_ndr/ndr_dns_c.h',
-header_path='gen_ndr'
- )
-
-
bld.SAMBA_LIBRARY('dcerpc_atsvc',
source='../../librpc/gen_ndr/ndr_atsvc_c.c',
pc_files='dcerpc_atsvc.pc',
@@ -365,12 +355,6 @@ bld.SAMBA_PYTHON('python_dcerpc_xattr',
realname='samba/dcerpc/xattr.so'
)
-bld.SAMBA_PYTHON('python_dns',
- source='../../librpc/gen_ndr/py_dns.c',
- deps='PYTALLOC NDR_DNS pyrpc_util dcerpc_dns',
- realname='samba/dcerpc/dns.so'
- )
-
bld.SAMBA_PYTHON('python_netlogon',
source='../../librpc/gen_ndr/py_netlogon.c',
deps='RPC_NDR_NETLOGON PYTALLOC pyrpc_util',
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 172a158 s3: Initialize output vars in parse_ea_blob
from 005b50a s4:librpc: we don't need dcerpc client bindings for dns.idl
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 172a1580d234a2194ce5bc6ca6056bbea48ed7e3
Author: Volker Lendecke v...@samba.org
Date: Sun Oct 24 13:27:33 2010 +0200
s3: Initialize output vars in parse_ea_blob
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Sun Oct 24 12:22:22 UTC 2010 on sn-devel-104
---
Summary of changes:
source3/libsmb/clifile.c |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index b57cba5..6ce884a 100644
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -4227,6 +4227,7 @@ static bool parse_ea_blob(TALLOC_CTX *ctx, const uint8_t
*rdata,
if (ea_size == 0) {
/* No EA's present. */
*pnum_eas = 0;
+ *pea_list = NULL;
return true;
}
@@ -4249,6 +4250,7 @@ static bool parse_ea_blob(TALLOC_CTX *ctx, const uint8_t
*rdata,
if (num_eas == 0) {
*pnum_eas = 0;
+ *pea_list = NULL;
return true;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 482c022 pidl:Samba4/NDR/Parser: fix NDR64 union alignment
via fd628e7 midltests: add more union_align examples
from 172a158 s3: Initialize output vars in parse_ea_blob
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 482c02284068810a57b35a509857fb1273d833b0
Author: Stefan Metzmacher me...@samba.org
Date: Mon Aug 16 17:35:50 2010 +0200
pidl:Samba4/NDR/Parser: fix NDR64 union alignment
We need to align before the switch_type and before the
union arms. Both alignments are to the boundary of the largest
possible union arm.
This means that adding a new union arm with a larger alignment
would break compat!!!
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Sun Oct 24 17:49:23 UTC 2010 on sn-devel-104
commit fd628e7ae4653d5224c5dfcd9b2815113eaae7b8
Author: Stefan Metzmacher me...@samba.org
Date: Sun Oct 24 18:54:46 2010 +0200
midltests: add more union_align examples
This demonstrates the difference between NDR32 and NDR64
metze
---
Summary of changes:
pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm |8 ++
.../midltests/valid/midltests_union_align_01.txt | 48
.../midltests/valid/midltests_union_align_02.idl | 61 +
.../midltests/valid/midltests_union_align_02.txt | 37 ++
.../midltests/valid/midltests_union_align_03.idl | 64 ++
.../midltests/valid/midltests_union_align_03.txt | 37 ++
.../midltests/valid/midltests_union_align_04.idl | 64 ++
.../midltests/valid/midltests_union_align_04.txt | 37 ++
.../midltests/valid/midltests_union_align_05.idl | 61 +
.../midltests/valid/midltests_union_align_05.txt | 37 ++
.../midltests/valid/midltests_union_align_06.idl | 61 +
.../midltests/valid/midltests_union_align_06.txt | 37 ++
.../midltests/valid/midltests_union_align_07.idl | 61 +
.../midltests/valid/midltests_union_align_07.txt | 38 ++
.../midltests/valid/midltests_union_align_08.idl | 68 ++
.../midltests/valid/midltests_union_align_08.txt | 129
16 files changed, 824 insertions(+), 24 deletions(-)
create mode 100644 testprogs/win32/midltests/valid/midltests_union_align_02.idl
create mode 100644 testprogs/win32/midltests/valid/midltests_union_align_02.txt
create mode 100644 testprogs/win32/midltests/valid/midltests_union_align_03.idl
create mode 100644 testprogs/win32/midltests/valid/midltests_union_align_03.txt
create mode 100644 testprogs/win32/midltests/valid/midltests_union_align_04.idl
create mode 100644 testprogs/win32/midltests/valid/midltests_union_align_04.txt
create mode 100644 testprogs/win32/midltests/valid/midltests_union_align_05.idl
create mode 100644 testprogs/win32/midltests/valid/midltests_union_align_05.txt
create mode 100644 testprogs/win32/midltests/valid/midltests_union_align_06.idl
create mode 100644 testprogs/win32/midltests/valid/midltests_union_align_06.txt
create mode 100644 testprogs/win32/midltests/valid/midltests_union_align_07.idl
create mode 100644 testprogs/win32/midltests/valid/midltests_union_align_07.txt
create mode 100644 testprogs/win32/midltests/valid/midltests_union_align_08.idl
create mode 100644 testprogs/win32/midltests/valid/midltests_union_align_08.txt
Changeset truncated at 500 lines:
diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index 27e7a30..09518f7 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -1688,6 +1688,10 @@ sub ParseUnionPushPrimitives()
$self-pidl(uint32_t level = ndr_push_get_switch_value($ndr,
$varname););
+ if (defined($e-{ALIGN})) {
+ $self-pidl(NDR_CHECK(ndr_push_union_align($ndr,
$e-{ALIGN})););
+ }
+
if (defined($e-{SWITCH_TYPE})) {
$self-pidl(NDR_CHECK(ndr_push_$e-{SWITCH_TYPE}($ndr,
NDR_SCALARS, level)););
}
@@ -1833,6 +1837,10 @@ sub ParseUnionPullPrimitives($)
my ($self,$e,$ndr,$varname,$switch_type) = @_;
my $have_default = 0;
+ if (defined($e-{ALIGN})) {
+ $self-pidl(NDR_CHECK(ndr_pull_union_align($ndr,
$e-{ALIGN})););
+ }
+
if (defined($switch_type)) {
$self-pidl(NDR_CHECK(ndr_pull_$switch_type($ndr, NDR_SCALARS,
_level)););
$self-pidl(if (_level != level) {);
diff --git a/testprogs/win32/midltests/valid/midltests_union_align_01.txt
b/testprogs/win32/midltests/valid/midltests_union_align_01.txt
index a7f737c..cc372c8 100644
--- a/testprogs/win32/midltests/valid/midltests_union_align_01.txt
+++
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 3218968 s4:dsdb - use LDB results in add_time_element and
add_uint64_element
via 49dee0e s4:dsdb - use the more safe samdb_msg_add_(u)int* calls
always where possible
from 482c022 pidl:Samba4/NDR/Parser: fix NDR64 union alignment
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 32189689df2bc40473dfeaccff6219f8e0d56b76
Author: Matthias Dieter Wallnöfer m...@samba.org
Date: Sun Oct 24 19:39:26 2010 +0200
s4:dsdb - use LDB results in add_time_element and add_uint64_element
In both the objectguid and the repl_meta_data DSDB module.
Autobuild-User: Matthias Dieter Wallnöfer m...@samba.org
Autobuild-Date: Sun Oct 24 18:39:43 UTC 2010 on sn-devel-104
commit 49dee0e453049a2b26aaacf81e61a0f11afccd91
Author: Matthias Dieter Wallnöfer m...@samba.org
Date: Sun Oct 24 19:30:12 2010 +0200
s4:dsdb - use the more safe samdb_msg_add_(u)int* calls always where
possible
This should prevent all possible integer storage problems in future.
---
Summary of changes:
source4/dsdb/samdb/ldb_modules/objectguid.c | 42 +-
source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 30 +++-
source4/dsdb/samdb/ldb_modules/rootdse.c| 13 ---
source4/dsdb/samdb/ldb_modules/util.c |5 ++-
source4/libnet/libnet_join.c|5 +--
5 files changed, 57 insertions(+), 38 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/samdb/ldb_modules/objectguid.c
b/source4/dsdb/samdb/ldb_modules/objectguid.c
index bf730d9..d7dc885 100644
--- a/source4/dsdb/samdb/ldb_modules/objectguid.c
+++ b/source4/dsdb/samdb/ldb_modules/objectguid.c
@@ -55,18 +55,20 @@ static int add_time_element(struct ldb_message *msg, const
char *attr, time_t t)
{
struct ldb_message_element *el;
char *s;
+ int ret;
if (ldb_msg_find_element(msg, attr) != NULL) {
- return 0;
+ return LDB_SUCCESS;
}
s = ldb_timestring(msg, t);
if (s == NULL) {
- return -1;
+ return LDB_ERR_OPERATIONS_ERROR;
}
- if (ldb_msg_add_string(msg, attr, s) != 0) {
- return -1;
+ ret = ldb_msg_add_string(msg, attr, s);
+ if (ret != LDB_SUCCESS) {
+ return ret;
}
el = ldb_msg_find_element(msg, attr);
@@ -74,22 +76,25 @@ static int add_time_element(struct ldb_message *msg, const
char *attr, time_t t)
is ignored */
el-flags = LDB_FLAG_MOD_REPLACE;
- return 0;
+ return LDB_SUCCESS;
}
/*
add a uint64_t element to a record
*/
-static int add_uint64_element(struct ldb_message *msg, const char *attr,
uint64_t v)
+static int add_uint64_element(struct ldb_context *ldb, struct ldb_message *msg,
+ const char *attr, uint64_t v)
{
struct ldb_message_element *el;
+ int ret;
if (ldb_msg_find_element(msg, attr) != NULL) {
- return 0;
+ return LDB_SUCCESS;
}
- if (ldb_msg_add_fmt(msg, attr, %llu, (unsigned long long)v) != 0) {
- return -1;
+ ret = samdb_msg_add_uint64(ldb, msg, msg, attr, v);
+ if (ret != LDB_SUCCESS) {
+ return ret;
}
el = ldb_msg_find_element(msg, attr);
@@ -97,7 +102,7 @@ static int add_uint64_element(struct ldb_message *msg, const
char *attr, uint64_
is ignored */
el-flags = LDB_FLAG_MOD_REPLACE;
- return 0;
+ return LDB_SUCCESS;
}
struct og_context {
@@ -174,12 +179,12 @@ static int objectguid_add(struct ldb_module *module,
struct ldb_request *req)
guid = GUID_random();
ret = dsdb_msg_add_guid(msg, guid, objectGUID);
- if (ret) {
+ if (ret != LDB_SUCCESS) {
return ret;
}
- if (add_time_element(msg, whenCreated, t) != 0 ||
- add_time_element(msg, whenChanged, t) != 0) {
+ if (add_time_element(msg, whenCreated, t) != LDB_SUCCESS ||
+ add_time_element(msg, whenChanged, t) != LDB_SUCCESS) {
return ldb_operr(ldb);
}
@@ -188,8 +193,10 @@ static int objectguid_add(struct ldb_module *module,
struct ldb_request *req)
* make sure this function is split and a callback is used */
ret = ldb_sequence_number(ldb, LDB_SEQ_NEXT, seq_num);
if (ret == LDB_SUCCESS) {
- if (add_uint64_element(msg, uSNCreated, seq_num) != 0 ||
- add_uint64_element(msg, uSNChanged, seq_num) != 0) {
+ if (add_uint64_element(ldb, msg, uSNCreated,
+ seq_num) != LDB_SUCCESS ||
+ add_uint64_element(ldb, msg,
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 177aad5 talloc: pytalloc should not depend on samba specific code
via cbee24b s3:include: move debug.c prototypes to debug.h
via dbc934e s3:include: move MAX_DEBUG_LEVEL from local.h to debug.h
from 3218968 s4:dsdb - use LDB results in add_time_element and
add_uint64_element
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 177aad556f4be8b6b82eec8fbf0bf4711ae32d2b
Author: Stefan Metzmacher me...@samba.org
Date: Sun Oct 24 19:52:01 2010 +0200
talloc: pytalloc should not depend on samba specific code
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Sun Oct 24 19:21:25 UTC 2010 on sn-devel-104
commit cbee24b2da4e067d751c3f8d30bf34a8cc1e08d0
Author: Stefan Metzmacher me...@samba.org
Date: Sun Oct 24 20:25:18 2010 +0200
s3:include: move debug.c prototypes to debug.h
metze
commit dbc934ee4b98f04b4c21d650a018e8aae9e437fa
Author: Stefan Metzmacher me...@samba.org
Date: Sun Oct 24 19:44:21 2010 +0200
s3:include: move MAX_DEBUG_LEVEL from local.h to debug.h
metze
---
Summary of changes:
lib/talloc/pytalloc.c |5 ++---
source3/include/debug.h | 30 ++
source3/include/local.h |9 -
source3/include/proto.h | 21 -
4 files changed, 32 insertions(+), 33 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/talloc/pytalloc.c b/lib/talloc/pytalloc.c
index ae59b69..d5ef919 100644
--- a/lib/talloc/pytalloc.c
+++ b/lib/talloc/pytalloc.c
@@ -21,8 +21,7 @@
#include replace.h
#include talloc.h
#include pytalloc.h
-#include lib/util/debug.h
-#include lib/util/util.h
+#include assert.h
/**
* Simple dealloc for talloc-wrapping PyObjects
@@ -30,7 +29,7 @@
void py_talloc_dealloc(PyObject* self)
{
py_talloc_Object *obj = (py_talloc_Object *)self;
- SMB_ASSERT(talloc_unlink(NULL, obj-talloc_ctx) != -1);
+ assert(talloc_unlink(NULL, obj-talloc_ctx) != -1);
obj-talloc_ctx = NULL;
self-ob_type-tp_free(self);
}
diff --git a/source3/include/debug.h b/source3/include/debug.h
index 2c910da..467fb2f 100644
--- a/source3/include/debug.h
+++ b/source3/include/debug.h
@@ -27,6 +27,15 @@
* Debugging code. See also debug.c
*/
+/* the maximum debug level to compile into the code. This assumes a good
+ optimising compiler that can remove unused code
+ for embedded or low-memory systems set this to a value like 2 to get
+ only important messages. This gives *much* smaller binaries
+*/
+#ifndef MAX_DEBUG_LEVEL
+#define MAX_DEBUG_LEVEL 1000
+#endif
+
/* mkproto.awk has trouble with ifdef'd function definitions (it ignores
* the #ifdef directive and will read both definitions, thus creating two
* diffferent prototype declarations), so we must do these by hand.
@@ -239,4 +248,25 @@ extern bool *DEBUGLEVEL_CLASS_ISSET;
#define DEBUGSEP(level)\
DEBUG((level),(===\n))
+/* The following definitions come from lib/debug.c */
+
+void gfree_debugsyms(void);
+const char *debug_classname_from_index(int ndx);
+int debug_add_class(const char *classname);
+int debug_lookup_classname(const char *classname);
+bool debug_parse_levels(const char *params_str);
+void debug_message(struct messaging_context *msg_ctx, void *private_data,
uint32_t msg_type, struct server_id src, DATA_BLOB *data);
+void debug_init(void);
+void debug_register_msgs(struct messaging_context *msg_ctx);
+void setup_logging(const char *pname, bool interactive);
+void setup_logging_stdout( void );
+void debug_set_logfile(const char *name);
+bool reopen_logs( void );
+void force_check_log_size( void );
+bool need_to_check_log_size( void );
+void check_log_size( void );
+void dbgflush( void );
+bool dbghdrclass(int level, int cls, const char *location, const char *func);
+bool dbghdr(int level, const char *location, const char *func);
+
#endif
diff --git a/source3/include/local.h b/source3/include/local.h
index 93ec4cc..6c9a8c3 100644
--- a/source3/include/local.h
+++ b/source3/include/local.h
@@ -10,15 +10,6 @@
#define WORKGROUP WORKGROUP
#endif
-/* the maximum debug level to compile into the code. This assumes a good
- optimising compiler that can remove unused code
- for embedded or low-memory systems set this to a value like 2 to get
- only important messages. This gives *much* smaller binaries
-*/
-#ifndef MAX_DEBUG_LEVEL
-#define MAX_DEBUG_LEVEL 1000
-#endif
-
/* This defines the section name in the configuration file that will contain */
/* global parameters - that is, parameters relating to the whole server, not */
/* just services. This name is then reserved, and may not be used as a */
diff --git a/source3/include/proto.h
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 7b3dbbd s4:dsdb - remove some calls of samdb_msg_add_string when
we have talloc'ed strings
from 177aad5 talloc: pytalloc should not depend on samba specific code
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 7b3dbbde04d52f9faeeba507b82bc4242b1efddd
Author: Matthias Dieter Wallnöfer m...@samba.org
Date: Thu Oct 14 22:26:44 2010 +0200
s4:dsdb - remove some calls of samdb_msg_add_string when we have
talloc'ed strings
They can be substituted by ldb_msg_add_string if the string was already
talloc'ed.
Autobuild-User: Matthias Dieter Wallnöfer m...@samba.org
Autobuild-Date: Sun Oct 24 20:03:27 UTC 2010 on sn-devel-104
---
Summary of changes:
source4/dsdb/samdb/ldb_modules/samldb.c |5 ++---
source4/rpc_server/netlogon/dcerpc_netlogon.c | 16 ++--
2 files changed, 8 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c
b/source4/dsdb/samdb/ldb_modules/samldb.c
index 21b6506..2357ffd 100644
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -604,9 +604,8 @@ static int samldb_fill_object(struct samldb_ctx *ac)
* caller. Use the entry DN for it. */
ac-dn = ac-msg-dn;
- ret = samdb_msg_add_string(ldb, ac-msg, ac-msg,
- defaultObjectCategory,
-
ldb_dn_get_linearized(ac-dn));
+ ret = ldb_msg_add_string(ac-msg,
defaultObjectCategory,
+ldb_dn_alloc_linearized(ac,
ac-dn));
if (ret != LDB_SUCCESS) {
ldb_oom(ldb);
return ret;
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c
b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index 680b766..2f80c1b 100644
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -1431,16 +1431,12 @@ static NTSTATUS dcesrv_netr_LogonGetDomainInfo(struct
dcesrv_call_state *dce_cal
dNSHostname,
r-in.query-workstation_info-dns_hostname);
- samdb_msg_add_string(sam_ctx, mem_ctx, new_msg,
- servicePrincipalName,
- talloc_asprintf(mem_ctx, HOST/%s,
- r-in.computer_name)
- );
- samdb_msg_add_string(sam_ctx, mem_ctx, new_msg,
- servicePrincipalName,
- talloc_asprintf(mem_ctx, HOST/%s,
- r-in.query-workstation_info-dns_hostname)
- );
+ ldb_msg_add_string(new_msg, servicePrincipalName,
+ talloc_asprintf(new_msg, HOST/%s,
+ r-in.computer_name));
+ ldb_msg_add_string(new_msg, servicePrincipalName,
+ talloc_asprintf(new_msg, HOST/%s,
+
r-in.query-workstation_info-dns_hostname));
}
if (dsdb_replace(sam_ctx, new_msg, 0) != LDB_SUCCESS) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 9e7bcaa s4-test: Print correct partition DN in msDSIntId test
from 7b3dbbd s4:dsdb - remove some calls of samdb_msg_add_string when
we have talloc'ed strings
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 9e7bcaab2dc9a73c8251431fa4573d1d1ba32561
Author: Kamen Mazdrashki kame...@samba.org
Date: Sat Oct 9 06:04:52 2010 +0300
s4-test: Print correct partition DN in msDSIntId test
Autobuild-User: Kamen Mazdrashki kame...@samba.org
Autobuild-Date: Sun Oct 24 20:45:21 UTC 2010 on sn-devel-104
---
Summary of changes:
source4/torture/drs/rpc/msds_intid.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/drs/rpc/msds_intid.c
b/source4/torture/drs/rpc/msds_intid.c
index 2b2fa5e..a6e7dc5 100644
--- a/source4/torture/drs/rpc/msds_intid.c
+++ b/source4/torture/drs/rpc/msds_intid.c
@@ -580,7 +580,7 @@ static bool test_dsintid_domain(struct torture_context
*tctx, struct DsIntIdTest
torture_assert(tctx, mem_ctx, Not enough memory);
/* fetch whole Schema partition */
- torture_comment(tctx, Fetch partition: %s\n, ctx-schema_dn);
+ torture_comment(tctx, Fetch partition: %s\n, ctx-domain_dn);
if (!_test_GetNCChanges(tctx, ctx-dsa_bind, ctx-domain_dn, mem_ctx,
ctr6)) {
torture_fail(tctx, _test_GetNCChanges() failed);
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via caf77f7 s3: Use cli_setpathinfo in cli_posix_unlink_internal
via 2d51a24 s3: Avoid passing down a boolean to
cli_posix_unlink_internal_send
via 28e243f s3: Use cli_setpathinfo in cli_posix_chown_chmod_internal
via dedda3e s3: Use cli_setpathinfo in cli_posix_link_internal
via c0a6b74 s3: Use tevent_req_simple_recv_ntstatus where appropriate
via 64275eb s3: Pass down a level instead of a flag to
cli_posix_link_internal
via 7b3fccd s3: Add async cli_setpathinfo
via 40cc1a3 s3: Add setea to smbclient
via 86cb0ad s3: Add geteas to smbclient
via 0831807 Add dump_data_cb()
via 611bcfc Add print_asc_cb()
from 9e7bcaa s4-test: Print correct partition DN in msDSIntId test
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit caf77f7c73419064b3a4cea68d0b8591a4ec486a
Author: Volker Lendecke v...@samba.org
Date: Sun Oct 24 18:32:29 2010 +0200
s3: Use cli_setpathinfo in cli_posix_unlink_internal
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Sun Oct 24 21:28:08 UTC 2010 on sn-devel-104
commit 2d51a24ba51934e1a9264ced1d52648a5c4c2cfc
Author: Volker Lendecke v...@samba.org
Date: Sun Oct 24 18:27:25 2010 +0200
s3: Avoid passing down a boolean to cli_posix_unlink_internal_send
commit 28e243f7ad1a0b645a00bb92b43638af5bfe8b8d
Author: Volker Lendecke v...@samba.org
Date: Sun Oct 24 18:05:03 2010 +0200
s3: Use cli_setpathinfo in cli_posix_chown_chmod_internal
commit dedda3e245d9ee2a875494d0f3c42c44e749f4f6
Author: Volker Lendecke v...@samba.org
Date: Sun Oct 24 17:06:47 2010 +0200
s3: Use cli_setpathinfo in cli_posix_link_internal
commit c0a6b74aa4cb1c3833353b28b22b83df59955cfd
Author: Volker Lendecke v...@samba.org
Date: Sun Oct 24 16:59:56 2010 +0200
s3: Use tevent_req_simple_recv_ntstatus where appropriate
commit 64275ebe898e4ac47ec00e49d24e37b914527734
Author: Volker Lendecke v...@samba.org
Date: Sun Oct 24 16:56:34 2010 +0200
s3: Pass down a level instead of a flag to cli_posix_link_internal
commit 7b3fccd5b4342494a33081f88b5069b2af9749de
Author: Volker Lendecke v...@samba.org
Date: Sun Oct 24 16:45:54 2010 +0200
s3: Add async cli_setpathinfo
commit 40cc1a3d2e4d63153730a03d89cca8c936a2e06c
Author: Volker Lendecke v...@samba.org
Date: Sun Oct 24 15:43:34 2010 +0200
s3: Add setea to smbclient
commit 86cb0ad242002014a4bfcdd9d0b40a3d3d172b81
Author: Volker Lendecke v...@samba.org
Date: Sun Oct 24 13:32:30 2010 +0200
s3: Add geteas to smbclient
commit 0831807782e01d8fb6e4e5ebcd46c014dc3ab599
Author: Volker Lendecke v...@samba.org
Date: Sun Oct 24 15:42:45 2010 +0200
Add dump_data_cb()
commit 611bcfcb49f3a17ac7a1b866b2ea04806c7c1b40
Author: Volker Lendecke v...@samba.org
Date: Sun Oct 24 15:23:41 2010 +0200
Add print_asc_cb()
---
Summary of changes:
lib/util/util.c | 85 ---
lib/util/util.h | 11 ++
source3/client/client.c | 106 +
source3/include/proto.h |9 +
source3/libsmb/clifile.c | 368 ++
5 files changed, 332 insertions(+), 247 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/util.c b/lib/util/util.c
index 11bb315..42beed4 100644
--- a/lib/util/util.c
+++ b/lib/util/util.c
@@ -300,29 +300,46 @@ _PUBLIC_ bool fcntl_lock(int fd, int op, off_t offset,
off_t count, int type)
return true;
}
-void print_asc(int level, const uint8_t *buf,int len)
+static void debugadd_cb(const char *buf, void *private_data)
+{
+ int *plevel = (int *)private_data;
+ DEBUGADD(*plevel, (%s, buf));
+}
+
+void print_asc_cb(const uint8_t *buf, int len,
+ void (*cb)(const char *buf, void *private_data),
+ void *private_data)
{
int i;
- for (i=0;ilen;i++)
- DEBUGADD(level,(%c, isprint(buf[i])?buf[i]:'.'));
+ char s[2];
+ s[1] = 0;
+
+ for (i=0; ilen; i++) {
+ s[0] = isprint(buf[i]) ? buf[i] : '.';
+ cb(s, private_data);
+ }
+}
+
+void print_asc(int level, const uint8_t *buf,int len)
+{
+ print_asc_cb(buf, len, debugadd_cb, level);
}
/**
- * Write dump of binary data to the log file.
- *
- * The data is only written if the log level is at least level.
+ * Write dump of binary data to a callback
*/
-static void _dump_data(int level, const uint8_t *buf, int len,
- bool omit_zero_bytes)
+void dump_data_cb(const uint8_t *buf, int len,
+ bool omit_zero_bytes,
+ void (*cb)(const char *buf, void *private_data),
+ void *private_data)
{
int i=0;
static const uint8_t empty[16] = { 0, };
bool skipped =
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 14686e4 libcli/security Remove unused sec_acl_equal()
from caf77f7 s3: Use cli_setpathinfo in cli_posix_unlink_internal
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 14686e4b5a4faeed5868e2e16121acd47ff5ba43
Author: Andrew Bartlett abart...@samba.org
Date: Mon Oct 25 08:30:00 2010 +1100
libcli/security Remove unused sec_acl_equal()
This was orphaned by changing sec_desc_equal() to the stricter
security_descriptor_equal() by
f4195183a47b0e7c8bc9644d62b123f7880f3fcd in 2009.
(The difference here was that sec_acl_equal allowed for equivilent
ordering. I've checked the callers, and this function is only used to skip
actual ACL sets, or to reference a cache, so this seems
Autobuild-User: Andrew Bartlett abart...@samba.org
Autobuild-Date: Sun Oct 24 22:21:23 UTC 2010 on sn-devel-104
---
Summary of changes:
libcli/security/secacl.c | 46 --
libcli/security/secacl.h |1 -
2 files changed, 0 insertions(+), 47 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/security/secacl.c b/libcli/security/secacl.c
index 29afe46..9c04df8 100644
--- a/libcli/security/secacl.c
+++ b/libcli/security/secacl.c
@@ -75,49 +75,3 @@ struct security_acl *dup_sec_acl(TALLOC_CTX *ctx, struct
security_acl *src)
return make_sec_acl(ctx, src-revision, src-num_aces, src-aces);
}
-
-/***
- Compares two SEC_ACL structures
-/
-
-bool sec_acl_equal(struct security_acl *s1, struct security_acl *s2)
-{
- unsigned int i, j;
-
- /* Trivial cases */
-
- if (!s1 !s2) return true;
- if (!s1 || !s2) return false;
-
- /* Check top level stuff */
-
- if (s1-revision != s2-revision) {
- DEBUG(10, (sec_acl_equal(): revision differs (%d != %d)\n,
- s1-revision, s2-revision));
- return false;
- }
-
- if (s1-num_aces != s2-num_aces) {
- DEBUG(10, (sec_acl_equal(): num_aces differs (%d != %d)\n,
- s1-revision, s2-revision));
- return false;
- }
-
- /* The ACEs could be in any order so check each ACE in s1 against
- each ACE in s2. */
-
- for (i = 0; i s1-num_aces; i++) {
- bool found = false;
-
- for (j = 0; j s2-num_aces; j++) {
- if (sec_ace_equal(s1-aces[i], s2-aces[j])) {
- found = true;
- break;
- }
- }
-
- if (!found) return false;
- }
-
- return true;
-}
diff --git a/libcli/security/secacl.h b/libcli/security/secacl.h
index 9f1e8fa..90fafe9 100644
--- a/libcli/security/secacl.h
+++ b/libcli/security/secacl.h
@@ -26,7 +26,6 @@
struct security_acl *make_sec_acl(TALLOC_CTX *ctx, enum security_acl_revision
revision,
int num_aces, struct security_ace *ace_list);
struct security_acl *dup_sec_acl(TALLOC_CTX *ctx, struct security_acl *src);
-bool sec_acl_equal(struct security_acl *s1, struct security_acl *s2);
#endif /*_SECACL_H_*/
--
Samba Shared Repository
[SCM] CTDB repository - branch 1.2 updated - ctdb-1.9.1-212-g8128f46
The branch, 1.2 has been updated
via 8128f466e646fd945fe9e8ff098858d13e52e6a0 (commit)
from e31fde87b9ac43637f5e8e651385f1234bd4732f (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=1.2
- Log -
commit 8128f466e646fd945fe9e8ff098858d13e52e6a0
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Mon Oct 25 11:31:12 2010 +1100
Add support to create TDB databases using the new jenkins hash.
SRVID for the control to attach to a database is used to pass
tdb flags from samba to ctdb when samba attached to a database.
This has been used earlier for TDB_NOSYNC flag.
Add TDB_INCOMPATIBLE_HASH as a supported tdb flag to store in the
SRVID field when attaching to a database.
This allows samba to control if ctdb should create databases using the
new jenkins hash, or using the old hash.
This only affects new databases when they are initially created.
Existing databases remain using the old hash when attached to.
---
Summary of changes:
server/ctdb_ltdb_server.c | 14 +-
1 files changed, 9 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/server/ctdb_ltdb_server.c b/server/ctdb_ltdb_server.c
index b1a032f..ba2a9cb 100644
--- a/server/ctdb_ltdb_server.c
+++ b/server/ctdb_ltdb_server.c
@@ -513,7 +513,8 @@ int32_t ctdb_control_db_get_health(struct ctdb_context
*ctdb,
return 0 on success, -1 on failure
*/
static int ctdb_local_attach(struct ctdb_context *ctdb, const char *db_name,
-bool persistent, const char *unhealthy_reason)
+bool persistent, const char *unhealthy_reason,
+bool jenkinshash)
{
struct ctdb_db_context *ctdb_db, *tmp_db;
int ret;
@@ -596,6 +597,9 @@ static int ctdb_local_attach(struct ctdb_context *ctdb,
const char *db_name,
tdb_flags |= TDB_NOMMAP;
}
tdb_flags |= TDB_DISALLOW_NESTING;
+ if (jenkinshash) {
+ tdb_flags |= TDB_INCOMPATIBLE_HASH;
+ }
again:
ctdb_db-ltdb = tdb_wrap_open(ctdb, ctdb_db-db_path,
@@ -756,7 +760,7 @@ int32_t ctdb_control_db_attach(struct ctdb_context *ctdb,
TDB_DATA indata,
only allow a subset of those on the database in ctdb. Note
that tdb_flags is passed in via the (otherwise unused)
srvid to the attach control */
- tdb_flags = TDB_NOSYNC;
+ tdb_flags = (TDB_NOSYNC|TDB_INCOMPATIBLE_HASH);
/* If the node is inactive it is not part of the cluster
and we should not allow clients to attach to any
@@ -777,7 +781,7 @@ int32_t ctdb_control_db_attach(struct ctdb_context *ctdb,
TDB_DATA indata,
return 0;
}
- if (ctdb_local_attach(ctdb, db_name, persistent, NULL) != 0) {
+ if (ctdb_local_attach(ctdb, db_name, persistent, NULL,
(tdb_flagsTDB_INCOMPATIBLE_HASH)?true:false) != 0) {
return -1;
}
@@ -797,7 +801,7 @@ int32_t ctdb_control_db_attach(struct ctdb_context *ctdb,
TDB_DATA indata,
ctdb_lockdown_memory(ctdb);
/* tell all the other nodes about this database */
- ctdb_daemon_send_control(ctdb, CTDB_BROADCAST_ALL, 0,
+ ctdb_daemon_send_control(ctdb, CTDB_BROADCAST_ALL, tdb_flags,
persistent?CTDB_CONTROL_DB_ATTACH_PERSISTENT:
CTDB_CONTROL_DB_ATTACH,
0, CTDB_CTRL_FLAG_NOREPLY,
@@ -853,7 +857,7 @@ static int ctdb_attach_persistent(struct ctdb_context *ctdb,
}
p[4] = 0;
- if (ctdb_local_attach(ctdb, s, true, unhealthy_reason) != 0) {
+ if (ctdb_local_attach(ctdb, s, true, unhealthy_reason, 0) != 0)
{
DEBUG(DEBUG_ERR,(Failed to attach to persistent
database '%s'\n, de-d_name));
closedir(d);
talloc_free(s);
--
CTDB repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via db73b4a waf: moved the -Wl,-no-undefined flags to source4 and ldb
via 986a00d s3-waf: fixed paths in s3 waf build for rpc_server
via ec98bb5 s3-waf: fixed waf configure for recent changes
from 14686e4 libcli/security Remove unused sec_acl_equal()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit db73b4a2c129eeb7dddcd2466f8b7b485d66c1d9
Author: Andrew Tridgell tri...@samba.org
Date: Mon Oct 25 11:29:12 2010 +1100
waf: moved the -Wl,-no-undefined flags to source4 and ldb
moved it out of the general waf build as the s3 waf build cannot yet
handle linking with -Wl,-no-undefined
Pair-Programmed-With: Andrew Bartlett abart...@samba.org
Autobuild-User: Andrew Tridgell tri...@samba.org
Autobuild-Date: Mon Oct 25 01:12:15 UTC 2010 on sn-devel-104
commit 986a00dcef2bc2c9cf00c987555e0f4ff646437d
Author: Andrew Tridgell tri...@samba.org
Date: Mon Oct 25 10:27:14 2010 +1100
s3-waf: fixed paths in s3 waf build for rpc_server
paths in waf rules are relative
Pair-Programmed-With: Andrew Bartlett abart...@samba.org
commit ec98bb55c6fe06f9ca698e52dda41b3cff2f95b5
Author: Andrew Tridgell tri...@samba.org
Date: Mon Oct 25 10:14:41 2010 +1100
s3-waf: fixed waf configure for recent changes
---
Summary of changes:
buildtools/wafsamba/samba_autoconf.py |2 --
source3/rpc_server/wscript_build | 28 ++--
source3/wscript |2 +-
source4/lib/ldb/wscript |4
source4/wscript |4
5 files changed, 23 insertions(+), 17 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_autoconf.py
b/buildtools/wafsamba/samba_autoconf.py
index ea2ef09..34acfdd 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -577,8 +577,6 @@ def SAMBA_CONFIG_H(conf, path=None):
# we add these here to ensure that -Wstrict-prototypes is not set
during configure
conf.ADD_CFLAGS('-Wall -g -Wshadow -Wstrict-prototypes -Wpointer-arith
-Wcast-qual -Wcast-align -Wwrite-strings -Werror-implicit-function-declaration
-Wformat=2 -Wno-format-y2k',
testflags=True)
-conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
-
if Options.options.picky_developer:
conf.ADD_CFLAGS('-Werror', testflags=True)
diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build
index 7ad35cc..59c19d5 100644
--- a/source3/rpc_server/wscript_build
+++ b/source3/rpc_server/wscript_build
@@ -1,22 +1,22 @@
#!/usr/bin/env python
-RPC_LSARPC_SRC = '''srv_lsa_nt.c ../librpc/gen_ndr/srv_lsa.c'''
-RPC_NETLOGON_SRC = '''srv_netlog_nt.c ../librpc/gen_ndr/srv_netlogon.c'''
-RPC_SAMR_SRC = '''srv_samr_nt.c ../librpc/gen_ndr/srv_samr.c
+RPC_LSARPC_SRC = '''srv_lsa_nt.c ../../librpc/gen_ndr/srv_lsa.c'''
+RPC_NETLOGON_SRC = '''srv_netlog_nt.c ../../librpc/gen_ndr/srv_netlogon.c'''
+RPC_SAMR_SRC = '''srv_samr_nt.c ../../librpc/gen_ndr/srv_samr.c
srv_samr_util.c
srv_samr_chgpasswd.c'''
-RPC_INITSHUTDOWN_SRC = '''srv_initshutdown_nt.c
../librpc/gen_ndr/srv_initshutdown.c'''
-RPC_WINREG_SRC = '''srv_winreg_nt.c ../librpc/gen_ndr/srv_winreg.c'''
-RPC_DSSETUP_SRC = '''srv_dssetup_nt.c ../librpc/gen_ndr/srv_dssetup.c'''
-RPC_SRVSVC_SRC = '''srv_srvsvc_nt.c ../librpc/gen_ndr/srv_srvsvc.c'''
-RPC_WKSSVC_SRC = '''srv_wkssvc_nt.c ../librpc/gen_ndr/srv_wkssvc.c'''
-RPC_SVCCTL_SRC = '''srv_svcctl_nt.c ../librpc/gen_ndr/srv_svcctl.c'''
-RPC_NTSVCS_SRC = '''srv_ntsvcs_nt.c ../librpc/gen_ndr/srv_ntsvcs.c'''
-RPC_NETDFS_SRC = '''srv_dfs_nt.c ../librpc/gen_ndr/srv_dfs.c'''
-RPC_SPOOLSS_SRC = '''srv_spoolss_nt.c ../librpc/gen_ndr/srv_spoolss.c
+RPC_INITSHUTDOWN_SRC = '''srv_initshutdown_nt.c
../../librpc/gen_ndr/srv_initshutdown.c'''
+RPC_WINREG_SRC = '''srv_winreg_nt.c ../../librpc/gen_ndr/srv_winreg.c'''
+RPC_DSSETUP_SRC = '''srv_dssetup_nt.c ../../librpc/gen_ndr/srv_dssetup.c'''
+RPC_SRVSVC_SRC = '''srv_srvsvc_nt.c ../../librpc/gen_ndr/srv_srvsvc.c'''
+RPC_WKSSVC_SRC = '''srv_wkssvc_nt.c ../../librpc/gen_ndr/srv_wkssvc.c'''
+RPC_SVCCTL_SRC = '''srv_svcctl_nt.c ../../librpc/gen_ndr/srv_svcctl.c'''
+RPC_NTSVCS_SRC = '''srv_ntsvcs_nt.c ../../librpc/gen_ndr/srv_ntsvcs.c'''
+RPC_NETDFS_SRC = '''srv_dfs_nt.c ../../librpc/gen_ndr/srv_dfs.c'''
+RPC_SPOOLSS_SRC = '''srv_spoolss_nt.c ../../librpc/gen_ndr/srv_spoolss.c
srv_spoolss_util.c'''
-RPC_EVENTLOG_SRC = '''srv_eventlog_nt.c ../librpc/gen_ndr/srv_eventlog.c'''
-RPC_RPCECHO_SRC = '''srv_echo_nt.c ../librpc/gen_ndr/srv_echo.c'''
+RPC_EVENTLOG_SRC = '''srv_eventlog_nt.c ../../librpc/gen_ndr/srv_eventlog.c'''
+RPC_RPCECHO_SRC = '''srv_echo_nt.c
