Re: [Samba] Samba4 on Ubuntu 12.04 won't join existing domain
On 21.11.2012 19:31, Rowland Penny wrote: On 21/11/12 17:52, pccom frank wrote: root@u1204:/etc# /usr/local/samba/bin/samba-tool domain join delltest.pccom.ca DC -Uadministrator --realm=delltest.pccom.caFinding a writeable DC for domain 'delltest.pccom.ca'Found DC dell2008.delltest.pccom.caPassword for [WORKGROUP\administrator]:Failed to bind - LDAP client internal error: NT_STATUS_INVALID_PARAMETERFailed to connect to 'ldap://dell2008.delltest.pccom.ca' with backend 'ldap': (null)ERROR(ldb): uncaught exception - None File /usr/local/samba/lib/python2.7/site-packages/samba/netcmd/__init__.py, line 175, in _runreturn self.run(*args, **kwargs) File /usr/local/samba/lib/python2.7/site-packages/samba/netcmd/domain.py, line 552, in runmachinepass=machinepass, use_ntvfs=use_ntvfs, dns_backend=dns_backend) File /usr/local/samba/lib/python2.7/site-packages/samba/join.py, line 1082, in join_DCmachinepass, use_ntvfs, dns_backend, promote_existing) File /usr/local/samba/lib/python2.7/site-packages/samba/join.py, line 78, in __init__cr ed entials=ctx.creds, lp=ctx.lp) File /usr/local/samba/lib/python2.7/site-packages/samba/samdb.py, line 56, in __init__options=options) File /usr/local/samba/lib/python2.7/site-packages/samba/__init__.py, line 114, in __init__self.connect(url, flags, options) File /usr/local/samba/lib/python2.7/site-packages/samba/samdb.py, line 71, in connectoptions=options)root@u1204:/etc# uname -aLinux u1204 3.2.0-33-generic #52-Ubuntu SMP Thu Oct 18 16:29:15 UTC 2012 x86_64 x86_64 x86_64 GNU/Linux /usr/local/samba/sbin/samba --versionVersion 4.1.0pre1-GIT-d6983f4 It has no problem to create a new domain and allow XP to join it. Your help will be appreciated. Hi, have you provisioned the samba4 server? does /usr/local/samba/etc/smb.conf exist? When you try to join a domain as domain controller, the join command replaces the provisioning step - and in fact you should delete your smb.conf before you do it, because it will be re-created during the join. I agree with the original poster that uncaught exception - None is not exactly a helpful error message. But since it's the initial bind to the domain controllers LDAP that fails, I'd guess that it's a permission problem on the other server's side or a problem with network connectivity. I would try including the administrator password on the join command line: -Uadministrator%password ... I'm not sure if sambatool will actually ask if you don't give it the password right away. What you could also try is checking with a generic ldap client if the other domain controller will actually let you connect at all to its ldap server. Best Regards, Sven -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] S3 - Valid users option and AD/Ldap primary group
Dear samba list, We did more tests on this topic and I'd like to give more precisions. Here's a small tab illustrating our tests Samba version-AD Version-Usage of primary group with the valid users's option of a share 3.5.6 (debian stable)-Windows 2003- Works 3.5.6 (debian stable)-Samba 4 rc 5-Permission denied 3.6.3 (and higher - ubuntu LTS debian backports tested)- Windows 2003-Works 3.6.3 (and higher - ubuntu LTS debian backports tested)- Samba 4 rc 5-Works If somebody knows the source of this issue, we'll be pleased to have more information. If not, we'll use the workaround of the empty valid users option. Cheers, --- *** OB *** Service Informatique -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Moving file after transfer
On Wed, Nov 21, 2012 at 08:07:39AM -0800, Ovidiu Barzan wrote: Hi, I\m writing a VFS module that needs to move a file, after it is transferred, to a folder that is not shared. The shared folders that use this VFS module are used to sent files for processing by another application. The module signals the application that it has work to do and moves the file. So far I've been using the last close call, moving the file after doing SMB_VFS_NEXT_CLOSE(). When moving the file an error is displayed on MAC. My question is: Is there a better way then the close call to know when a client is done with the file, and it's safe to move it? Wait a minute or two after the last close? I don't think there is a really bullet-proof way over which the client tells the server it's done with the file. The protocol has no operation for that. With best regards, Volker Lendecke -- SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen phone: +49-551-37-0, fax: +49-551-37-9 AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen http://www.sernet.de, mailto:kont...@sernet.de -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Moving file after transfer
On 21.11.2012 17:07, Ovidiu Barzan wrote: Is there a better way then the close call to know when a client is done with the file, and it's safe to move it? If you have any influence on the client-side process that generates the file, the easiest and safest way would be to write the file with a temporary filename (let's say with a .tmp suffix), and let the client rename the file to its final name only after it is done with it. Let your VFS module ignore temporary files, and you should be safe. (This also works nicely for FTP uploads where some server-side process needs to know when an upload is complete.) -- Mit freundlichen Grüßen Sven Tegethoff EDV-Team _ UDO BÄR GmbH Co. KG Fürstenstraße 18 47051 Duisburg Tel.: +49 (0) 203 28117-142 Fax: +49 (0) 203 28117-151 E-Mail: tegeth...@udobaer.de Ust.-Idnr.: DE119562189, HRA 6056, Sitz der Gesellschaft: Duisburg, Gerichtsstand: Duisburg Geschäftsführer: Bodo Badnowitz, Jürgen Dietz Ein Unternehmen der BTI Gruppe: www.bti-group.com Diese E-Mail enthält vertrauliche und/oder rechtlich geschützte Informationen. Wenn Sie nicht der richtige Adressat sind oder diese E-Mail irrtümlich erhalten haben, informieren Sie bitte sofort den Absender und vernichten Sie diese E-Mail. Das unerlaubte Kopieren sowie die unbefugte Weitergabe dieser E-Mail ist nicht gestattet. This e-mail may contain confidential and/or privileged information. If you are not the intended recipient (or have received this e-mail in error) please notify the sender immediately and destroy this e-mail. Any unauthorized copying, disclosure or distribution of the material in this e-mail is strictly forbidden. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba4 on Ubuntu 12.04 won't join existing domain
On 21/11/12 22:26, pccom frank wrote: The howto says you need to build Samba as usual, but don't do the provision step. You should remove any existing smb.conf in /usr/local/samba/etc So I did not do the samba-tool domain provision... Also I deleted the smb.conf file in /usr/local/samba/etc My existing domain is on a Windows 2008. I am trying to join it from a Ubuntu Samba 4 as a secondary DC, not as a client. Now there is no smb.conf file in /usr/local/samba/etc Since the samba-tool domain join command failed, there should not be a smb.conf file. What I have seen is that the Ubuntu computer name now is showing in the Windows 2008 computer list. I restarted the Windows 2008 trying to join the domain, still it failed. Should i do a apt-get install samba4 instead git clone ? Thanks a lot! Date: Wed, 21 Nov 2012 18:31:59 + From: rpe...@f2s.com To: samba@lists.samba.org Subject: Re: [Samba] Samba4 on Ubuntu 12.04 won't join existing domain On 21/11/12 17:52, pccom frank wrote: root@u1204:/etc# /usr/local/samba/bin/samba-tool domain join delltest.pccom.ca DC -Uadministrator --realm=delltest.pccom.caFinding a writeable DC for domain 'delltest.pccom.ca'Found DC dell2008.delltest.pccom.caPassword for [WORKGROUP\administrator]:Failed to bind - LDAP client internal error: NT_STATUS_INVALID_PARAMETERFailed to connect to 'ldap://dell2008.delltest.pccom.ca' with backend 'ldap': (null)ERROR(ldb): uncaught exception - None File /usr/local/samba/lib/python2.7/site-packages/samba/netcmd/__init__.py, line 175, in _run return self.run(*args, **kwargs) File /usr/local/samba/lib/python2.7/site-packages/samba/netcmd/domain.py, line 552, in run machinepass=machinepass, use_ntvfs=use_ntvfs, dns_backend=dns_backend) File /usr/local/samba/lib/python2.7/site-packages/samba/join.py, line 1082, in join_DC machinepass, use_ntvfs, dns_backend, promote_existing) File /usr/local/samba/lib/python2.7/site-packages/samba/join.py, line 78, in __init__ cr ed entials=ctx.creds, lp=ctx.lp) File /usr/local/samba/lib/python2.7/site-packages/samba/samdb.py, line 56, in __init__ options=options) File /usr/local/samba/lib/python2.7/site-packages/samba/__init__.py, line 114, in __init__ self.connect(url, flags, options) File /usr/local/samba/lib/python2.7/site-packages/samba/samdb.py, line 71, in connect options=options)root@u1204:/etc# uname -aLinux u1204 3.2.0-33-generic #52-Ubuntu SMP Thu Oct 18 16:29:15 UTC 2012 x86_64 x86_64 x86_64 GNU/Linux /usr/local/samba/sbin/samba --versionVersion 4.1.0pre1-GIT-d6983f4 It has no problem to create a new domain and allow XP to join it. Your help will be appreciated. Hi, have you provisioned the samba4 server? does /usr/local/samba/etc/smb.conf exist? Rowland -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba -- This message has been scanned for viruses and dangerous content by *MailScanner* http://www.mailscanner.info/, and is believed to be clean. Hi, this works for me adding a second DC to a Samba 4 domain. Is the hostname of the Windows 2008 DC 'dell2008.delltest.pccom.ca' If so, then there must be a connection/permissions problem and you need to sort this out before going further Rowland -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Wait For Network - Win registry
Hi people, I'd like to know about registry key HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\System\WaitForNetwork. The question is simple, but I didn't get to find the answer; so, the time to be specified, per default, is in minutes or in secounds? Thanks a lot, -- Marcio Oliveira. Tudo concorre para o bem daqueles que amam à Deus. (Rom 8,28) -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba4 logon server against windows server 2003
2012-11-21 23:47 keltezéssel, Innocent Yevide írta: Hello, does any one knows how I can force samba4 to be the logon server against windows server 2003? I have below in my smb.conf but it doesn't help: domain logons = Yes domain master = Yes preferred master = Yes os level = 255 Best Regards, Innocent. IMHO you can't. Active Directory was designed to provide a round robin type failover, and thus each AD controller (in a site) is equally probably chosen by clients. Regards Geza Gemes -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Wait For Network - Win registry
Ok I already found the answer. The time is in seconds and the maximum time to wait is 300s. Thanks. Marcio Oliveira. 2012/11/22 Marcio Oli marcio.oli...@gmail.com Hi people, I'd like to know about registry key HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\System\WaitForNetwork. The question is simple, but I didn't get to find the answer; so, the time to be specified, per default, is in minutes or in secounds? Thanks a lot, -- Marcio Oliveira. Tudo concorre para o bem daqueles que amam à Deus. (Rom 8,28) -- Marcio Oliveira. Tudo concorre para o bem daqueles que amam à Deus. (Rom 8,28) -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Windows 7 clients not joining domain with Samba PDC
Yes I searched, I tried fixes, I pulled my hair out and finally gave in. New Windows 7 desktop trying to join a domain happily service XP clients from Samba 3.5.10 on Centos 6.3. I've applied the registry fix from https://wiki.samba.org/index.php/Windows7#Windows_7_Registry_settings and rebooted, no joy. I've tried nikonz' changes from http://www.tomshardware.com/forum/75-63-windows-samba-issue with no joy. Each time I try to have the machine join the domain, I get the following in the machine specific error log: [2012/11/22 15:28:45.189030, 0] lib/util_sock.c:474(read_fd_with_timeout) [2012/11/22 15:28:45.189331, 0] lib/util_sock.c:1441(get_peer_addr_internal) getpeername failed. Error was Transport endpoint is not connected read_fd_with_timeout: client 0.0.0.0 read error = Connection reset by peer. followed by the message: The join operation was not successful. This could be because an existing computer account having the name MACHINENAME was previously created using a different set of credentials. Use a different computer name, or contact your administrator to remove any stale conflicting account. The error was: Access is denied. How can I get Windows 7 to play nice and join in with the domain? -- Daniel Foster Technical Director 34SP.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] window 7 loses connection to Samba 3.5.19
Dear Samba list, I have probem with windows 7 loses connection to Samba version 3.5.19 regards Gerardo -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba4 logon server against windows server 2003
Thanks Gémes, the point here is that whenever the clients login, I see that they have only the windows server as logon server and not the samba4 server: I always have this: LOGONSERVER=\\WINSERVER My Expectation is to have: LOGONSERVER=\\SAMBA4SERVER but when I switch off the Win Server, I could log into the samba4 server. I even tried Adjusting the Weight and Priority for DNS SRV Records in the Registry on the Windows server so that the samba4 will be prioritized... but it doesn't help. Best Regards, Innocent. De : Gémes Géza g...@kzsdabas.hu À : samba@lists.samba.org Envoyé le : Jeudi 22 novembre 2012 19h41 Objet : Re: [Samba] Samba4 logon server against windows server 2003 2012-11-21 23:47 keltezéssel, Innocent Yevide írta: Hello, does any one knows how I can force samba4 to be the logon server against windows server 2003? I have below in my smb.conf but it doesn't help: domain logons = Yes domain master = Yes preferred master = Yes os level = 255 Best Regards, Innocent. IMHO you can't. Active Directory was designed to provide a round robin type failover, and thus each AD controller (in a site) is equally probably chosen by clients. Regards Geza Gemes -- 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
Re: [Samba] Samba4 on Ubuntu 12.04 won't join existing domain
Yes. It is working now. I added the Samba4 server computer name and put the IP address in Windows 2008. I also put the Windows 2008 name and IP address in Samba server computer /etc/hosts. Thank you very much. Date: Thu, 22 Nov 2012 12:57:45 + From: rpe...@f2s.com To: pccom.fr...@hotmail.com CC: samba@lists.samba.org Subject: Re: [Samba] Samba4 on Ubuntu 12.04 won't join existing domain On 21/11/12 22:26, pccom frank wrote: The howto says you need to build Samba as usual, but don't do the provision step. You should remove any existing smb.conf in /usr/local/samba/etc So I did not do the samba-tool domain provision... Also I deleted the smb.conf file in /usr/local/samba/etc My existing domain is on a Windows 2008. I am trying to join it from a Ubuntu Samba 4 as a secondary DC, not as a client. Now there is no smb.conf file in /usr/local/samba/etc Since the samba-tool domain join command failed, there should not be a smb.conf file. What I have seen is that the Ubuntu computer name now is showing in the Windows 2008 computer list. I restarted the Windows 2008 trying to join the domain, still it failed. Should i do a apt-get install samba4 instead git clone ? Thanks a lot! Date: Wed, 21 Nov 2012 18:31:59 + From: rpe...@f2s.com To: samba@lists.samba.org Subject: Re: [Samba] Samba4 on Ubuntu 12.04 won't join existing domain On 21/11/12 17:52, pccom frank wrote: root@u1204:/etc# /usr/local/samba/bin/samba-tool domain join delltest.pccom.ca DC -Uadministrator --realm=delltest.pccom.caFinding a writeable DC for domain 'delltest.pccom.ca'Found DC dell2008.delltest.pccom.caPassword for [WORKGROUP\administrator]:Failed to bind - LDAP client internal error: NT_STATUS_INVALID_PARAMETERFailed to connect to 'ldap://dell2008.delltest.pccom.ca' with backend 'ldap': (null)ERROR(ldb): uncaught exception - None File /usr/local/samba/lib/python2.7/site-packages/samba/netcmd/__init__.py, line 175, in _run return self.run(*args, **kwargs) File /usr/local/samba/lib/python2.7/site-packages/samba/netcmd/domain.py, line 552, in run machinepass=machinepass, use_ntvfs=use_ntvfs, dns_backend=dns_backend) File /usr/local/samba/lib/python2.7/site-packages/samba/join.py, line 1082, in join_DC machinepass, use_ntvfs, dns_backend, promote_existing) File /usr/local/samba/lib/python2.7/site-packages/samba/join.py, line 78, in __init__ cr ed entials=ctx.creds, lp=ctx.lp) File /usr/local/samba/lib/python2.7/site-packages/samba/samdb.py, line 56, in __init__ options=options) File /usr/local/samba/lib/python2.7/site-packages/samba/__init__.py, line 114, in __init__ self.connect(url, flags, options) File /usr/local/samba/lib/python2.7/site-packages/samba/samdb.py, line 71, in connect options=options)root@u1204:/etc# uname -aLinux u1204 3.2.0-33-generic #52-Ubuntu SMP Thu Oct 18 16:29:15 UTC 2012 x86_64 x86_64 x86_64 GNU/Linux /usr/local/samba/sbin/samba --versionVersion 4.1.0pre1-GIT-d6983f4 It has no problem to create a new domain and allow XP to join it. Your help will be appreciated. Hi, have you provisioned the samba4 server? does /usr/local/samba/etc/smb.conf exist? Rowland -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. Hi, this works for me adding a second DC to a Samba 4 domain. Is the hostname of the Windows 2008 DC 'dell2008.delltest.pccom.ca'
Re: [Samba] Samba4 logon server against windows server 2003
Hi, I would recommend checking, that the samba4 server has all the DNS records, that the Win2k3 has, especially under _msdcs. except the PDC entry which should be unique to the AD controller which owns the PDC fsmo role. Regards Geza Gemes Thanks Gémes, the point here is that whenever the clients login, I see that they have only the windows server as logon server and not the samba4 server: I always have this: LOGONSERVER=\\WINSERVER My Expectation is to have: LOGONSERVER=\\SAMBA4SERVER but when I switch off the Win Server, I could log into the samba4 server. I even tried Adjusting the Weight and Priority for DNS SRV Records in the Registry on the Windowsserver so that the samba4 will be prioritized... but it doesn't help. Best Regards, Innocent. *De :* Gémes Géza g...@kzsdabas.hu *À :* samba@lists.samba.org *Envoyé le :* Jeudi 22 novembre 2012 19h41 *Objet :* Re: [Samba] Samba4 logon server against windows server 2003 2012-11-21 23:47 keltezéssel, Innocent Yevide írta: Hello, does any one knows how I can force samba4 to be the logon server against windows server 2003? I have below in my smb.conf but it doesn't help: domain logons = Yes domain master = Yes preferred master = Yes os level = 255 Best Regards, Innocent. IMHO you can't. Active Directory was designed to provide a round robin type failover, and thus each AD controller (in a site) is equally probably chosen by clients. Regards Geza Gemes -- 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 v4-0-test updated
The branch, v4-0-test has been updated via 2b130b4 WHATSNEW: Update changes since rc5. via 225dcb2 examples: fix build on AIX6 from cdbf43c WHATSNEW: Update changes since rc5. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log - commit 2b130b4c0f0ad06ffd4a2f180dc1622f9d15b131 Author: Karolin Seeger ksee...@samba.org Date: Thu Nov 22 09:06:28 2012 +0100 WHATSNEW: Update changes since rc5. Karolin Autobuild-User(v4-0-test): Karolin Seeger ksee...@samba.org Autobuild-Date(v4-0-test): Thu Nov 22 10:48:41 CET 2012 on sn-devel-104 commit 225dcb24501821fa45cf789c18b85543a70e9422 Author: Christian Ambach a...@samba.org Date: Tue Nov 20 09:50:15 2012 +0100 examples: fix build on AIX6 Signed-off-by: Christian Ambach a...@samba.org Autobuild-User(master): Volker Lendecke v...@samba.org Autobuild-Date(master): Tue Nov 20 16:06:59 CET 2012 on sn-devel-104 Fix bug #9413 - waf build fails on AIX6. --- Summary of changes: WHATSNEW.txt |1 + examples/libsmbclient/testfstatvfs.c |2 ++ examples/libsmbclient/teststatvfs.c |2 ++ 3 files changed, 5 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 46f08c0..4285b5c 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -176,6 +176,7 @@ o Jeremy Allison j...@samba.org o Christian Ambach a...@samba.org * BUG 9178: Add DMAPI configure option and checks. * BUG 9411: aio read marks the file as modified. +* BUG 9413: Fix waf build on AIX6. o Sumit Bose sb...@redhat.com diff --git a/examples/libsmbclient/testfstatvfs.c b/examples/libsmbclient/testfstatvfs.c index 2442404..512563f 100644 --- a/examples/libsmbclient/testfstatvfs.c +++ b/examples/libsmbclient/testfstatvfs.c @@ -86,8 +86,10 @@ int main(int argc, char * argv[]) (unsigned long long) statvfsbuf.f_ffree); printf(Available Files: %llu\n, (unsigned long long) statvfsbuf.f_favail); +#ifdef HAVE_FSID_INT printf(File System ID: %lu\n, (unsigned long) statvfsbuf.f_fsid); +#endif printf(\n); printf(Flags: 0x%lx\n, statvfsbuf.f_flag); diff --git a/examples/libsmbclient/teststatvfs.c b/examples/libsmbclient/teststatvfs.c index 5c69122..2f656d5 100644 --- a/examples/libsmbclient/teststatvfs.c +++ b/examples/libsmbclient/teststatvfs.c @@ -58,8 +58,10 @@ int main(int argc, char * argv[]) (unsigned long long) statvfsbuf.f_ffree); printf(Available Files: %llu\n, (unsigned long long) statvfsbuf.f_favail); +#ifdef HAVE_FSID_INT printf(File System ID: %lu\n, (unsigned long) statvfsbuf.f_fsid); +#endif printf(\n); printf(Flags: 0x%lx\n, statvfsbuf.f_flag); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via f22e15d build: Do not install testing binaries via 895cc9a packaging: Remove long-gone --disable-merged-build from RHEL-CTDB packaging via 7626b5d build: Remove --enable-smbtorture, require bin/smbtorture (from waf) for make test via 8a2ef49 build: Be consistent with the name of smbtorture binaries via ef195a1 torture: remove source3 locktest and masktest via 1000da9 build: Use ntlm_auth from source3 as the only ntlm_auth installed on the system via c704f0d lib/replace: Do not use STRERROR_R_PROTO_COMPATIBLE as only roken.h sets this from 831a9f8 s4/web_server: Fix typo in URL. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit f22e15d9d5a3d4744982265363c357ef277ba31e Author: Andrew Bartlett abart...@samba.org Date: Wed Nov 21 20:20:46 2012 +1100 build: Do not install testing binaries These binaries are for developer or selftest use, and are not supported for installation onto the system. The autoconf build does not install these binaries, and so neither should the waf build. Andrew Bartlett Reviewed-by: Andreas Schneider a...@samba.org Autobuild-User(master): Andreas Schneider a...@cryptomilk.org Autobuild-Date(master): Thu Nov 22 12:00:36 CET 2012 on sn-devel-104 commit 895cc9a9157d51f768d35f888795e8af7efed781 Author: Andrew Bartlett abart...@samba.org Date: Wed Nov 21 19:52:50 2012 +1100 packaging: Remove long-gone --disable-merged-build from RHEL-CTDB packaging Reviewed-by: Andreas Schneider a...@samba.org commit 7626b5d9045c2b490b38dee7dd45ba7763740f83 Author: Andrew Bartlett abart...@samba.org Date: Wed Nov 21 17:52:35 2012 +1100 build: Remove --enable-smbtorture, require bin/smbtorture (from waf) for make test This simply moves this to being a side-effect of --enable-selftest. The flag was renamed from --enable-smbtorture4 in a recent patch. Make test now relies on smbtorture4, and so this code to make the dependency optional for the tests is not required any more. Andrew Bartlett Reviewed-by: Andreas Schneider a...@samba.org commit 8a2ef49dea36b103a87cf2aa63417737dd754ce6 Author: Andrew Bartlett abart...@samba.org Date: Wed Nov 21 16:32:38 2012 +1100 build: Be consistent with the name of smbtorture binaries This ensures that in both build systems, smbtorture3 is the source3 binary, and smbtoture is our main smbtorture binary, built with waf. Also included in this is the removal of bin/ndrdump4 as a special case. This removes the last cases of binaries with different names in each build system. Andrew Bartlett Reviewed-by: Andreas Schneider a...@samba.org commit ef195a18aac1f2b1ebfd34741d2242f659896549 Author: Andrew Bartlett abart...@samba.org Date: Wed Nov 21 16:00:53 2012 +1100 torture: remove source3 locktest and masktest We now just build these in waf, using the source4/torture code. The source4 versions of these are tested in make test. Andrew Bartlett Reviewed-by: Andreas Schneider a...@samba.org commit 1000da933534f1148f5b6f9db2029a5074917968 Author: Andrew Bartlett abart...@samba.org Date: Wed Nov 21 15:34:43 2012 +1100 build: Use ntlm_auth from source3 as the only ntlm_auth installed on the system The ntlm_auth4 binary is untested, and is missing major features compared with the source3 binary. The two are being slowly merged, but I have not finished that. Andrew Bartlett Reviewed-by: Andreas Schneider a...@samba.org commit c704f0daa5e81911ea2b507323b5005303f61e91 Author: Andrew Bartlett abart...@samba.org Date: Mon Nov 19 23:25:45 2012 +1100 lib/replace: Do not use STRERROR_R_PROTO_COMPATIBLE as only roken.h sets this Currently, we put strerror_r into libreplace even on systems with strerror_r. Andrew Bartlett Reviewed-by: Andreas Schneider a...@samba.org --- Summary of changes: lib/replace/replace.c |2 +- lib/replace/replace.h |4 +- nsswitch/wscript_build |7 +- packaging/RHEL-CTDB/configure.rpm |2 - packaging/RHEL-CTDB/samba.spec.tmpl|2 - script/autobuild.py|4 +- selftest/wscript |2 +- .../{Makefile-smbtorture4 = Makefile-smbtorture} | 14 +- source3/Makefile.in| 30 +- source3/configure.in | 26 +- source3/lib/asys/wscript_build |3 +- source3/lib/pthreadpool/wscript_build |3 +-
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 0d9bdcf web_server: Load SWAT if it is available. via bfc6a9e web_server: the web server is not multi-process, indicate so in WSGI. via b89e7f6 web_server: Properly decrement reference counters for python objects in wsgi. via ac635d0 web_server: Properly set SCRIPT_NAME and PATH_INFO. via 3bffb58 web_server: Create a string object for SERVER_PORT variable. via 31f0e24 web_server/wsgi: Don't segfault when wsgi app doesn't return iterable. from f22e15d build: Do not install testing binaries http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 0d9bdcf834cbe9ec4e1354bc7e912f197bf72d7b Author: Jelmer Vernooij jel...@samba.org Date: Thu Nov 22 00:47:00 2012 + web_server: Load SWAT if it is available. Reviewed-by: Matthieu Patou m...@matws.net Autobuild-User(master): Matthieu Patou m...@samba.org Autobuild-Date(master): Fri Nov 23 01:39:38 CET 2012 on sn-devel-104 commit bfc6a9e21d2955d0662e4179448c7031806ad6d7 Author: Jelmer Vernooij jel...@samba.org Date: Thu Nov 22 00:46:59 2012 + web_server: the web server is not multi-process, indicate so in WSGI. This is a requirement for some of the paster middleware used by SWAT2. Reviewed-by: Matthieu Patou m...@matws.net commit b89e7f6e51011cce264a9a0c8796a5d4811007d7 Author: Jelmer Vernooij jel...@samba.org Date: Thu Nov 22 00:46:58 2012 + web_server: Properly decrement reference counters for python objects in wsgi. Reviewed-by: Matthieu Patou m...@matws.net commit ac635d02de202523d8921ce752d7f93e2377bb07 Author: Jelmer Vernooij jel...@samba.org Date: Thu Nov 22 00:46:57 2012 + web_server: Properly set SCRIPT_NAME and PATH_INFO. Reviewed-by: Matthieu Patou m...@matws.net commit 3bffb585ba36753cf1ebd5c00e7a47f1974b0d85 Author: Jelmer Vernooij jel...@samba.org Date: Thu Nov 22 00:46:56 2012 + web_server: Create a string object for SERVER_PORT variable. This matches the behaviour of other wsgi server implementations. Reviewed-by: Matthieu Patou m...@matws.net commit 31f0e24fbe5f3da7e1a3e4b0ae234c0803123501 Author: Jelmer Vernooij jel...@samba.org Date: Thu Nov 22 00:46:55 2012 + web_server/wsgi: Don't segfault when wsgi app doesn't return iterable. There is a bug in the application if this happens, but invalid Python code shouldn't cause segfaults. Reviewed-by: Matthieu Patou m...@matws.net --- Summary of changes: .../scripting/python/samba/web_server/__init__.py | 34 +- source4/web_server/wsgi.c | 120 +++- 2 files changed, 121 insertions(+), 33 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/scripting/python/samba/web_server/__init__.py b/source4/scripting/python/samba/web_server/__init__.py index ed3c7de..78ce953 100644 --- a/source4/scripting/python/samba/web_server/__init__.py +++ b/source4/scripting/python/samba/web_server/__init__.py @@ -19,9 +19,8 @@ # along with this program. If not, see http://www.gnu.org/licenses/. # - - def render_placeholder(environ, start_response): +Send the user a simple placeholder about missing SWAT. status = '200 OK' response_headers = [('Content-type', 'text/html')] start_response(status, response_headers) @@ -41,7 +40,36 @@ def render_placeholder(environ, start_response): yield /html\n -__call__ = render_placeholder +def __call__(environ, start_response): +Handle a HTTP request. +from wsgiref.util import application_uri, shift_path_info +from urlparse import urljoin + +try: +import swat +except ImportError, e: +print NO SWAT: %r % e +have_swat = False +else: +have_swat = True + +orig_path = environ['PATH_INFO'] +name = shift_path_info(environ) + +if name == : +if have_swat: +start_response('301 Redirect', +[('Location', urljoin(application_uri(environ), 'swat')),]) +return [] +else: +return render_placeholder(environ, start_response) +elif have_swat and name == swat: +return swat.__call__(environ, start_response) +else: +status = '404 Not found' +response_headers = [('Content-type', 'text/html')] +start_response(status, response_headers) +return [The path %s (%s) was not found % (orig_path, name)] if __name__ == '__main__': diff --git a/source4/web_server/wsgi.c b/source4/web_server/wsgi.c index 37ded29..00c9535 100644 --- a/source4/web_server/wsgi.c +++ b/source4/web_server/wsgi.c @@ -263,57 +263,91 @@ static PyObject *Py_ErrorHttpStream(void) static PyObject *create_environ(bool tls, int content_length, struct http_header
[SCM] CTDB repository - branch master updated - ctdb-2.0-12-gd05faf2
The branch, master has been updated via d05faf294e58e22ae3fbc76162258f1ae8178129 (commit) from 4f42d17b74ce891691eee1cead498959cc8e4837 (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master - Log - commit d05faf294e58e22ae3fbc76162258f1ae8178129 Author: Amitay Isaacs ami...@gmail.com Date: Wed Nov 21 17:03:37 2012 +1100 doc: Update ping_pong documentation to add -c option Signed-off-by: Amitay Isaacs ami...@gmail.com --- Summary of changes: doc/ping_pong.1.xml | 17 + 1 files changed, 17 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/doc/ping_pong.1.xml b/doc/ping_pong.1.xml index 0b67e8f..f4148ae 100644 --- a/doc/ping_pong.1.xml +++ b/doc/ping_pong.1.xml @@ -25,6 +25,7 @@ arg choice=opt-r/arg arg choice=opt-w/arg arg choice=opt-m/arg + arg choice=opt-c/arg /cmdsynopsis /refsynopsisdiv @@ -65,6 +66,15 @@ /para /listitem /varlistentry + + varlistentryterm-c/term +listitem + para + validate the locks + /para +/listitem + /varlistentry + /variablelist /refsect1 @@ -77,6 +87,13 @@ /screen para + Testing lock coherence with lock validation +/para +screen format=linespecific + ping_pong -c test.dat N +/screen + +para Testing IO coherence /para screen format=linespecific -- CTDB repository