[Samba] Samba4 - question about DNS
I'm completely new to Samba4, so sorry if this question is stupid :)) We probably will setup a Samba4-AD in the near future and it currently came to the question whether Samba4 can also work with a remote DNS-server (DNS-server not on Samba4-server). We plan to use some ready appliance for DNS and DHCP. Thanks, christian -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Join to domain
Helo list, i follow the step in the URL https://wiki.samba.org/index.php/Samba4_joining_a_domain, when i going to run this tool bin/samba-tool domain join samba.example.com DC -Uadministrator --realm=samba.example.com i have the follow error root@bdc:/usr/local/samba/bin# ./samba-tool domain join eccmg.cupet.cu DC -Usand y --realm=eccmg.cupet.cu Finding a writeable DC for domain 'eccmg.cupet.cu' Found DC siscont.eccmg.cupet.cu Password for [WORKGROUP\sandy]: Failed to bind - LDAP client internal error: NT_STATUS_INVALID_PARAMETER Failed to connect to 'ldap://siscont.eccmg.cupet.cu' with backend 'ldap': (null) ERROR(ldb): uncaught exception - None File /usr/local/samba/lib/python2.6/site-packages/samba/netcmd/__init__.py, line 167, in _run return self.run(*args, **kwargs) File /usr/local/samba/lib/python2.6/site-packages/samba/netcmd/domain.py, line 162, in run machinepass=machinepass) File /usr/local/samba/lib/python2.6/site-packages/samba/join.py, line 927, in join_DC machinepass) File /usr/local/samba/lib/python2.6/site-packages/samba/join.py, line 71, in __init__ credentials=ctx.creds, lp=ctx.lp) File /usr/local/samba/lib/python2.6/site-packages/samba/samdb.py, line 58, in __init__ options=options) File /usr/local/samba/lib/python2.6/site-packages/samba/__init__.py, line 113, in __init__ self.connect(url, flags, options) File /usr/local/samba/lib/python2.6/site-packages/samba/samdb.py, line 73, in connect options=options) somebody can helpme -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] nfs4 with Samba 4
On 01/29/2012 10:20 AM, steve wrote: On 29/01/12 08:17, steve wrote: On 29/01/12 07:32, Gémes Géza wrote: 2012-01-28 21:44 keltezéssel, steve írta: On 28/01/12 20:29, Gémes Géza wrote: 2012-01-28 18:41 keltezéssel, steve írta: On 28/01/12 12:21, steve wrote: On 28/01/12 11:03, Gémes Géza wrote: As the nfs4 is writeable without the krb5, that's why I thought it may be related to the S4 Kerbreros. Thanks for your patience, Steve Unfortunately I can't be of real help here (I don't remember anything similar from when I was using nfs4 with krb5) and it seems to be very nfs4 specific, the kerberos (samba4) part has done its job (obtaining machine ticket at mount time, and user ticket when you cd-ed into the mount. What goes on from then is nfs4s own business :-( . I would suggest to ask for help at (I don't know if there is one :-( ) a nfs4 mailing list/forum.Good Luck! Regards Geza Hi Thanks for the confirmation. There is a nfs list: linux-...@vger.kernel.org It's a high tension version of samba-technical, and there is a three headed dog guarding its entrance, but I've been courageous enough to subscribe and post there. Maybe they'll suggest I use cifs! Cheers, Steve Let's see if openSUSE can help. Must be worth a try. https://bugzilla.novell.com/show_bug.cgi?id=743976 Cheers, Steve It _must_ be a bug in openSUSE. I worked through the nfs4 stuff with Ubuntu 11.10 and it worked fine. Kerberized mounts, the lot. It looks like this: http://linuxcostablanca.blogspot.com/2012/01/important-samba-4-update.html Cheers, Steve -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Join to domain
Hello list i did found my error, the problem was in the time sincronization, both server must have the same time. thanks.. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Samba4
Hello list, in the follow url thereis a how to join a domain as DC https://wiki.samba.org/index.php/Samba4_joining_a_domain In this url thereis a step (samba-tool drs showrepl) when i run this tool i have the follow error ERROR(class 'samba.drs_utils.drsException'): DRS connection to bdc. failed - drsException: DRS connection to bdc. failed: (-1073741772, 'NT_STATUS_OBJECT_NAME_NOT_FOUND') File /usr/local/samba/lib/python2.6/site-packages/samba/netcmd/drs.py, line 42, in drsuapi_connect (ctx.drsuapi, ctx.drsuapi_handle, ctx.bind_supported_extensions) = drs_utils.drsuapi_connect(ctx.server, ctx.lp, ctx.creds) File /usr/local/samba/lib/python2.6/site-packages/samba/drs_utils.py, line 56, in drsuapi_connect raise drsException(DRS connection to %s failed: %s % (server, e)) somebody can helpme -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] TS licensing problem on samba domain
On Mon, 2012-01-30 at 09:07 -0500, Aaron E. wrote: I can confirm that this is an issue. We went through this to great lengths. I can also confirm that after you install the licensing it will not keep track of the issued calls properly. I also remember that since it isn't working properly that you may still be on the temporary install and after the term period it will not function. We had a third party work with this and they were able to get the cals to function with specific schemas added to samba and ldap. This allowed it to work and keep track of cals properly but the error in Licensing / Diagnostics was still there.. The licensing was working and looked like it would not expire. I went through great lengths on this one and found no resolution aside from special schemas.. In that case, it must be expecting AD. If that is the case, then running Samba4 as an AD DC would be the supported solution from the Samba Team. Andrew Bartlett -- Andrew Bartletthttp://samba.org/~abartlet/ Authentication Developer, Samba Team http://samba.org -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Help adding RHEL 5.x workstation to Win2008R2 DC
We have a Windows 2008 R2 w/Service Pack 1 domain controller and a RHEL 5.7 workstation. Part of the required security settings on the domain controller are: Network Access: Allow anonymous SID/Name translation: Disabled Network access: Do not allow anonymous enumeration of SAM accounts: Enabled Network Access: Do not allow anonymous enumeration of SAM accounts and shares: Enabled We would like to add the RHEL 5.7 workstation to the domain controller for user authentication, thus no local accounts in /etc/passwd. But, due to the security mentioned above, conventional methods of adding the RHEL 5.7 workstation to the domain controller result in failures - I've tried both net ads join and the newer Likewise client, both of which fail. Since the domain controller's settings cannot be changed, what options do I have on the RHEL 5.7 workstation side? Are there other products/methods, outside of net ads join and likewise, that might do the job? Thanks. Scott -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba4 - question about DNS
To do the best set up a test environment and compile samba 4 provision with --dns_backend=SAMBA_INTERNAL to use internal dns. Point a forwarder to the external. Good luck Daniel --- EDV Daniel Müller Leitung EDV Tropenklinik Paul-Lechler-Krankenhaus Paul-Lechler-Str. 24 72076 Tübingen Tel.: 07071/206-463, Fax: 07071/206-499 eMail: muel...@tropenklinik.de Internet: www.tropenklinik.de --- -Ursprüngliche Nachricht- Von: samba-boun...@lists.samba.org [mailto:samba-boun...@lists.samba.org] Im Auftrag von Masopust, Christian Gesendet: Dienstag, 31. Januar 2012 15:57 An: samba@lists.samba.org Betreff: [Samba] Samba4 - question about DNS I'm completely new to Samba4, so sorry if this question is stupid :)) We probably will setup a Samba4-AD in the near future and it currently came to the question whether Samba4 can also work with a remote DNS-server (DNS-server not on Samba4-server). We plan to use some ready appliance for DNS and DHCP. Thanks, christian -- 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
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via c83ce7b replace: Only include C files from which there are actually
functions used.
via 5c50e08 replace: use libbsd for strlcat/strlcpy when available.
from bfa951d s4-s3-upgrade: Check if there are duplicate sids for users
and groups
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit c83ce7bcc6dbee5b3b8c9cceb7de698763d2d10e
Author: Jelmer Vernooij jel...@samba.org
Date: Tue Jan 31 11:25:17 2012 +0100
replace: Only include C files from which there are actually functions used.
Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Tue Jan 31 15:21:04 CET 2012 on sn-devel-104
commit 5c50e08983ff276dc472d00baba7a835dbda6cc5
Author: Jelmer Vernooij jel...@samba.org
Date: Tue Jan 31 11:10:18 2012 +0100
replace: use libbsd for strlcat/strlcpy when available.
---
Summary of changes:
lib/replace/wscript | 59 --
1 files changed, 42 insertions(+), 17 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/wscript b/lib/replace/wscript
index e4fc72b..4b4f0a8 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -163,12 +163,18 @@ def configure(conf):
conf.CHECK_FUNCS('pipe strftime srandom random srand rand usleep
setbuffer')
conf.CHECK_FUNCS('lstat getpgrp utime utimes seteuid setreuid setresuid
setegid')
conf.CHECK_FUNCS('setregid setresgid chroot strerror vsyslog setlinebuf
mktime')
-conf.CHECK_FUNCS('ftruncate chsize rename waitpid wait4 strlcpy strlcat')
+conf.CHECK_FUNCS('ftruncate chsize rename waitpid wait4')
conf.CHECK_FUNCS('initgroups pread pwrite strndup strcasestr')
conf.CHECK_FUNCS('strtok_r mkdtemp dup2 dprintf vdprintf isatty chown
lchown')
conf.CHECK_FUNCS('link readlink symlink realpath snprintf vsnprintf')
conf.CHECK_FUNCS('asprintf vasprintf setenv unsetenv strnlen strtoull
__strtoull')
conf.CHECK_FUNCS('strtouq strtoll __strtoll strtoq')
+
+# libbsd on some platforms provides strlcpy and strlcat
+if not conf.CHECK_FUNCS('strlcpy strlcat'):
+conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h',
+checklibc=True)
+
#Some OS (ie. freebsd) return EINVAL if the convertion could not be done,
it's not what we expect
#Let's detect those cases
if conf.CONFIG_SET('HAVE_STRTOLL'):
@@ -206,19 +212,19 @@ def configure(conf):
if conf.CHECK_FUNCS_IN('clock_gettime', 'rt', checklibc=True):
for c in ['CLOCK_MONOTONIC', 'CLOCK_PROCESS_CPUTIME_ID',
'CLOCK_REALTIME']:
conf.CHECK_CODE('''
- #if TIME_WITH_SYS_TIME
- # include sys/time.h
- # include time.h
- #else
- # if HAVE_SYS_TIME_H
- # include sys/time.h
- # else
- # include time.h
- # endif
- #endif
- clockid_t clk = %s''' % c,
- 'HAVE_%s' % c,
- msg='Checking whether the clock_gettime clock ID %s
is available' % c)
+#if TIME_WITH_SYS_TIME
+# include sys/time.h
+# include time.h
+#else
+# if HAVE_SYS_TIME_H
+# include sys/time.h
+# else
+# include time.h
+# endif
+#endif
+clockid_t clk = %s''' % c,
+'HAVE_%s' % c,
+msg='Checking whether the clock_gettime clock ID %s is
available' % c)
conf.CHECK_TYPE('struct timespec', headers='sys/time.h time.h')
@@ -395,13 +401,32 @@ def configure(conf):
conf.SAMBA_CONFIG_H()
+REPLACEMENT_FUNCTIONS = {
+'replace.c': ['ftruncate', 'strlcpy', 'strlcat', 'mktime', 'initgroups',
+ 'memmove', 'strdup', 'setlinebuf', 'vsyslog', 'strnlen',
+ 'strndup', 'waitpid', 'seteuid', 'setegid', 'chroot',
+ 'mkstemp', 'mkdtemp', 'pread', 'pwrite', 'strcasestr',
+ 'strtok_r', 'strtoll', 'strtoull', 'setenv', 'unsetenv',
+ 'utime', 'utimes', 'dup2', 'chown', 'link', 'readlink',
+ 'symlink', 'lchown', 'realpath', 'memmem', 'vdprintf',
+ 'dprintf', 'get_current_dir_name',
+ 'strerror_r', 'clock_gettime'],
+'timegm.c': ['timegm'],
+'snprintf.c': ['snprintf'],
+}
+
+
def build(bld):
bld.RECURSE('buildtools/wafsamba')
-REPLACE_HOSTCC_SOURCE = 'replace.c snprintf.c'
+REPLACE_HOSTCC_SOURCE = ''
if bld.CONFIG_SET('REPLACE_STRPTIME'):
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 2343703 tevent: Fix python documentation strings
from c83ce7b replace: Only include C files from which there are actually
functions used.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 2343703985ccbd62e3ec6c851817d31fdefbf8a4
Author: Amitay Isaacs ami...@gmail.com
Date: Wed Feb 1 00:58:32 2012 +1100
tevent: Fix python documentation strings
Autobuild-User: Amitay Isaacs ami...@samba.org
Autobuild-Date: Tue Jan 31 16:59:29 CET 2012 on sn-devel-104
---
Summary of changes:
lib/tevent/pytevent.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tevent/pytevent.c b/lib/tevent/pytevent.c
index bb702a1..870f5aa 100644
--- a/lib/tevent/pytevent.c
+++ b/lib/tevent/pytevent.c
@@ -331,7 +331,7 @@ static void py_tevent_signal_dealloc(TeventSignal_Object
*self)
}
static PyTypeObject TeventSignal_Type = {
- .tp_name = Signal,
+ .tp_name = tevent.Signal,
.tp_basicsize = sizeof(TeventSignal_Object),
.tp_dealloc = (destructor)py_tevent_signal_dealloc,
.tp_flags = Py_TPFLAGS_DEFAULT,
@@ -662,7 +662,7 @@ static PyObject *py_tevent_context_new(PyTypeObject *type,
PyObject *args, PyObj
}
static PyTypeObject TeventContext_Type = {
- .tp_name = _tevent.Context,
+ .tp_name = tevent.Context,
.tp_new = py_tevent_context_new,
.tp_basicsize = sizeof(TeventContext_Object),
.tp_dealloc = (destructor)py_tevent_context_dealloc,
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 8972c92 s3:net ads join: remove a useless empty comment block via 976672b s3:net ads join: add a comment for the call to _net_ads_join_dns_update() via be312e7 s3:net ads join: reduce indentation in _net_ads_join_dns_updates() via 7e5c5bd s3:net ads join: move dns update code out to new function _net_ads_join_dns_updates() via 1768d36 s3:net ads join: improve comment for dns update block via 8f9b432 s3:net ads join: improve status evaluation for call to net_update_dns() via 9cd7b8f s3:net ads join: interpret return code of ads_kinit_password() in dns update block via 4831b6e s3:net ads join: check for malloc success and react accordingly in dns update block via ca913c9 s3:net ads join: check for success of fetching machine password in dns update block via 04fa9a3 s3:net ads join: untangle assignment from check, fix return code and improve error logging via 63d9b5d s3:net ads join: reduce indentation and improve logging in the dns update code block via 1d83f21 s3:net ads join: untangle assignment from check. via dc4cf82 s3:net registry: fix a copy and paste error in a help text from 2343703 tevent: Fix python documentation strings http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 8972c92342211fefb3d76bc306f7fbc467089010 Author: Michael Adam ob...@samba.org Date: Tue Jan 31 16:16:47 2012 +0100 s3:net ads join: remove a useless empty comment block Autobuild-User: Michael Adam ob...@samba.org Autobuild-Date: Tue Jan 31 18:37:45 CET 2012 on sn-devel-104 commit 976672bf805e3ec44c10e07baeaa4a4ebc0da5cc Author: Michael Adam ob...@samba.org Date: Tue Jan 31 16:15:54 2012 +0100 s3:net ads join: add a comment for the call to _net_ads_join_dns_update() commit be312e76d2b27674c5e38b760ca6521052caa460 Author: Michael Adam ob...@samba.org Date: Tue Jan 31 01:05:14 2012 +0100 s3:net ads join: reduce indentation in _net_ads_join_dns_updates() commit 7e5c5bdcc46b55c5890d755601fe5278557d0948 Author: Michael Adam ob...@samba.org Date: Tue Jan 31 00:59:21 2012 +0100 s3:net ads join: move dns update code out to new function _net_ads_join_dns_updates() commit 1768d3621a077eb8b0457cbcabc1f7e2a4545948 Author: Michael Adam ob...@samba.org Date: Mon Jan 30 18:04:41 2012 +0100 s3:net ads join: improve comment for dns update block commit 8f9b43281d7ad425a4e6681503eb6e872d9040d7 Author: Michael Adam ob...@samba.org Date: Mon Jan 30 14:15:14 2012 +0100 s3:net ads join: improve status evaluation for call to net_update_dns() untangle assignment from check and log error code in message if failed. commit 9cd7b8f04d6e51a0be4e18e8842ff1062134afae Author: Michael Adam ob...@samba.org Date: Mon Jan 30 14:12:15 2012 +0100 s3:net ads join: interpret return code of ads_kinit_password() in dns update block If failed, print according error message and skip the attempt to do dns update. commit 4831b6e6bb422a9186cf42980894b5e46c147ed4 Author: Michael Adam ob...@samba.org Date: Mon Jan 30 14:07:52 2012 +0100 s3:net ads join: check for malloc success and react accordingly in dns update block commit ca913c98a6948f1b4acf38dd548fb6fa0191367c Author: Michael Adam ob...@samba.org Date: Mon Jan 30 14:05:59 2012 +0100 s3:net ads join: check for success of fetching machine password in dns update block log and cleanup accordingly if failed commit 04fa9a389c6d027dc4defb2527550fda650c4a6b Author: Michael Adam ob...@samba.org Date: Mon Jan 30 14:00:12 2012 +0100 s3:net ads join: untangle assignment from check, fix return code and improve error logging only the dns update failed, not the join. Also do proper memory cleanup commit 63d9b5d75a435bbbc06aa8d00371a1c61b69acfb Author: Michael Adam ob...@samba.org Date: Mon Jan 30 13:56:45 2012 +0100 s3:net ads join: reduce indentation and improve logging in the dns update code block by doing an early goto done upon error condition commit 1d83f2118e0e9e1de02909247114ac18ce55a6be Author: Michael Adam ob...@samba.org Date: Mon Jan 30 13:03:59 2012 +0100 s3:net ads join: untangle assignment from check. commit dc4cf82fb573074b4bb063321c86cb306902a4bc Author: Michael Adam ob...@samba.org Date: Fri Jan 27 14:02:07 2012 +0100 s3:net registry: fix a copy and paste error in a help text --- Summary of changes: source3/utils/net_ads.c | 135 +++-- source3/utils/net_registry.c |4 +- 2 files changed, 91 insertions(+), 48 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c index 0893a1d..381393e 100644 --- a/source3/utils/net_ads.c +++
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 2b1d7ac s3: Unify stream testing in open_directory
via 549a319 s3: Re-indent an sequence for better understanding
via 312228d s3: Fix smbcontrol smbd close-share
from 8972c92 s3:net ads join: remove a useless empty comment block
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 2b1d7ac0603ce8fe5a76efa45c3f17f1680e5e66
Author: Volker Lendecke v...@samba.org
Date: Tue Jan 31 17:26:34 2012 +0100
s3: Unify stream testing in open_directory
The second if-statement could never have kicked in, assuming the
SMB_ASSERT above was right.
Jeremy, please check!
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Tue Jan 31 20:15:36 CET 2012 on sn-devel-104
commit 549a31963e993a15b6155a046dd4ecea9b05eed7
Author: Volker Lendecke v...@samba.org
Date: Tue Jan 31 17:24:49 2012 +0100
s3: Re-indent an sequence for better understanding
commit 312228d0c89f83c9defaba268a2bb62365b0ce1b
Author: Volker Lendecke v...@samba.org
Date: Mon Jan 30 18:23:49 2012 +0100
s3: Fix smbcontrol smbd close-share
---
Summary of changes:
source3/smbd/open.c | 14 +-
source3/smbd/server.c | 11 +++
2 files changed, 16 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 5388059..3374fdb 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -2675,7 +2675,11 @@ static NTSTATUS open_directory(connection_struct *conn,
struct timespec mtimespec;
int info = 0;
- SMB_ASSERT(!is_ntfs_stream_smb_fname(smb_dname));
+ if (is_ntfs_stream_smb_fname(smb_dname)) {
+ DEBUG(2, (open_directory: %s is a stream name!\n,
+ smb_fname_str_dbg(smb_dname)));
+ return NT_STATUS_NOT_A_DIRECTORY;
+ }
/* Ensure we have a directory attribute. */
file_attributes |= FILE_ATTRIBUTE_DIRECTORY;
@@ -2690,14 +2694,6 @@ static NTSTATUS open_directory(connection_struct *conn,
(unsigned int)create_disposition,
(unsigned int)file_attributes));
- if (!(file_attributes FILE_FLAG_POSIX_SEMANTICS)
- (conn-fs_capabilities FILE_NAMED_STREAMS)
- is_ntfs_stream_smb_fname(smb_dname)) {
- DEBUG(2, (open_directory: %s is a stream name!\n,
- smb_fname_str_dbg(smb_dname)));
- return NT_STATUS_NOT_A_DIRECTORY;
- }
-
status = smbd_calculate_access_mask(conn, smb_dname,
access_mask, access_mask);
if (!NT_STATUS_IS_OK(status)) {
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 369b7ab..10d59ad 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -269,6 +269,15 @@ static void smbd_parent_id_cache_delete(struct
messaging_context *ctx,
messaging_send_to_children(ctx, msg_type, msg_data);
}
+static void smb_parent_force_tdis(struct messaging_context *ctx,
+ void* data,
+ uint32_t msg_type,
+ struct server_id srv_id,
+ DATA_BLOB* msg_data)
+{
+ messaging_send_to_children(ctx, msg_type, msg_data);
+}
+
static void add_child_pid(struct smbd_parent_context *parent,
pid_t pid)
{
@@ -806,6 +815,8 @@ static bool open_sockets_smbd(struct smbd_parent_context
*parent,
smb_pcap_updated);
messaging_register(msg_ctx, NULL, MSG_SMB_BRL_VALIDATE,
brl_revalidate);
+ messaging_register(msg_ctx, NULL, MSG_SMB_FORCE_TDIS,
+ smb_parent_force_tdis);
messaging_register(msg_ctx, NULL,
ID_CACHE_FLUSH, smbd_parent_id_cache_flush);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 507872f s3:smbd: inline code in reply_sesssetup_and_X_spnego() via 5f79ad5 s3:smbd: the spnego session setup don't need to copy the in blob via ec0142d s3:smbd: rework reply_spnego_ntlmssp to reply_spnego_generic via ee15790 s3:smbd: remove unused code from sesssetup.c via 63f6567 s3:smbd: remove pending_auth_data logic via 8327ee9 s3:smbd: always use the gensec code path in sesssetup.c via 3383ebb s3:smbd: rework smbd_smb2_*_ntlmssp_auth* to smbd_smb2_auth_generic* via 58e401f s3:smbd: always use the gensec code path in smb2_sesssetup.c via 5ad7665 libcli/smb: Convert struct smb_trans_enc_state to talloc via fce53e0 s3-libsmb: Remove unused enum smb_trans_enc_type via a1a667d s3-libsmb: Use gensec_spnego in smb seal client via d6b0d52 s3-smbd: Use gensec_spnego in smb seal server via 204dfd2 s3:libsmb/auth_generic: make use of gensec_spnego in the client via ab364e9 s3:auth/auth_generic: make use of gensec_spnego in the server from 2b1d7ac s3: Unify stream testing in open_directory http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 507872f90f0df364cc758b1df6b29f46806c9671 Author: Stefan Metzmacher me...@samba.org Date: Sat Jan 14 13:24:51 2012 +0100 s3:smbd: inline code in reply_sesssetup_and_X_spnego() This makes the logic much easier to follow. metze Autobuild-User: Stefan Metzmacher me...@samba.org Autobuild-Date: Tue Jan 31 21:52:45 CET 2012 on sn-devel-104 commit 5f79ad5f8718fec99f209590f088bafb998f1c9c Author: Stefan Metzmacher me...@samba.org Date: Sat Jan 14 12:38:36 2012 +0100 s3:smbd: the spnego session setup don't need to copy the in blob metze commit ec0142dd3197a9cd429ee925486d2fc87509706f Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 13 13:20:27 2012 +0100 s3:smbd: rework reply_spnego_ntlmssp to reply_spnego_generic This removes the unused spnego_gen_auth_response() wrapping. metze commit ee15790d7a28aff22efc7b95f86f70078322241d Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 13 12:46:25 2012 +0100 s3:smbd: remove unused code from sesssetup.c metze commit 63f6567ca98179736bf41922bddf8a8f3567fd68 Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 13 12:30:08 2012 +0100 s3:smbd: remove pending_auth_data logic This is handled by the gensec_spnego module. metze commit 8327ee94db3d2b89eaa1763ccde896b437da9094 Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 13 12:24:47 2012 +0100 s3:smbd: always use the gensec code path in sesssetup.c The other code pathes are unused, because we always have the spnego gensec module. metze commit 3383ebbe7edaf902a511bd3be964d7ae56b62610 Author: Stefan Metzmacher me...@samba.org Date: Wed Jan 25 09:02:15 2012 +0100 s3:smbd: rework smbd_smb2_*_ntlmssp_auth* to smbd_smb2_auth_generic* metze commit 58e401fae28728d7f28106216b4bbffa8cb0df93 Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 13 12:24:47 2012 +0100 s3:smbd: always use the gensec code path in smb2_sesssetup.c The other code pathes are unused, because we always have the spnego gensec module. metze commit 5ad7665b6377768d3710b00b25aeb530131924cc Author: Andrew Bartlett abart...@samba.org Date: Sat Jan 14 15:30:34 2012 +1100 libcli/smb: Convert struct smb_trans_enc_state to talloc Signed-off-by: Stefan Metzmacher me...@samba.org commit fce53e0e794f38782092be3433608772f5be7f2b Author: Andrew Bartlett abart...@samba.org Date: Sat Jan 14 15:17:41 2012 +1100 s3-libsmb: Remove unused enum smb_trans_enc_type Signed-off-by: Stefan Metzmacher me...@samba.org commit a1a667dd37d0218eda56bd2033a24cdff2dc8ea2 Author: Andrew Bartlett abart...@samba.org Date: Sat Jan 14 12:28:28 2012 +1100 s3-libsmb: Use gensec_spnego in smb seal client This is intead of the inline, manual spnego code currently in use. Andrew Bartlett Signed-off-by: Stefan Metzmacher me...@samba.org commit d6b0d521ea816cb538077fa84cbc292aab1299e8 Author: Andrew Bartlett abart...@samba.org Date: Sat Jan 14 12:15:17 2012 +1100 s3-smbd: Use gensec_spnego in smb seal server This is instead of the inline, manual spnego code currently in use. Andrew Bartlett Signed-off-by: Stefan Metzmacher me...@samba.org commit 204dfd2c1d40e6f0450004b38805bd3d78a4b5a9 Author: Stefan Metzmacher me...@samba.org Date: Thu Jan 12 16:12:02 2012 +0100 s3:libsmb/auth_generic: make use of gensec_spnego in the client metze commit ab364e987433bb5d5f7dd08e8ef74a32c0aa592a Author: Stefan Metzmacher me...@samba.org Date: Thu Jan 12 16:12:02 2012 +0100 s3:auth/auth_generic:
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via a1901b5 Fix bug #8729 - getpass regressions on Solaris/Illumos -
3.6 and master.
via 6b8a4c9 s3:client: ignore SMBecho errors (the server may not
support it) (bug #8139)
via 27c686d Revert Fix bug #8139 - smbclient fails if server does not
support Echo request.
from 507872f s3:smbd: inline code in reply_sesssetup_and_X_spnego()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit a1901b55cfa658f39a33d0ea120641f56453fe4e
Author: Ira Cooper sa...@ira.wakeful.net
Date: Tue Jan 31 12:15:36 2012 -0800
Fix bug #8729 - getpass regressions on Solaris/Illumos - 3.6 and master.
Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Tue Jan 31 23:28:09 CET 2012 on sn-devel-104
commit 6b8a4c96e8b2294c48bbf8ad8a3422d98448dd6c
Author: Stefan Metzmacher me...@samba.org
Date: Tue Jan 31 08:47:38 2012 +0100
s3:client: ignore SMBecho errors (the server may not support it) (bug #8139)
metze
commit 27c686dd70daf6a565c83c037e1ced09212cfff6
Author: Stefan Metzmacher me...@samba.org
Date: Tue Jan 31 08:41:07 2012 +0100
Revert Fix bug #8139 - smbclient fails if server does not support Echo
request.
This reverts commit 1fdc96ecaff8ca12e9aa0082527468ad4242a8a9.
This is wrong in master as the error codes are different compared to
3.5.x. The correct way to handle this is to call cli_state_is_connected().
metze
---
Summary of changes:
lib/replace/replace.h | 11 +++
lib/replace/system/passwd.h |2 ++
source3/client/client.c | 14 +++---
3 files changed, 20 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/replace.h b/lib/replace/replace.h
index c081f23..c47cf1c 100644
--- a/lib/replace/replace.h
+++ b/lib/replace/replace.h
@@ -802,4 +802,15 @@ int fdatasync(int );
/* prototype is in system/network.h */
#endif
+#if !defined(getpass)
+#ifdef REPLACE_GETPASS
+#if defined(REPLACE_GETPASS_BY_GETPASSPHRASE)
+#define getpass(prompt) getpassphrase(prompt)
+#else
+#define getpass(prompt) rep_getpass(prompt)
+char *rep_getpass(const char *prompt);
+#endif
+#endif
+#endif
+
#endif /* _LIBREPLACE_REPLACE_H */
diff --git a/lib/replace/system/passwd.h b/lib/replace/system/passwd.h
index f630012..223324c 100644
--- a/lib/replace/system/passwd.h
+++ b/lib/replace/system/passwd.h
@@ -67,6 +67,7 @@
#include compat.h
#endif
+#if !defined(getpass)
#ifdef REPLACE_GETPASS
#if defined(REPLACE_GETPASS_BY_GETPASSPHRASE)
#define getpass(prompt) getpassphrase(prompt)
@@ -75,6 +76,7 @@
char *rep_getpass(const char *prompt);
#endif
#endif
+#endif
#ifndef NGROUPS_MAX
#define NGROUPS_MAX 32 /* Guess... */
diff --git a/source3/client/client.c b/source3/client/client.c
index 9b36ff7..89fd1d4 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -5032,15 +5032,15 @@ static void readline_callback(void)
/* Ping the server to keep the connection alive using SMBecho. */
memset(garbage, 0xf0, sizeof(garbage));
status = cli_echo(cli, 1, data_blob_const(garbage, sizeof(garbage)));
- if (NT_STATUS_EQUAL(status, NT_STATUS_PIPE_BROKEN) ||
- NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE) ||
- NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT)) {
- DEBUG(0, (SMBecho failed (%s). Maybe server has closed
- the connection\n, nt_errstr(status)));
+ if (NT_STATUS_IS_OK(status)) {
+ return;
+ }
+
+ if (!cli_state_is_connected(cli)) {
+ DEBUG(0,(SMBecho failed (%s). The connection is
+disconnected now\n, nt_errstr(status)));
finished = true;
smb_readline_done();
- /* Ignore all other errors - sometimes servers simply
- don't implement SMBecho (Apple for example). */
}
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 1f328d1 s3: Add rmdir operation to streams_depot
via 92b96ac s3: Delete streams on directories
via a93cdac s3: Simplify an if-statement
from a1901b5 Fix bug #8729 - getpass regressions on Solaris/Illumos -
3.6 and master.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1f328d1e6a820564e9570bc27a018301c7cb453c
Author: Volker Lendecke v...@samba.org
Date: Tue Jan 31 22:26:35 2012 +0100
s3: Add rmdir operation to streams_depot
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Wed Feb 1 01:05:57 CET 2012 on sn-devel-104
commit 92b96ac84bea5aa8ca37ea6ca17376199aef4142
Author: Volker Lendecke v...@samba.org
Date: Tue Jan 31 22:26:23 2012 +0100
s3: Delete streams on directories
commit a93cdacd1679d968862b6c82ea266f986d4c621e
Author: Volker Lendecke v...@samba.org
Date: Tue Jan 31 17:47:07 2012 +0100
s3: Simplify an if-statement
is_ntfs_default_stream_smb_fname already contains all checks that
the variable stream_name gives us here.
---
Summary of changes:
source3/modules/vfs_streams_depot.c | 47 +++
source3/smbd/close.c| 11
source3/smbd/open.c |2 +-
3 files changed, 59 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_streams_depot.c
b/source3/modules/vfs_streams_depot.c
index 68a1453..a188274 100644
--- a/source3/modules/vfs_streams_depot.c
+++ b/source3/modules/vfs_streams_depot.c
@@ -657,6 +657,52 @@ static int streams_depot_unlink(vfs_handle_struct *handle,
return ret;
}
+static int streams_depot_rmdir(vfs_handle_struct *handle, const char *path)
+{
+ struct smb_filename *smb_fname_base = NULL;
+ NTSTATUS status;
+ int ret = -1;
+
+ DEBUG(10, (streams_depot_rmdir called for %s\n, path));
+
+ /*
+* We potentially need to delete the per-inode streams directory
+*/
+
+ status = create_synthetic_smb_fname(talloc_tos(), path,
+ NULL, NULL, smb_fname_base);
+ if (!NT_STATUS_IS_OK(status)) {
+ errno = map_errno_from_nt_status(status);
+ return -1;
+ }
+
+ if (lp_posix_pathnames()) {
+ ret = SMB_VFS_NEXT_LSTAT(handle, smb_fname_base);
+ } else {
+ ret = SMB_VFS_NEXT_STAT(handle, smb_fname_base);
+ }
+
+ if (ret == -1) {
+ TALLOC_FREE(smb_fname_base);
+ return -1;
+ }
+
+ if (smb_fname_base-st.st_ex_nlink == 2) {
+ char *dirname = stream_dir(handle, smb_fname_base,
+ smb_fname_base-st, false);
+
+ if (dirname != NULL) {
+ SMB_VFS_NEXT_RMDIR(handle, dirname);
+ }
+ TALLOC_FREE(dirname);
+ }
+
+ ret = SMB_VFS_NEXT_RMDIR(handle, path);
+
+ TALLOC_FREE(smb_fname_base);
+ return ret;
+}
+
static int streams_depot_rename(vfs_handle_struct *handle,
const struct smb_filename *smb_fname_src,
const struct smb_filename *smb_fname_dst)
@@ -868,6 +914,7 @@ static struct vfs_fn_pointers vfs_streams_depot_fns = {
.stat_fn = streams_depot_stat,
.lstat_fn = streams_depot_lstat,
.unlink_fn = streams_depot_unlink,
+ .rmdir_fn = streams_depot_rmdir,
.rename_fn = streams_depot_rename,
.streaminfo_fn = streams_depot_streaminfo,
};
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 131f4bf..42e88d8 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -1088,6 +1088,17 @@ static NTSTATUS close_directory(struct smb_request *req,
files_struct *fsp,
TALLOC_FREE(lck);
+ if ((fsp-conn-fs_capabilities FILE_NAMED_STREAMS)
+!is_ntfs_stream_smb_fname(fsp-fsp_name)) {
+
+ status = delete_all_streams(fsp-conn,
fsp-fsp_name-base_name);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(5, (delete_all_streams failed: %s\n,
+ nt_errstr(status)));
+ goto out;
+ }
+ }
+
status = rmdir_internals(talloc_tos(), fsp);
DEBUG(5,(close_directory: %s. Delete on close was set -
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 3374fdb..a94a02e 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -3832,7 +3832,7 @@ NTSTATUS create_file_default(connection_struct *conn,
}
}
- if (stream_name
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via b7d5d01 s3/wscript: Fix dependency on gssapi, necessary when there
is no system Kerberos.
via 51e162d source3/wscript: Expand tabs, to prevent confusion
(whitespace is significant in python/waf).
via 5931e1d replace: Add include for bsd/string.h.
from 1f328d1 s3: Add rmdir operation to streams_depot
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b7d5d01c35b875c0458a0c7145f3d67e7f731eba
Author: Jelmer Vernooij jel...@samba.org
Date: Tue Jan 31 22:31:30 2012 +0100
s3/wscript: Fix dependency on gssapi, necessary when there is no system
Kerberos.
Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Wed Feb 1 02:43:11 CET 2012 on sn-devel-104
commit 51e162df8bd364583e3af43066b7ea273d986e97
Author: Jelmer Vernooij jel...@samba.org
Date: Tue Jan 31 22:30:45 2012 +0100
source3/wscript: Expand tabs, to prevent confusion (whitespace is
significant in python/waf).
commit 5931e1da87de591a2b4cb61c6c97cc60d4f01175
Author: Jelmer Vernooij jel...@samba.org
Date: Tue Jan 31 22:28:08 2012 +0100
replace: Add include for bsd/string.h.
---
Summary of changes:
lib/replace/replace.h |4 +
source3/wscript | 642
source3/wscript_build |2 +-
3 files changed, 326 insertions(+), 322 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/replace.h b/lib/replace/replace.h
index c47cf1c..7112414 100644
--- a/lib/replace/replace.h
+++ b/lib/replace/replace.h
@@ -104,6 +104,10 @@
# define PRIu64__PRI64_PREFIX u
#endif
+#ifdef HAVE_BSD_STRING_H
+#include bsd/string.h
+#endif
+
#ifdef HAVE_STRING_H
#include string.h
#endif
diff --git a/source3/wscript b/source3/wscript
index 912997f..901d2b6 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -157,8 +157,8 @@ main() {
#include signal.h
#include sys/file.h
#ifndef LOCK_MAND
-#define LOCK_MAND 32
-#define LOCK_READ 64
+#define LOCK_MAND32
+#define LOCK_READ64
#endif
main() {
exit(flock(open(/dev/null, O_RDWR), LOCK_MAND|LOCK_READ) != 0);
@@ -172,7 +172,7 @@ main() {
conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_blksize',
define='HAVE_STAT_ST_BLKSIZE',
headers='sys/stat.h')
conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_flags',
define='HAVE_STAT_ST_FLAGS',
- headers='sys/types.h sys/stat.h unistd.h')
+headers='sys/types.h sys/stat.h unistd.h')
# Check for POSIX capability support
conf.CHECK_FUNCS_IN('cap_get_proc', 'cap', headers='sys/capability.h')
@@ -301,8 +301,8 @@ utimensat vsyslog _write __write __xstat
#FIXME: add more checks
if Options.options.with_acl_support:
if host_os.rfind('linux') -1:
- conf.CHECK_FUNCS_IN('acl_get_file', 'acl')
- conf.CHECK_FUNCS_IN('getxattr', 'attr')
+conf.CHECK_FUNCS_IN('acl_get_file', 'acl')
+conf.CHECK_FUNCS_IN('getxattr', 'attr')
if conf.CHECK_CODE('''
acl_t acl;
int entry_id;
@@ -311,7 +311,7 @@ return acl_get_entry(acl, entry_id, entry_p);
''',
'HAVE_POSIX_ACLS',
headers='sys/types.h sys/acl.h', link=False,
- msg=Checking for POSIX ACL support) :
+msg=Checking for POSIX ACL support) :
conf.CHECK_CODE('''
acl_permset_t permset_d;
acl_perm_t perm;
@@ -338,54 +338,54 @@ return acl_get_perm_np(permset_d, perm);
if conf.CONFIG_SET('HAVE_FALLOCATE'):
conf.CHECK_CODE('''
- int ret = fallocate(0, FALLOC_FL_KEEP_SIZE, 0, 10);''',
- 'HAVE_LINUX_FALLOCATE',
- msg=Checking whether the Linux 'fallocate' function is
available,
- headers='unistd.h sys/types.h fcntl.h linux/falloc.h')
+int ret = fallocate(0, FALLOC_FL_KEEP_SIZE, 0, 10);''',
+'HAVE_LINUX_FALLOCATE',
+msg=Checking whether the Linux 'fallocate' function is
available,
+headers='unistd.h sys/types.h fcntl.h linux/falloc.h')
if conf.CONFIG_SET('HAVE_FALLOCATE64'):
conf.CHECK_CODE('''
- int ret = fallocate64(0, FALLOC_FL_KEEP_SIZE, 0, 10);''',
- 'HAVE_LINUX_FALLOCATE64',
- msg=Checking whether the Linux 'fallocate64' function is
available,
- headers='unistd.h sys/types.h fcntl.h linux/falloc.h')
+int ret = fallocate64(0, FALLOC_FL_KEEP_SIZE, 0, 10);''',
+'HAVE_LINUX_FALLOCATE64',
+msg=Checking whether the Linux 'fallocate64' function is
available,
+headers='unistd.h sys/types.h fcntl.h linux/falloc.h')
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 9336658 s3-auth Remove unused nt_status_squash from auth_context
via eecf2ac selftest: Remove unused support for --exeext
from b7d5d01 s3/wscript: Fix dependency on gssapi, necessary when there
is no system Kerberos.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 93366586d85389a50144138c788d46703f15d52e
Author: Andrew Bartlett abart...@samba.org
Date: Tue Jan 31 21:34:19 2012 +1100
s3-auth Remove unused nt_status_squash from auth_context
Autobuild-User: Andrew Bartlett abart...@samba.org
Autobuild-Date: Wed Feb 1 04:18:50 CET 2012 on sn-devel-104
commit eecf2ac4c83e730dd402c410f7f2087d87d70d6f
Author: Andrew Bartlett abart...@samba.org
Date: Thu Jan 26 09:42:27 2012 +1100
selftest: Remove unused support for --exeext
---
Summary of changes:
lib/ldb/tests/test-extended.sh|6 +-
lib/ldb/tests/test-generic.sh | 72 ++--
lib/ldb/tests/test-tdb-features.sh| 34 +++---
lib/ldb/tests/test-tdb.sh |4 +-
nsswitch/tests/test_wbinfo.sh |2 +-
selftest/selftest.pl | 14 +
selftest/selftesthelpers.py |2 +-
selftest/target/Samba.pm |8 ++--
selftest/target/Samba3.pm |4 +-
selftest/target/Samba4.pm |6 +--
source3/include/auth.h|1 -
source4/client/tests/test_cifsdd.sh |2 +-
source4/client/tests/test_smbclient.sh|2 +-
source4/setup/tests/blackbox_s3upgrade.sh |6 +-
source4/torture/tests/test_gentest.sh |2 +-
source4/torture/tests/test_locktest.sh|2 +-
source4/torture/tests/test_masktest.sh|2 +-
source4/utils/tests/test_demote.sh|4 +-
source4/utils/tests/test_nmblookup.sh |2 +-
source4/utils/tests/test_samba_tool.sh|4 +-
testprogs/blackbox/test_chgdcpass.sh |4 +-
testprogs/blackbox/test_export_keytab.sh |6 +-
testprogs/blackbox/test_kinit.sh | 14 +++---
testprogs/blackbox/test_ktpass.sh |2 +-
testprogs/blackbox/test_ldb.sh|2 +-
testprogs/blackbox/test_passwords.sh | 12 ++--
testprogs/blackbox/test_pkinit.sh | 14 +++---
27 files changed, 110 insertions(+), 123 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/ldb/tests/test-extended.sh b/lib/ldb/tests/test-extended.sh
index 14b988e..0599757 100755
--- a/lib/ldb/tests/test-extended.sh
+++ b/lib/ldb/tests/test-extended.sh
@@ -4,7 +4,7 @@ echo Running extended search tests
mv $LDB_URL $LDB_URL.1
-cat EOF | $VALGRIND ldbadd$EXEEXT || exit 1
+cat EOF | $VALGRIND ldbadd || exit 1
dn: cn=testrec1,cn=TEST
i1: 1
i2: 0
@@ -38,10 +38,10 @@ EOF
checkcount() {
count=$1
expression=$2
-n=`$VALGRIND ldbsearch$EXEEXT $expression | grep '^dn' | wc -l`
+n=`$VALGRIND ldbsearch $expression | grep '^dn' | wc -l`
if [ $n != $count ]; then
echo Got $n but expected $count for $expression
- $VALGRIND ldbsearch$EXEEXT $expression
+ $VALGRIND ldbsearch $expression
exit 1
fi
echo OK: $count $expression
diff --git a/lib/ldb/tests/test-generic.sh b/lib/ldb/tests/test-generic.sh
index 7c3db4a..9c45ed9 100755
--- a/lib/ldb/tests/test-generic.sh
+++ b/lib/ldb/tests/test-generic.sh
@@ -8,87 +8,87 @@ fi
echo LDB_URL: $LDB_URL
echo Adding base elements
-$VALGRIND ldbadd$EXEEXT $LDBDIR/tests/test.ldif || exit 1
+$VALGRIND ldbadd $LDBDIR/tests/test.ldif || exit 1
echo Adding again - should fail
-$VALGRIND ldbadd$EXEEXT $LDBDIR/tests/test.ldif 2 /dev/null {
+$VALGRIND ldbadd $LDBDIR/tests/test.ldif 2 /dev/null {
echo Should have failed to add again - gave $?
exit 1
}
echo Modifying elements
-$VALGRIND ldbmodify$EXEEXT $LDBDIR/tests/test-modify.ldif || exit 1
+$VALGRIND ldbmodify $LDBDIR/tests/test-modify.ldif || exit 1
echo Showing modified record
-$VALGRIND ldbsearch$EXEEXT '(uid=uham)' || exit 1
+$VALGRIND ldbsearch '(uid=uham)' || exit 1
echo Rename entry with ldbmodify - modrdn
-$VALGRIND ldbmodify$EXEEXT $LDBDIR/tests/test-modify-modrdn.ldif || exit 1
+$VALGRIND ldbmodify $LDBDIR/tests/test-modify-modrdn.ldif || exit 1
echo Rename entry with ldbrename
OLDDN=cn=Ursula Hampster,ou=Alumni Association,ou=People,o=University of
Michigan,c=TEST
NEWDN=cn=Hampster Ursula,ou=Alumni Association,ou=People,o=University of
Michigan,c=TEST
-$VALGRIND ldbrename$EXEEXT $OLDDN $NEWDN || exit 1
+$VALGRIND ldbrename $OLDDN $NEWDN || exit 1
echo Showing renamed record
-$VALGRIND ldbsearch$EXEEXT '(uid=uham)' || exit 1
+$VALGRIND ldbsearch '(uid=uham)' || exit 1
echo Starting ldbtest
-$VALGRIND ldbtest$EXEEXT --num-records 100 --num-searches 10 || exit
[SCM] CTDB repository - branch master updated - ctdb-1.12-162-ge1da348
The branch, master has been updated via e1da34874f22ec3de0c4abe50b703dd637f1fa98 (commit) via f53c66a5e0dc5351b86b81dc5b1faea757981d4c (commit) from 444a7bac4e9a854b06c1ad4cb36c2b58a72001fa (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master - Log - commit e1da34874f22ec3de0c4abe50b703dd637f1fa98 Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Wed Feb 1 13:47:49 2012 +1100 ReadOnly update documentation commit f53c66a5e0dc5351b86b81dc5b1faea757981d4c Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Wed Feb 1 09:32:02 2012 +1100 ReadOnly: update the loop test tool to print number of fetches per second --- Summary of changes: doc/readonlyrecords.txt | 257 ++ tests/src/ctdb_fetch_readonly_loop.c | 13 ++- 2 files changed, 181 insertions(+), 89 deletions(-) Changeset truncated at 500 lines: diff --git a/doc/readonlyrecords.txt b/doc/readonlyrecords.txt index f8f1095..e09aa41 100644 --- a/doc/readonlyrecords.txt +++ b/doc/readonlyrecords.txt @@ -3,36 +3,48 @@ Read-Only locks in CTDB Problem === -CTDB currently only supports exclusive Read-Write locks for clients(samba) accessing the TDB databases. -This works well mostly, but when very mny number of clients are accessing the same file, at the same time, -this will cause the exclusive lock as well as the record itself to rapidly bounce between nodes, and acts as -a scalability limitation. +CTDB currently only supports exclusive Read-Write locks for clients(samba) accessing the +TDB databases. +This mostly works well but when very many clients are accessing the same file, +at the same time, this causes the exclusive lock as well as the record itself to +rapidly bounce between nodes and acts as a scalability limitation. -This primarily affects locking.tdb and brlock.tdb, two databases where record access is mostly read, and where a read request is magnitudes more common than read-write requests. +This primarily affects locking.tdb and brlock.tdb, two databases where record access is +read-mostly and where writes are semi-rare. -For the common case, if CTDB provided shared non-exlusive Read-Only lock semantincs, this would greatly improve scaling for these workloads. +For the common case, if CTDB provided shared non-exlusive Read-Only lock semantincs +this would greatly improve scaling for these workloads. Desired properties == -We can not make backward incompatible changes the ctdb/ltdb header for the records. +We can not make backward incompatible changes the ctdb_ltdb header for the records. -A Read-Only lock enabled ctdb demon must be able to interoperate with a non-Read-Only lock enbled daemon. +A Read-Only lock enabled ctdb demon must be able to interoperate with a non-Read-Only +lock enbled daemon. Getting a Read-Only look should not be slower than getting a Read-Write lock. -Requesting a Read-Only lock should never trigger a record migration. +When revoking Read-Only locks for a record, this should involve only those nodes that +currently hold a Read-Only lock and should avoid broadcasting opportunistic revocations. +(must track which nodes are delegated to) -When revoking Read-Only locks for a record, this should involve only those nodes that hold a Read-Only lock right now and should avoid broadcasting opportunistic revocations. (must track which nodes are delegated to) +When a Read-Write lock is requested, if there are Read-Only locks delegated to other +nodes, the DMASTER will defer the record migration until all read-only locks are first +revoked (synchronous revoke). -When a Read-Write lock is requested, if there are Read-Only locks delegated to other nodes, the DMASTER will defer the record migration until all read-only locks are first revoked (synchronous revoke). +Due to the cost of revoking Read-Only locks has on getting a Read-Write lock, the +implementation should try to avoid creating Read-Only locks unless it has indication +that there is contention. This may mean that even if client requests a Read-Only lock +we might still provide a full Read-Write lock in order to avoid the cost of revoking +the locks in some cases. -Due to the cost of revoking Read-Only locks has on getting a Read-Write lock, the implementation should try to avoid -creating Read-Only locks, unless it has indication that there is contention. This may mean that even if client requests a Read-Only lock we may still provide a full Read-Write lock in order to avoid the cost of revoking the locks in some cases. +Read-Only locks require additional state to be stored in a separate database, containing +information about which nodes have have been delegated Read-Only locks. +This database should be kept at minimal size. -Read-Only locks require
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 42d4152 s4-heimdal: the ASN1 compiler now depends on libreplace
from 9336658 s3-auth Remove unused nt_status_squash from auth_context
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 42d4152ed4255f22ff0718d450f181468d7fb827
Author: Andrew Tridgell tri...@samba.org
Date: Wed Feb 1 12:54:31 2012 +1100
s4-heimdal: the ASN1 compiler now depends on libreplace
it uses strlcat(), which we now get from libbsd if available
Autobuild-User: Andrew Tridgell tri...@samba.org
Autobuild-Date: Wed Feb 1 05:51:56 CET 2012 on sn-devel-104
---
Summary of changes:
source4/heimdal_build/wscript_build |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/heimdal_build/wscript_build
b/source4/heimdal_build/wscript_build
index 948191f..8d62f21 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -921,7 +921,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_ASN1_COMPILE'):
cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1
-D_SAMBA_HOSTCC_',
includes='../heimdal/lib/asn1',
group='build_compilers',
-deps='ROKEN_HOSTCC LIBREPLACE_HOSTCC HEIMDAL_VERS_HOSTCC',
+deps='ROKEN_HOSTCC LIBREPLACE_HOSTCC HEIMDAL_VERS_HOSTCC replace',
install=False
)
bld.env['ASN1_COMPILE'] = os.path.join(bld.env['BUILD_DIRECTORY'],
'asn1_compile')
@@ -935,7 +935,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_COMPILE_ET'):
includes='../heimdal/lib/com_err',
group='build_compilers',
cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1
-D_SAMBA_HOSTCC_',
-deps='ROKEN_HOSTCC LIBREPLACE_HOSTCC HEIMDAL_VERS_HOSTCC',
+deps='ROKEN_HOSTCC LIBREPLACE_HOSTCC HEIMDAL_VERS_HOSTCC replace',
install=False
)
bld.env['COMPILE_ET'] = os.path.join(bld.env['BUILD_DIRECTORY'],
'compile_et')
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 204c075 Revert s4-drs: do not try to contact for replication
servers that are not anymore in reps*
from 42d4152 s4-heimdal: the ASN1 compiler now depends on libreplace
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 204c07501d05f3d7e4657ce4422709ad64e087e2
Author: Andrew Tridgell tri...@samba.org
Date: Wed Feb 1 16:14:08 2012 +1100
Revert s4-drs: do not try to contact for replication servers that are not
anymore in reps*
This reverts commit 5bfd6251eb22ff701184a95649822a73cf4d157b.
This change has been causing regular segfaults in the build farm since
it was applied. I also think it may be unnecessary as
dreplsrv_refresh_partitions() should already be achieving the same
thing (removing stale replication targets).
I think the segfaults were caused by freeing an in-flight DSA, but I
have been unable to reproduce it outside of the build farm
Autobuild-User: Andrew Tridgell tri...@samba.org
Autobuild-Date: Wed Feb 1 07:49:42 CET 2012 on sn-devel-104
---
Summary of changes:
source4/dsdb/repl/drepl_partitions.c | 42 +++--
1 files changed, 4 insertions(+), 38 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/repl/drepl_partitions.c
b/source4/dsdb/repl/drepl_partitions.c
index de5d007..07f3339 100644
--- a/source4/dsdb/repl/drepl_partitions.c
+++ b/source4/dsdb/repl/drepl_partitions.c
@@ -376,7 +376,6 @@ static WERROR dreplsrv_partition_add_source_dsa(struct
dreplsrv_service *s,
struct dreplsrv_partition *p,
struct
dreplsrv_partition_source_dsa **listp,
struct
dreplsrv_partition_source_dsa *check_list,
- struct
dreplsrv_partition_source_dsa **oldlist,
const struct ldb_val *val)
{
WERROR status;
@@ -414,16 +413,14 @@ static WERROR dreplsrv_partition_add_source_dsa(struct
dreplsrv_service *s,
}
/* re-use an existing source if found */
- for (s2=*oldlist; s2; s2=s2-next) {
+ for (s2=*listp; s2; s2=s2-next) {
if (GUID_compare(s2-repsFrom1-source_dsa_obj_guid,
source-repsFrom1-source_dsa_obj_guid) == 0)
{
talloc_free(s2-repsFrom1-other_info);
*s2-repsFrom1 = *source-repsFrom1;
talloc_steal(s2, s2-repsFrom1-other_info);
talloc_free(source);
- source = s2;
- DLIST_REMOVE(*oldlist, s2);
- break;
+ return WERR_OK;
}
}
@@ -569,7 +566,6 @@ static WERROR dreplsrv_refresh_partition(struct
dreplsrv_service *s,
NULL
};
struct ldb_dn *dn;
- struct dreplsrv_partition_source_dsa *src, *oldsources, *oldnotifies;
DEBUG(4, (dreplsrv_refresh_partition(%s)\n,
ldb_dn_get_linearized(p-dn)));
@@ -611,52 +607,22 @@ static WERROR dreplsrv_refresh_partition(struct
dreplsrv_service *s,
status = WERR_OK;
- oldsources = p-sources;
- p-sources = NULL;
if (r != NULL (orf_el = ldb_msg_find_element(r-msgs[0],
repsFrom))) {
for (i=0; i orf_el-num_values; i++) {
status = dreplsrv_partition_add_source_dsa(s, p,
p-sources,
- NULL,
oldsources,
-
orf_el-values[i]);
+ NULL,
orf_el-values[i]);
W_ERROR_NOT_OK_GOTO_DONE(status);
}
- } else {
- if (r != NULL p-sources) {
- DEBUG(0, (repsFrom do not exists or is empty\n));
- }
}
- oldnotifies = p-notifies;
- p-notifies = NULL;
if (r != NULL (orf_el = ldb_msg_find_element(r-msgs[0], repsTo)))
{
for (i=0; i orf_el-num_values; i++) {
status = dreplsrv_partition_add_source_dsa(s, p,
p-notifies,
- p-sources,
- oldnotifies,
-
orf_el-values[i]);
+ p-sources,
orf_el-values[i]);
W_ERROR_NOT_OK_GOTO_DONE(status);
}
}
- if (oldsources) {
-
