Re: [Samba] allow trusted domains
On Sun, 2012-03-11 at 09:26 +0700, Victor Sudakov wrote: Andrew Bartlett wrote: Is there a way to map all trusted domain users to the guest account? As if they were nonexistent users or users from untrusted domains. If I could maintain a list of domains for the samba server to trust, it would be fine too. Try 'map to guest = bad uid'. Will it not interfere with add user script? No idea. As simo has suggested, what you are doing is essentially unsupported. If it happens to work, great, if it does not, then we really can't do anything more. 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
Re: [Samba] samba PDC/NIS client
On Sunday 11 March 2012 05:31:35 Simon Matthews wrote: On Sat, Mar 10, 2012 at 4:24 PM, Gaiseric Vandal gaiseric.van...@gmail.comwrote: Do you have password sync enabled?If password sync is enabled, samba will try to use the passwd command to set the unix password. But with nis, you probably might need something nis specific. On solaris it was “passwd –r nis” - not sure about linux.Probably better to just disable password sync. I've got a very similar setup to you. Except I use a smbpasswd file. No, I don't have this option enabled. I am not sure how it is relevant. Problem summary: The samba PDC is an NIS client getent passwd retruns the passwd data. The user's SAMBA password was set using smbpasswd The user's NIS passwd was set using yppasswd So far all the same. ALL I had to do to allow domain logins was: ypcat passwd | grep username /etc/passwd Why duplicate the password entries. I just have them in NIS and /etc/passwd just has the system passwords. Note that after copying the user details to /etc/passwd, the password that was set with smbpasswd was the password that was used with the successful domain login. Don't really uinderstand what you mean by domain logins 1. Create the user under linux first 2. Use smbpasswd to add the user to samba You now have a user in both linux and samba but remember the passwords are stored separately, changing one does not change the other. 3. Edit /etc/nsswitch.conf. Set passwd:files nis shdow: files That works for me. YMMV Tony Simon -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] The trust relationship between this workstation and the primary domain failed. (After SAMBA upgrade)
Hi folks I am writing to this list because Google was unable to provide me with a solution for my problem (neither did the samba list archives ; as far as I can see). I know that the topic The trust relationship between this workstation and the primary domain failed. is not unknown and a lot of people are suffering from it but I have the feeling that my problem is different. I am not using SAMBA as DC and try to join Windows 7 to it; but let me explain. I had a working configuration which looked as follows: - Windows 2008 R2 SP1 Domain Controller (Forest functional Level 2008 R2; so highest possible) (DNS Server, Global Catalog etc. It is only this ONE DC) - Windows 7 Workstation as a domain member of this domain (Works great; no Problems) - SAMBA 3.x running on Fedora 13 (+ updates so not the newest SAMBA3.5/3.6 releases but somwehere in the 3.1 - 3.3 releases) The SAMBA Box was joined to the domain and some directories on the Fedora box were shared. I was able to access them from my Windows 7 Box without any problems. So SAMBA was a perfectc ADS member. Everything was running fine until . I decided to upgrade (reinstall) my box with Fedora 16 The Fedora Box now has the newest SAMBA release (samba-3.6.3-78.fc16.i686) installed. I reconfigured SAMBA by - re-created the same users with the same uid/gid on the box - configuring DNS as it was before - copied back /etc/krb5.conf - copied back /etc/samba/smb.conf and /etc/samba/smbusers (Basically I used the new smb.conf and replaced the necessary information. I have an include file ads.conf for my ADS configuration which I inject into smb.conf. So no typos or mssing something) - Did a: kinit administra...@mydomain.com (successful) - Did a: net ads join -U Administrator (successful) - Did a: net ads testjoin (- Join is OK) - Did a: smbclient mydc\\myshare -U Administrator (could access the share) (OK. smbclient does not use the local Samba-Daemon but directly connects to the DC. So not really a test) So everyting was as it was before with the execption that when I try to access the SAMBA box from my Windows 7 Box I get: - The trust relationship between this workstation and the primary domain failed. - /var/log/samba/log.win7box shows error messages: [2012/03/11 13:33:07.281548, 0] rpc_client/cli_pipe_schannel.c:184(cli_rpc_pipe_open_schannel) cli_rpc_pipe_open_schannel: failed to get schannel session key from server MYDC.MYDOMAIN.COM for domain MYDOMAIN. [2012/03/11 13:33:07.281867, 0] auth/auth_domain.c:193(connect_to_domain_password_server) connect_to_domain_password_server: unable to open the domain client session to machine MYDC.MYDOMAIN.COM. Error was : NT_STATUS_ACCESS_DENIED. [2012/03/11 13:33:07.284289, 0] rpc_client/cli_pipe_schannel.c:184(cli_rpc_pipe_open_schannel) cli_rpc_pipe_open_schannel: failed to get schannel session key from server MYDC.MYDOMAIN.COM for domain MYDOMAIN. [2012/03/11 13:33:07.284665, 0] auth/auth_domain.c:193(connect_to_domain_password_server) connect_to_domain_password_server: unable to open the domain client session to machine MYDC.MYDOMAIN.COM. Error was : NT_STATUS_ACCESS_DENIED. [2012/03/11 13:33:07.285166, 0] auth/auth_domain.c:292(domain_client_validate) domain_client_validate: Domain password server not available. When I do a Wireshark trace on the Linux system I see the SAMBA Daemon communicates with my domain Controller (MYDC) and gets some errors (when accessing the SAMBA Box from Win 7). No. TimeSourceDestination Protocol Info 9245 45.548203 192.168.1.131 192.168.1.3 SMB Negotiate Protocol Request 9247 45.584079 192.168.1.3 192.168.1.131 SMB Negotiate Protocol Response 9248 45.690020 192.168.1.131 192.168.1.3 SMB Session Setup AndX Request, NTLMSSP_NEGOTIATE 9249 45.690874 192.168.1.3 192.168.1.131 SMB Session Setup AndX Response, NTLMSSP_CHALLENGE, Error: STATUS_MORE_PROCESSING_REQUIRED 9250 45.691254 192.168.1.131 192.168.1.3 SMB Session Setup AndX Request, NTLMSSP_AUTH, User: MYDOMAIN\Snoopy 9257 45.760270 192.168.1.3 192.168.1.4 SMB Negotiate Protocol Request 9258 45.760989 192.168.1.4 192.168.1.3 SMB Negotiate Protocol Response 9260 45.761266 192.168.1.3 192.168.1.4 SMB Session Setup AndX Request, User: anonymous 9261 45.761586 192.168.1.4 192.168.1.3 SMB Session Setup AndX Response 9262 45.763317 192.168.1.3 192.168.1.4 SMB Tree Connect AndX Request, Path: \\MYDC.MYDOMAIN.COM\IPC$ 9264 45.763683 192.168.1.4 192.168.1.3 SMB Tree Connect AndX Response 9265 45.763883 192.168.1.3 192.168.1.4 SMB NT
[Samba] LDAP Account Manager 3.7.RC1 released
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 LDAP Account Manager (LAM) 3.7.RC1 - March 11th, 2012 = LAM is a web frontend for managing accounts stored in an LDAP directory. Announcement: - - This release adds basic support for Heimdal Kerberos (LAM Pro). It also fixes several bugs and includes lots of detail enhancements. The Zarafa module (LAM Pro) now supports the archiving options. This is a test release. Please do not use on production servers. Please report any bugs until 2012-03-23. Full changelog: http://www.ldap-account-manager.org/lamcms/changelog Download: http://www.ldap-account-manager.org/lamcms/releases Features: - - * management of various account types * Unix * Samba 3 * Kolab 2 * Asterisk * Zarafa * DHCP * SSH keys * profiles for account creation * account creation via file upload * automatic creation/deletion of home directories * setting quotas * PDF output for all accounts * editor for organizational units * schema browser * tree view * multiple configuration files * multi-language support: Catalan, Chinese (Traditional + Simplified), Czech, Dutch, English, French, German, Hungarian, Italian, Japanese, Polish, Portuguese, Russian and Spanish * support for LDAP+SSL/TLS Demo installation: - -- You can try our demo installation online. http://www.ldap-account-manager.org/lamcms/liveDemo Support: - If you find a bug please file a bug report. For questions or implementing new features please use the mailinglist and feature request tracker at our homepage http://www.ldap-account-manager.org. Authors Copyright: - Copyright (C) 2003 - 2012: Roland Gruber p...@rolandgruber.de LAM is published under the GNU General Public License. The complete list of licenses can be found in the copyright file. -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk9dEqEACgkQq/ywNCsrGZ5MdwCfVVDjZhZuxfqKcDPveaslaOb3 HWIAn1KubsWPGzZbtqTQ7gjUiKwWXwUG =5ZmK -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Winbind Issues with Server 2003/2008
Good morning all, I really hate emailing lists, but I've come to a wall that I just cant work out how to get past at the moment, so am hoping for some community assistance if possible. Some background: We are running Windows Server 2003 on all of our domain controllers, and are in the middle of migrating to server 2008 R2. We have unix exentions enabled (rfc2307 I believe), and manage all of our uids/shell/home via this. Our linux servers are a mix of RHEL 5.1, 5.4 and 5.5. We were using Samba 3.0.33-3.29.el5_5.1 or equivalent on most of our servers, but we hit a stone wall when trying to get them to co-exist with a domain controller that was running Server 2008. So we upgraded to the redhat package Samba3x which I believe is 3.3.8 on some of the hosts and 3.5.10 on the others. However then we hit the snafu that the servers running samba3x wouldn't talk to the domain controllers running server 2003 still. To combat that, we null routed the server 2003 servers, and only let the Linux servers talk to AD servers running 2008. This was working fine, except that some servers stopped being able to run getent passwd or getent group and would just return nothing from winbind. As a test, I converted over to RID as the idmap backend away from ADS, and this appears to have almost worked perfectly. Except now that a users UID isn't being returned from the AD unixattributes tab, but instead has what I assume is the RID ID for the user. Other attributes seem to be coming down ok For example on a production host that is still running samba 3.0.33, returns: [nathan_adm@qbtdbsprd01 ~]$ getent passwd nathan_adm nathan_adm:*:310:900:Nathan Frankish - Admin:/unixshared/home/nathan_adm:/bin/bash But on an upgraded host its returning [root@qdrbinppz01 ~]# getent passwd nathan_adm nathan_adm:*:9071:900:Nathan Frankish - Admin:/unixshared/home/nathan_adm:/bin/bash Likewise with group look ups, im getting simular results. Ive tried converting back to ADS from RID to see if that will help, but after updating smb.conf and restarting winbind, it still appears to be getting its info from RID and not from ADS. Below I have two config files.. One of the upgraded hosts, one of the not upgraded hosts. Is there any way I can rid to do what I want? Or get ADS to play nicely on the domain? Or should I just convert to RID entirely and fix all the users permissions on directories etc **upgraded hosts config** #=== Global Settings = [global] interfaces = 10.8.52.0/24 10.8.57.0/24 10.30.52.0/24 10.8.78.0/24 10.8.0.0/22 10.30.0.0/22 10.8.103.0/24 bind interfaces only = yes workgroup = QLDMOTORWAYS local master = no passdb backend = tdbsam password server = QB2DC-PRD01.QLDMOTORWAYS.COM.AU realm = QLDMOTORWAYS.COM.AU domain master = no local master = no preferred master = no os level = 0 server string = qdrbinppz01 Linux server security = ads encrypt passwords = yes log level = 3 log file = /var/log/samba/%m max log size = 50 idmap backend = ad idmap uid = 100-200 idmap gid = 100-200 idmap config QLDMOTORWAYS : schema_mode =rfc2307 idmap config QLDMOTORWAYS : backend = ADs idmap config QLDMOTORWAYS : range = 300-200 winbind separator = + template shell = /bin/bash winbind enum users = yes winbind enum groups = yes winbind use default domain = yes winbind nested groups = yes winbind nss info = rfc2307 winbind cache time = 1 load printers = no printing = bsd printcap name = /dev/null disable spoolss = yes **non upgraded host** #=== Global Settings = [global] workgroup = QLDMOTORWAYS local master = no passdb backend = tdbsam password server = * realm = QLDMOTORWAYS.COM.AU domain master = no local master = no preferred master = no os level = 0 server string = qbtdbsprd01 Linux server security = ads encrypt passwords = yes log level = 3 log file = /var/log/samba/%m max log size = 50 idmap backend = ad idmap uid = 100-200 idmap gid = 100-200 winbind separator = + template shell = /bin/bash winbind enum users = yes winbind enum groups = yes winbind use default domain = yes winbind nested groups = yes winbind nss info = rfc2307 winbind cache time = 1 load printers = no printing = bsd printcap name = /dev/null disable spoolss = yes Much appreciate any help that can be provided.. Nathan Frankish | Systems Engineer -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Samba 4 - SWAT
Is SWAT integrated into samba 4? Is it even working? Blessings, Jason -- 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 f0bba96 s3: Improve statvfs support
via 51e7859 waf: Do not use standards.h on darwin
from 26a0e7a s4 dns: Test deleting records and fix a small bu
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f0bba969d87f0fd5c7d3f1ba001a5c9a754cd7ed
Author: Brad Smith b...@comstyle.com
Date: Sat Mar 10 19:16:06 2012 +0100
s3: Improve statvfs support
Autobuild-User: Volker Lendecke v...@samba.org
Autobuild-Date: Sun Mar 11 14:18:04 CET 2012 on sn-devel-104
commit 51e785949c5908912a9b0ae903e7c18d898808fc
Author: Volker Lendecke v...@samba.org
Date: Sat Mar 10 10:26:10 2012 +0100
waf: Do not use standards.h on darwin
We get a nasty warning every time we include that
---
Summary of changes:
buildtools/wafsamba/wscript |7 ++-
source3/modules/vfs_default.c | 12 ++--
source3/smbd/statvfs.c| 11 ---
3 files changed, 20 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 5c5e249..094f9cc 100755
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -350,7 +350,12 @@ def configure(conf):
conf.CHECK_HEADERS('stdio.h sys/types.h sys/stat.h stdlib.h stddef.h
memory.h string.h',
add_headers=True)
conf.CHECK_HEADERS('strings.h inttypes.h stdint.h unistd.h
minix/config.h', add_headers=True)
-conf.CHECK_HEADERS('ctype.h standards.h stdbool.h stdint.h stdarg.h
vararg.h', add_headers=True)
+conf.CHECK_HEADERS('ctype.h', add_headers=True)
+
+if sys.platform != 'darwin':
+conf.CHECK_HEADERS('standards.h', add_headers=True)
+
+conf.CHECK_HEADERS('stdbool.h stdint.h stdarg.h vararg.h',
add_headers=True)
conf.CHECK_HEADERS('limits.h assert.h')
# see if we need special largefile flags
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index fd0ff0a..1dbd308 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -108,15 +108,15 @@ static uint32_t vfswrap_fs_capabilities(struct
vfs_handle_struct *handle,
connection_struct *conn = handle-conn;
uint32_t caps = FILE_CASE_SENSITIVE_SEARCH | FILE_CASE_PRESERVED_NAMES;
struct smb_filename *smb_fname_cpath = NULL;
+ struct vfs_statvfs_struct statbuf;
NTSTATUS status;
- int ret = -1;
+ int ret;
-#if defined(DARWINOS) || (defined(BSD) defined(BSD_STATVFS_BSIZE))
- struct vfs_statvfs_struct statbuf;
ZERO_STRUCT(statbuf);
- sys_statvfs(conn-connectpath, statbuf);
- caps = statbuf.FsCapabilities;
-#endif
+ ret = sys_statvfs(conn-connectpath, statbuf);
+ if (ret == 0) {
+ caps = statbuf.FsCapabilities;
+ }
*p_ts_res = TIMESTAMP_SET_SECONDS;
diff --git a/source3/smbd/statvfs.c b/source3/smbd/statvfs.c
index 1e72a8e..5cefe2d 100644
--- a/source3/smbd/statvfs.c
+++ b/source3/smbd/statvfs.c
@@ -151,12 +151,17 @@ static int linux_statvfs(const char *path,
vfs_statvfs_struct *statbuf)
statbuf-TotalFileNodes = statvfs_buf.f_files;
statbuf-FreeFileNodes = statvfs_buf.f_ffree;
statbuf-FsIdentifier = statvfs_buf.f_fsid;
-
- /* Good defaults for Linux filesystems are case sensitive
-* and case preserving.
+ /* Try to extrapolate some of the fs flags into the
+* capabilities
*/
statbuf-FsCapabilities =
FILE_CASE_SENSITIVE_SEARCH | FILE_CASE_PRESERVED_NAMES;
+#ifdef ST_QUOTA
+ if (statvfs_buf.f_flag ST_QUOTA)
+ statbuf-FsCapabilities |= FILE_VOLUME_QUOTAS;
+#endif
+ if (statvfs_buf.f_flag ST_RDONLY)
+ statbuf-FsCapabilities |= FILE_READ_ONLY_VOLUME;
}
return result;
}
--
Samba Shared Repository
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2012-03-11-1627/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2012-03-11-1627/samba3.stderr http://git.samba.org/autobuild.flakey/2012-03-11-1627/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2012-03-11-1627/samba4.stderr http://git.samba.org/autobuild.flakey/2012-03-11-1627/samba4.stdout The top commit at the time of the failure was: commit f0bba969d87f0fd5c7d3f1ba001a5c9a754cd7ed Author: Brad Smith b...@comstyle.com Date: Sat Mar 10 19:16:06 2012 +0100 s3: Improve statvfs support Autobuild-User: Volker Lendecke v...@samba.org Autobuild-Date: Sun Mar 11 14:18:04 CET 2012 on sn-devel-104
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2012-03-11-2024/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2012-03-11-2024/samba3.stderr http://git.samba.org/autobuild.flakey/2012-03-11-2024/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2012-03-11-2024/samba4.stderr http://git.samba.org/autobuild.flakey/2012-03-11-2024/samba4.stdout The top commit at the time of the failure was: commit f0bba969d87f0fd5c7d3f1ba001a5c9a754cd7ed Author: Brad Smith b...@comstyle.com Date: Sat Mar 10 19:16:06 2012 +0100 s3: Improve statvfs support Autobuild-User: Volker Lendecke v...@samba.org Autobuild-Date: Sun Mar 11 14:18:04 CET 2012 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via a57d7ad s4:upgradeprovision - fix some output messages from f0bba96 s3: Improve statvfs support http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit a57d7ad772e04634253b3e84d72bc5dbefd1825c Author: Matthias Dieter Wallnöfer m...@samba.org Date: Sun Mar 11 10:29:10 2012 +0100 s4:upgradeprovision - fix some output messages Autobuild-User: Matthias Dieter Wallnöfer m...@samba.org Autobuild-Date: Sun Mar 11 21:54:54 CET 2012 on sn-devel-104 --- Summary of changes: source4/scripting/bin/upgradeprovision |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision index 4986f8a..41edd07 100755 --- a/source4/scripting/bin/upgradeprovision +++ b/source4/scripting/bin/upgradeprovision @@ -1873,8 +1873,8 @@ if __name__ == '__main__': # 18) We rebuild SD if a we have a list of DN to recalculate or if the # defSDmodified is set. if defSDmodified or len(dnToRecalculate) 0: -message(SIMPLE, Some defaultSecurityDescriptors and/or -securityDescriptor have changed, recalculating SD ) +message(SIMPLE, Some (default) security descriptors (SDs) have +changed, recalculating them) ldbs.sam.set_session_info(adm_session) rebuild_sd(ldbs.sam, names) @@ -1922,7 +1922,7 @@ if __name__ == '__main__': # But the second part of the update (when we update existing objects # can also have an influence on indexing as some attribute might have their # searchflag modificated -message(SIMPLE, Reopenning samdb to trigger reindexing if needed +message(SIMPLE, Reopening samdb to trigger reindexing if needed after modification) samdb = Ldb(paths.samdb, session_info=session, credentials=creds, lp=lp) message(SIMPLE, Reindexing finished) -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 8af7dad selftest.run: Use subunit version of iso8601. via ed32df6 selftest.py: Remove some unnecessary checks. via 6f9c333 selftest.py: Move some infrastructure for running commands to selftest.run, with tests. via f5bb26e upgradedns: Remove unused import. via 9068115 samba-tool: Write diagnostics to stderr rather than stdout. from a57d7ad s4:upgradeprovision - fix some output messages http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 8af7dadca2c820e125c6059eef62e2a4c76f7ff3 Author: Jelmer Vernooij jel...@samba.org Date: Sun Mar 11 23:56:56 2012 +0100 selftest.run: Use subunit version of iso8601. Autobuild-User: Jelmer Vernooij jel...@samba.org Autobuild-Date: Mon Mar 12 01:36:25 CET 2012 on sn-devel-104 commit ed32df61f8d447735546b3b7b78fe8d112313287 Author: Jelmer Vernooij jel...@samba.org Date: Sun Mar 11 21:46:00 2012 +0100 selftest.py: Remove some unnecessary checks. commit 6f9c333f95956138fbd8245a4cf3f285ca601181 Author: Jelmer Vernooij jel...@samba.org Date: Sun Mar 11 20:58:00 2012 +0100 selftest.py: Move some infrastructure for running commands to selftest.run, with tests. commit f5bb26edb36936b08dc2384cf6aa1dee73a355c8 Author: Jelmer Vernooij jel...@samba.org Date: Sun Mar 11 19:58:47 2012 +0100 upgradedns: Remove unused import. commit 90681153ad3af45aa4c09ced28effd2beb2881f1 Author: Jelmer Vernooij jel...@samba.org Date: Sun Mar 11 19:58:23 2012 +0100 samba-tool: Write diagnostics to stderr rather than stdout. --- Summary of changes: selftest/run.py | 55 selftest/selftest.py | 58 -- selftest/tests/test_run.py| 93 + source4/scripting/bin/samba_upgradedns|1 - source4/scripting/python/samba/netcmd/__init__.py |2 +- 5 files changed, 164 insertions(+), 45 deletions(-) Changeset truncated at 500 lines: diff --git a/selftest/run.py b/selftest/run.py index 20ede65..222ac8b 100644 --- a/selftest/run.py +++ b/selftest/run.py @@ -15,7 +15,14 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/. +Test command running. + +import datetime +from subunit import iso8601 import os +import subprocess +import subunit +import sys import tempfile import warnings @@ -77,3 +84,51 @@ def exported_envvars_str(vars, names): continue out += %s=%s\n % (n, vars[n]) return out + + +def now(): +Return datetime instance for current time in UTC. + +return datetime.datetime.utcnow().replace(tzinfo=iso8601.Utc()) + + +def run_testsuite_command(name, cmd, subunit_ops, env=None, outf=None): +Run a testsuite command. + +:param name: Name of the testsuite +:param cmd: Command to run +:param subunit_ops: Subunit ops to use for reporting results +:param env: Environment the test is run in +:param outf: File-like object to write standard out to (defaults to sys.stdout) +:return: Exit code or None if the test failed to run completely + +if outf is None: +outf = sys.stdout +subunit_ops.start_testsuite(name) +subunit_ops.progress(None, subunit.PROGRESS_PUSH) +subunit_ops.time(now()) +try: +exitcode = subprocess.call(cmd, shell=True, stdout=outf) +except Exception, e: +subunit_ops.time(now()) +subunit_ops.progress(None, subunit.PROGRESS_POP) +subunit_ops.end_testsuite(name, error, Unable to run %r: %s % (cmd, e)) +return None + +subunit_ops.time(now()) +subunit_ops.progress(None, subunit.PROGRESS_POP) + +if env is not None: +envlog = env.get_log() +if envlog != : +outf.write(envlog: %s\n % envlog) + +outf.write(command: %s\n % cmd) +outf.write(expanded command: %s\n % expand_environment_strings(cmd, os.environ)) + +if exitcode == 0: +subunit_ops.end_testsuite(name, success) +else: +subunit_ops.end_testsuite(name, failure, Exit code was %d % exitcode) + +return exitcode diff --git a/selftest/selftest.py b/selftest/selftest.py index 1b20441..af2e552 100755 --- a/selftest/selftest.py +++ b/selftest/selftest.py @@ -18,8 +18,6 @@ import atexit from cStringIO import StringIO -import datetime -import iso8601 import os import sys import signal @@ -39,10 +37,11 @@ from selftest import ( ) from selftest.client import write_clientconf from selftest.run import ( -expand_environment_strings, expand_command_list, expand_command_run, exported_envvars_str, +now, +run_testsuite_command, ) from selftest.target import (
[SCM] CTDB repository - branch 1.13 updated - ctdb-1.13-2-g8d606e5
The branch, 1.13 has been updated
via 8d606e5f71072ccc60bcac54dfd9e92bb699c6e5 (commit)
from 0c0e887912ca37682312091f4b89ff5167b254d9 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=1.13
- Log -
commit 8d606e5f71072ccc60bcac54dfd9e92bb699c6e5
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Mon Mar 12 13:13:51 2012 +1100
ReadOnly: Only restrict the readonly sanity/paranoia check that only allows
UPDATE_RECORD to create a record to only apply to normal databases, not
persistent databases or else the net registry command breaks
and other persistent database creation/updates .
---
Summary of changes:
server/ctdb_update_record.c |5 -
1 files changed, 4 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/server/ctdb_update_record.c b/server/ctdb_update_record.c
index f8be8e8..a4a6fc4 100644
--- a/server/ctdb_update_record.c
+++ b/server/ctdb_update_record.c
@@ -325,7 +325,10 @@ int32_t ctdb_control_update_record(struct ctdb_context
*ctdb,
state-ctdb_db = ctdb_db;
state-c = c;
state-m = m;
- state-flags = UPDATE_FLAGS_REPLACE_ONLY;
+ state-flags = 0;
+ if (!ctdb_db-persistent) {
+ state-flags = UPDATE_FLAGS_REPLACE_ONLY;
+ }
/* create a child process to take out a transaction and
write the data.
--
CTDB repository
[SCM] CTDB repository - branch 1.2.40 updated - ctdb-1.9.1-557-gd967d1b
The branch, 1.2.40 has been updated
via d967d1bcf72d32312ca765bb467d03ddd4690cb7 (commit)
via ba1b678db4dde637d7aba1037f446038d2093ec2 (commit)
via 10249a8f350471d5c6e0bb16a7c1276ec3bcc22b (commit)
from 9fd1d9cca3fcced1aa4af5d515f7e2617eae4a50 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=1.2.40
- Log -
commit d967d1bcf72d32312ca765bb467d03ddd4690cb7
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Mon Mar 12 13:05:07 2012 +1100
new version 1.2.42
commit ba1b678db4dde637d7aba1037f446038d2093ec2
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Mon Mar 12 13:03:19 2012 +1100
ReadOnly: Only restrict the readonly sanity/paranoia check that only allows
UPDATE_RECORD to create a record to only apply to normal databases, not
persistent databases or else the net registry command breaks
and other persistent database creation/updates .
S1035666
commit 10249a8f350471d5c6e0bb16a7c1276ec3bcc22b
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Tue Mar 6 16:03:18 2012 +1100
new version 1.2.41
---
Summary of changes:
packaging/RPM/ctdb.spec.in | 10 +-
server/ctdb_persistent.c |5 -
2 files changed, 13 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index 3027baf..7519be1 100644
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -3,7 +3,7 @@ Name: ctdb
Summary: Clustered TDB
Vendor: Samba Team
Packager: Samba Team sa...@samba.org
-Version: 1.2.40
+Version: 1.2.42
Release: 1GITHASH
Epoch: 0
License: GNU GPL version 3
@@ -144,6 +144,14 @@ development libraries for ctdb
%{_libdir}/libctdb.a
%changelog
+* Mon Mar 12 2012 : Version 1.2.42
+ - Allow non-readonly database UPDATE_RECORD to create non-existing records
+ or else net command and the registry breaks.
+ S1035666
+* Tue Mar 6 2012 : Version 1.2.41
+ - rewrite of 13.per_ip_routing script
+ - readonly record bugfixes
+ - add statistics for readonly delegations and revokes
* Mon Feb 6 2012 : Version 1.2.40
- Fix for LCP2 failure to balance uneven netgroups
- Add ReadOnly record support
diff --git a/server/ctdb_persistent.c b/server/ctdb_persistent.c
index 669021a..01c0e86 100644
--- a/server/ctdb_persistent.c
+++ b/server/ctdb_persistent.c
@@ -732,7 +732,10 @@ int32_t ctdb_control_update_record(struct ctdb_context
*ctdb,
state-ctdb_db = ctdb_db;
state-c = c;
state-m = m;
- state-flags = UPDATE_FLAGS_REPLACE_ONLY;
+ state-flags = 0;
+ if (!ctdb_db-persistent) {
+ state-flags = UPDATE_FLAGS_REPLACE_ONLY;
+ }
/* create a child process to take out a transaction and
write the data.
--
CTDB repository
[SCM] CTDB repository - branch master updated - ctdb-1.13-2-g68390cb
The branch, master has been updated
via 68390cb1e8c7f30be034b8ca6c9215b40147305b (commit)
from fb00e1290fcea3386132a46c883994019a43799a (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -
commit 68390cb1e8c7f30be034b8ca6c9215b40147305b
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Mon Mar 12 13:13:51 2012 +1100
ReadOnly: Only restrict the readonly sanity/paranoia check that only allows
UPDATE_RECORD to create a record to only apply to normal databases, not
persistent databases or else the net registry command breaks
and other persistent database creation/updates .
---
Summary of changes:
server/ctdb_update_record.c |5 -
1 files changed, 4 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/server/ctdb_update_record.c b/server/ctdb_update_record.c
index f8be8e8..a4a6fc4 100644
--- a/server/ctdb_update_record.c
+++ b/server/ctdb_update_record.c
@@ -325,7 +325,10 @@ int32_t ctdb_control_update_record(struct ctdb_context
*ctdb,
state-ctdb_db = ctdb_db;
state-c = c;
state-m = m;
- state-flags = UPDATE_FLAGS_REPLACE_ONLY;
+ state-flags = 0;
+ if (!ctdb_db-persistent) {
+ state-flags = UPDATE_FLAGS_REPLACE_ONLY;
+ }
/* create a child process to take out a transaction and
write the data.
--
CTDB repository
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2012-03-12-0427/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2012-03-12-0427/samba3.stderr http://git.samba.org/autobuild.flakey/2012-03-12-0427/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2012-03-12-0427/samba4.stderr http://git.samba.org/autobuild.flakey/2012-03-12-0427/samba4.stdout The top commit at the time of the failure was: commit 8af7dadca2c820e125c6059eef62e2a4c76f7ff3 Author: Jelmer Vernooij jel...@samba.org Date: Sun Mar 11 23:56:56 2012 +0100 selftest.run: Use subunit version of iso8601. Autobuild-User: Jelmer Vernooij jel...@samba.org Autobuild-Date: Mon Mar 12 01:36:25 CET 2012 on sn-devel-104
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2012-03-12-0628/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2012-03-12-0628/samba3.stderr http://git.samba.org/autobuild.flakey/2012-03-12-0628/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2012-03-12-0628/samba4.stderr http://git.samba.org/autobuild.flakey/2012-03-12-0628/samba4.stdout The top commit at the time of the failure was: commit 8af7dadca2c820e125c6059eef62e2a4c76f7ff3 Author: Jelmer Vernooij jel...@samba.org Date: Sun Mar 11 23:56:56 2012 +0100 selftest.run: Use subunit version of iso8601. Autobuild-User: Jelmer Vernooij jel...@samba.org Autobuild-Date: Mon Mar 12 01:36:25 CET 2012 on sn-devel-104
