[Samba] Read-only alert for MS Office files on samba share
Hi everybody, We've been running a samba server for some time, which is used both as PDC and share space. Recently, we bought some new machines which came with Windows 7 installed. I struggled to find a solution to make them join the domain, and discovered I had to upgrade samba for that, which I did. We are now running version 3.4.9-42 on CentOS5. Since this upgrade, we have problems with MS Office files that are opened read-only because already open by another user. This happens very often on the Windows 7 machines, quite often on Vista machines and I did not see it happen (yet at least) on XP machines. We found a workaround to avoid the problem : instead of double clicking on the shared file, if we right click on it and click on open, the problem does not happen, which seems really strange ! When I try to open the file from the Windows machine and it complains the file is already in use by another user, I checked on the samba side : - The file permissions are correct - There is no ~xxx file - The file is not open at all according to smbstatus At the same time, if I try to open the file on a Windows XP machine, I have no problem at all, whatever network user I use. Could anybody help ? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Mapping characters for non-DOS names under UNIX
Hi TAKAHASHI, Thanks for your suggestion. the way is a little complicate to me. is there any options of smb configuration, by which we can get the same purpose? Thanks a lot. 2011/1/6 TAKAHASHI Motonobu mo...@monyo.com: Create your custom vfs module. Perhaps vfs_cap.c shows you how to do this. Also to create a custom charset module may offer another way. --- TAKAHASHI Motonobu mo...@samba.gr.jp 2011/1/6 tao wang twang1...@gmail.com: Hi All, As known, samba can mapping non-DOS names under UNIX to DOS-compatible names by using some HASH/HASH2 algorithm. But is there any way we can define a character mapping tables by self, not using HASH? such as: (just a sample) character mapping table: Unix Windows --- a * --- b / --- c : --- d --- e --- f ? --- g \ h | i then a filename '***' on Unix will be mapped to 'bbb' on Windows... and so on. Thanks a lot. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Windows 7 client losing trust with domain
same problem with samba 3.2, I did an upgrade to version 3.3.13-40 and the issue i resolved. But samba 3.2 is not fully supported with samba 3.2 Il 06/01/2011 23:29, John Drescher ha scritto: On Thu, Jan 6, 2011 at 4:10 PM, Koji Yanagisawak...@umich.edu wrote: Dear Samba, I'm running Samba 3.3.8 and I have a Windows 7 client that was once able to join and log in domain users for a while thanks to http://wiki.samba.org/index.php/Windows7. Then after Christmas it's showing the trust relationship between this workstation and the primary domain failed and refusing to log in domain users until I removed and rejoined the domain. I'd say the workstation had been a member roughly one month. No other workstation by the same name was ever added to the domain, so that's not it. I'm a bit flabbergasted this happened. Is anybody experiencing this? http://www.mail-archive.com/samba@lists.samba.org/msg110665.html John -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Auto-Removal of Straggling File locks due to Ungraceful Client Disconnects
Thanks Volker, Yes, while awaiting a reply, I had already zoned in on the Linux TCP/IP keepalive mechanism and it works perfectly. I ended up using samba's SO_KEEPALIVE socket option but tweaked the OS parameters directly using sysctl.conf (my distro is CentOS 5). The default OS check interval is 2 hours which is far too long for my purposes. I changed this to 5 mins (actually 10 mins in total allowing for retry probes). Now, when the OS disconnects an inactive client, Samba picks up the disconnection and kills the relevant process, releasing any locked files. In the unusual scenario that the disconnected client only had an intermittent problem (e.g. network issue) which eventually fixed itself, the client CIFS stack will simply reconnect under the covers (that's where the samba reset on zero vc option is important). IMHO, this tweak should be part-and-parcel of any self-contained LAN deployment e.g. a Windows-Server replacement in a business network. In summary -- and as I anticipated -- the heart of the matter is the OS stack (with some helpful prodding from Samba). BTW, my allusion to Windows Server not having this problem was incorrect as a further web search showed up -- I want to put the record straight on that one. After a long, sometimes frustrating, journey with Samba over three years, I am hugely impressed with the work you guys have done. Apart from this particular problem/corner case (which is now solved), my CentOS 5 based PDC just runs and runs and runs with minimal maintenance and performance is superb. Regards, Vincent On 6 January 2011 16:55, Volker Lendecke volker.lende...@sernet.de wrote: On Thu, Dec 30, 2010 at 03:36:04AM +, Vincent Callanan wrote: This question has come up many times before in a number of guises. But I do not believe that it has ever been answered satisfactorily. That's because it can't be anwered really satisfactorily given that the CIFS protocol does not allow the server to ping the client if it's still around. All you can do is to apply heuristics. This may well reflect fundamental difficulties in the CIFS protocol However, recent incarnations of Windows Server seem to handle the problem better possibly due to tweaks in the underlying TCP/IP stack vis-a-vis Linux. If you're on moderately recent Linux, you might want to play with something like socket options = SO_KEEPALIVE TCP_KEEPIDLE=300 TCP_KEEPINTVL=10 TCP_KEEPCNT=5 This should kick dead clients after something like 6 minutes. A description of these parameters can be found in man tcp. 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 -- Regards, Vincent Callanan +353-86-8511625 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Windows 7 client losing trust with domain
I had the same Problem, fixed it with this registry-hack: [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\LanmanWorkstation\Parameters] DomainCompatibilityMode=dword:0001 DNSNameResolutionRequired=dword: [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Lsa\] “LmCompatibilityLevel”=dword: [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\Netlogon\Parameters] Update=no DisablePasswordChange=dword: MaximumPasswordAge=dword:001e RequireSignOrSeal=dword:0001 RequireStrongKey=dword:0001 SealSecureChannel=dword:0001 SignSecureChannel=dword:0001 Good Luck On Fri, 07 Jan 2011 10:45:25 +0100, Ufficiotecnico Acknow Srl ufficiotecn...@acknow.it wrote: same problem with samba 3.2, I did an upgrade to version 3.3.13-40 and the issue i resolved. But samba 3.2 is not fully supported with samba 3.2 Il 06/01/2011 23:29, John Drescher ha scritto: On Thu, Jan 6, 2011 at 4:10 PM, Koji Yanagisawak...@umich.edu wrote: Dear Samba, I'm running Samba 3.3.8 and I have a Windows 7 client that was once able to join and log in domain users for a while thanks to http://wiki.samba.org/index.php/Windows7. Then after Christmas it's showing the trust relationship between this workstation and the primary domain failed and refusing to log in domain users until I removed and rejoined the domain. I'd say the workstation had been a member roughly one month. No other workstation by the same name was ever added to the domain, so that's not it. I'm a bit flabbergasted this happened. Is anybody experiencing this? http://www.mail-archive.com/samba@lists.samba.org/msg110665.html John -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] samba4 - public share.
Hi, just do it as admin from your tool for ads on a windows client. On Thu, 06 Jan 2011 15:34:11 +0100, Rafał Michaluk ra...@michaluk.pl wrote: Hi, I have samba4 working as PDC. Everything is working great, but when I'm trying to set public share I can't set permissions to this folder which allows to connect without auth. Is it possible to setup share like this in samba4? Please, help me with this issue. -- Rafał Michaluk -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] samba4 - public share.
Hi, thanks for replay. I tried to set RW access for everyone in security tab on this share properties... but it is not working. I'm getting error like no such user in samba.log when i'm trying to connect from other than domain member PC... :( Rafał Michaluk W dniu 2011-01-07 11:47, Daniel Müller pisze: Hi, just do it as admin from your tool for ads on a windows client. On Thu, 06 Jan 2011 15:34:11 +0100, Rafał Michalukra...@michaluk.pl wrote: Hi, I have samba4 working as PDC. Everything is working great, but when I'm trying to set public share I can't set permissions to this folder which allows to connect without auth. Is it possible to setup share like this in samba4? Please, help me with this issue. -- Rafał Michaluk -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Solaris 10 winbind authentication with ADS
Hi On 6 January 2011 01:11, CJ Keist cj.ke...@colostate.edu wrote: Well, I did smart thing and upgraded my Solaris box to Solaris 10 update 9. And now my winbind authentication has broken. I have checked all my /usr/lib/*winbind* and /usr/lib/security/*winbind* libs and all are still good from my last install. /etc/pam.conf, nsswitch.conf are still intact. wbinfo seems to work fine. getent passwd username just returns empty. This is what I'm getting in my /var/samba/log/log.winbindd file: [2011/01/05 16:04:00.061446, 2] winbindd/winbindd.c:819(winbind_client_request_read) Could not read client request from fd 22: I/O error I don't run Solaris and am not using winbind, so this is just a guess, but I hope it helps. winbind communicates via a socket, which I think is put in /tmp by default (/tmp/.winbindd/ or something like that). Can you check what fd 22 is? e.g. using lsof. Maybe it's the socket. It might be that Solaris 10 changes something about /tmp that interferes with winbind's socket? Maybe try putting the socket somewhere else. I think you're supposed to be able to do this with winbind:socket dir = It seems the winbind:socket dir option was introduced in Samba 3.2.0. -- Michael Wood esiot...@gmail.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] RES: ntlm_auth Version 3.2.5
Thanks for the answer ! I Will try version 3.5.6 and then i put the results here. Best Regards, -Mensagem original- De: Volker Lendecke [mailto:volker.lende...@sernet.de] Enviada em: quinta-feira, 6 de janeiro de 2011 14:49 Para: Rafael Simão (rafael.simao) Cc: samba@lists.samba.org Assunto: Re: [Samba] ntlm_auth Version 3.2.5 On Wed, Jan 05, 2011 at 01:09:07PM -0200, Rafael Simão (rafael.simao) wrote: Im trying to integrate Samba + AD + Squid. Almost everything is ok, except that I got a problem with lib ntlm_auth with respect with last characters. ie. libsmb/ntlmssp.c:ntlmssp_server_auth(745) Got user=[ADMINISTRATO] domain=[INTRANE] workstation=[AVELETRO] len1=24 len2=24 But, at Windows, i`ve puted administrator and intranet. Last characters are gone, so authentication is not possible. ntlm_auth Version 3.2.5 Can you check with 3.5.6? 3.2.5 is certainly fixable, but to do so you would need to contact someone doing paid support from http://www.samba.org/samba/support 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 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Read-only alert for MS Office files on samba share
Which version of Office?Do you have full rights to the parent directory? Maybe it creates temp files in a different location? When you double-click the file, was office already running? I can't see why it would matter. ALl I can think is that when you double-click a document different parameters are passed to the file system. If I remember, in explorer when you associate file types with an app, you can also associate what the app should do with it. Can you set office to always create temp files on local drive rather than by default in the same directory as the file? On 01/07/2011 03:52 AM, Admin machines wrote: Hi everybody, We've been running a samba server for some time, which is used both as PDC and share space. Recently, we bought some new machines which came with Windows 7 installed. I struggled to find a solution to make them join the domain, and discovered I had to upgrade samba for that, which I did. We are now running version 3.4.9-42 on CentOS5. Since this upgrade, we have problems with MS Office files that are opened read-only because already open by another user. This happens very often on the Windows 7 machines, quite often on Vista machines and I did not see it happen (yet at least) on XP machines. We found a workaround to avoid the problem : instead of double clicking on the shared file, if we right click on it and click on open, the problem does not happen, which seems really strange ! When I try to open the file from the Windows machine and it complains the file is already in use by another user, I checked on the samba side : - The file permissions are correct - There is no ~xxx file - The file is not open at all according to smbstatus At the same time, if I try to open the file on a Windows XP machine, I have no problem at all, whatever network user I use. Could anybody help ? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] problem connecting DFS-share with winXP - successful with Vista 7
No problem on connecting directly. Policy update for ODAA (DSS) compliance. A whole slew of stuff. Didn't cause a problem on clients, but DFS (on XP) dropped when policy hit server. (We've tried rolling back on the client). It is a 2K3 domain. We could deviate temporarily with the group policy were we to identify the offending setting, but running through all the permutations and accompanying resets is not an option. Could also be a windows update issue as the entire network was reset over the break - but I am pretty certain it's group policy/security related. We're closing in on 1PB worth of SAN, so DFS verges on essential, but maybe this will provide the users the incentive to upgrade to MS7. djm On Jan 5, 2011, at 1:01 PM, Steffen Frömer wrote: hej David, can you connect shares directly with XP? Am 04.01.2011 18:50, schrieb David Merhar: Anyone? I am seeing the same behavior - DFS shares visible in Vista and 7, but not XP - though I have not spotted the same detail at session setup. No problem with XP until recently when we applied a domain wide group policy update and latest windows updates. Can't go backwards on the policy. What policy update did you do? samba-3.5.4 security = ads our DFS security is domain and Samba Server has security = ads But there is noch differnce bitween ads and domain in relation with our problem. We also tried 'security' = ads for DFS master, but same issue. Thanks. djm -- 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] Solaris users: any way to join a samba domain?
Hello, sorry for the late reply but maybe it still helps. We've been running two Opensolaris servers as Samba/NFS servers in a Samba3 domain for some time now. I recall it took a lot of time, testing and research but eventually we had to conclude that the kernel CIFS server only supports ADS and not NT4/Samba domains. It does ADS very well but we absolutely couldn't get it into our Samba domain. We also found some mailing list/forum posts that suggested the same. Still I might be wrong of course, so if anyone wants to correct me, you're very welcome to. :) What we did instead was install the SFWsamba packages that came on the installation medium. This is Solaris Express to be exact, I'm not sure if Opensolaris proper ships with SFWsamba. If not, you might be able to find it in the package management that Opensolaris uses. I could go on about some pitfalls and experiences that we've encountered with this setup but it seems you really want to use the kernel CIFS server. In that case I think you have no other choice but use ADS or configure it as a standalone server. Regards Frank - Originalnachricht - Von: Jean-Yves Avenard jyaven...@gmail.com Gesendet: Sam, 1.1.2011 13:19 An: samba@lists.samba.org Betreff: [Samba] Solaris users: any way to join a samba domain? Hi there. I installed OpenSolaris 10 on a test machine, and I'm trying to make it join my samba domain. Unfortunately, the only references I can find about joining a domain on Solaris are related to joining an AD domain. I just want to join a samba domain (Windows NT/2000 style) smbadm -u name DOMAIN always fail with: failed to find any domain controllers for DOMAIN I wanted to experiment with the CIFS kernel ... Thanks in advance Jean-Yves -- 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] samba acl support
On Thu, Jan 06, 2011 at 11:52:46PM -0500, suresh.kanduk...@emc.com wrote: Thanks this helps. Let me know if you really need the first version with ACL support and I'll track it down. Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Read-only alert for MS Office files on samba share
THe point is that msoffice produces temp files while opening and writing. There is a solution around this in the mail listing years ago. I came over that problem by setting the sticky bit for the group according the shares. in your globals: nt acl support = no in your shares: sometimes if you have set the sticky bit it should be sufficient: inherit permissions = yes force group = yourgroup or, force create mode = 0660 force directory mode = 0770 force group = yourgroup good luck daniel #On Fri, 07 Jan 2011 09:42:35 -0500, Gaiseric Vandal gaiseric.van...@gmail.com wrote: Which version of Office?Do you have full rights to the parent directory? Maybe it creates temp files in a different location? When you double-click the file, was office already running? I can't see why it would matter. ALl I can think is that when you double-click a document different parameters are passed to the file system. If I remember, in explorer when you associate file types with an app, you can also associate what the app should do with it. Can you set office to always create temp files on local drive rather than by default in the same directory as the file? On 01/07/2011 03:52 AM, Admin machines wrote: Hi everybody, We've been running a samba server for some time, which is used both as PDC and share space. Recently, we bought some new machines which came with Windows 7 installed. I struggled to find a solution to make them join the domain, and discovered I had to upgrade samba for that, which I did. We are now running version 3.4.9-42 on CentOS5. Since this upgrade, we have problems with MS Office files that are opened read-only because already open by another user. This happens very often on the Windows 7 machines, quite often on Vista machines and I did not see it happen (yet at least) on XP machines. We found a workaround to avoid the problem : instead of double clicking on the shared file, if we right click on it and click on open, the problem does not happen, which seems really strange ! When I try to open the file from the Windows machine and it complains the file is already in use by another user, I checked on the samba side : - The file permissions are correct - There is no ~xxx file - The file is not open at all according to smbstatus At the same time, if I try to open the file on a Windows XP machine, I have no problem at all, whatever network user I use. Could anybody help ? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] One shared folder to be HA over CIFS to windows clients
Hi, i'm Emiliano this is my first mail to samba mailing list. I have to solve this issue for a company. They need to had a folder, shared over CIFS for windows/mac clients, that is always available, also if the server who host it hang up or burn. I've looked for a lot of solution but i cannot find the right for me. Actually the company has two server, all running debian lenny as linux distro. The first one, a quad core proliant ml350 g5 6tb raid 10, work as primary server. On it i've installed vmware server that runs a win2003 r2 guest for central authentication,domain policing ecc. It has another role : the primary file server, running a samba server integrated with AD. The seconde one, a pentium 4 1,2 tb raid 5, work as secondary server. Like the proliant it has vmware server running a BDC w2k3 r2 for fail-over and load balancing windows services. Here the file sharing is offered again by a samba server that shares archive folders. Now, how can i have the same shared folder on both file servers? I can adopt microsoft technology : use DFS filesystem and FSR replicas. Actually, i'm fallen in love with the DFS functionality that permit to uniform the namespace of file servers resource using only the name of the ad domain, but i hate the limits of FSR replicas. Hyp: - Think that i use DFS and setup that \mydomain\dfs\aaa refer to \firstserver\aaa and \secondserver\aaa. - aaa on the firstserver and on the secondserver are the same - i've setup FSR replicas continuosly between the two shares. Now, if from one my win client i poll for \mydomain\dfs\aaa , using somekind of roundrobin\casual algorithm, the DC tell me that \mydomain\dfs\aaa is \firstserver\aaa or \secondserver\aaa. Suppose, that DC translate the dfs share with the share on the second file server, this means that if i open a file gino.txt i'm working on gino.txt on secondserver. So now, before the FSR replica, second server got a version of gino.txt newer than first server. Now there is a little window of time when if another client ask for the same dfs share and the same file, it could be possible that DC translate \mydomain\dfs\aaa with \firstserver\dfs\aaa and this second windows client works a different version of the file. Now imagine, that, always before the start of FSR replica, this second windows client save a modified version of gino.txt . The FSR algorithm take a decision, i propagate the newer version of file. So DFS doesn't work for my situation, i think. So i ask to you if CTDB samba could work for my problem. I think no, because i have to have the same configuration (also shares, here is the problem, i need only one share) between the two fileservers. I'm trying to test this configuration: using LVM create a LV and mirror with drbd between two fileserver. After, put a GFS2 filesystem on them and sharing the filesystem as two separate shares on the two file servers. Now i think that DFS could work as a peacemaker to decide which host is up and translate DFS correctly. Suppose that i open gino.txt on \1st\aaa , modify it, and save it. If i setup drbd with the sync mode, instantanously, because the copy it's at the block level, i have the same file on \2nd\aaa. But if i open gino.txt on \1st\aaa and gino.txt \2nd\aaa , who tell to the two usesr that the same file is opened on both fileserver? From my test seems that only ctdb samba could provide a locking mechanism ( at the cifs level), but gfs2 doesn't provide nothing like that. My hope is that someone had the same issue and solved in some way, i know that it is long but it's also difficult to explain my doubts and willings. Thanks for the reply, Emiliano PS: I've looked for also GlusterFS but not tested, i'm scared that operating as FUSE there will be some performance break down. I will test, i wish. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] One shared folder to be HA over CIFS to windows clients
I think what you really need is clusterd file system.. 2011/1/8 Emiliano Bonassi benazh...@gmail.com Hi, i'm Emiliano this is my first mail to samba mailing list. I have to solve this issue for a company. They need to had a folder, shared over CIFS for windows/mac clients, that is always available, also if the server who host it hang up or burn. I've looked for a lot of solution but i cannot find the right for me. Actually the company has two server, all running debian lenny as linux distro. The first one, a quad core proliant ml350 g5 6tb raid 10, work as primary server. On it i've installed vmware server that runs a win2003 r2 guest for central authentication,domain policing ecc. It has another role : the primary file server, running a samba server integrated with AD. The seconde one, a pentium 4 1,2 tb raid 5, work as secondary server. Like the proliant it has vmware server running a BDC w2k3 r2 for fail-over and load balancing windows services. Here the file sharing is offered again by a samba server that shares archive folders. Now, how can i have the same shared folder on both file servers? I can adopt microsoft technology : use DFS filesystem and FSR replicas. Actually, i'm fallen in love with the DFS functionality that permit to uniform the namespace of file servers resource using only the name of the ad domain, but i hate the limits of FSR replicas. Hyp: - Think that i use DFS and setup that \mydomain\dfs\aaa refer to \firstserver\aaa and \secondserver\aaa. - aaa on the firstserver and on the secondserver are the same - i've setup FSR replicas continuosly between the two shares. Now, if from one my win client i poll for \mydomain\dfs\aaa , using somekind of roundrobin\casual algorithm, the DC tell me that \mydomain\dfs\aaa is \firstserver\aaa or \secondserver\aaa. Suppose, that DC translate the dfs share with the share on the second file server, this means that if i open a file gino.txt i'm working on gino.txt on secondserver. So now, before the FSR replica, second server got a version of gino.txt newer than first server. Now there is a little window of time when if another client ask for the same dfs share and the same file, it could be possible that DC translate \mydomain\dfs\aaa with \firstserver\dfs\aaa and this second windows client works a different version of the file. Now imagine, that, always before the start of FSR replica, this second windows client save a modified version of gino.txt . The FSR algorithm take a decision, i propagate the newer version of file. So DFS doesn't work for my situation, i think. So i ask to you if CTDB samba could work for my problem. I think no, because i have to have the same configuration (also shares, here is the problem, i need only one share) between the two fileservers. I'm trying to test this configuration: using LVM create a LV and mirror with drbd between two fileserver. After, put a GFS2 filesystem on them and sharing the filesystem as two separate shares on the two file servers. Now i think that DFS could work as a peacemaker to decide which host is up and translate DFS correctly. Suppose that i open gino.txt on \1st\aaa , modify it, and save it. If i setup drbd with the sync mode, instantanously, because the copy it's at the block level, i have the same file on \2nd\aaa. But if i open gino.txt on \1st\aaa and gino.txt \2nd\aaa , who tell to the two usesr that the same file is opened on both fileserver? From my test seems that only ctdb samba could provide a locking mechanism ( at the cifs level), but gfs2 doesn't provide nothing like that. My hope is that someone had the same issue and solved in some way, i know that it is long but it's also difficult to explain my doubts and willings. Thanks for the reply, Emiliano PS: I've looked for also GlusterFS but not tested, i'm scared that operating as FUSE there will be some performance break down. I will test, i wish. -- 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 v3-6-test updated
The branch, v3-6-test has been updated
via 837333e s3-waf: make the --with-Xdir options work more like in the
classic build.
via cbaecf4 s3-waf: no need to compile librpc/gen_ndr/cli_dfs.c anymore.
via 68833a0 s3-build: no need to compile librpc/gen_ndr/cli_dfs.c
anymore.
via 5912141 s3-rpcclient: use dcerpc_dfs_X functions.
from f2a4eec s3-net: Fix bug #7690: retry DNS updates when connection to
one nameserver has failed.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 837333e5407c034f71dce383d4920b9e616910d5
Author: Günther Deschner g...@samba.org
Date: Fri Jan 7 00:05:27 2011 +0100
s3-waf: make the --with-Xdir options work more like in the classic build.
Also remove duplicates and sort the tables.
Still not sure if I understand the reason of processing the flags table
after
the diroptions table, as every option you give it via configure was
overwritten
immediately.
Guenther
Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Fri Jan 7 00:57:10 CET 2011 on sn-devel-104
(cherry picked from commit f405384ad840ebe438ecf3a2ce05893857c952b2)
commit cbaecf495ef997d08fe563fa29eb19f85a70b5ac
Author: Günther Deschner g...@samba.org
Date: Wed Jan 5 17:26:39 2011 +0100
s3-waf: no need to compile librpc/gen_ndr/cli_dfs.c anymore.
Guenther
Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Thu Jan 6 15:20:14 CET 2011 on sn-devel-104
(cherry picked from commit 2958a43fad6b714e3f2bfe5f0e43b344395de179)
commit 68833a0793e1cacca85385546613a543bcdf85e5
Author: Günther Deschner g...@samba.org
Date: Wed Jan 5 17:26:16 2011 +0100
s3-build: no need to compile librpc/gen_ndr/cli_dfs.c anymore.
Guenther
(cherry picked from commit 577b4e527c27ff074ea375ff31a339a5ad4e8071)
commit 59121419c3901df5d9f4d5c6c01a9759dc91c253
Author: Günther Deschner g...@samba.org
Date: Wed Jan 5 17:22:24 2011 +0100
s3-rpcclient: use dcerpc_dfs_X functions.
Guenther
(cherry picked from commit 7888108e89995b0bacbd5915bd70778fe901820a)
---
Summary of changes:
source3/Makefile.in |3 +-
source3/build/dynconfig.py | 49 --
source3/build/wscript |4 ++-
source3/rpcclient/cmd_dfs.c | 36 +--
source3/wscript_build |6 +
5 files changed, 52 insertions(+), 46 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 376a2f1..7151df9 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -354,8 +354,7 @@ LIBCLI_NTSVCS_OBJ = librpc/gen_ndr/ndr_ntsvcs_c.o
LIBCLI_DRSUAPI_OBJ = librpc/gen_ndr/cli_drsuapi.o \
librpc/gen_ndr/ndr_drsuapi_c.o
-LIBCLI_DFS_OBJ = librpc/gen_ndr/cli_dfs.o \
-librpc/gen_ndr/ndr_dfs_c.o
+LIBCLI_DFS_OBJ = librpc/gen_ndr/ndr_dfs_c.o
LIBCLI_ECHO_OBJ = librpc/gen_ndr/cli_echo.o \
librpc/gen_ndr/ndr_echo_c.o
diff --git a/source3/build/dynconfig.py b/source3/build/dynconfig.py
index 4bc97e5..f755f7f 100644
--- a/source3/build/dynconfig.py
+++ b/source3/build/dynconfig.py
@@ -2,51 +2,48 @@ import string, Utils
# list of directory options to offer in configure
dir_options = {
-'with-piddir' : [ '${PREFIX}/var/locks', 'where to
put pid files' ],
-'with-privatedir' : [ '${PREFIX}/private', 'Where to
put sam.ldb and other private files' ],
-'with-winbindd-socket-dir': [ '${PREFIX}/var/lib/winbindd',
'winbind socket directory' ],
-'with-winbindd-privileged-socket-dir' : [
'${PREFIX}/var/lib/winbindd_privileged', 'winbind privileged socket directory'],
-'with-ntp-signd-socket-dir' : [ '${PREFIX}/var/run/ntp_signd',
'NTP signed directory'],
-'with-lockdir': [ '${PREFIX}/var/locks', 'where to
put lock files' ],
-'with-codepagedir': [ '${PREFIX}/lib/samba', 'where to
put codepages' ],
-'with-privatedir' : [ '${PREFIX}/private', 'where to
put smbpasswd' ],
'with-cachedir' : [ '${PREFIX}/var/locks', 'where to
put temporary cache files' ],
-'with-logfilebase': [ '${PREFIX}/var/log/samba',
'Where to put log files' ],
+'with-codepagedir': [ '${PREFIX}/lib/samba', 'where to
put codepages' ],
'with-configdir' : [ '${PREFIX}/etc/samba', 'Where to
put configuration files' ],
-'with-swatdir': [ '${PREFIX}/swat', 'Where to put
SWAT files' ],
-'with-statedir' : [ '${PREFIX}/var/locks', 'where to
put persistent state files' ],
-
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 2cc005a s4-waf: get the version number right on private libraries
from 837333e s3-waf: make the --with-Xdir options work more like in the
classic build.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 2cc005a32f1ee25186e9da793120e72d0af845f2
Author: Andrew Tridgell tri...@samba.org
Date: Wed Dec 8 11:25:28 2010 +1100
s4-waf: get the version number right on private libraries
use the first digit of the version number for the library version
Pair-Programmed-With: Jelmer Vernooij jel...@samba.org
(cherry picked from commit d5bf5255917862f35bb6849a407539c43cde2b04)
---
Summary of changes:
buildtools/wafsamba/samba_version.py | 13 +
buildtools/wafsamba/wafsamba.py |2 +-
source4/wscript | 22 +-
source4/wscript_build|3 +++
4 files changed, 22 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_version.py
b/buildtools/wafsamba/samba_version.py
index df71584..c5f424d 100644
--- a/buildtools/wafsamba/samba_version.py
+++ b/buildtools/wafsamba/samba_version.py
@@ -1,5 +1,6 @@
import os
import Utils
+import samba_utils
def bzr_version_summary(path):
try:
@@ -244,3 +245,15 @@ def samba_version_file(version_file, path, env=None):
raise
return SambaVersion(version_dict, path, env=env)
+
+
+
+def load_version(env=None):
+'''load samba versions either from ./VERSION or git
+return a version object for detailed breakdown'''
+if not env:
+env = samba_utils.LOAD_ENVIRONMENT()
+
+version = samba_version_file(./VERSION, .., env)
+Utils.g_module.VERSION = version.STRING
+return version
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 5d13fa1..4e1b3e1 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -191,7 +191,7 @@ def SAMBA_LIBRARY(bld, libname, source,
if vnum:
Logs.error(vnum is invalid for private libraries)
sys.exit(1)
-vnum = Utils.g_module.VERSION
+vnum = Utils.g_module.VERSION[0]
features = 'cc cshlib symlink_lib install_lib'
if target_type == 'PYTHON':
diff --git a/source4/wscript b/source4/wscript
index 48f340c..145f6b8 100644
--- a/source4/wscript
+++ b/source4/wscript
@@ -8,19 +8,7 @@ VERSION=None
import sys, os
sys.path.insert(0, srcdir+/buildtools/wafsamba)
-import wafsamba, Options, samba_dist, Scripting, Utils
-
-
-def load_version(env=None):
-'''load samba versions either from ./VERSION or git
-return a version object for detailed breakdown'''
-import samba_utils, Utils
-if not env:
-env = samba_utils.LOAD_ENVIRONMENT()
-
-version = wafsamba.samba_version_file(./VERSION, .., env)
-Utils.g_module.VERSION = version.STRING
-return version
+import wafsamba, Options, samba_dist, Scripting, Utils, samba_version
samba_dist.DIST_DIRS('.')
@@ -61,7 +49,7 @@ def set_options(opt):
def configure(conf):
-version = load_version(env=conf.env)
+version = samba_version.load_version(env=conf.env)
conf.DEFINE('CONFIG_H_IS_FROM_SAMBA', 1)
conf.DEFINE('_SAMBA_BUILD_', version.MAJOR, add_to_cflags=True)
@@ -152,7 +140,7 @@ def ctags(ctx):
# of commands in --help
def build(bld):
'''build all targets'''
-load_version(env=bld.env)
+samba_version.load_version(env=bld.env)
pass
@@ -178,12 +166,12 @@ def wafdocs(ctx):
def dist():
'''makes a tarball for distribution'''
-load_version(env=None)
+samba_version.load_version(env=None)
samba_dist.dist()
def distcheck():
'''test that distribution tarball builds and installs'''
-load_version(env=None)
+samba_version.load_version(env=None)
import Scripting
d = Scripting.distcheck
d(subdir='source4')
diff --git a/source4/wscript_build b/source4/wscript_build
index 474aca6..27c6932 100644
--- a/source4/wscript_build
+++ b/source4/wscript_build
@@ -5,11 +5,14 @@
import os
srcdir = ..
+import samba_version
+
# create separate build groups for building the asn1 and et compiler, then
# building the C from ASN1 and IDL, and finally the main build process
bld.SETUP_BUILD_GROUPS()
bld.AUTOCLEANUP_STALE_FILES()
+samba_version.load_version(bld.env)
bld.SAMBA_MKVERSION('version.h')
# bld.ENABLE_MAGIC_ORDERING()
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 2187c49 s3-waf: fix winbind_krb5_locator.so realname.
from f405384 s3-waf: make the --with-Xdir options work more like in the
classic build.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 2187c490137b420fd09343fcc03c04320b9f8183
Author: Günther Deschner g...@samba.org
Date: Fri Jan 7 00:37:02 2011 +0100
s3-waf: fix winbind_krb5_locator.so realname.
Guenther
Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Fri Jan 7 11:13:29 CET 2011 on sn-devel-104
---
Summary of changes:
source3/wscript_build |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/wscript_build b/source3/wscript_build
index a9e2e24..7d70608 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -773,7 +773,7 @@ if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
bld.SAMBA_LIBRARY('winbind_krb5_locator',
source='../nsswitch/winbind_krb5_locator.c',
deps='wbclient krb5',
- vnum='0')
+ realname='winbind_krb5_locator.so')
bld.SAMBA_SUBSYSTEM('LIBMSRPC',
source='${LIBMSRPC_SRC}',
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 6a0a047 s4/ldapcmp: Two new options are added to the tool
from 2187c49 s3-waf: fix winbind_krb5_locator.so realname.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 6a0a0478ad6f77e3279775dcb0dad51bc3b1457a
Author: Zahari Zahariev zahari.zahar...@postpath.com
Date: Wed Jan 5 18:56:23 2011 +0200
s4/ldapcmp: Two new options are added to the tool
The new ones are --base and --scope they give us the opportunity to
compare DN subsets of the partitions. Now we are also able to compare
any two objects even if they have different DNs. This is exteremely
helpful when you are after nasty nTSecurityDescriptor bug.
Signed-off-by: Anatoliy Atanasov anatoliy.atana...@postpath.com
Autobuild-User: Anatoliy Atanasov anatoliy.atana...@postpath.com
Autobuild-Date: Fri Jan 7 13:22:26 CET 2011 on sn-devel-104
---
Summary of changes:
source4/scripting/python/samba/netcmd/ldapcmp.py | 116 ++
1 files changed, 76 insertions(+), 40 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/scripting/python/samba/netcmd/ldapcmp.py
b/source4/scripting/python/samba/netcmd/ldapcmp.py
index 7816fce..dff0c1e 100755
--- a/source4/scripting/python/samba/netcmd/ldapcmp.py
+++ b/source4/scripting/python/samba/netcmd/ldapcmp.py
@@ -47,7 +47,7 @@ class LDAPBase(object):
def __init__(self, host, creds, lp,
two=False, quiet=False, descriptor=False, verbose=False,
- view=section):
+ view=section, base=, scope=SUB):
ldb_options = []
samdb_url = host
if not :// in host:
@@ -62,6 +62,8 @@ class LDAPBase(object):
credentials=creds,
lp=lp,
options=ldb_options)
+self.search_base = base
+self.search_scope = scope
self.two_domains = two
self.quiet = quiet
self.descriptor = descriptor
@@ -591,6 +593,8 @@ class LDAPBundel(object):
self.two_domains = self.con.two_domains
self.quiet = self.con.quiet
self.verbose = self.con.verbose
+self.search_base = self.con.search_base
+self.search_scope = self.con.search_scope
self.summary = {}
self.summary[unique_attrs] = []
self.summary[df_value_attrs] = []
@@ -635,32 +639,36 @@ class LDAPBundel(object):
self.log( \n* DN lists have different size: %s != %s %
(self.size, other.size) )
res = False
#
-title= \n* DNs found only in %s: % self.con.host
-for x in self.dn_list:
-if not x.upper() in [q.upper() for q in other.dn_list]:
-if title:
-self.log( title )
-title = None
-res = False
-self.log( 4* + x )
-self.dn_list[self.dn_list.index(x)] =
-self.dn_list = [x for x in self.dn_list if x]
-#
-title= \n* DNs found only in %s: % other.con.host
-for x in other.dn_list:
-if not x.upper() in [q.upper() for q in self.dn_list]:
-if title:
-self.log( title )
-title = None
-res = False
-self.log( 4* + x )
-other.dn_list[other.dn_list.index(x)] =
-other.dn_list = [x for x in other.dn_list if x]
-#
-self.update_size()
-other.update_size()
-assert self.size == other.size
-assert sorted([x.upper() for x in self.dn_list]) == sorted([x.upper()
for x in other.dn_list])
+# This is the case where we want to explicitly compare two objects
with different DNs.
+# It does not matter if they are in the same DC, in two DC in one
domain or in two
+# different domains.
+if self.search_scope != SCOPE_BASE:
+title= \n* DNs found only in %s: % self.con.host
+for x in self.dn_list:
+if not x.upper() in [q.upper() for q in other.dn_list]:
+if title:
+self.log( title )
+title = None
+res = False
+self.log( 4* + x )
+self.dn_list[self.dn_list.index(x)] =
+self.dn_list = [x for x in self.dn_list if x]
+#
+title= \n* DNs found only in %s: % other.con.host
+for x in other.dn_list:
+if not x.upper() in [q.upper() for q in self.dn_list]:
+if title:
+self.log( title )
+title = None
+res = False
+self.log( 4* + x )
+
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 3e0915f s3: Make nmbd socket dir configurable via 2672101 s3: Remove some unused code via dab6a35 s3: Limit the number of unexpected clients to 200 via 0cff82e s3: Limit the number of unexpected packets per client to 10 via 5f4ff3b s3: Use the new nbt_getdc in winbindd_cm via b4041b5 s3: Use the new nbt_getdc in dsgetdcname() via f952000 s3: Add nbt_getdc via 1137cf8 s3: Fix a valgrind error via 126b180 s3: Factor out parse_getdc_response via 0376d03 s3: Lift my_mailslot from prep_getdc_request via 6ba4bdd s3: Make name_query use /tmp/.nmbd/unexpected via a32f021 s3: Make node_status_query use /tmp/.nmbd/unexpected via 77a9b0e s3: Add nb_trans_send/recv via cbd5e4e s3: Add sock_packet_read via d801d4d s3: Add packet_trn_id() via 5297f3f s3: Make nmbd listen on the unexpected socket via b2c62d6 s3: Basic infrastructure for /tmp/.nmbd/unexpected from 6a0a047 s4/ldapcmp: Two new options are added to the tool http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 3e0915f2712a966f14ac0f7bc9fb24b6ed95d284 Author: Volker Lendecke v...@samba.org Date: Thu Jan 6 12:33:44 2011 +0100 s3: Make nmbd socket dir configurable Autobuild-User: Volker Lendecke vlen...@samba.org Autobuild-Date: Fri Jan 7 14:14:19 CET 2011 on sn-devel-104 commit 2672101cc4fa406ed89647b3d541556e548c10bf Author: Volker Lendecke v...@samba.org Date: Wed Jan 5 14:50:21 2011 +0100 s3: Remove some unused code commit dab6a35f4cf6a7e8a3c05319e891e06887d63998 Author: Volker Lendecke v...@samba.org Date: Wed Jan 5 14:35:11 2011 +0100 s3: Limit the number of unexpected clients to 200 DoS protection like the max winbind clients. Settable by nmbd:unexpected_clients commit 0cff82e054cea6b473dcfa6de840ece7327ef6ca Author: Volker Lendecke v...@samba.org Date: Wed Jan 5 14:34:04 2011 +0100 s3: Limit the number of unexpected packets per client to 10 Non-reading clients could maliciously make nmbd allocate memory commit 5f4ff3bfbd0a48787b8b57c60cc4c6cdcec036a1 Author: Volker Lendecke v...@samba.org Date: Wed Jan 5 14:13:00 2011 +0100 s3: Use the new nbt_getdc in winbindd_cm commit b4041b59b2977b821f1f786e42c9bfac9763d7ea Author: Volker Lendecke v...@samba.org Date: Wed Jan 5 14:12:44 2011 +0100 s3: Use the new nbt_getdc in dsgetdcname() commit f9520008dfbea495636fdf591b5c998056082633 Author: Volker Lendecke v...@samba.org Date: Sun Jan 2 12:49:08 2011 +0100 s3: Add nbt_getdc This is a getdc version that uses /tmp/.nmbd/unexpected commit 1137cf8e6fa35cec24826642e4289c4a8df56cb8 Author: Volker Lendecke v...@samba.org Date: Thu Jan 6 02:12:00 2011 +0100 s3: Fix a valgrind error commit 126b1806b8e8fba98de94e217836680608621726 Author: Volker Lendecke v...@samba.org Date: Sun Jan 2 14:43:18 2011 +0100 s3: Factor out parse_getdc_response commit 0376d03e6db6713285bad9ad27c3b48e8c11b848 Author: Volker Lendecke v...@samba.org Date: Sun Jan 2 12:42:47 2011 +0100 s3: Lift my_mailslot from prep_getdc_request commit 6ba4bddb61cb6033a7937152966a608c1bbced40 Author: Volker Lendecke v...@samba.org Date: Tue Jan 4 18:48:47 2011 +0100 s3: Make name_query use /tmp/.nmbd/unexpected commit a32f021d66f7b4f5cc3b902371a22ced1f786fee Author: Volker Lendecke v...@samba.org Date: Tue Jan 4 18:34:38 2011 +0100 s3: Make node_status_query use /tmp/.nmbd/unexpected commit 77a9b0e265ae6e65bd0a0b73f65b3a8953b3f59d Author: Volker Lendecke v...@samba.org Date: Tue Jan 4 18:22:38 2011 +0100 s3: Add nb_trans_send/recv This does an async port 137 transaction: It connects to /tmp/.nmbd/unexpected, sends out the query and then waits for a reply on both the socket as well as data from /tmp/.nmbd/unexpected. Every packet is passed through a validator. If that returns true, the packet received is finally accepted. commit cbd5e4e16b6499a945bd5969bdd2da87bdf21255 Author: Volker Lendecke v...@samba.org Date: Tue Jan 4 18:17:33 2011 +0100 s3: Add sock_packet_read Read packets from both a socket and from /tmp/.nmbd/unexpected simultaneously commit d801d4da2d9f6146b4dfe5e2a0be00e8d2d3ae1b Author: Volker Lendecke v...@samba.org Date: Tue Jan 4 18:07:12 2011 +0100 s3: Add packet_trn_id() commit 5297f3fcffbe42c646048abf63e63ed10d971d46 Author: Volker Lendecke v...@samba.org Date: Tue Jan 4 17:58:12 2011 +0100 s3: Make nmbd listen on the unexpected socket commit b2c62d639d7fd565d39a999d500018b290b5279f Author: Volker Lendecke v...@samba.org Date: Tue Jan 4 17:12:17 2011 +0100 s3: Basic infrastructure for /tmp/.nmbd/unexpected This provides the framework to replace the unexpected.tdb file. Nmbd will listen on /tmp/.nmbd/unexpected.
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 286c3d6 s3-waf: add NMBDSOCKETDIR variable.
via 5c9eca6 s3-build: fix classic build after libcli netlogon changes.
via 3294ccb netlogon: move netlogon helpers to ../libcli/netlogon.
via 75c8e42 s3-waf: rename LIBCLI_NETLOGON subsystem to
LIBRPCCLI_NETLOGON.
via 358c8ec s3-waf: rearrange waf recurses in main wscript_build.
via ccf15eb s3-waf: cleanup wscript_build a little.
via 0a7d6dc s3-waf: recurse into ../lib/smbconf.
from 3e0915f s3: Make nmbd socket dir configurable
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 286c3d6d8ed0b50b8da0e9416df200c9162bc4cf
Author: Günther Deschner g...@samba.org
Date: Fri Jan 7 15:21:26 2011 +0100
s3-waf: add NMBDSOCKETDIR variable.
Guenther
Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Fri Jan 7 16:33:55 CET 2011 on sn-devel-104
commit 5c9eca6fc4060d9780264fe3576f12ac1d9d9759
Author: Günther Deschner g...@samba.org
Date: Fri Jan 7 12:36:38 2011 +0100
s3-build: fix classic build after libcli netlogon changes.
Guenther
commit 3294ccbb6d2ce26da5b6b9b512dfc1184a153d26
Author: Günther Deschner g...@samba.org
Date: Fri Jan 7 12:01:42 2011 +0100
netlogon: move netlogon helpers to ../libcli/netlogon.
Guenther
commit 75c8e429383d0d5d4cb13e769d66d87a64252e42
Author: Günther Deschner g...@samba.org
Date: Fri Jan 7 12:19:00 2011 +0100
s3-waf: rename LIBCLI_NETLOGON subsystem to LIBRPCCLI_NETLOGON.
Guenther
commit 358c8ec292868b8674577b41e46fc447e657b396
Author: Günther Deschner g...@samba.org
Date: Fri Jan 7 12:08:54 2011 +0100
s3-waf: rearrange waf recurses in main wscript_build.
Guenther
commit ccf15ebcc3ee318415028cf449a0b2efa914548e
Author: Günther Deschner g...@samba.org
Date: Fri Jan 7 11:45:33 2011 +0100
s3-waf: cleanup wscript_build a little.
Guenther
commit 0a7d6dc8a886c0e4cd98efadc193e43df05ab172
Author: Günther Deschner g...@samba.org
Date: Fri Jan 7 11:41:15 2011 +0100
s3-waf: recurse into ../lib/smbconf.
Guenther
---
Summary of changes:
libcli/cldap/cldap.h |2 +-
libcli/nbt/wscript_build | 12
libcli/{ = netlogon}/ndr_netlogon.c |2 +-
libcli/{ = netlogon}/ndr_netlogon_proto.h |0
libcli/{ = netlogon}/netlogon.c |2 +-
libcli/{ = netlogon}/netlogon.h |4 +-
libcli/{ = netlogon}/netlogon_proto.h |0
libcli/netlogon/wscript_build | 11 +++
librpc/idl/nbt.idl |2 +-
source3/Makefile.in|4 +-
source3/build/dynconfig.py |2 +
source3/libads/cldap.h |2 +-
source3/libsmb/clidgram.h |2 +-
source3/libsmb/namequery.c |2 +-
source3/nmbd/nmbd_processlogon.c |2 +-
source3/wscript_build | 95
source4/libcli/dgram/libdgram.h|2 +-
source4/libcli/finddc.h|2 +-
source4/wscript_build |1 +
19 files changed, 68 insertions(+), 81 deletions(-)
rename libcli/{ = netlogon}/ndr_netlogon.c (99%)
rename libcli/{ = netlogon}/ndr_netlogon_proto.h (100%)
rename libcli/{ = netlogon}/netlogon.c (99%)
rename libcli/{ = netlogon}/netlogon.h (94%)
rename libcli/{ = netlogon}/netlogon_proto.h (100%)
create mode 100644 libcli/netlogon/wscript_build
Changeset truncated at 500 lines:
diff --git a/libcli/cldap/cldap.h b/libcli/cldap/cldap.h
index d05e5b9..d119748 100644
--- a/libcli/cldap/cldap.h
+++ b/libcli/cldap/cldap.h
@@ -19,7 +19,7 @@
along with this program. If not, see http://www.gnu.org/licenses/.
*/
-#include ../libcli/netlogon.h
+#include ../libcli/netlogon/netlogon.h
struct ldap_message;
struct tsocket_address;
diff --git a/libcli/nbt/wscript_build b/libcli/nbt/wscript_build
index 9cae6e0..7229d12 100644
--- a/libcli/nbt/wscript_build
+++ b/libcli/nbt/wscript_build
@@ -21,18 +21,6 @@ bld.SAMBA_BINARY('nmblookup',
)
-bld.SAMBA_SUBSYSTEM('LIBCLI_NDR_NETLOGON',
- source='../ndr_netlogon.c',
- public_deps='ndr NDR_SECURITY'
- )
-
-
-bld.SAMBA_SUBSYSTEM('LIBCLI_NETLOGON',
- source='../netlogon.c',
- public_deps='samba-util LIBCLI_NDR_NETLOGON'
- )
-
-
bld.SAMBA_PYTHON('python_netbios',
source='pynbt.c',
public_deps='cli-nbt DYNCONFIG samba-hostconfig',
diff --git a/libcli/ndr_netlogon.c b/libcli/netlogon/ndr_netlogon.c
similarity index 99%
rename from libcli/ndr_netlogon.c
rename to libcli/netlogon/ndr_netlogon.c
index d15154d..7d6aa97 100644
--- a/libcli/ndr_netlogon.c
+++ b/libcli/netlogon/ndr_netlogon.c
@@
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 617e342 s3-nmbd: Fix bug #7875
from 286c3d6 s3-waf: add NMBDSOCKETDIR variable.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 617e342a14e4fa8046ea456a89a0760f7deab8d5
Author: Björn Baumbach b...@sernet.de
Date: Fri Jan 7 15:53:13 2011 +0100
s3-nmbd: Fix bug #7875
nmbd --port didn't work
Signed-off-by: Stefan Metzmacher me...@samba.org
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Fri Jan 7 17:44:08 CET 2011 on sn-devel-104
---
Summary of changes:
source3/nmbd/nmbd.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 446c893..b2230c3 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -760,8 +760,8 @@ static bool open_sockets(bool isdaemon, int port)
{foreground, 'F', POPT_ARG_NONE, NULL, OPT_FORK, Run daemon in
foreground (for daemontools etc) },
{no-process-group, 0, POPT_ARG_NONE, NULL, OPT_NO_PROCESS_GROUP,
Don't create a new process group },
{log-stdout, 'S', POPT_ARG_NONE, NULL, OPT_LOG_STDOUT, Log to
stdout },
- {hosts, 'H', POPT_ARG_STRING, p_lmhosts, 'H', Load a netbios hosts
file},
- {port, 'p', POPT_ARG_INT, global_nmb_port, NMB_PORT, Listen on the
specified port },
+ {hosts, 'H', POPT_ARG_STRING, p_lmhosts, 0, Load a netbios hosts
file},
+ {port, 'p', POPT_ARG_INT, global_nmb_port, 0, Listen on the
specified port },
POPT_COMMON_SAMBA
{ NULL }
};
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via fb58d94 s3-nmbd: Fix bug #7875
from 2cc005a s4-waf: get the version number right on private libraries
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit fb58d94f297529c3b3388b564b3866658b91c957
Author: Björn Baumbach b...@sernet.de
Date: Fri Jan 7 15:53:13 2011 +0100
s3-nmbd: Fix bug #7875
nmbd --port didn't work
Signed-off-by: Stefan Metzmacher me...@samba.org
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Fri Jan 7 17:44:08 CET 2011 on sn-devel-104
(cherry picked from commit 617e342a14e4fa8046ea456a89a0760f7deab8d5)
---
Summary of changes:
source3/nmbd/nmbd.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 30bbeaa..1f7d4b5 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -768,8 +768,8 @@ static bool open_sockets(bool isdaemon, int port)
{foreground, 'F', POPT_ARG_NONE, NULL, OPT_FORK, Run daemon in
foreground (for daemontools etc) },
{no-process-group, 0, POPT_ARG_NONE, NULL, OPT_NO_PROCESS_GROUP,
Don't create a new process group },
{log-stdout, 'S', POPT_ARG_NONE, NULL, OPT_LOG_STDOUT, Log to
stdout },
- {hosts, 'H', POPT_ARG_STRING, p_lmhosts, 'H', Load a netbios hosts
file},
- {port, 'p', POPT_ARG_INT, global_nmb_port, NMB_PORT, Listen on the
specified port },
+ {hosts, 'H', POPT_ARG_STRING, p_lmhosts, 0, Load a netbios hosts
file},
+ {port, 'p', POPT_ARG_INT, global_nmb_port, 0, Listen on the
specified port },
POPT_COMMON_SAMBA
{ NULL }
};
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via 4e72d9b s3: Make nmbd socket dir configurable via 082040d s3: Remove some unused code via 84e4835 s3: Limit the number of unexpected clients to 200 via b2d10b7 s3: Limit the number of unexpected packets per client to 10 via ef77aa7 s3: Use the new nbt_getdc in winbindd_cm via 8ba9767 s3: Use the new nbt_getdc in dsgetdcname() via 01f60a6 s3: Add nbt_getdc via 4934d84 s3: Fix a valgrind error via cdaf2f8 s3: Factor out parse_getdc_response via c070a39 s3: Lift my_mailslot from prep_getdc_request via 6e32aac s3: Make name_query use /tmp/.nmbd/unexpected via f40375e s3: Make node_status_query use /tmp/.nmbd/unexpected via 063f50a s3: Add nb_trans_send/recv via 9abeeae s3: Add sock_packet_read via 6bbba0a s3: Add packet_trn_id() via 71ade76 s3: Make nmbd listen on the unexpected socket via 60ef871 s3: Basic infrastructure for /tmp/.nmbd/unexpected from fb58d94 s3-nmbd: Fix bug #7875 http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit 4e72d9bdb3b737b3e13b65a863515ba840e1daab Author: Volker Lendecke v...@samba.org Date: Thu Jan 6 12:33:44 2011 +0100 s3: Make nmbd socket dir configurable Autobuild-User: Volker Lendecke vlen...@samba.org Autobuild-Date: Fri Jan 7 14:14:19 CET 2011 on sn-devel-104 commit 082040d4ee69763e0355bc87b23d51dfff87bce0 Author: Volker Lendecke v...@samba.org Date: Wed Jan 5 14:50:21 2011 +0100 s3: Remove some unused code commit 84e48356790a3c5390e6a97c5e36f9b5c4546d75 Author: Volker Lendecke v...@samba.org Date: Wed Jan 5 14:35:11 2011 +0100 s3: Limit the number of unexpected clients to 200 DoS protection like the max winbind clients. Settable by nmbd:unexpected_clients commit b2d10b7e295fd298cbcd997b67656f064c6c9ab5 Author: Volker Lendecke v...@samba.org Date: Wed Jan 5 14:34:04 2011 +0100 s3: Limit the number of unexpected packets per client to 10 Non-reading clients could maliciously make nmbd allocate memory commit ef77aa754852c7c6e1694c4aa669c5df210bc298 Author: Volker Lendecke v...@samba.org Date: Wed Jan 5 14:13:00 2011 +0100 s3: Use the new nbt_getdc in winbindd_cm commit 8ba97675dbfde418352e2b2fbca77974391285e5 Author: Volker Lendecke v...@samba.org Date: Wed Jan 5 14:12:44 2011 +0100 s3: Use the new nbt_getdc in dsgetdcname() commit 01f60a6d9fae0214133431280acb062530bd7f24 Author: Volker Lendecke v...@samba.org Date: Sun Jan 2 12:49:08 2011 +0100 s3: Add nbt_getdc This is a getdc version that uses /tmp/.nmbd/unexpected commit 4934d841bd4af3553c0ea00ca4e054a1ca3cafc6 Author: Volker Lendecke v...@samba.org Date: Thu Jan 6 02:12:00 2011 +0100 s3: Fix a valgrind error commit cdaf2f8cfe65c8be92593de47ce555fff71d8e38 Author: Volker Lendecke v...@samba.org Date: Sun Jan 2 14:43:18 2011 +0100 s3: Factor out parse_getdc_response commit c070a3956dbee29003d9720d7fc0a025ff124d94 Author: Volker Lendecke v...@samba.org Date: Sun Jan 2 12:42:47 2011 +0100 s3: Lift my_mailslot from prep_getdc_request commit 6e32aac073a1527ac2f30bc861002d7a947114a6 Author: Volker Lendecke v...@samba.org Date: Tue Jan 4 18:48:47 2011 +0100 s3: Make name_query use /tmp/.nmbd/unexpected commit f40375e955140f5d1fa59c4ef6ceda386eeaa7fc Author: Volker Lendecke v...@samba.org Date: Tue Jan 4 18:34:38 2011 +0100 s3: Make node_status_query use /tmp/.nmbd/unexpected commit 063f50a0c06fe268c8ec38d91946fa3128adc665 Author: Volker Lendecke v...@samba.org Date: Tue Jan 4 18:22:38 2011 +0100 s3: Add nb_trans_send/recv This does an async port 137 transaction: It connects to /tmp/.nmbd/unexpected, sends out the query and then waits for a reply on both the socket as well as data from /tmp/.nmbd/unexpected. Every packet is passed through a validator. If that returns true, the packet received is finally accepted. commit 9abeeae58a259a7a623176f2af4e44ce5252b2b2 Author: Volker Lendecke v...@samba.org Date: Tue Jan 4 18:17:33 2011 +0100 s3: Add sock_packet_read Read packets from both a socket and from /tmp/.nmbd/unexpected simultaneously commit 6bbba0a80673cd3bab3d589f828e87a2805a4c07 Author: Volker Lendecke v...@samba.org Date: Tue Jan 4 18:07:12 2011 +0100 s3: Add packet_trn_id() commit 71ade76c304ba8412a8be28a059279e2e5a1d129 Author: Volker Lendecke v...@samba.org Date: Tue Jan 4 17:58:12 2011 +0100 s3: Make nmbd listen on the unexpected socket commit 60ef871acee2342445d420c7f96642683c0061b6 Author: Volker Lendecke v...@samba.org Date: Tue Jan 4 17:12:17 2011 +0100 s3: Basic infrastructure for /tmp/.nmbd/unexpected This provides the framework to replace the unexpected.tdb file. Nmbd will listen on /tmp/.nmbd/unexpected. A client interested
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 3a14c97 s4: upgradeprovision: Improve wording, punctuation from 617e342 s3-nmbd: Fix bug #7875 http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 3a14c97459ea21f4a3ecefabfd676cb9839a162f Author: Michael Wood esiot...@gmail.com Date: Wed Jan 5 03:36:16 2011 +0200 s4: upgradeprovision: Improve wording, punctuation Signed-off-by: Matthieu Patou m...@matws.net Autobuild-User: Matthieu Patou m...@samba.org Autobuild-Date: Sat Jan 8 00:25:08 CET 2011 on sn-devel-104 --- Summary of changes: source4/scripting/bin/upgradeprovision | 117 --- 1 files changed, 60 insertions(+), 57 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision index 36c99ee..297d38a 100755 --- a/source4/scripting/bin/upgradeprovision +++ b/source4/scripting/bin/upgradeprovision @@ -146,7 +146,7 @@ parser.add_option(--debugguess, action=store_true, parser.add_option(--debugchange, action=store_true, help=Print information on what is different but won't be changed) parser.add_option(--debugchangesd, action=store_true, - help=Print information security descriptors differences) + help=Print security descriptor differences) parser.add_option(--debugall, action=store_true, help=Print all available information (very verbose)) parser.add_option(--resetfileacl, action=store_true, @@ -219,11 +219,11 @@ def check_for_DNS(refprivate, private): os.mkdir(dnsdir) shutil.copy(%s/named.conf % refprivate, %s/named.conf % destdir) shutil.copy(%s/named.txt % refprivate, %s/named.txt % destdir) -message(SIMPLE, It seems that you provision didn't integrate new rules -for dynamic dns update of domain related entries) +message(SIMPLE, It seems that your provision did not integrate +new rules for dynamic dns update of domain related entries) message(SIMPLE, A copy of the new bind configuration files and -template as been put in %s, you should read them and configure dynamic - dns update % destdir) +template has been put in %s, you should read them and +configure dynamic dns updates % destdir) def populate_links(samdb, schemadn): @@ -263,12 +263,13 @@ def sanitychecks(samdb, names): scope=SCOPE_SUBTREE, attrs=[dn], controls=[search_options:1:2]) if len(res) == 0: -print No DC found, your provision is most probably hardly broken ! +print No DC found. Your provision is most probably broken! return False elif len(res) != 1: -print Found %d domain controllers, for the moment upgradeprovision \ - is not able to handle upgrade on domain with more than one DC, please demote \ - the other(s) DC(s) before upgrading % len(res) +print Found %d domain controllers. For the moment \ + upgradeprovision is not able to handle an upgrade on a \ + domain with more than one DC. PLease demote the other \ + DC(s) before upgrading % len(res) return False else: return True @@ -409,7 +410,7 @@ def handle_special_case(att, delta, new, old, usn, basedn, aldb): return False def dump_denied_change(dn, att, flagtxt, current, reference): -Print detailed information about why a changed is denied +Print detailed information about why a change is denied :param dn: DN of the object which attribute is denied :param att: Attribute that was supposed to be upgraded @@ -419,7 +420,7 @@ def dump_denied_change(dn, att, flagtxt, current, reference): :param reference: Value(s) of the reference attribute message(CHANGE, dn= + str(dn)+ + att+ with flag + flagtxt -+ is not allowed to be changed/removed, I discard this change) ++ must not be changed/removed. Discarding the change) if att == objectSid : message(CHANGE, old : %s % ndr_unpack(security.dom_sid, current[0])) message(CHANGE, new : %s % ndr_unpack(security.dom_sid, reference[0])) @@ -488,7 +489,7 @@ def handle_special_add(samdb, dn, names): controls=[search_options:1:2]) if len(res) 0 and len(res2) == 0: -message(CHANGE, Existing object %s must be replaced by %s, +message(CHANGE, Existing object %s must be replaced by %s. Renaming old object % (str(oldDn), str(dn))) samdb.rename(oldDn, objDn, [relax:0, provision:0]) @@ -507,8 +508,8 @@ def
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 0838466 s3-waf: add NMBDSOCKETDIR variable.
via d3a475d s3-build: fix classic build after libcli netlogon changes.
via ecdb498 netlogon: move netlogon helpers to ../libcli/netlogon.
via c4262ad s3-waf: rename LIBCLI_NETLOGON subsystem to
LIBRPCCLI_NETLOGON.
via 7e1902e s3-waf: rearrange waf recurses in main wscript_build.
via 8dcedd5 s3-waf: cleanup wscript_build a little.
via a5d07e8 s3-waf: recurse into ../lib/smbconf.
via 59d5f42 s3-waf: fix winbind_krb5_locator.so realname.
from 4e72d9b s3: Make nmbd socket dir configurable
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 0838466c5db640c5a8cd146d0339f77b16d75f42
Author: Günther Deschner g...@samba.org
Date: Fri Jan 7 15:21:26 2011 +0100
s3-waf: add NMBDSOCKETDIR variable.
Guenther
Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Fri Jan 7 16:33:55 CET 2011 on sn-devel-104
(cherry picked from commit 286c3d6d8ed0b50b8da0e9416df200c9162bc4cf)
commit d3a475d56bbb1947b33f99b5615bf650bcc69322
Author: Günther Deschner g...@samba.org
Date: Fri Jan 7 12:36:38 2011 +0100
s3-build: fix classic build after libcli netlogon changes.
Guenther
(cherry picked from commit 5c9eca6fc4060d9780264fe3576f12ac1d9d9759)
commit ecdb498b3e0b927a22b5dab569650a6b9b95cc2a
Author: Günther Deschner g...@samba.org
Date: Fri Jan 7 12:01:42 2011 +0100
netlogon: move netlogon helpers to ../libcli/netlogon.
Guenther
commit c4262ade8d2128bbdee35d6bb05f91691fbefec7
Author: Günther Deschner g...@samba.org
Date: Fri Jan 7 12:19:00 2011 +0100
s3-waf: rename LIBCLI_NETLOGON subsystem to LIBRPCCLI_NETLOGON.
Guenther
(cherry picked from commit 75c8e429383d0d5d4cb13e769d66d87a64252e42)
commit 7e1902e3700be864b6fd4ac5c5ed0ecf9e4be665
Author: Günther Deschner g...@samba.org
Date: Fri Jan 7 12:08:54 2011 +0100
s3-waf: rearrange waf recurses in main wscript_build.
Guenther
(cherry picked from commit 358c8ec292868b8674577b41e46fc447e657b396)
commit 8dcedd5fe81aaf9fd00d79fe94f82dfd4c5c57bf
Author: Günther Deschner g...@samba.org
Date: Fri Jan 7 11:45:33 2011 +0100
s3-waf: cleanup wscript_build a little.
Guenther
(cherry picked from commit ccf15ebcc3ee318415028cf449a0b2efa914548e)
commit a5d07e81d6b94a51fe8e29947caa06df691bcdef
Author: Günther Deschner g...@samba.org
Date: Fri Jan 7 11:41:15 2011 +0100
s3-waf: recurse into ../lib/smbconf.
Guenther
(cherry picked from commit 0a7d6dc8a886c0e4cd98efadc193e43df05ab172)
commit 59d5f422f17878b877a60a89085c24dcc197c447
Author: Günther Deschner g...@samba.org
Date: Fri Jan 7 00:37:02 2011 +0100
s3-waf: fix winbind_krb5_locator.so realname.
Guenther
Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Fri Jan 7 11:13:29 CET 2011 on sn-devel-104
(cherry picked from commit 2187c490137b420fd09343fcc03c04320b9f8183)
---
Summary of changes:
libcli/cldap/cldap.h |2 +-
libcli/nbt/wscript_build | 12
libcli/{ = netlogon}/ndr_netlogon.c |2 +-
libcli/{ = netlogon}/ndr_netlogon_proto.h |0
libcli/{ = netlogon}/netlogon.c |2 +-
libcli/{ = netlogon}/netlogon.h |4 +-
libcli/{ = netlogon}/netlogon_proto.h |0
libcli/netlogon/wscript_build | 11 +++
librpc/idl/nbt.idl |2 +-
source3/Makefile.in|4 +-
source3/build/dynconfig.py |2 +
source3/libads/cldap.h |2 +-
source3/libsmb/clidgram.h |2 +-
source3/libsmb/namequery.c |2 +-
source3/nmbd/nmbd_processlogon.c |2 +-
source3/wscript_build | 97
source4/libcli/dgram/libdgram.h|2 +-
source4/libcli/finddc.h|2 +-
source4/wscript_build |1 +
19 files changed, 69 insertions(+), 82 deletions(-)
rename libcli/{ = netlogon}/ndr_netlogon.c (99%)
rename libcli/{ = netlogon}/ndr_netlogon_proto.h (100%)
rename libcli/{ = netlogon}/netlogon.c (99%)
rename libcli/{ = netlogon}/netlogon.h (94%)
rename libcli/{ = netlogon}/netlogon_proto.h (100%)
create mode 100644 libcli/netlogon/wscript_build
Changeset truncated at 500 lines:
diff --git a/libcli/cldap/cldap.h b/libcli/cldap/cldap.h
index d05e5b9..d119748 100644
--- a/libcli/cldap/cldap.h
+++ b/libcli/cldap/cldap.h
@@ -19,7 +19,7 @@
along with this program. If not, see http://www.gnu.org/licenses/.
*/
-#include ../libcli/netlogon.h
+#include ../libcli/netlogon/netlogon.h
struct ldap_message;
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 52aac4d Move wins_lookup_open_socket_in() to remove a compile warning. via 3e61c97 s3-printing: remove printer_list_need_refresh via ff57776 s3-printing: remove old entries in pcap_cache_replace via 0b188e7 s3-printing: Initiate pcap reload from parent smbd via 04248c2 s3-printing: reload shares after pcap cache fill from 3a14c97 s4: upgradeprovision: Improve wording, punctuation http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 52aac4dd54e5b965505049828b3505c7109a6c8e Author: Jeremy Allison j...@samba.org Date: Fri Jan 7 15:27:51 2011 -0800 Move wins_lookup_open_socket_in() to remove a compile warning. Autobuild-User: Jeremy Allison j...@samba.org Autobuild-Date: Sat Jan 8 01:48:27 CET 2011 on sn-devel-104 commit 3e61c97a7e20a55be53f60c761091933ced53570 Author: David Disseldorp dd...@suse.de Date: Tue Dec 28 15:54:54 2010 +0100 s3-printing: remove printer_list_need_refresh printer_list_need_refresh() was used previously to ensure one smbd process did not attempt to update the printer_list tdb during or soon after update by another smbd. It is no longer needed, as pcap updates are now only performed by the parent smbd process following startup, SIGHUP, config update or printcap cache time expiry. commit ff577762b9cb37355f9433850b2119a6411e21da Author: David Disseldorp dd...@suse.de Date: Tue Dec 28 14:55:01 2010 +0100 s3-printing: remove old entries in pcap_cache_replace Callers of pcap_cache_replace() assume the existing printcap cache is replaced by the new values provided. This is not currently the case, old entries should be removed. commit 0b188e7784a3f58810f871bf63d10d8a691ecbae Author: David Disseldorp dd...@suse.de Date: Thu Dec 23 12:14:21 2010 +0100 s3-printing: Initiate pcap reload from parent smbd Since commit 7022554, smbds share a printcap cache (printer_list.tdb), therefore ordering of events between smbd processes is important when updating printcap cache information. Consider the following two process example: 1) smbd1 receives HUP or printcap cache time expiry 2) smbd1 checks whether pcap needs refresh, it does 3) smbd1 marks pcap as refreshed 4) smbd1 forks child1 to obtain cups printer info 5) smbd2 receives HUP or printcap cache time expiry 6) smbd2 checks whether pcap needs refresh, it does not (due to step 3) 7) smbd2 reloads printer shares prior to child1 completion (stale pcap) 8) child1 completion, pcap cache (printer_list.tdb) is updated by smbd1 9) smbd1 reloads printer shares based on new pcap information In this case both smbd1 and smbd2 are reliant on the pcap update performed on child1 completion. The prior commit reload shares after pcap cache fill ensures that smbd1 only reloads printer shares following pcap update, however smbd2 continues to present shares based on stale pcap data. This commit addresses the above problem by driving pcap cache and printer share updates from the parent smbd process. 1) smbd0 (parent) receives a HUP or printcap cache time expiry 2) smbd0 forks child0 to obtain cups printer info 3) child0 completion, pcap cache (printer_list.tdb) is updated by smbd0 4) smbd0 reloads printer shares 5) smbd0 notifies child smbds of pcap update via message_send_all() 6) child smbds read fresh pcap data and reload printer shares This architecture has the additional advantage that only a single process (the parent smbd) requests printer information from the printcap backend. Use time_mono in housekeeping functions As suggested by Björn Jacke. commit 04248c2cfaa5a1728ef58fc8ca231fd1309ca694 Author: David Disseldorp dd...@suse.de Date: Sun Dec 19 19:52:08 2010 +0100 s3-printing: reload shares after pcap cache fill Since commit eada8f8a, updates to the cups pcap cache are performed asynchronously - cups_cache_reload() forks a child process to request cups printer information and notify the parent smbd on completion. Currently printer shares are reloaded immediately following the call to cups_cache_reload(), this occurs prior to smbd receiving new cups pcap information from the child process. Such behaviour can result in stale print shares as outlined in bug 7836. This fix ensures print shares are only reloaded after new pcap data has been received. Pair-Programmed-With: Lars Müller l...@samba.org --- Summary of changes: docs-xml/smbdotconf/printing/printcapcachetime.xml |4 +- nsswitch/wins.c| 87 ++-- source3/include/local.h|1 +
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 005c637 waf: ensure make dist works from a clean git tree for all libraries from 52aac4d Move wins_lookup_open_socket_in() to remove a compile warning. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 005c6370cdaab69d4228ecbf5e7369ebc61b86ae Author: Andrew Tridgell tri...@samba.org Date: Sat Jan 8 11:39:32 2011 +1100 waf: ensure make dist works from a clean git tree for all libraries this uses a temporary waf lock file to force the build directory Autobuild-User: Andrew Tridgell tri...@samba.org Autobuild-Date: Sat Jan 8 02:35:22 CET 2011 on sn-devel-104 --- Summary of changes: lib/replace/Makefile |6 -- lib/talloc/Makefile |6 -- lib/tdb/Makefile |6 -- lib/tevent/Makefile |6 -- source4/lib/ldb/Makefile |6 -- 5 files changed, 20 insertions(+), 10 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/replace/Makefile b/lib/replace/Makefile index 5b8220c..3649901 100644 --- a/lib/replace/Makefile +++ b/lib/replace/Makefile @@ -21,10 +21,12 @@ quicktest: $(WAF) test --quick $(TEST_OPTIONS) dist: - $(WAF) dist + touch .tmplock + WAFLOCK=.tmplock $(WAF) dist distcheck: - $(WAF) distcheck + touch .tmplock + WAFLOCK=.tmplock $(WAF) distcheck clean: $(WAF) clean diff --git a/lib/talloc/Makefile b/lib/talloc/Makefile index 95564eb..4c28653 100644 --- a/lib/talloc/Makefile +++ b/lib/talloc/Makefile @@ -21,10 +21,12 @@ quicktest: $(WAF) test --quick $(TEST_OPTIONS) dist: - $(WAF) dist + touch .tmplock + WAFLOCK=.tmplock $(WAF) dist distcheck: - $(WAF) distcheck + touch .tmplock + WAFLOCK=.tmplock $(WAF) distcheck clean: $(WAF) clean diff --git a/lib/tdb/Makefile b/lib/tdb/Makefile index 95564eb..4c28653 100644 --- a/lib/tdb/Makefile +++ b/lib/tdb/Makefile @@ -21,10 +21,12 @@ quicktest: $(WAF) test --quick $(TEST_OPTIONS) dist: - $(WAF) dist + touch .tmplock + WAFLOCK=.tmplock $(WAF) dist distcheck: - $(WAF) distcheck + touch .tmplock + WAFLOCK=.tmplock $(WAF) distcheck clean: $(WAF) clean diff --git a/lib/tevent/Makefile b/lib/tevent/Makefile index f178363..5acfcbc 100644 --- a/lib/tevent/Makefile +++ b/lib/tevent/Makefile @@ -15,10 +15,12 @@ test: $(WAF) test $(TEST_OPTIONS) dist: - $(WAF) dist + touch .tmplock + WAFLOCK=.tmplock $(WAF) dist distcheck: - $(WAF) distcheck + touch .tmplock + WAFLOCK=.tmplock $(WAF) distcheck clean: $(WAF) clean diff --git a/source4/lib/ldb/Makefile b/source4/lib/ldb/Makefile index da05bcf..a07b4a7 100644 --- a/source4/lib/ldb/Makefile +++ b/source4/lib/ldb/Makefile @@ -15,10 +15,12 @@ test: $(WAF) test $(TEST_OPTIONS) dist: - $(WAF) dist + touch .tmplock + WAFLOCK=.tmplock $(WAF) dist distcheck: - $(WAF) distcheck + touch .tmplock + WAFLOCK=.tmplock $(WAF) distcheck clean: $(WAF) clean -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via adfacdc Move wins_lookup_open_socket_in() to remove a compile warning. via 57dcab1 s3-printing: remove printer_list_need_refresh via cde4ebd s3-printing: remove old entries in pcap_cache_replace via 29d67d6 s3-printing: Initiate pcap reload from parent smbd via 60b7c19 s3-printing: reload shares after pcap cache fill from 0838466 s3-waf: add NMBDSOCKETDIR variable. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit adfacdcfac94e7646dae3ed38a6ff3eeea9f5e84 Author: Jeremy Allison j...@samba.org Date: Fri Jan 7 15:27:51 2011 -0800 Move wins_lookup_open_socket_in() to remove a compile warning. Autobuild-User: Jeremy Allison j...@samba.org Autobuild-Date: Sat Jan 8 01:48:27 CET 2011 on sn-devel-104 commit 57dcab12d1ac2098ec77a1c5533a85f5b31f8a0e Author: David Disseldorp dd...@suse.de Date: Tue Dec 28 15:54:54 2010 +0100 s3-printing: remove printer_list_need_refresh printer_list_need_refresh() was used previously to ensure one smbd process did not attempt to update the printer_list tdb during or soon after update by another smbd. It is no longer needed, as pcap updates are now only performed by the parent smbd process following startup, SIGHUP, config update or printcap cache time expiry. commit cde4ebd2bf9c2288fe954e3c51c8cf3b0ec3fb2d Author: David Disseldorp dd...@suse.de Date: Tue Dec 28 14:55:01 2010 +0100 s3-printing: remove old entries in pcap_cache_replace Callers of pcap_cache_replace() assume the existing printcap cache is replaced by the new values provided. This is not currently the case, old entries should be removed. commit 29d67d615278f00e9bc6ae4583c209fa836f3b72 Author: David Disseldorp dd...@suse.de Date: Thu Dec 23 12:14:21 2010 +0100 s3-printing: Initiate pcap reload from parent smbd Since commit 7022554, smbds share a printcap cache (printer_list.tdb), therefore ordering of events between smbd processes is important when updating printcap cache information. Consider the following two process example: 1) smbd1 receives HUP or printcap cache time expiry 2) smbd1 checks whether pcap needs refresh, it does 3) smbd1 marks pcap as refreshed 4) smbd1 forks child1 to obtain cups printer info 5) smbd2 receives HUP or printcap cache time expiry 6) smbd2 checks whether pcap needs refresh, it does not (due to step 3) 7) smbd2 reloads printer shares prior to child1 completion (stale pcap) 8) child1 completion, pcap cache (printer_list.tdb) is updated by smbd1 9) smbd1 reloads printer shares based on new pcap information In this case both smbd1 and smbd2 are reliant on the pcap update performed on child1 completion. The prior commit reload shares after pcap cache fill ensures that smbd1 only reloads printer shares following pcap update, however smbd2 continues to present shares based on stale pcap data. This commit addresses the above problem by driving pcap cache and printer share updates from the parent smbd process. 1) smbd0 (parent) receives a HUP or printcap cache time expiry 2) smbd0 forks child0 to obtain cups printer info 3) child0 completion, pcap cache (printer_list.tdb) is updated by smbd0 4) smbd0 reloads printer shares 5) smbd0 notifies child smbds of pcap update via message_send_all() 6) child smbds read fresh pcap data and reload printer shares This architecture has the additional advantage that only a single process (the parent smbd) requests printer information from the printcap backend. Use time_mono in housekeeping functions As suggested by Björn Jacke. commit 60b7c19739acf3c18dc4071e96e3311a32237506 Author: David Disseldorp dd...@suse.de Date: Sun Dec 19 19:52:08 2010 +0100 s3-printing: reload shares after pcap cache fill Since commit eada8f8a, updates to the cups pcap cache are performed asynchronously - cups_cache_reload() forks a child process to request cups printer information and notify the parent smbd on completion. Currently printer shares are reloaded immediately following the call to cups_cache_reload(), this occurs prior to smbd receiving new cups pcap information from the child process. Such behaviour can result in stale print shares as outlined in bug 7836. This fix ensures print shares are only reloaded after new pcap data has been received. Pair-Programmed-With: Lars Müller l...@samba.org --- Summary of changes: docs-xml/smbdotconf/printing/printcapcachetime.xml |4 +- nsswitch/wins.c| 87 ++-- source3/include/local.h|1 +
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 85cbe4a Explicitly set nmbd: socket dir in the test environment.
(cherry picked from commit 12277bb5f5e6b3cd0e9158ebda3c1746fc25bb4a)
from adfacdc Move wins_lookup_open_socket_in() to remove a compile
warning.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 85cbe4af615d9b2c6edc456bcee6475fa9ee88c0
Author: Jeremy Allison j...@samba.org
Date: Fri Jan 7 21:28:45 2011 -0800
Explicitly set nmbd: socket dir in the test environment.
(cherry picked from commit 12277bb5f5e6b3cd0e9158ebda3c1746fc25bb4a)
---
Summary of changes:
selftest/selftest.pl |1 +
selftest/target/Samba3.pm |8
2 files changed, 9 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 9759220..40fe2df 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -818,6 +818,7 @@ my @exported_envvars = (
KRB5_CONFIG,
WINBINDD_SOCKET_DIR,
WINBINDD_PRIV_PIPE_DIR,
+ NMBD_SOCKET_DIR,
LOCAL_PATH
);
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 279fc65..c2b31e4 100644
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -220,6 +220,7 @@ sub check_or_start($) {
SocketWrapper::set_default_iface($env_vars-{SOCKET_WRAPPER_DEFAULT_IFACE});
$ENV{WINBINDD_SOCKET_DIR} = $env_vars-{WINBINDD_SOCKET_DIR};
+ $ENV{NMBD_SOCKET_DIR} = $env_vars-{NMBD_SOCKET_DIR};
$ENV{NSS_WRAPPER_PASSWD} = $env_vars-{NSS_WRAPPER_PASSWD};
$ENV{NSS_WRAPPER_GROUP} = $env_vars-{NSS_WRAPPER_GROUP};
@@ -262,6 +263,7 @@ sub check_or_start($) {
SocketWrapper::set_default_iface($env_vars-{SOCKET_WRAPPER_DEFAULT_IFACE});
$ENV{WINBINDD_SOCKET_DIR} = $env_vars-{WINBINDD_SOCKET_DIR};
+ $ENV{NMBD_SOCKET_DIR} = $env_vars-{NMBD_SOCKET_DIR};
$ENV{NSS_WRAPPER_PASSWD} = $env_vars-{NSS_WRAPPER_PASSWD};
$ENV{NSS_WRAPPER_GROUP} = $env_vars-{NSS_WRAPPER_GROUP};
@@ -304,6 +306,7 @@ sub check_or_start($) {
SocketWrapper::set_default_iface($env_vars-{SOCKET_WRAPPER_DEFAULT_IFACE});
$ENV{WINBINDD_SOCKET_DIR} = $env_vars-{WINBINDD_SOCKET_DIR};
+ $ENV{NMBD_SOCKET_DIR} = $env_vars-{NMBD_SOCKET_DIR};
$ENV{NSS_WRAPPER_PASSWD} = $env_vars-{NSS_WRAPPER_PASSWD};
$ENV{NSS_WRAPPER_GROUP} = $env_vars-{NSS_WRAPPER_GROUP};
@@ -403,6 +406,9 @@ sub provision($$)
my $wbsockdir=$prefix_abs/winbindd;
my $wbsockprivdir=$lockdir/winbindd_privileged;
+ my $nmbdsockdir=$prefix_abs/nmbd;
+ push(@dirs,$nmbdsockdir);
+
##
## create the test directory layout
##
@@ -519,6 +525,7 @@ sub provision($$)
printcap name = /dev/null
winbindd:socket dir = $wbsockdir
+ nmbd:socket dir = $nmbdsockdir
idmap uid = 10-20
idmap gid = 10-20
winbind enum users = yes
@@ -652,6 +659,7 @@ domusers:X:$gid_domusers:
$ret{PIDDIR} = $piddir;
$ret{WINBINDD_SOCKET_DIR} = $wbsockdir;
$ret{WINBINDD_PRIV_PIPE_DIR} = $wbsockprivdir;
+ $ret{NMBD_SOCKET_DIR} = $nmbdsockdir;
$ret{SOCKET_WRAPPER_DEFAULT_IFACE} = $swiface;
$ret{NSS_WRAPPER_PASSWD} = $nss_wrapper_passwd;
$ret{NSS_WRAPPER_GROUP} = $nss_wrapper_group;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 04987bd Explicitly set nmbd: socket dir in the test environment.
from 005c637 waf: ensure make dist works from a clean git tree for all
libraries
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 04987bd84362e894631dc0c75c74f23dd8b36a34
Author: Jeremy Allison j...@samba.org
Date: Fri Jan 7 21:28:45 2011 -0800
Explicitly set nmbd: socket dir in the test environment.
Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Sat Jan 8 07:17:22 CET 2011 on sn-devel-104
---
Summary of changes:
selftest/selftest.pl |1 +
selftest/target/Samba3.pm |8
2 files changed, 9 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 5552736..1da1331 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -819,6 +819,7 @@ my @exported_envvars = (
KRB5_CONFIG,
WINBINDD_SOCKET_DIR,
WINBINDD_PRIV_PIPE_DIR,
+ NMBD_SOCKET_DIR,
LOCAL_PATH
);
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 279fc65..c2b31e4 100644
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -220,6 +220,7 @@ sub check_or_start($) {
SocketWrapper::set_default_iface($env_vars-{SOCKET_WRAPPER_DEFAULT_IFACE});
$ENV{WINBINDD_SOCKET_DIR} = $env_vars-{WINBINDD_SOCKET_DIR};
+ $ENV{NMBD_SOCKET_DIR} = $env_vars-{NMBD_SOCKET_DIR};
$ENV{NSS_WRAPPER_PASSWD} = $env_vars-{NSS_WRAPPER_PASSWD};
$ENV{NSS_WRAPPER_GROUP} = $env_vars-{NSS_WRAPPER_GROUP};
@@ -262,6 +263,7 @@ sub check_or_start($) {
SocketWrapper::set_default_iface($env_vars-{SOCKET_WRAPPER_DEFAULT_IFACE});
$ENV{WINBINDD_SOCKET_DIR} = $env_vars-{WINBINDD_SOCKET_DIR};
+ $ENV{NMBD_SOCKET_DIR} = $env_vars-{NMBD_SOCKET_DIR};
$ENV{NSS_WRAPPER_PASSWD} = $env_vars-{NSS_WRAPPER_PASSWD};
$ENV{NSS_WRAPPER_GROUP} = $env_vars-{NSS_WRAPPER_GROUP};
@@ -304,6 +306,7 @@ sub check_or_start($) {
SocketWrapper::set_default_iface($env_vars-{SOCKET_WRAPPER_DEFAULT_IFACE});
$ENV{WINBINDD_SOCKET_DIR} = $env_vars-{WINBINDD_SOCKET_DIR};
+ $ENV{NMBD_SOCKET_DIR} = $env_vars-{NMBD_SOCKET_DIR};
$ENV{NSS_WRAPPER_PASSWD} = $env_vars-{NSS_WRAPPER_PASSWD};
$ENV{NSS_WRAPPER_GROUP} = $env_vars-{NSS_WRAPPER_GROUP};
@@ -403,6 +406,9 @@ sub provision($$)
my $wbsockdir=$prefix_abs/winbindd;
my $wbsockprivdir=$lockdir/winbindd_privileged;
+ my $nmbdsockdir=$prefix_abs/nmbd;
+ push(@dirs,$nmbdsockdir);
+
##
## create the test directory layout
##
@@ -519,6 +525,7 @@ sub provision($$)
printcap name = /dev/null
winbindd:socket dir = $wbsockdir
+ nmbd:socket dir = $nmbdsockdir
idmap uid = 10-20
idmap gid = 10-20
winbind enum users = yes
@@ -652,6 +659,7 @@ domusers:X:$gid_domusers:
$ret{PIDDIR} = $piddir;
$ret{WINBINDD_SOCKET_DIR} = $wbsockdir;
$ret{WINBINDD_PRIV_PIPE_DIR} = $wbsockprivdir;
+ $ret{NMBD_SOCKET_DIR} = $nmbdsockdir;
$ret{SOCKET_WRAPPER_DEFAULT_IFACE} = $swiface;
$ret{NSS_WRAPPER_PASSWD} = $nss_wrapper_passwd;
$ret{NSS_WRAPPER_GROUP} = $nss_wrapper_group;
--
Samba Shared Repository
