[Samba] file locking options in smb.conf
Hi List, I have a file server which runs samba-3.0.28a. My aim is to share a logical volume ( with XFS filesystem) using SAMBA, NFS and FTP. Since it is a file server I’m very much concerned about file locking. After googling and reading a lot I had set file locking flags in smb.conf lock directory = /var/lock/samba strict locking = no locking = yes level2 oplocks = no kernel oplocks = yes oplocks = yes But still I am having lots of problems in file locking. Following conditions are not working as expected CIFS(linux) -- CIFS(windows) NFS -- CIFS CIFS -- FTP How ever CIFS(windows) -- CIFS ( windows) locking working as expected. Can any one suggest best suitable combination file locking parameters for me? Thanks Regards, Anoop P A -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] winbind, ntlm_auth and multiple AD domains
Hello In the organization where I work there are serveral labolatories, each having its own, independent Active Directory Domain (there are no trust relationships between them). We want to build a central 802.1x authentication with users credentials being verified in these AD. To achieve this we configured a central FreeRadius server + winbind and ntlm_auth from Samba suite. It works perfectly with one AD, but situation with multiple AD seems to be very troublesome. The question is - it is possible to have multiple winbind instances, each binded to a different AD domain and each being interacted (via FreeRadius) by a different instance of ntlm_auth? Or maybe it is possible to bind one winbinnd to more than one domain? I've managed so far to run multiple instances of winbind (each with a different configuration), but because of pipe in /tmp/ ntlm_auth interacts only with the most recent one. We have already considered other solutions (trust between domains, running multiple configuration on virtual machines) but from many security, political and redundancy reasons these are not suitable solutions for us. Any suggestions will be highly appreciated. Best regards Lukasz Fiszer -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] file locking options in smb.conf
On Tue, May 05, 2009 at 02:42:57AM -0700, Anoop P.A. wrote: Hi List, I have a file server which runs samba-3.0.28a. My aim is to share a logical volume ( with XFS filesystem) using SAMBA, NFS and FTP. Since it is a file server I’m very much concerned about file locking. After googling and reading a lot I had set file locking flags in smb.conf lock directory = /var/lock/samba strict locking = no locking = yes level2 oplocks = no kernel oplocks = yes oplocks = yes But still I am having lots of problems in file locking. Following conditions are not working as expected Question: What do you expect with which applications? Volker pgptZovLUdQeY.pgp Description: PGP signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
RE: [Samba] file locking options in smb.conf
Hi Volker, Thanks for the reply. I want basic file locking work as expected. ( i.e. I want to prevent files from getting corrupted while shared across multiple platforms). If some file is opened writing in one client, other clients should not be able to write in to it. My server failing in many scenarios, I could explain one of the scenario as follows. 1. Opened a share using browser in Win XP machine. 2. Mounted same share in a Linux machine through nfs. 3. Initiated a 1 GB file transfer to share in windows 4. Same time tried to copy a file with same name in nfs share.It asked to overwrite existing file( I expect it not to start copy as write lock of that file is being obtained by CIFS client) 5. After a while both the transfers finished. MD5SUM showed resultant file got corrupted. I would like to know best possible file locking options which will prevent files being corrupted while sharing across multiple platform / multiple protocols Thanks Anoop -Original Message- From: Volker Lendecke [mailto:volker.lende...@sernet.de] Sent: Tuesday, May 05, 2009 4:06 PM To: Anoop P.A. Cc: samba@lists.samba.org Subject: Re: [Samba] file locking options in smb.conf On Tue, May 05, 2009 at 02:42:57AM -0700, Anoop P.A. wrote: Hi List, I have a file server which runs samba-3.0.28a. My aim is to share a logical volume ( with XFS filesystem) using SAMBA, NFS and FTP. Since it is a file server I’m very much concerned about file locking. After googling and reading a lot I had set file locking flags in smb.conf lock directory = /var/lock/samba strict locking = no locking = yes level2 oplocks = no kernel oplocks = yes oplocks = yes But still I am having lots of problems in file locking. Following conditions are not working as expected Question: What do you expect with which applications? Volker -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] samba on mipsel board
Hi, I have cross compiled samba to a mipsel board. I could access the shares from another linux machine using smbmount, and from a mac OSX machine. But, I can not modify files from an XP machine. I could successfully mount the shares, but if I open, say a text file from the XP in notepad and try to modify it, it generates an error not enough storage is available to process this command. And if I open it with Wordpad, it would not even open, the error is An Unexpected error occured while reading \\Blackboxone\public\dummy.txt. Could anybody please help me to resolve the issue. Many thanks, mahmood. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] file locking options in smb.conf
On Tue, May 05, 2009 at 04:27:30AM -0700, Anoop P.A. wrote: Hi Volker, Thanks for the reply. I want basic file locking work as expected. ( i.e. I want to prevent files from getting corrupted while shared across multiple platforms). If some file is opened writing in one client, other clients should not be able to write in to it. My server failing in many scenarios, I could explain one of the scenario as follows. 1. Opened a share using browser in Win XP machine. 2. Mounted same share in a Linux machine through nfs. 3. Initiated a 1 GB file transfer to share in windows 4. Same time tried to copy a file with same name in nfs share.It asked to overwrite existing file( I expect it not to start copy as write lock of that file is being obtained by CIFS client) 5. After a while both the transfers finished. MD5SUM showed resultant file got corrupted. No way you will achieve this cross-protocol. Unix just does not know how to lock a complete file like Windows/CIFS does using share modes. Your only chance is to only use Samba and a cifs client file system and ditch NFS and local file access. Volker pgpuDndNnUwZG.pgp Description: PGP signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] samba on mipsel board
On Tue, May 05, 2009 at 12:20:54PM +0100, Mahmood Javed wrote: Hi, I have cross compiled samba to a mipsel board. I could access the shares from another linux machine using smbmount, and from a mac OSX machine. But, I can not modify files from an XP machine. I could successfully mount the shares, but if I open, say a text file from the XP in notepad and try to modify it, it generates an error not enough storage is available to process this command. And if I open it with Wordpad, it would not even open, the error is An Unexpected error occured while reading \\Blackboxone\public\dummy.txt. Could anybody please help me to resolve the issue. Many thanks, Please send a debug level 10 log of smbd of those attempts. Thanks, Volker pgpAPKz5yVEU0.pgp Description: PGP signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] default log level
Hello, According to 'man smb.conf' and 'testparm -v' the default log level 0 while it seems to be actually 1. Regards, Thierry -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] winbindd stays at 100% CPU having joined a domain
[ Please would anyone replying to this maintain the Cc list here as my dear colleague is not subscribed to this mailing list. ] Hello all, I am trying to track down an oddity with winbindd. We're using samba only to join a given domain -- so the config file is very minimal, as per: [global] workgroup = TEDDYBEARS netbios name = SMOOTHWALL realm = TEDDYBEARS.LOCAL security = ads password server = ad.teddybears.local winbind separator = / winbind enum users = yes winbind enum groups = yes Shortly after joining a domain though, winbindd will suddenly start using 100% CPU and sit there. Attaching strace to this process shows nothing -- literally, it's making no system calls whatsoever. Attaching gdb to this running process and using next reveals that it's doing the following: memcpy() - tdb_read() - tdb_find() ... and then stops in tdb_find() claiming there's no more line numbers to look at. So on the tentative premise the problem lies in tbd_find(), I didn't find anything obvious, but noticed the following call-chain is happening: tdb_find() |--- tdb_key_compare() +--- tdb_parse_data() Not knowing *anything* about samba internals, can someone suggest whether this is even a relevant starting point? We're currently using samba 3.2.8 -- and in trying to diagnose this, have gone through some releases, trying samba 3.2.10 and then samba 3.3.3 -- alas, this problem still remains in both those versions. Our use of Samba is deployed as part of a commercial product. The kernel we're running is 2.6.16.60-3-smp. Is there something that we're not adding to our configuration file (as in the above) which might aid in solving this? It's certainly a difficult problem to replicate -- and perhaps the only likely aspect worth mentioning is that samba is being asked to join a domain against Windows Server 2008 -- should that be relevant. Having done a lot of background work trying to track this down, there's almost no information about this in the mailing list archives which suggests to me some very odd corner-case bug, a problem with Samba and Windows Server 2008, or a configuration problem. Given that the configuration referenced above is the same for all customers (barring the obvious changes for values on netbios, workgroup, realm, etc.) it's likely to be something else, but I am open to suggestions. I'm attaching a version of a backtrace from GDB of a running version of winbindd exhibiting this problem. The version of winbind is from version 3.2.4. There's two backtraces of the same process for comparison. If there's any further information, don't hesitiate to let me know. Kindly, -- Thomas Adam Senior Developer Smoothwall Ltd. Email: thomas.a...@smoothwall.net SmoothWall Limited 1 John Charles Way Leeds LS12 6QA United Kingdom Phone: 1 800 959 3760 (USA, Canada and North America) 0870 1 999 500 (United Kingdom) +44 870 1 999 500 (all other countries) Fax: +44 870 1 991 399 Web: http://www.smoothwall.net/ SmoothWall Limited is registered in England, Company Number: 429824i7 This email and any attachments transmitted with it are confidential to the intended recipient(s) and may not be communicated to any other person or published by any means without the express permission of SmoothWall Limited. Any views expressed in this message are solely those of the author. See: http://smoothwall.net/company/email.php for the full text of this notice. #0 0x402aa970 in tdb_find () from /modules/guardian/usr/lib/libtdb.so.1 #1 0x402aaa8d in tdb_update_hash () from /modules/guardian/usr/lib/libtdb.so.1 #2 0x402ab3c4 in tdb_store () from /modules/guardian/usr/lib/libtdb.so.1 #3 0x0812a48e in tdb_store_bystring () #4 0x0837f493 in netsamlogon_cache_store () #5 0x080aea38 in winbindd_dual_pam_auth_crap () #6 0x080c45d4 in child_process_request () #7 0x080c6a58 in fork_domain_child () #8 0x080c4191 in schedule_async_request () #9 0x080c3afe in async_request () #10 0x0809d467 in init_child_connection () #11 0x080c430e in async_domain_request () #12 0x0809cab8 in add_trusted_domains () #13 0x0809d1b8 in rescan_trusted_domains () #14 0x080946eb in process_loop () #15 0x0809571e in main () #0 0x4038979c in memcpy () from /lib/libc.so.6 #1 0x402af1a2 in tdb_read () from /modules/guardian/usr/lib/libtdb.so.1 #2 0x402afb6a in tdb_rec_read () from /modules/guardian/usr/lib/libtdb.so.1 #3 0x402aa90c in tdb_find () from /modules/guardian/usr/lib/libtdb.so.1 #4 0x402aaa8d in tdb_update_hash () from /modules/guardian/usr/lib/libtdb.so.1 #5 0x402ab3c4 in tdb_store () from /modules/guardian/usr/lib/libtdb.so.1 #6 0x0812a48e in tdb_store_bystring () #7 0x0837f493 in netsamlogon_cache_store () #8 0x080aea38 in winbindd_dual_pam_auth_crap () #9 0x080c45d4 in child_process_request () #10 0x080c6a58 in fork_domain_child () #11 0x080c4191 in schedule_async_request () #12 0x080c3afe in async_request () #13 0x0809d467 in init_child_connection () #14 0x080c430e in
Re: [Samba] winbindd stays at 100% CPU having joined a domain
On Tue, May 05, 2009 at 09:43:36AM +0100, Thomas Adam wrote: [ Please would anyone replying to this maintain the Cc list here as my dear colleague is not subscribed to this mailing list. ] Hello all, I am trying to track down an oddity with winbindd. We're using samba only to join a given domain -- so the config file is very minimal, as per: [global] workgroup = TEDDYBEARS netbios name = SMOOTHWALL realm = TEDDYBEARS.LOCAL security = ads password server = ad.teddybears.local winbind separator = / winbind enum users = yes winbind enum groups = yes Shortly after joining a domain though, winbindd will suddenly start using 100% CPU and sit there. Attaching strace to this process shows nothing -- literally, it's making no system calls whatsoever. Attaching gdb to this running process and using next reveals that it's doing the following: memcpy() - tdb_read() - tdb_find() Very likely that is a corrupted tdb file, probably the netsamlogon_cache.tdb. What kind of file system do you run this on? Volker pgp7p1gE8wlFE.pgp Description: PGP signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] winbindd stays at 100% CPU having joined a domain
On Tue, May 05, 2009 at 03:40:15PM +0200, Volker Lendecke wrote: On Tue, May 05, 2009 at 09:43:36AM +0100, Thomas Adam wrote: Attaching strace to this process shows nothing -- literally, it's making no system calls whatsoever. Attaching gdb to this running process and using next reveals that it's doing the following: memcpy() - tdb_read() - tdb_find() Very likely that is a corrupted tdb file, probably the netsamlogon_cache.tdb. What kind of file system do you run this on? This is in ext3. I've just looked at the machine in question and there's the following files: ./var/locks/gencache.tdb ./var/locks/idmap_cache.tdb ./var/locks/messages.tdb ./var/locks/winbindd_cache.tdb ./var/locks/netsamlogon_cache.tdb ./var/locks/connections.tdb ./var/locks/mutex.tdb The particular file in question has an access time of Jan 23rd 2009. Are these files periodically removed by samba such as when it restarts, or are they somehow persistent? Certainly the timestamp on the netsamlogon_cache.tdb file suggests it's persistent. Are they meant to be cleared, even? Kindly, -- Thomas Adam Senior Developer Smoothwall Ltd. Email: thomas.a...@smoothwall.net SmoothWall Limited 1 John Charles Way Leeds LS12 6QA United Kingdom Phone: 1 800 959 3760 (USA, Canada and North America) 0870 1 999 500 (United Kingdom) +44 870 1 999 500 (all other countries) Fax: +44 870 1 991 399 Web: http://www.smoothwall.net/ SmoothWall Limited is registered in England, Company Number: 429824i7 This email and any attachments transmitted with it are confidential to the intended recipient(s) and may not be communicated to any other person or published by any means without the express permission of SmoothWall Limited. Any views expressed in this message are solely those of the author. See: http://smoothwall.net/company/email.php for the full text of this notice. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] winbindd stays at 100% CPU having joined a domain
On Tue, May 05, 2009 at 02:47:13PM +0100, Thomas Adam wrote: On Tue, May 05, 2009 at 03:40:15PM +0200, Volker Lendecke wrote: On Tue, May 05, 2009 at 09:43:36AM +0100, Thomas Adam wrote: Attaching strace to this process shows nothing -- literally, it's making no system calls whatsoever. Attaching gdb to this running process and using next reveals that it's doing the following: memcpy() - tdb_read() - tdb_find() Very likely that is a corrupted tdb file, probably the netsamlogon_cache.tdb. What kind of file system do you run this on? This is in ext3. Ok, this indicates that you're running on Linux. The particular file in question has an access time of Jan 23rd 2009. Are these files periodically removed by samba such as when it restarts, or are they somehow persistent? Certainly the timestamp on the netsamlogon_cache.tdb file suggests it's persistent. Are they meant to be cleared, even? Linux has the problem that when writing to a file using mmap, the mtime is not updated. netsamlogon_cache is a persistent database that is not cleared, it's only overwritten by new entries. But you can safely delete it while Samba/winbind are shut down. If this happens frequently, you might want to look at smbd or winbind processes crashing hard and try to find more info on those, or you might want to look at possibly flaky hardware. Volker pgpOJIqEtE98y.pgp Description: PGP signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] samba on a mipsel board
Hi, In continuation to my earlier mail(pasted below), a debug level 10 log is attached. I tried to modify the dummy.txt file through notepad. Please ignore the time stamps in the logs. Many thanks, mahmood. *** I have cross compiled samba to a mipsel board. I could access the shares from another linux machine using smbmount, and from a mac OSX machine. But, I can not modify files from an XP machine. I could successfully mount the shares, but if I open, say a text file from the XP in notepad and try to modify it, it generates an error not enough storage is available to process this command. And if I open it with Wordpad, it would not even open, the error is An Unexpected error occured while reading \\Blackboxone\public\dummy.txt. *** [2000/01/01 03:35:36, 3] smbd/process.c:process_smb(1549) Transaction 200 of length 80 (0 toread) [2000/01/01 03:35:36, 3] smbd/process.c:switch_message(1361) switch message SMBtrans2 (pid 1459) conn 0x1005ec08 [2000/01/01 03:35:36, 3] smbd/sec_ctx.c:set_sec_ctx(324) setting sec ctx (1000, 1000) - sec_ctx_stack_ndx = 0 [2000/01/01 03:35:36, 3] smbd/trans2.c:call_trans2qfilepathinfo(3939) call_trans2qfilepathinfo: TRANSACT2_QPATHINFO: level = 1004 [2000/01/01 03:35:36, 3] smbd/trans2.c:call_trans2qfilepathinfo(4013) call_trans2qfilepathinfo . (fnum = -1) level=1004 call=5 total_data=0 [2000/01/01 03:35:36, 3] smbd/process.c:process_smb(1549) Transaction 201 of length 104 (0 toread) [2000/01/01 03:35:36, 3] smbd/process.c:switch_message(1361) switch message SMBntcreateX (pid 1459) conn 0x10059010 [2000/01/01 03:35:36, 3] smbd/sec_ctx.c:set_sec_ctx(324) setting sec ctx (1000, 1000) - sec_ctx_stack_ndx = 0 [2000/01/01 03:35:36, 3] smbd/nttrans.c:nt_open_pipe(320) nt_open_pipe: Known pipe srvsvc opening. [2000/01/01 03:35:36, 3] smbd/process.c:process_smb(1549) Transaction 202 of length 140 (0 toread) [2000/01/01 03:35:36, 3] smbd/process.c:switch_message(1361) switch message SMBwriteX (pid 1459) conn 0x10059010 [2000/01/01 03:35:36, 3] rpc_server/srv_pipe.c:api_pipe_bind_req(1564) api_pipe_bind_req: \PIPE\srvsvc - \PIPE\srvsvc [2000/01/01 03:35:36, 3] rpc_server/srv_pipe.c:check_bind_req(991) check_bind_req for \PIPE\srvsvc [2000/01/01 03:35:36, 3] smbd/pipes.c:reply_pipe_write_and_X(251) writeX-IPC pnum=70a7 nwritten=72 [2000/01/01 03:35:36, 3] smbd/process.c:process_smb(1549) Transaction 203 of length 63 (0 toread) [2000/01/01 03:35:36, 3] smbd/process.c:switch_message(1361) switch message SMBreadX (pid 1459) conn 0x10059010 [2000/01/01 03:35:36, 3] smbd/pipes.c:reply_pipe_read_and_X(301) readX-IPC pnum=70a7 min=1024 max=1024 nread=68 [2000/01/01 03:35:36, 3] smbd/process.c:process_smb(1549) Transaction 204 of length 188 (0 toread) [2000/01/01 03:35:36, 3] smbd/process.c:switch_message(1361) switch message SMBtrans (pid 1459) conn 0x10059010 [2000/01/01 03:35:36, 3] smbd/ipc.c:handle_trans(436) trans \PIPE\ data=100 params=0 setup=2 [2000/01/01 03:35:36, 3] smbd/ipc.c:named_pipe(387) named pipe command on name [2000/01/01 03:35:36, 3] smbd/ipc.c:api_fd_reply(345) Got API command 0x26 on pipe srvsvc (pnum 70a7) [2000/01/01 03:35:36, 3] rpc_server/srv_pipe_hnd.c:free_pipe_context(519) free_pipe_context: destroying talloc pool of size 69 [2000/01/01 03:35:36, 3] rpc_server/srv_pipe.c:api_rpcTNP(2304) api_rpcTNP: rpc command: SRVSVC_NETSHAREGETINFO [2000/01/01 03:35:36, 3] rpc_server/srv_pipe_hnd.c:free_pipe_context(519) free_pipe_context: destroying talloc pool of size 14 [2000/01/01 03:35:36, 3] smbd/process.c:process_smb(1549) Transaction 205 of length 45 (0 toread) [2000/01/01 03:35:36, 3] smbd/process.c:switch_message(1361) switch message SMBclose (pid 1459) conn 0x10059010 [2000/01/01 03:35:36, 3] smbd/process.c:process_smb(1549) Transaction 206 of length 100 (0 toread) [2000/01/01 03:35:36, 3] smbd/process.c:switch_message(1361) switch message SMBtrans2 (pid 1459) conn 0x1005ec08 [2000/01/01 03:35:36, 3] smbd/sec_ctx.c:set_sec_ctx(324) setting sec ctx (1000, 1000) - sec_ctx_stack_ndx = 0 [2000/01/01 03:35:36, 3] smbd/trans2.c:call_trans2qfilepathinfo(3939) call_trans2qfilepathinfo: TRANSACT2_QPATHINFO: level = 1004 [2000/01/01 03:35:36, 3] locking/locking.c:fetch_share_mode_unlocked(857) fill_share_mode_lock failed [2000/01/01 03:35:36, 3] smbd/trans2.c:call_trans2qfilepathinfo(4013) call_trans2qfilepathinfo dummy.txt (fnum = -1) level=1004 call=5 total_data=0 [2000/01/01 03:35:36, 3] smbd/process.c:process_smb(1549) Transaction 207 of length 106 (0 toread) [2000/01/01 03:35:36, 3] smbd/process.c:switch_message(1361) switch message SMBtrans2 (pid 1459) conn 0x1005ec08 [2000/01/01 03:35:36, 3] smbd/trans2.c:call_trans2findfirst(1921) call_trans2findfirst: dirtype = 16, maxentries = 1366, close_after_first=1,
[Samba] Whats is the most stable distro for a DC
whats is the best distro for create a domain controller ?, and the method for authentication, winbind whit pam_mount ?, openldap ?. thanks someone has a sample of the configuration of a DC working ? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] samba on a mipsel board
On Tue, May 05, 2009 at 03:09:40PM +0100, Mahmood Javed wrote: Hi, In continuation to my earlier mail(pasted below), a debug level 10 log is attached. I tried to modify the dummy.txt file through notepad. Please ignore the time stamps in the logs. This is really a debug level 10 log of the failure? Volker pgpPzxsIdQY9z.pgp Description: PGP signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] samba on a mipsel board
This actually is. I cleared the log file before restarting the smbd, and nmbd. Then started them to simulate this failure, and that is it. Moreover, it is the individual logs samba creates in /var/log/samba directory. The log.smbd seems pretty uninteresting because it just had following text: log.smbd: [2000/01/01 03:30:39, 0] smbd/server.c:main(1209) smbd version 3.2.5 started. Copyright Andrew Tridgell and the Samba Team 1992-2008 [2000/01/01 03:30:39, 2] lib/tallocmsg.c:register_msg_pool_usage(106) Registered MSG_REQ_POOL_USAGE [2000/01/01 03:30:39, 2] lib/dmallocmsg.c:register_dmalloc_msgs(77) Registered MSG_REQ_DMALLOC_MARK and LOG_CHANGED Regards, mahmood. Volker Lendecke wrote: On Tue, May 05, 2009 at 03:09:40PM +0100, Mahmood Javed wrote: Hi, In continuation to my earlier mail(pasted below), a debug level 10 log is attached. I tried to modify the dummy.txt file through notepad. Please ignore the time stamps in the logs. This is really a debug level 10 log of the failure? Volker -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
RE: [Samba] unable to map to share
I get STATUS_LOGIN_FAILURE on the client. I completely opened up the firewall on the Samba server to my machine on ports 445 139 and yet I'm still not able to connect to the share, nor does it authenticate correctly. So, the client is not connecting, which in reality, we already knew. It's something on the server, but we're just not sure what else to check. Any ideas? Jamen McGranahan Systems Services Librarian Vanderbilt University -Original Message- From: Volker Lendecke [mailto:volker.lende...@sernet.de] Sent: Monday, May 04, 2009 3:40 PM To: McGranahan, Jamen Cc: samba@lists.samba.org Subject: Re: [Samba] unable to map to share On Mon, May 04, 2009 at 03:33:57PM -0500, McGranahan, Jamen wrote: It should 1) automatically recognize me since we are authenticating through Active Directory and 2) create the share so that I can read/write to it, but neither one happens. It actually prompts me for my username password and then errors out: Enter the user name for 'libdig4.library.vanderbilt.edu': mcgranj Enter the password for libdig4.library.vanderbilt.edu: password System error 53 has occurred. System error 53 usually is a problem with name resolution. Can you verify that your client actually connected to the server? Can you provide a network trace of the connection attempt? Information on how to create useful network traces can be found under http://wiki.samba.org/index.php/Capture_Packets Volker -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Whats is the most stable distro for a DC
On Tue, May 5, 2009 at 10:13 AM, Joaquin Cañete joak...@gmail.com wrote: whats is the best distro for create a domain controller ?, and the method for authentication, winbind whit pam_mount ?, openldap ?. thanks someone has a sample of the configuration of a DC working ? Depends on your taste and if you need/require paid support. If you are not savvy with linux, I recommend paying for either Red Hat Enterprise Linux or SUSE. And I really mean paying for them and not just downloading the free downloads thinking you are getting enterprise quality software. The free downloads in my opinion are generally out of date and/or buggy. If you do not want to pay use Centos or opensuse. Otherwise ubuntu if you are comming from a windows background. At work we have been using gentoo for 5 years and I would normally recommend it however lately the packages for samba have been lagging. This is no problem for me since I roll my own samba releases in my overlay http://github.com/drescherjm/jmdgentoooverlay/tree/8dc61fa87dacc67d2012cb22a6961ff058be8097/net-fs/samba but this is really not for those who do not know gentoo. John -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] unable to map to share
On Tue, May 05, 2009 at 09:55:27AM -0500, McGranahan, Jamen wrote: I get STATUS_LOGIN_FAILURE on the client. I completely opened up the firewall on the Samba server to my machine on ports 445 139 and yet I'm still not able to connect to the share, nor does it authenticate correctly. So, the client is not connecting, which in reality, we already knew. It's something on the server, but we're just not sure what else to check. Any ideas? Did you follow my suggestion and provide network traces? Sorry if that was not clear enough. Thanks, Volker pgpAubSW0gqXI.pgp Description: PGP signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] unable to map to share
On Tue, May 05, 2009 at 10:25:37AM -0500, McGranahan, Jamen wrote: Here it is as a txt file (I used Wireshark for this). Ok, probably our description in the wiki sucks. Which part of it is not clear? It says that you should issue tshark -p -w FILENAME port 445 or port 139 where you replace FILENAME with some descriptive file name. You sent the stdout output of tshark, which is a LOT harder to read. How can we improve our wiki page to make it more clear that you should NOT send any stdout output of neither tcpdump nor anything else??? Volker pgpETYePMBNlW.pgp Description: PGP signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
RE: [Samba] unable to map to share
Here's the new trace file. Also, a little more info: I modified the firewall on the Samba server to allow traffic from port 139 445 specifically from my laptop. After restarting the firewall, I was able to map to my Samba server using the IP address but not the fully qualified domain name. Thought that was interesting. So I went back to my Samba server and restored the firewall to what it had originally, restarted it, and then could not map to my server at all (with either the IP or the FQDN). So it looks like I may have 2 problems - DNS firewall. I actually used the GUI interface first, because the tshark was not registering any data. Then I figured out why - it was looking at my VPN (registered first in my list), which was not being used. Once I changed this to my Ethernet card, I got data recorded. Jamen McGranahan Systems Services Librarian Vanderbilt University -Original Message- From: Volker Lendecke [mailto:volker.lende...@sernet.de] Sent: Tuesday, May 05, 2009 10:33 AM To: McGranahan, Jamen Cc: samba@lists.samba.org Subject: Re: [Samba] unable to map to share On Tue, May 05, 2009 at 10:25:37AM -0500, McGranahan, Jamen wrote: Here it is as a txt file (I used Wireshark for this). Ok, probably our description in the wiki sucks. Which part of it is not clear? It says that you should issue tshark -p -w FILENAME port 445 or port 139 where you replace FILENAME with some descriptive file name. You sent the stdout output of tshark, which is a LOT harder to read. How can we improve our wiki page to make it more clear that you should NOT send any stdout output of neither tcpdump nor anything else??? Volker -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Domain Server Problem
Vista/XP can only use one username/password per server per instance. For instance after booting up XP, if you successfully connect to \\water\homes as peteclapham, then you can't connect to \\water\archive as joestudent because XP/Vista can't handle multiple connections with the different usernames/passwords to the same server. samba can only be configured to authenticate against one source. be it smbpasswd, ldap, or tdbsam it can only be configured to authenticate against one of them at a time. it doesn't even look at /etc/passwd for authentication. even if you use encrypt passwords = no, the users have to be in smbpasswd. Pete Clapham wrote: Hi -- I have what I hope is a minor configuration problem. My PDC is configured so that it works just fine. I am trying to set up an additional domain server (not PDC or BDC), so that students can get to the material on the server. When I type net use w: \\water\archive (where water is the domain server and archive is a share), I invariably get the message that I need to input a user ID and password. If I put in my own ID/Password for the server (even though it's identical with the ID/password on the PDC) it goes through fine. However, if I am logged on to the network as another user and put in his/her ID/Password it doesn't work. My User ID/Password are the only combination on both the PDC and the additional server. If I try to log onto the additional server with a User ID/Password that's valid on the domain it doesn't work; If I try to log onto the additional server with a User ID/Password that's valid on the additional server it doesn't work. It would seem that SAMBA is looking at the Unix ID/Password on the PDC and the SMBPasswd on the additional domain server, and requiring that they both be the same -- so far that's mine. Does this make sense to anybody? And what do I need to do? I do have authentication set on the Additional Domain server to DOMAIN. Doesn't this mean that SAMBA should be reading both the Unix and SMBPasswd files on the PDC? Thanks for your help. cheers, pete -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Domain Server Problem, continued
This is interesting, and it led to a bit more sleuthing. I can log onto the PDC with any user ID/password; doesn't have to be mine. Then I can access the share on the additional domain server using the user name/password of anybody with a smbpasswd password. But with security = DOMAIN, shouldn't it look on the password server, in this case the PDC, for the proper password? Is it really necessary to go through all of the rigamarole of adding users to the second server as well as the PDC? Please advise. Thanks. cheers, pete p.s. Here are the relevant portions of the smb.conf file on the additional server: [global] workgroup = ERSL netbios aliases = water.sr-02-01.csuohio.edu server string = %h server (Samba, Ubuntu) security = DOMAIN password server = EARTH earth.sr-02-01.csuohio.edu passwd program = /usr/bin/passwd %u syslog = 0 log file = /var/log/samba/log.%m max log size = 1000 dns proxy = No usershare allow guests = Yes panic action = /usr/share/samba/panic-action %d [archive] comment = Archive files path = /archive = Vista/XP can only use one username/password per server per instance. For instance after booting up XP, if you successfully connect to \\water\homes as peteclapham, then you can't connect to \\water\archive as joestudent because XP/Vista can't handle multiple connections with the different usernames/passwords to the same server. samba can only be configured to authenticate against one source. be it smbpasswd, ldap, or tdbsam it can only be configured to authenticate against one of them at a time. it doesn't even look at /etc/passwd for authentication. even if you use encrypt passwords = no, the users have to be in smbpasswd. Pete Clapham wrote: Hi -- I have what I hope is a minor configuration problem. My PDC is configured so that it works just fine. I am trying to set up an additional domain server (not PDC or BDC), so that students can get to the material on the server. When I type net use w: \\water\archive (where water is the domain server and archive is a share), I invariably get the message that I need to input a user ID and password. If I put in my own ID/Password for the server (even though it's identical with the ID/password on the PDC) it goes through fine. However, if I am logged on to the network as another user and put in his/her ID/Password it doesn't work. My User ID/Password are the only combination on both the PDC and the additional server. If I try to log onto the additional server with a User ID/Password that's valid on the domain it doesn't work; If I try to log onto the additional server with a User ID/Password that's valid on the additional server it doesn't work. It would seem that SAMBA is looking at the Unix ID/Password on the PDC and the SMBPasswd on the additional domain server, and requiring that they both be the same -- so far that's mine. Does this make sense to anybody? And what do I need to do? I do have authentication set on the Additional Domain server to DOMAIN. Doesn't this mean that SAMBA should be reading both the Unix and SMBPasswd files on the PDC? Thanks for your help. cheers, pete -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Machine Login
Hi all, In my system, samba (3.0.34) is configured as PDC with an LDAP backend and has some user and machine accounts, and it all works fine. But recently I've found out that if I remove one machine account from the LDAP server user logins into the domain from that machine are still possible, even if the machine login verification fails: ... [2009/05/05 19:34:47, 2] passdb/pdb_ldap.c:init_sam_from_ldap(545) init_sam_from_ldap: Entry found for user: test [2009/05/05 19:34:47, 2] auth/auth.c:check_ntlm_password(309) check_ntlm_password: authentication for user [test] - [test] - [test] succeeded [2009/05/05 19:34:52, 1] smbd/service.c:make_connection_snum(1033) vmvista (192.168.100.198) connect to service netlogon initially as user test (uid=1507, gid=1000) (pid 27646) [2009/05/05 19:35:00, 0] rpc_server/srv_netlog_nt.c:get_md4pw(242) get_md4pw: Workstation VMVISTA$: no account in domain [2009/05/05 19:35:00, 0] rpc_server/srv_netlog_nt.c:_net_auth_2(461) _net_auth2: failed to get machine password for account VMVISTA$: NT_STATUS_ACCESS_DENIED [2009/05/05 19:35:06, 1] smbd/service.c:close_cnum(1230) vmvista (192.168.100.198) closed connection to service netlogon [2009/05/05 19:36:40, 2] smbd/sesssetup.c:setup_new_vc_session(1214) setup_new_vc_session: New VC == 0, if NT4.x compatible we would close all old resources. [2009/05/05 19:36:40, 2] smbd/sesssetup.c:setup_new_vc_session(1214) setup_new_vc_session: New VC == 0, if NT4.x compatible we would close all old resources. [2009/05/05 19:36:40, 2] lib/smbldap.c:smbldap_open_connection(786) smbldap_open_connection: connection opened [2009/05/05 19:36:41, 0] rpc_server/srv_netlog_nt.c:get_md4pw(242) get_md4pw: Workstation VMVISTA$: no account in domain [2009/05/05 19:36:41, 0] rpc_server/srv_netlog_nt.c:_net_auth_2(461) ... Is there a way to prevent users logins from machines that have been removed from system? Nelson Vale -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Re: Samba share of a NFS mount
On Tue, 05 May 2009 07:42:33 +0800, Michael Heydon micha...@jaswin.com.au wrote: Tim Boyer wrote: The easiest way to do so is to NFS mount the directory on my Samba server, and export the directory as a Samba share. It's been a while and I don't remember the specifics, but there are problems relating to locking when you do this. From memory it is OK as long as the samba server is the only NFS client accessing that share, but as soon as you have an NFS client accessing files that the samba clients have open things start to get messy. The proper way to do it is to run a samba server on the NFS server itself. *Michael Heydon - IT Administrator * micha...@jaswin.com.au mailto:micha...@jaswin.com.au I think that's the consensus. Dang, and here I was trying my best to avoid doing things the proper way... Thanks, Michael. -- tim boyer t...@denmantire.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Error when subscribing to list
When I try to subscribe to the Samba mailing list at https://lists.samba.org/mailman/ I get the following message in Firefox: Secure Connection Failed lists.samba.org uses an invalid security certificate. The certificate is not trusted because the issuer certificate is unknown. (Error code: sec_error_unknown_issuer) * This could be a problem with the server's configuration, or it could be someone trying to impersonate the server. * If you have connected to this server successfully in the past, the error may be temporary, and you can try again later. Is this normal? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[SCM] CTDB repository - branch master updated - c62e71fa8b6170245dbb66057b441b94c10e2c5d
The branch, master has been updated via c62e71fa8b6170245dbb66057b441b94c10e2c5d (commit) from bf1b76955db6ba00ec64686b53084268573ba6a0 (commit) http://gitweb.samba.org/?p=tridge/ctdb.git;a=shortlog;h=master - Log - commit c62e71fa8b6170245dbb66057b441b94c10e2c5d Author: Andrew Tridgell tri...@samba.org Date: Tue May 5 16:06:58 2009 +1000 added link to michaels sambaxp papers --- Summary of changes: web/documentation.html |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/web/documentation.html b/web/documentation.html index 6636869..d78a1f0 100644 --- a/web/documentation.html +++ b/web/documentation.html @@ -27,4 +27,10 @@ Man pages: lia href=http://ctdb.samba.org/~tridge/ctdb/doc/onnode.1.html;onnode manual page/a /ul +Articles: +ul +lia href=http://samba.org/~obnox/presentations/sambaXP-2009/;Michael +Adam's clustered NAS articles/a +/ul + !--#include virtual=footer.html -- -- CTDB repository
[SCM] CTDB repository - branch master updated - 08e6c100971e1d72edd050f7f502145363f3c1ab
The branch, master has been updated
via 08e6c100971e1d72edd050f7f502145363f3c1ab (commit)
via 8ae93da7f6341f1cddb15786df67644f29648b9b (commit)
via b06d4c6ee7da97aaa810aa4c95952b6505cf720f (commit)
via d26d522fd0a1df7f06be056e7458ed5349a00658 (commit)
via d02c0e9371981bc6830f792d65e9f08832656cf0 (commit)
via 87e674f93728fb20209b6473f07ca323530ddbdc (commit)
via 478f43bc3c970edc7c8db3e34095774261a48056 (commit)
via a63c79318678abe99d2a36fe4465e63eafc008b7 (commit)
via 8628402d4cad4b9ef580151b85e36b6a5909e56c (commit)
via c61c4f7a7628232e9094d463275ba6abf7b79941 (commit)
via 460e6b2402fc9bca9e9835e3a203278ac0bcaf8f (commit)
via fb582515c674b76e06aed28d04f24ae3a849cfe2 (commit)
via b5ef99f14fb02deb128b4b0956508fc980886407 (commit)
via ac5557659e667da5f3a33cc612e06a21396fce2d (commit)
via 968739ea9af2aaba90e6bb4569ae4d9fb60b79aa (commit)
via 2031fd8b83bd832d1104128c3faddf209e6bb23e (commit)
via 0563b3c6d9787164475538fbc1342f8c6be62eac (commit)
via 3aba067b7fa7d77836901f82deee441a07b3a15d (commit)
via 0a7dbe56d1b4545e9f45c29ea719d24b3b3ada3e (commit)
via 767e92f64b63a6bcaa36efe633e8a3e55a803e79 (commit)
via 7b6bada79b4e0534b261440438b4256bc446191f (commit)
from c62e71fa8b6170245dbb66057b441b94c10e2c5d (commit)
http://gitweb.samba.org/?p=tridge/ctdb.git;a=shortlog;h=master
- Log -
commit 08e6c100971e1d72edd050f7f502145363f3c1ab
Merge: c62e71fa8b6170245dbb66057b441b94c10e2c5d
8ae93da7f6341f1cddb15786df67644f29648b9b
Author: Andrew Tridgell tri...@samba.org
Date: Tue May 5 16:12:04 2009 +1000
merged 1.0.69 into head
---
Summary of changes:
client/ctdb_client.c|4 +-
include/ctdb_private.h | 16 --
packaging/RPM/ctdb.spec | 28 +++
server/ctdb_control.c |6 ++-
server/ctdb_traverse.c | 124 ++
5 files changed, 147 insertions(+), 31 deletions(-)
Changeset truncated at 500 lines:
diff --git a/client/ctdb_client.c b/client/ctdb_client.c
index 3bdb4b2..8c3bb74 100644
--- a/client/ctdb_client.c
+++ b/client/ctdb_client.c
@@ -2399,10 +2399,10 @@ int ctdb_ctrl_modflags(struct ctdb_context *ctdb,
struct timeval timeout, uint32
timeout, false, data,
NULL, NULL,
NULL) != 0) {
- DEBUG(DEBUG_ERR, (__location__ ctdb_control to disable node
failed\n));
+ DEBUG(DEBUG_ERR, (__location__ ctdb_control to update
nodeflags failed\n));
talloc_free(tmp_ctx);
- return -1;
+ return 0;
}
talloc_free(tmp_ctx);
diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index eac27f7..9ba4cc0 100644
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -430,6 +430,7 @@ struct ctdb_db_context {
struct ctdb_registered_call *calls; /* list of registered calls */
uint32_t seqnum;
struct timed_event *te;
+ struct ctdb_traverse_local_handle *traverse;
};
@@ -555,11 +556,12 @@ enum ctdb_controls {CTDB_CONTROL_PROCESS_EXISTS
= 0,
CTDB_CONTROL_TAKEOVER_IP = 89,
CTDB_CONTROL_GET_PUBLIC_IPS = 90,
CTDB_CONTROL_GET_NODEMAP = 91,
- CTDB_CONTROL_EVENT_SCRIPT_INIT = 92,
- CTDB_CONTROL_EVENT_SCRIPT_START = 93,
- CTDB_CONTROL_EVENT_SCRIPT_STOP = 94,
- CTDB_CONTROL_EVENT_SCRIPT_FINISHED = 95,
- CTDB_CONTROL_GET_EVENT_SCRIPT_STATUS = 96,
+ CTDB_CONTROL_TRAVERSE_KILL = 92,
+ CTDB_CONTROL_EVENT_SCRIPT_INIT = 93,
+ CTDB_CONTROL_EVENT_SCRIPT_START = 94,
+ CTDB_CONTROL_EVENT_SCRIPT_STOP = 95,
+ CTDB_CONTROL_EVENT_SCRIPT_FINISHED = 96,
+ CTDB_CONTROL_GET_EVENT_SCRIPT_STATUS = 97,
};
/*
@@ -1118,9 +1120,11 @@ struct ctdb_client_call_state {
int32_t ctdb_control_traverse_start(struct ctdb_context *ctdb, TDB_DATA
indata,
- TDB_DATA *outdata, uint32_t srcnode);
+ TDB_DATA *outdata, uint32_t srcnode,
uint32_t client_id);
int32_t ctdb_control_traverse_all(struct ctdb_context *ctdb, TDB_DATA data,
TDB_DATA *outdata);
int32_t ctdb_control_traverse_data(struct ctdb_context *ctdb, TDB_DATA data,
TDB_DATA *outdata);
+int32_t ctdb_control_traverse_kill(struct ctdb_context *ctdb, TDB_DATA indata,
+ TDB_DATA *outdata, uint32_t srcnode);
int
[SCM] CTDB repository - branch 1.0.69 updated - ctdb-1.0.69-21-g9a00035
The branch, 1.0.69 has been updated
via 9a00035c9c815736d0a5909dfc4de7f4c3ac41d4 (commit)
via 8ae93da7f6341f1cddb15786df67644f29648b9b (commit)
via b06d4c6ee7da97aaa810aa4c95952b6505cf720f (commit)
from d26d522fd0a1df7f06be056e7458ed5349a00658 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=1.0.69
- Log -
commit 9a00035c9c815736d0a5909dfc4de7f4c3ac41d4
Author: root r...@rcn1.vsofs1.com
Date: Tue May 5 16:33:21 2009 +1000
change the talloc hierarchy for the main transaction_start context and the
individual transaction_all handles
commit 8ae93da7f6341f1cddb15786df67644f29648b9b
Author: Andrew Tridgell tri...@samba.org
Date: Tue May 5 12:17:21 2009 +1000
fixed an error with newer autotools versions
commit b06d4c6ee7da97aaa810aa4c95952b6505cf720f
Author: Andrew Tridgell tri...@samba.org
Date: Tue May 5 12:17:07 2009 +1000
fixed a problem with clients disconnecting during a traverse
When a client (such as smbstatus) is killed, it may have outstanding
traverse children on remote nodes. We need to catch the client
disconnect in ctdbd and send a control to all nodes telling them to
kill those outstanding traverse children.
---
Summary of changes:
include/ctdb_private.h |6 ++-
lib/replace/autoconf-2.60.m4 |2 +
server/ctdb_control.c|6 ++-
server/ctdb_traverse.c | 135 -
4 files changed, 117 insertions(+), 32 deletions(-)
Changeset truncated at 500 lines:
diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index 5121cd9..e14a272 100644
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -439,6 +439,7 @@ struct ctdb_db_context {
struct ctdb_registered_call *calls; /* list of registered calls */
uint32_t seqnum;
struct timed_event *te;
+ struct ctdb_traverse_local_handle *traverse;
};
@@ -564,6 +565,7 @@ enum ctdb_controls {CTDB_CONTROL_PROCESS_EXISTS =
0,
CTDB_CONTROL_TAKEOVER_IP = 89,
CTDB_CONTROL_GET_PUBLIC_IPS = 90,
CTDB_CONTROL_GET_NODEMAP = 91,
+ CTDB_CONTROL_TRAVERSE_KILL = 92,
};
/*
@@ -1131,9 +1133,11 @@ struct ctdb_client_call_state {
int32_t ctdb_control_traverse_start(struct ctdb_context *ctdb, TDB_DATA
indata,
- TDB_DATA *outdata, uint32_t srcnode);
+ TDB_DATA *outdata, uint32_t srcnode,
uint32_t client_id);
int32_t ctdb_control_traverse_all(struct ctdb_context *ctdb, TDB_DATA data,
TDB_DATA *outdata);
int32_t ctdb_control_traverse_data(struct ctdb_context *ctdb, TDB_DATA data,
TDB_DATA *outdata);
+int32_t ctdb_control_traverse_kill(struct ctdb_context *ctdb, TDB_DATA indata,
+ TDB_DATA *outdata, uint32_t srcnode);
int ctdb_dispatch_message(struct ctdb_context *ctdb, uint64_t srvid, TDB_DATA
data);
diff --git a/lib/replace/autoconf-2.60.m4 b/lib/replace/autoconf-2.60.m4
index acdcd38..2d5dbc1 100644
--- a/lib/replace/autoconf-2.60.m4
+++ b/lib/replace/autoconf-2.60.m4
@@ -179,6 +179,7 @@ AC_DEFUN([AC_PROG_CC_C99],
#
# Enable extensions on systems that normally disable them,
# typically due to standards-conformance issues.
+m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[
AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
[
AC_BEFORE([$0], [AC_COMPILE_IFELSE])
@@ -208,3 +209,4 @@ AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
AC_DEFINE([__EXTENSIONS__])
AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
])
+])
diff --git a/server/ctdb_control.c b/server/ctdb_control.c
index 15f5000..73d5d46 100644
--- a/server/ctdb_control.c
+++ b/server/ctdb_control.c
@@ -217,7 +217,7 @@ static int32_t ctdb_control_dispatch(struct ctdb_context
*ctdb,
case CTDB_CONTROL_TRAVERSE_START:
CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_traverse_start));
- return ctdb_control_traverse_start(ctdb, indata, outdata,
srcnode);
+ return ctdb_control_traverse_start(ctdb, indata, outdata,
srcnode, client_id);
case CTDB_CONTROL_TRAVERSE_ALL:
return ctdb_control_traverse_all(ctdb, indata, outdata);
@@ -225,6 +225,10 @@ static int32_t ctdb_control_dispatch(struct ctdb_context
*ctdb,
case CTDB_CONTROL_TRAVERSE_DATA:
return ctdb_control_traverse_data(ctdb, indata, outdata);
+ case CTDB_CONTROL_TRAVERSE_KILL:
+ CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_traverse_start));
+ return ctdb_control_traverse_kill(ctdb, indata, outdata,
srcnode);
+
case CTDB_CONTROL_REGISTER_SRVID:
return daemon_register_message_handler(ctdb, client_id, srvid);
diff --git
[SCM] CTDB repository - branch master updated - 2eedaa8f4fd4afc0564387a93cd0f9186ae7d0a1
The branch, master has been updated via 2eedaa8f4fd4afc0564387a93cd0f9186ae7d0a1 (commit) from 08e6c100971e1d72edd050f7f502145363f3c1ab (commit) http://gitweb.samba.org/?p=tridge/ctdb.git;a=shortlog;h=master - Log - commit 2eedaa8f4fd4afc0564387a93cd0f9186ae7d0a1 Author: Andrew Tridgell tri...@samba.org Date: Tue May 5 16:49:05 2009 +1000 allow pages in subdirs --- Summary of changes: web/footer.html |2 +- web/header.html | 14 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/web/footer.html b/web/footer.html index a66b5c9..a9758e8 100644 --- a/web/footer.html +++ b/web/footer.html @@ -2,7 +2,7 @@ /tr TR ALIGN=center -TDBRa name=search/aimg src=bar1.jpg WIDTH=493 HEIGHT=26 BORDER=0 alt==-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +TDBRa name=search/aimg src=/bar1.jpg WIDTH=493 HEIGHT=26 BORDER=0 alt==-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= !-- SiteSearch Google -- form method=get action=http://www.google.com/custom; diff --git a/web/header.html b/web/header.html index e2b904f..c78d2ee 100644 --- a/web/header.html +++ b/web/header.html @@ -11,10 +11,10 @@ tr VALIGN=middle td ALIGN=left ul - lismalla href=.home/a/small - lismalla href=documentation.htmldocumentation/a/small - lismalla href=configuring.htmlconfiguring/a/small - lismalla href=building.htmlbuilding/a/small + lismalla href=/home/a/small + lismalla href=/documentation.htmldocumentation/a/small + lismalla href=/configuring.htmlconfiguring/a/small + lismalla href=/building.htmlbuilding/a/small /ul /td td align=center @@ -22,8 +22,8 @@ /td td align=left ul - lismalla href=download.htmldownload/a/small - lismalla href=testing.htmltesting/a/small + lismalla href=/download.htmldownload/a/small + lismalla href=/testing.htmltesting/a/small lismalla href=http://wiki.samba.org/index.php/CTDB_Setup;wiki/a/small lismalla href=http://bugzilla.samba.org/;bug-tracking/a/small /ul @@ -32,7 +32,7 @@ TR ALIGN=center TD COLSPAN=3 -img src=bar1.jpg WIDTH=493 HEIGHT=26 +img src=/bar1.jpg WIDTH=493 HEIGHT=26 BORDER=0 alt==-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= /TD -- CTDB repository
[SCM] CTDB repository - branch master updated - ba1f6c310d41c97fdef60ddbad60aece869cabc2
The branch, master has been updated via ba1f6c310d41c97fdef60ddbad60aece869cabc2 (commit) from 2eedaa8f4fd4afc0564387a93cd0f9186ae7d0a1 (commit) http://gitweb.samba.org/?p=tridge/ctdb.git;a=shortlog;h=master - Log - commit ba1f6c310d41c97fdef60ddbad60aece869cabc2 Author: Andrew Tridgell tri...@samba.org Date: Tue May 5 16:52:24 2009 +1000 more subdir html support --- Summary of changes: web/header.html |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/web/header.html b/web/header.html index c78d2ee..a356b08 100644 --- a/web/header.html +++ b/web/header.html @@ -18,7 +18,7 @@ /ul /td td align=center - a href=.img src=ctdblogo.png border=0 alt=CTDB/a + a href=.img src=/ctdblogo.png border=0 alt=CTDB/a /td td align=left ul -- CTDB repository
svn commit: samba-web r1294 - in trunk/team: .
Author: obnox Date: 2009-05-05 09:10:27 + (Tue, 05 May 2009) New Revision: 1294 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1294 Log: Link to my homepage instead of email address. Michael Modified: trunk/team/index.html Changeset: Modified: trunk/team/index.html === --- trunk/team/index.html 2009-05-04 07:53:18 UTC (rev 1293) +++ trunk/team/index.html 2009-05-05 09:10:27 UTC (rev 1294) @@ -41,7 +41,7 @@ tr td valign=top ul -lia href=mailto:ob...@samba.org;Michael Adam/a/li +lia href=http://samba.org/~obnox/;Michael Adam/a/li lia href=http://samba.org/~jra;Jeremy Allison/a/li lia href=http://samba.org/~abartlet/;Andrew Bartlett/a/li lia href=mailto:k...@samba.org;Kai Blin/a/li
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5245-g0236862
The branch, v3-3-test has been updated via 02368626a273368a3b731d2b413e90d91ed15c5c (commit) from c89c2db8c51bd3cede2e2e8fb58214971eda4129 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 02368626a273368a3b731d2b413e90d91ed15c5c Author: Björn Jacke b...@sernet.de Date: Sun Mar 8 12:54:04 2009 +0100 to be portable, use options first, arguments last Signed-off-by: Michael Adam ob...@samba.org --- Summary of changes: source/script/installmo.sh |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) mode change 100755 = 100644 source/script/installmo.sh Changeset truncated at 500 lines: diff --git a/source/script/installmo.sh b/source/script/installmo.sh old mode 100755 new mode 100644 index 9c4ab1e..5ca3371 --- a/source/script/installmo.sh +++ b/source/script/installmo.sh @@ -35,7 +35,7 @@ for dir in $SRCDIR/locale/*; do if test $mode = 'install'; then echo Installing $f as $FNAME touch $FNAME - $MSGFMT $f -f -o $FNAME + $MSGFMT -f -o $FNAME $f if test ! -f $FNAME; then echo Cannot install $FNAME. Does $USER have privileges? exit 1 -- Samba Shared Repository
svn commit: samba-web r1295 - in trunk/team: .
Author: bjacke Date: 2009-05-05 09:36:14 + (Tue, 05 May 2009) New Revision: 1295 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1295 Log: add me Bj?\195?\182rn Modified: trunk/team/index.html Changeset: Modified: trunk/team/index.html === --- trunk/team/index.html 2009-05-05 09:10:27 UTC (rev 1294) +++ trunk/team/index.html 2009-05-05 09:36:14 UTC (rev 1295) @@ -53,6 +53,7 @@ lia href=mailto:pa...@samba.org;Paul Green/a/li lia href=http://ubiqx.org/;Chris Hertel/a/li lia href=http://www.devurandom.org;Deryck Hodge/a/li +lia href=http://www.j3e.de/;Bjouml;rn Jacke/a/li lia href=http://people.su.se/~lha/;Love Houml;rnquist Aring;strand/a/li lia href=mailto:mkap...@samba.org;Marc Kaplan/a/li lia href=mailto:ku...@samba.org;Guuml;nter Kukkukk/a/li
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1439-g290449a
The branch, master has been updated
via 290449aeae950d7490cdcf9d601052fc45bb84dd (commit)
from 2c4725462e2251de887e043653aa0ce3eaa9771e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 290449aeae950d7490cdcf9d601052fc45bb84dd
Author: Günther Deschner g...@samba.org
Date: Tue May 5 12:54:21 2009 +0200
s3-pam_winbind: Fix Bug 6253: Use correct value for password expiry
calculation.
Patch from Blindauer Emmanuel sa...@mooby.net.
Guenther
---
Summary of changes:
nsswitch/pam_winbind.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index 0d33f59..545c87d 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -914,7 +914,7 @@ static void _pam_warn_password_expiry(struct pwb_context
*ctx,
/* now check for the global password policy */
/* good catch from Ralf Haferkamp: an expiry of never is translated
* to -1 */
- if (policy-expire = 0) {
+ if (policy-expire == -1) {
return;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-872-ga79ae4e
The branch, v3-4-test has been updated
via a79ae4e5364fe8e3ec6b451364dc5d861f202528 (commit)
from aeb7de50b51840bddcdd4cbe6d96a4066b5116f0 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit a79ae4e5364fe8e3ec6b451364dc5d861f202528
Author: Günther Deschner g...@samba.org
Date: Tue May 5 12:54:21 2009 +0200
s3-pam_winbind: Fix Bug 6253: Use correct value for password expiry
calculation.
Patch from Blindauer Emmanuel sa...@mooby.net.
Guenther
(cherry picked from commit 290449aeae950d7490cdcf9d601052fc45bb84dd)
---
Summary of changes:
nsswitch/pam_winbind.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index 0d33f59..545c87d 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -914,7 +914,7 @@ static void _pam_warn_password_expiry(struct pwb_context
*ctx,
/* now check for the global password policy */
/* good catch from Ralf Haferkamp: an expiry of never is translated
* to -1 */
- if (policy-expire = 0) {
+ if (policy-expire == -1) {
return;
}
--
Samba Shared Repository
[SCM] CTDB repository - branch master updated - de559946b20cfd7560a205b9c4ae73688341d1b5
The branch, master has been updated
via de559946b20cfd7560a205b9c4ae73688341d1b5 (commit)
from ba1f6c310d41c97fdef60ddbad60aece869cabc2 (commit)
http://gitweb.samba.org/?p=tridge/ctdb.git;a=shortlog;h=master
- Log -
commit de559946b20cfd7560a205b9c4ae73688341d1b5
Author: Andrew Tridgell tri...@samba.org
Date: Tue May 5 21:35:52 2009 +1000
removed merge fluff
---
Summary of changes:
packaging/RPM/ctdb.spec |1 -
1 files changed, 0 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index ac4f908..6c628c3 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -131,7 +131,6 @@ fi
%{_libdir}/pkgconfig/ctdb.pc
%changelog
- HEAD:packaging/RPM/ctdb.spec
* Tue May 5 2009 : Version 1.0.69-6
- Try to add back the routes in 99.routing both for the takeip and also the
releaseip event since during releaseip) too many addresses may have been
--
CTDB repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1440-gb58abb2
The branch, master has been updated
via b58abb262c33dd5cd9cfb3397333c0c1f5e91592 (commit)
from 290449aeae950d7490cdcf9d601052fc45bb84dd (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b58abb262c33dd5cd9cfb3397333c0c1f5e91592
Author: Simo Sorce i...@samba.org
Date: Tue May 5 09:50:19 2009 -0400
Add release scripts for talloc and tdb
---
Summary of changes:
lib/talloc/release-script.sh | 45 ++
lib/tdb/release-script.sh| 45 ++
2 files changed, 90 insertions(+), 0 deletions(-)
create mode 100755 lib/talloc/release-script.sh
create mode 100755 lib/tdb/release-script.sh
Changeset truncated at 500 lines:
diff --git a/lib/talloc/release-script.sh b/lib/talloc/release-script.sh
new file mode 100755
index 000..7ec47b7
--- /dev/null
+++ b/lib/talloc/release-script.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+if [ $1 = ]; then
+echo Please provide version string, eg: 1.2.0
+exit 1
+fi
+
+if [ ! -d lib/talloc ]; then
+echo Run this script from the samba base directory.
+exit 1
+fi
+
+curbranch=`git-branch |grep ^* | tr -d * `
+
+version=$1
+strver=`echo ${version} | tr . -`
+
+# Checkout the release tag
+git branch -f talloc-release-script-${strver} talloc-${strver}
+if [ ! $? = 0 ]; then
+echo Unable to checkout talloc-${strver} release
+exit 1
+fi
+
+git checkout talloc-release-script-${strver}
+
+# Test configure agrees with us
+confver=`grep ^AC_INIT lib/talloc/configure.ac | tr -d AC_INIT(talloc, |
tr -d )`
+if [ ! $confver = $version ]; then
+echo Wrong version, requested release for ${version}, found ${confver}
+exit 1
+fi
+
+# Now build tarball
+cp -a lib/talloc talloc-${version}
+cp -a lib/replace talloc-${version}/libreplace
+pushd talloc-${version}
+./autogen.sh
+popd
+tar cvzf talloc-${version}.tar.gz talloc-${version}
+rm -fr talloc-${version}
+
+#Clean up
+git checkout $curbranch
+git branch -d talloc-release-script-${strver}
diff --git a/lib/tdb/release-script.sh b/lib/tdb/release-script.sh
new file mode 100755
index 000..95d4238
--- /dev/null
+++ b/lib/tdb/release-script.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+if [ $1 = ]; then
+echo Please provide version string, eg: 1.2.0
+exit 1
+fi
+
+if [ ! -d lib/tdb ]; then
+echo Run this script from the samba base directory.
+exit 1
+fi
+
+curbranch=`git-branch |grep ^* | tr -d * `
+
+version=$1
+strver=`echo ${version} | tr . -`
+
+# Checkout the release tag
+git branch -f tdb-release-script-${strver} tdb-${strver}
+if [ ! $? = 0 ]; then
+echo Unable to checkout tdb-${strver} release
+exit 1
+fi
+
+git checkout tdb-release-script-${strver}
+
+# Test configure agrees with us
+confver=`grep ^AC_INIT lib/tdb/configure.ac | tr -d AC_INIT(tdb, | tr -d
)`
+if [ ! $confver = $version ]; then
+echo Wrong version, requested release for ${version}, found ${confver}
+exit 1
+fi
+
+# Now build tarball
+cp -a lib/tdb tdb-${version}
+cp -a lib/replace tdb-${version}/libreplace
+pushd tdb-${version}
+./autogen.sh
+popd
+tar cvzf tdb-${version}.tar.gz tdb-${version}
+rm -fr tdb-${version}
+
+#Clean up
+git checkout $curbranch
+git branch -d tdb-release-script-${strver}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1441-g0ca795e
The branch, master has been updated
via 0ca795ef4fab1f880c2b76d7fe8f0aabb302b6e2 (commit)
from b58abb262c33dd5cd9cfb3397333c0c1f5e91592 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 0ca795ef4fab1f880c2b76d7fe8f0aabb302b6e2
Author: Michael Adam ob...@samba.org
Date: Tue May 5 17:46:20 2009 +0200
s3:loadparm: use the returnvalue of service_ok() in
process_smbconf_service().
Michael
---
Summary of changes:
source3/param/loadparm.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 7b79402..670746e 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -6819,7 +6819,7 @@ static bool process_smbconf_service(struct
smbconf_service *service)
}
}
if (iServiceIndex = 0) {
- ret = service_ok(iServiceIndex);
+ return service_ok(iServiceIndex);
}
return true;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1442-ge7a8577
The branch, master has been updated
via e7a8577df1e92982ff717a62280f86e3b0384d54 (commit)
from 0ca795ef4fab1f880c2b76d7fe8f0aabb302b6e2 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e7a8577df1e92982ff717a62280f86e3b0384d54
Author: Günther Deschner g...@samba.org
Date: Tue May 5 19:38:58 2009 +0200
error-codes: add some more group specific windows error codes.
Guenther
---
Summary of changes:
libcli/util/doserr.c |4
libcli/util/werror.h |2 ++
2 files changed, 6 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/util/doserr.c b/libcli/util/doserr.c
index 1151d32..a7a132f 100644
--- a/libcli/util/doserr.c
+++ b/libcli/util/doserr.c
@@ -79,6 +79,7 @@ static const struct werror_code_struct dos_errs[] =
{ WERR_USER_ALREADY_EXISTS, WERR_USER_ALREADY_EXISTS },
{ WERR_NO_SUCH_USER, WERR_NO_SUCH_USER },
{ WERR_GROUP_EXISTS, WERR_GROUP_EXISTS },
+ { WERR_NO_SUCH_GROUP, WERR_NO_SUCH_GROUP },
{ WERR_MEMBER_IN_GROUP, WERR_MEMBER_IN_GROUP },
{ WERR_USER_NOT_IN_GROUP, WERR_USER_NOT_IN_GROUP },
{ WERR_PRINTER_DRIVER_IN_USE, WERR_PRINTER_DRIVER_IN_USE },
@@ -96,6 +97,7 @@ static const struct werror_code_struct dos_errs[] =
{ WERR_UNKNOWN_REVISION, WERR_UNKNOWN_REVISION },
{ WERR_REVISION_MISMATCH, WERR_REVISION_MISMATCH },
{ WERR_INVALID_OWNER, WERR_INVALID_OWNER },
+ { WERR_INVALID_PRIMARY_GROUP, WERR_INVALID_PRIMARY_GROUP },
{ WERR_INVALID_COMPUTERNAME, WERR_INVALID_COMPUTERNAME },
{ WERR_INVALID_DOMAINNAME, WERR_INVALID_DOMAINNAME },
{ WERR_MACHINE_LOCKED, WERR_MACHINE_LOCKED },
@@ -232,6 +234,8 @@ const struct werror_str_struct dos_err_strs[] = {
{ WERR_NONE_MAPPED, Could not map names to SIDs },
{ WERR_NO_SUCH_USER, No such User },
{ WERR_GROUP_EXISTS, Group already exists },
+ { WERR_NO_SUCH_GROUP, No such Group },
+ { WERR_INVALID_PRIMARY_GROUP, The account's primary group is invalid
},
{ WERR_DS_DRA_BAD_DN, An invalid distinguished name was specified for
this replication },
{ WERR_DS_DRA_BAD_NC, An invalid naming context was specified for this
replication operation },
{ WERR_WRONG_PASSWORD, The current password is incorrect }
diff --git a/libcli/util/werror.h b/libcli/util/werror.h
index 2e6b696..2976390 100644
--- a/libcli/util/werror.h
+++ b/libcli/util/werror.h
@@ -126,6 +126,7 @@ typedef uint32_t WERROR;
#define WERR_MACHINE_LOCKED W_ERROR(1271)
#define WERR_REVISION_MISMATCH W_ERROR(1306)
#define WERR_INVALID_OWNER W_ERROR(1307)
+#define WERR_INVALID_PRIMARY_GROUP W_ERROR(1308)
#define WERR_NO_LOGON_SERVERS W_ERROR(1311)
#define WERR_NO_SUCH_LOGON_SESSION W_ERROR(1312)
#define WERR_NO_SUCH_PRIVILEGE W_ERROR(1313)
@@ -133,6 +134,7 @@ typedef uint32_t WERROR;
#define WERR_USER_ALREADY_EXISTS W_ERROR(1316)
#define WERR_NO_SUCH_USER W_ERROR(1317)
#define WERR_GROUP_EXISTS W_ERROR(1318)
+#define WERR_NO_SUCH_GROUP W_ERROR(1319)
#define WERR_MEMBER_IN_GROUP W_ERROR(1320)
#define WERR_USER_NOT_IN_GROUP W_ERROR(1321)
#define WERR_WRONG_PASSWORD W_ERROR(1323)
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1444-gfee4c99
The branch, master has been updated
via fee4c99be494b9679c414d6ba1938aa88adeacd3 (commit)
via 5b37df21f6af52d20ad3a25361b1d7faa51308d1 (commit)
from e7a8577df1e92982ff717a62280f86e3b0384d54 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit fee4c99be494b9679c414d6ba1938aa88adeacd3
Author: Günther Deschner g...@samba.org
Date: Tue May 5 21:12:33 2009 +0200
s3-ldap: fix more callers of smbldap_dn_talloc() that were passing a NULL
context.
Guenther
commit 5b37df21f6af52d20ad3a25361b1d7faa51308d1
Author: Günther Deschner g...@samba.org
Date: Tue May 5 18:50:48 2009 +0200
s3-ldapsam: Fix Bug #6313: ldapsam_update_sam_account() crashes while doing
talloc_free on malloced memory.
Guenther
---
Summary of changes:
source3/passdb/pdb_ldap.c |4 ++--
source3/passdb/pdb_nds.c |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index d548fe9..01d3da8 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -1909,7 +1909,7 @@ static NTSTATUS ldapsam_update_sam_account(struct
pdb_methods *my_methods, struc
}
entry = ldap_first_entry(ldap_state-smbldap_state-ldap_struct,
result);
- dn = smbldap_talloc_dn(NULL, ldap_state-smbldap_state-ldap_struct,
entry);
+ dn = smbldap_talloc_dn(talloc_tos(),
ldap_state-smbldap_state-ldap_struct, entry);
if (!dn) {
return NT_STATUS_UNSUCCESSFUL;
}
@@ -3513,7 +3513,7 @@ static NTSTATUS ldapsam_modify_aliasmem(struct
pdb_methods *methods,
return NT_STATUS_UNSUCCESSFUL;
}
- dn = smbldap_talloc_dn(NULL, ldap_state-smbldap_state-ldap_struct,
entry);
+ dn = smbldap_talloc_dn(talloc_tos(),
ldap_state-smbldap_state-ldap_struct, entry);
if (!dn) {
ldap_msgfree(result);
return NT_STATUS_UNSUCCESSFUL;
diff --git a/source3/passdb/pdb_nds.c b/source3/passdb/pdb_nds.c
index 08665e4..1545b45 100644
--- a/source3/passdb/pdb_nds.c
+++ b/source3/passdb/pdb_nds.c
@@ -788,7 +788,7 @@ static NTSTATUS pdb_nds_update_login_attempts(struct
pdb_methods *methods,
}
entry =
ldap_first_entry(ldap_state-smbldap_state-ldap_struct, result);
- dn = smbldap_talloc_dn(NULL,
ldap_state-smbldap_state-ldap_struct, entry);
+ dn = smbldap_talloc_dn(talloc_tos(),
ldap_state-smbldap_state-ldap_struct, entry);
if (!dn) {
return NT_STATUS_OBJECT_NAME_NOT_FOUND;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-876-g10c009c
The branch, v3-4-test has been updated
via 10c009cec59358ec11a9d25242fe395f31f671a6 (commit)
via 079c52a2c39ca2723402e7c6e2f8fd5825c2c40f (commit)
via 14734deb6aacb592af5ddbbc93397ea79fe0d9bc (commit)
via d9233f534e9087cf6b35db5b72aefdd396b772e0 (commit)
from a79ae4e5364fe8e3ec6b451364dc5d861f202528 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit 10c009cec59358ec11a9d25242fe395f31f671a6
Author: Günther Deschner g...@samba.org
Date: Tue May 5 21:12:33 2009 +0200
s3-ldap: fix more callers of smbldap_dn_talloc() that were passing a NULL
context.
Guenther
(cherry picked from commit fee4c99be494b9679c414d6ba1938aa88adeacd3)
commit 079c52a2c39ca2723402e7c6e2f8fd5825c2c40f
Author: Günther Deschner g...@samba.org
Date: Tue May 5 18:50:48 2009 +0200
s3-ldapsam: Fix Bug #6313: ldapsam_update_sam_account() crashes while doing
talloc_free on malloced memory.
Guenther
(cherry picked from commit 5b37df21f6af52d20ad3a25361b1d7faa51308d1)
commit 14734deb6aacb592af5ddbbc93397ea79fe0d9bc
Author: Günther Deschner g...@samba.org
Date: Tue May 5 19:38:58 2009 +0200
error-codes: add some more group specific windows error codes.
Guenther
(cherry picked from commit e7a8577df1e92982ff717a62280f86e3b0384d54)
commit d9233f534e9087cf6b35db5b72aefdd396b772e0
Author: Günther Deschner g...@samba.org
Date: Fri May 1 02:17:23 2009 +0200
s3-printing: Fix driver upload for Xerox 4110 PS printer driver.
We need to allow to set filesystem capabilities from the default vfs in
create_conn_struct() in order to find mixed-case filenames. Thanks Volker!
This one was hard to find, so a little longer explanation:
When a Windows client tries to upload e.g. the Xerox 4110 PS driver, the
client
first uploads the driver files to the [print$] share. Some of them (in this
case
the Windows Postscript drivers) are with uppercase filenames while some of
them
(like the PPD file) are in lowercase. After the driver upload the client
issues
the spoolss_AddPrinterDriverEx() call with level 6. There the client tries
to
add the PPD file with an uppercase filename (while having stored it in
lowercase
on the server). The internal spoolss add driver functions then could not
find the
appropriate filename while trying to move them to the version subdirectory
(in
this case W32X86/3) and fails then entire spoolss_AddPrinterDriverEx() call.
With this fix, the convert_unix_name() name finds the correct file and
the spoolss_AddPrinterDriverEx() succeeds.
Guenther
(cherry picked from commit fe839b65a7b4e8d5e085287b7d33ee1f970fe7c2)
---
Summary of changes:
libcli/util/doserr.c |4
libcli/util/werror.h |2 ++
source3/passdb/pdb_ldap.c |4 ++--
source3/passdb/pdb_nds.c |2 +-
source3/smbd/msdfs.c |2 ++
5 files changed, 11 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/util/doserr.c b/libcli/util/doserr.c
index 1151d32..a7a132f 100644
--- a/libcli/util/doserr.c
+++ b/libcli/util/doserr.c
@@ -79,6 +79,7 @@ static const struct werror_code_struct dos_errs[] =
{ WERR_USER_ALREADY_EXISTS, WERR_USER_ALREADY_EXISTS },
{ WERR_NO_SUCH_USER, WERR_NO_SUCH_USER },
{ WERR_GROUP_EXISTS, WERR_GROUP_EXISTS },
+ { WERR_NO_SUCH_GROUP, WERR_NO_SUCH_GROUP },
{ WERR_MEMBER_IN_GROUP, WERR_MEMBER_IN_GROUP },
{ WERR_USER_NOT_IN_GROUP, WERR_USER_NOT_IN_GROUP },
{ WERR_PRINTER_DRIVER_IN_USE, WERR_PRINTER_DRIVER_IN_USE },
@@ -96,6 +97,7 @@ static const struct werror_code_struct dos_errs[] =
{ WERR_UNKNOWN_REVISION, WERR_UNKNOWN_REVISION },
{ WERR_REVISION_MISMATCH, WERR_REVISION_MISMATCH },
{ WERR_INVALID_OWNER, WERR_INVALID_OWNER },
+ { WERR_INVALID_PRIMARY_GROUP, WERR_INVALID_PRIMARY_GROUP },
{ WERR_INVALID_COMPUTERNAME, WERR_INVALID_COMPUTERNAME },
{ WERR_INVALID_DOMAINNAME, WERR_INVALID_DOMAINNAME },
{ WERR_MACHINE_LOCKED, WERR_MACHINE_LOCKED },
@@ -232,6 +234,8 @@ const struct werror_str_struct dos_err_strs[] = {
{ WERR_NONE_MAPPED, Could not map names to SIDs },
{ WERR_NO_SUCH_USER, No such User },
{ WERR_GROUP_EXISTS, Group already exists },
+ { WERR_NO_SUCH_GROUP, No such Group },
+ { WERR_INVALID_PRIMARY_GROUP, The account's primary group is invalid
},
{ WERR_DS_DRA_BAD_DN, An invalid distinguished name was specified for
this replication },
{ WERR_DS_DRA_BAD_NC, An invalid naming context was specified for this
replication operation },
{ WERR_WRONG_PASSWORD, The current password is incorrect }
diff --git a/libcli/util/werror.h b/libcli/util/werror.h
index 2e6b696..2976390
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-877-ge606a32
The branch, v3-4-test has been updated
via e606a32d2981a67290379e7b2d4da7237746731a (commit)
from 10c009cec59358ec11a9d25242fe395f31f671a6 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit e606a32d2981a67290379e7b2d4da7237746731a
Author: Michael Adam ob...@samba.org
Date: Tue May 5 17:46:20 2009 +0200
s3:loadparm: use the returnvalue of service_ok() in
process_smbconf_service().
Michael
(cherry picked from commit 0ca795ef4fab1f880c2b76d7fe8f0aabb302b6e2)
---
Summary of changes:
source3/param/loadparm.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 27f1dbb..26f3214 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -6785,7 +6785,7 @@ static bool process_smbconf_service(struct
smbconf_service *service)
}
}
if (iServiceIndex = 0) {
- ret = service_ok(iServiceIndex);
+ return service_ok(iServiceIndex);
}
return true;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-878-g651ae5c
The branch, v3-4-test has been updated
via 651ae5c705c15c84882f6c1c3d73292794c63aa9 (commit)
from e606a32d2981a67290379e7b2d4da7237746731a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit 651ae5c705c15c84882f6c1c3d73292794c63aa9
Author: Volker Lendecke v...@samba.org
Date: Sat May 2 11:31:37 2009 +0200
Fix bug 6302: Give the VFS a chance to read from 0-byte files
---
Summary of changes:
source3/smbd/reply.c | 17 +
1 files changed, 9 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 5cdc59b..eb52ef3 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -3263,14 +3263,13 @@ static void send_file_readX(connection_struct *conn,
struct smb_request *req,
return;
}
- if (startpos sbuf.st_size) {
- smb_maxcnt = 0;
- } else if (smb_maxcnt (sbuf.st_size - startpos)) {
- smb_maxcnt = (sbuf.st_size - startpos);
- }
-
- if (smb_maxcnt == 0) {
- goto normal_read;
+ if (!S_ISREG(sbuf.st_mode) || (startpos sbuf.st_size)
+ || (smb_maxcnt (sbuf.st_size - startpos))) {
+ /*
+* We already know that we would do a short read, so don't
+* try the sendfile() path.
+*/
+ goto nosendfile_read;
}
#if defined(WITH_SENDFILE)
@@ -3386,6 +3385,8 @@ normal_read:
return;
}
+nosendfile_read:
+
reply_outbuf(req, 12, smb_maxcnt);
nread = read_file(fsp, smb_buf(req-outbuf), startpos, smb_maxcnt);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1445-g386a5d9
The branch, master has been updated
via 386a5d99b32fa1296618f59f9a9072d9faf2c8ac (commit)
from fee4c99be494b9679c414d6ba1938aa88adeacd3 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 386a5d99b32fa1296618f59f9a9072d9faf2c8ac
Author: Volker Lendecke v...@samba.org
Date: Sat May 2 11:31:37 2009 +0200
Fix bug 6302: Give the VFS a chance to read from 0-byte files
---
Summary of changes:
source3/smbd/reply.c | 17 +
1 files changed, 9 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index d2e1f8b..418c8ba 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -3358,14 +3358,13 @@ static void send_file_readX(connection_struct *conn,
struct smb_request *req,
return;
}
- if (startpos sbuf.st_size) {
- smb_maxcnt = 0;
- } else if (smb_maxcnt (sbuf.st_size - startpos)) {
- smb_maxcnt = (sbuf.st_size - startpos);
- }
-
- if (smb_maxcnt == 0) {
- goto normal_read;
+ if (!S_ISREG(sbuf.st_mode) || (startpos sbuf.st_size)
+ || (smb_maxcnt (sbuf.st_size - startpos))) {
+ /*
+* We already know that we would do a short read, so don't
+* try the sendfile() path.
+*/
+ goto nosendfile_read;
}
#if defined(WITH_SENDFILE)
@@ -3482,6 +3481,8 @@ normal_read:
return;
}
+nosendfile_read:
+
reply_outbuf(req, 12, smb_maxcnt);
nread = read_file(fsp, smb_buf(req-outbuf), startpos, smb_maxcnt);
--
Samba Shared Repository
[SCM] CTDB repository - branch 1.0.69 updated - ctdb-1.0.69-22-g54c5cfe
The branch, 1.0.69 has been updated
via 54c5cfe8659a49054659a693098c0fba4fdf76cd (commit)
from 9a00035c9c815736d0a5909dfc4de7f4c3ac41d4 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=1.0.69
- Log -
commit 54c5cfe8659a49054659a693098c0fba4fdf76cd
Author: root r...@rcn1.vsofs1.com
Date: Wed May 6 07:30:36 2009 +1000
change the control opcode number for transaction_kill so it will not
conflict with newer controls in the master branch
---
Summary of changes:
include/ctdb_private.h |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index e14a272..7439ada 100644
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -565,7 +565,7 @@ enum ctdb_controls {CTDB_CONTROL_PROCESS_EXISTS =
0,
CTDB_CONTROL_TAKEOVER_IP = 89,
CTDB_CONTROL_GET_PUBLIC_IPS = 90,
CTDB_CONTROL_GET_NODEMAP = 91,
- CTDB_CONTROL_TRAVERSE_KILL = 92,
+ CTDB_CONTROL_TRAVERSE_KILL = 97,
};
/*
--
CTDB repository
[SCM] CTDB repository - branch master updated - ctdb-1.0.79-18-g919b298
The branch, master has been updated
via 919b29850671b59bcf748aec25658ea09d8b4f1c (commit)
via f2fb2df4619a14f7f6c11f9132ee7d793028042c (commit)
from bf1b76955db6ba00ec64686b53084268573ba6a0 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit 919b29850671b59bcf748aec25658ea09d8b4f1c
Author: root r...@rcn1.vsofs1.com
Date: Tue May 5 16:33:21 2009 +1000
change the talloc hierarchy for the main transaction_start context and the
individual transaction_all handles
commit f2fb2df4619a14f7f6c11f9132ee7d793028042c
Author: root r...@rcn1.vsofs1.com
Date: Wed May 6 07:32:25 2009 +1000
fixed a problem with clients disconnecting during a traverse
When a client (such as smbstatus) is killed, it may have outstanding
traverse children on remote nodes. We need to catch the client
disconnect in ctdbd and send a control to all nodes telling them to
kill those outstanding traverse children.
---
Summary of changes:
include/ctdb_private.h |6 ++-
server/ctdb_control.c |6 ++-
server/ctdb_traverse.c | 135 +---
3 files changed, 115 insertions(+), 32 deletions(-)
Changeset truncated at 500 lines:
diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index eac27f7..f37560a 100644
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -430,6 +430,7 @@ struct ctdb_db_context {
struct ctdb_registered_call *calls; /* list of registered calls */
uint32_t seqnum;
struct timed_event *te;
+ struct ctdb_traverse_local_handle *traverse;
};
@@ -560,6 +561,7 @@ enum ctdb_controls {CTDB_CONTROL_PROCESS_EXISTS =
0,
CTDB_CONTROL_EVENT_SCRIPT_STOP = 94,
CTDB_CONTROL_EVENT_SCRIPT_FINISHED = 95,
CTDB_CONTROL_GET_EVENT_SCRIPT_STATUS = 96,
+ CTDB_CONTROL_TRAVERSE_KILL = 97,
};
/*
@@ -1118,9 +1120,11 @@ struct ctdb_client_call_state {
int32_t ctdb_control_traverse_start(struct ctdb_context *ctdb, TDB_DATA
indata,
- TDB_DATA *outdata, uint32_t srcnode);
+ TDB_DATA *outdata, uint32_t srcnode,
uint32_t client_id);
int32_t ctdb_control_traverse_all(struct ctdb_context *ctdb, TDB_DATA data,
TDB_DATA *outdata);
int32_t ctdb_control_traverse_data(struct ctdb_context *ctdb, TDB_DATA data,
TDB_DATA *outdata);
+int32_t ctdb_control_traverse_kill(struct ctdb_context *ctdb, TDB_DATA indata,
+ TDB_DATA *outdata, uint32_t srcnode);
int ctdb_dispatch_message(struct ctdb_context *ctdb, uint64_t srvid, TDB_DATA
data);
diff --git a/server/ctdb_control.c b/server/ctdb_control.c
index ac77696..d5d4766 100644
--- a/server/ctdb_control.c
+++ b/server/ctdb_control.c
@@ -217,7 +217,7 @@ static int32_t ctdb_control_dispatch(struct ctdb_context
*ctdb,
case CTDB_CONTROL_TRAVERSE_START:
CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_traverse_start));
- return ctdb_control_traverse_start(ctdb, indata, outdata,
srcnode);
+ return ctdb_control_traverse_start(ctdb, indata, outdata,
srcnode, client_id);
case CTDB_CONTROL_TRAVERSE_ALL:
return ctdb_control_traverse_all(ctdb, indata, outdata);
@@ -225,6 +225,10 @@ static int32_t ctdb_control_dispatch(struct ctdb_context
*ctdb,
case CTDB_CONTROL_TRAVERSE_DATA:
return ctdb_control_traverse_data(ctdb, indata, outdata);
+ case CTDB_CONTROL_TRAVERSE_KILL:
+ CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_traverse_start));
+ return ctdb_control_traverse_kill(ctdb, indata, outdata,
srcnode);
+
case CTDB_CONTROL_REGISTER_SRVID:
return daemon_register_message_handler(ctdb, client_id, srvid);
diff --git a/server/ctdb_traverse.c b/server/ctdb_traverse.c
index 35ae318..dbb4b4f 100644
--- a/server/ctdb_traverse.c
+++ b/server/ctdb_traverse.c
@@ -24,6 +24,7 @@
#include db_wrap.h
#include lib/tdb/include/tdb.h
#include ../include/ctdb_private.h
+#include lib/util/dlinklist.h
typedef void (*ctdb_traverse_fn_t)(void *private_data, TDB_DATA key, TDB_DATA
data);
@@ -32,9 +33,12 @@ typedef void (*ctdb_traverse_fn_t)(void *private_data,
TDB_DATA key, TDB_DATA da
terminate the traverse
*/
struct ctdb_traverse_local_handle {
+ struct ctdb_traverse_local_handle *next, *prev;
struct ctdb_db_context *ctdb_db;
int fd[2];
pid_t child;
+ uint64_t srvid;
+ uint32_t client_reqid;
void *private_data;
ctdb_traverse_fn_t callback;
struct timeval start_time;
@@ -73,6 +77,7 @@ static void ctdb_traverse_local_handler(uint8_t *rawdata,
size_t length, void *p
*/
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-879-gf4e2f7b
The branch, v3-4-test has been updated
via f4e2f7bc23da5f73311bb7adeab2838af14bdeaf (commit)
from 651ae5c705c15c84882f6c1c3d73292794c63aa9 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit f4e2f7bc23da5f73311bb7adeab2838af14bdeaf
Author: Steven Danneman steven.danne...@isilon.com
Date: Tue May 5 14:42:19 2009 -0700
s3:onefs.so Change system function names
Addendum to c49730e1. Use newer cookie conversion names.
---
Summary of changes:
source3/modules/onefs_dir.c |8
1 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/onefs_dir.c b/source3/modules/onefs_dir.c
index 8c056d9..47da33f 100644
--- a/source3/modules/onefs_dir.c
+++ b/source3/modules/onefs_dir.c
@@ -431,7 +431,7 @@ onefs_seekdir(vfs_handle_struct *handle, SMB_STRUCT_DIR
*dirp, long offset)
}
/* Convert offset to resume_cookie */
- resume_cookie = rdp_offset2cookie(offset);
+ resume_cookie = rdp_offset31_to_cookie63(offset);
DEBUG(9, (Seek DIR %p, offset: %ld, resume_cookie: %#llx\n,
dsp-dirp, offset, resume_cookie));
@@ -487,11 +487,11 @@ onefs_telldir(vfs_handle_struct *handle, SMB_STRUCT_DIR
*dirp)
}
/* Convert resume_cookie to offset */
- offset = rdp_cookie2offset(dsp-resume_cookie);
+ offset = rdp_cookie63_to_offset31(dsp-resume_cookie);
if (offset 0) {
DEBUG(1, (Unable to convert resume_cookie: %#llx to a
-suitable 32-bit offset value.\n,
-dsp-resume_cookie));
+suitable 32-bit offset value. Error: %s\n,
+dsp-resume_cookie, strerror(errno)));
return -1;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1446-g798389c
The branch, master has been updated
via 798389c49aa7167157d052f1513f1c81f77e10f7 (commit)
from 386a5d99b32fa1296618f59f9a9072d9faf2c8ac (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 798389c49aa7167157d052f1513f1c81f77e10f7
Author: Steven Danneman steven.danne...@isilon.com
Date: Tue May 5 14:42:19 2009 -0700
s3:onefs.so Change system function names
Addendum to c49730e1. Use newer cookie conversion names.
---
Summary of changes:
source3/modules/onefs_dir.c |8
1 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/onefs_dir.c b/source3/modules/onefs_dir.c
index 8c056d9..47da33f 100644
--- a/source3/modules/onefs_dir.c
+++ b/source3/modules/onefs_dir.c
@@ -431,7 +431,7 @@ onefs_seekdir(vfs_handle_struct *handle, SMB_STRUCT_DIR
*dirp, long offset)
}
/* Convert offset to resume_cookie */
- resume_cookie = rdp_offset2cookie(offset);
+ resume_cookie = rdp_offset31_to_cookie63(offset);
DEBUG(9, (Seek DIR %p, offset: %ld, resume_cookie: %#llx\n,
dsp-dirp, offset, resume_cookie));
@@ -487,11 +487,11 @@ onefs_telldir(vfs_handle_struct *handle, SMB_STRUCT_DIR
*dirp)
}
/* Convert resume_cookie to offset */
- offset = rdp_cookie2offset(dsp-resume_cookie);
+ offset = rdp_cookie63_to_offset31(dsp-resume_cookie);
if (offset 0) {
DEBUG(1, (Unable to convert resume_cookie: %#llx to a
-suitable 32-bit offset value.\n,
-dsp-resume_cookie));
+suitable 32-bit offset value. Error: %s\n,
+dsp-resume_cookie, strerror(errno)));
return -1;
}
--
Samba Shared Repository
[SCM] CTDB repository - branch master updated - 9fc1b49dddf7f7c5b6a7562c293cb22bc7d5f3b9
The branch, master has been updated
via 9fc1b49dddf7f7c5b6a7562c293cb22bc7d5f3b9 (commit)
via 11b11e00d00d1bc587e18283861664d73f287b41 (commit)
from de559946b20cfd7560a205b9c4ae73688341d1b5 (commit)
http://gitweb.samba.org/?p=tridge/ctdb.git;a=shortlog;h=master
- Log -
commit 9fc1b49dddf7f7c5b6a7562c293cb22bc7d5f3b9
Author: Andrew Tridgell tri...@samba.org
Date: Wed May 6 08:18:21 2009 +1000
use less intrusive smbstatus call in periodic connections cleanup
commit 11b11e00d00d1bc587e18283861664d73f287b41
Author: Andrew Tridgell tri...@samba.org
Date: Wed May 6 08:17:45 2009 +1000
merged from ronnie
---
Summary of changes:
config/events.d/50.samba |2 +-
include/ctdb_private.h | 12 ++--
server/ctdb_traverse.c | 11 +++
3 files changed, 10 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/events.d/50.samba b/config/events.d/50.samba
index e0e2ad7..0343ce4 100755
--- a/config/events.d/50.samba
+++ b/config/events.d/50.samba
@@ -135,7 +135,7 @@ periodic_cleanup() {
# running smbstatus scrubs any dead entries from the connections
# and sessionid database
# echo Running periodic cleanup of samba databases
-smbstatus -n /dev/null 21
+smbstatus -np /dev/null 21
}
case $cmd in
diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index 9ba4cc0..f37560a 100644
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -556,12 +556,12 @@ enum ctdb_controls {CTDB_CONTROL_PROCESS_EXISTS
= 0,
CTDB_CONTROL_TAKEOVER_IP = 89,
CTDB_CONTROL_GET_PUBLIC_IPS = 90,
CTDB_CONTROL_GET_NODEMAP = 91,
- CTDB_CONTROL_TRAVERSE_KILL = 92,
- CTDB_CONTROL_EVENT_SCRIPT_INIT = 93,
- CTDB_CONTROL_EVENT_SCRIPT_START = 94,
- CTDB_CONTROL_EVENT_SCRIPT_STOP = 95,
- CTDB_CONTROL_EVENT_SCRIPT_FINISHED = 96,
- CTDB_CONTROL_GET_EVENT_SCRIPT_STATUS = 97,
+ CTDB_CONTROL_EVENT_SCRIPT_INIT = 92,
+ CTDB_CONTROL_EVENT_SCRIPT_START = 93,
+ CTDB_CONTROL_EVENT_SCRIPT_STOP = 94,
+ CTDB_CONTROL_EVENT_SCRIPT_FINISHED = 95,
+ CTDB_CONTROL_GET_EVENT_SCRIPT_STATUS = 96,
+ CTDB_CONTROL_TRAVERSE_KILL = 97,
};
/*
diff --git a/server/ctdb_traverse.c b/server/ctdb_traverse.c
index 60a8e90..dbb4b4f 100644
--- a/server/ctdb_traverse.c
+++ b/server/ctdb_traverse.c
@@ -92,7 +92,6 @@ static int ctdb_traverse_local_fn(struct tdb_context *tdb,
TDB_DATA key, TDB_DAT
struct ctdb_rec_data *d;
struct ctdb_ltdb_header *hdr;
-
hdr = (struct ctdb_ltdb_header *)data.dptr;
if (h-ctdb_db-persistent == 0) {
@@ -229,10 +228,10 @@ static void ctdb_traverse_all_timeout(struct
event_context *ev, struct timed_eve
{
struct ctdb_traverse_all_handle *state = talloc_get_type(private_data,
struct ctdb_traverse_all_handle);
+ DEBUG(DEBUG_ERR,(__location__ Traverse all timeout on database:%s\n,
state-ctdb_db-db_name));
state-ctdb-statistics.timeouts.traverse++;
state-callback(state-private_data, tdb_null, tdb_null);
- talloc_free(state);
}
@@ -265,7 +264,7 @@ static struct ctdb_traverse_all_handle
*ctdb_daemon_traverse_all(struct ctdb_db_
struct ctdb_traverse_all r;
uint32_t destination;
- state = talloc(ctdb_db, struct ctdb_traverse_all_handle);
+ state = talloc(start_state, struct ctdb_traverse_all_handle);
if (state == NULL) {
return NULL;
}
@@ -450,11 +449,6 @@ int32_t ctdb_control_traverse_data(struct ctdb_context
*ctdb, TDB_DATA data, TDB
private_data = state-private_data;
callback(private_data, key, data);
- if (key.dsize == 0 data.dsize == 0) {
- /* we've received all of the null replies, so all
- nodes are finished */
- talloc_free(state);
- }
return 0;
}
@@ -495,6 +489,7 @@ static int ctdb_traverse_start_destructor(struct
traverse_start_state *state)
struct ctdb_traverse_start r;
TDB_DATA data;
+ DEBUG(DEBUG_ERR,(__location__ Traverse cancelled by client disconnect
for database:0x%08x\n, state-db_id));
r.db_id = state-db_id;
r.reqid = state-reqid;
r.srvid = state-srvid;
--
CTDB repository
[SCM] CTDB repository - branch 1.0.69 updated - 3848f8a8f809bf3eb5d6818b62b6e4af967348ad
The branch, 1.0.69 has been updated
via 3848f8a8f809bf3eb5d6818b62b6e4af967348ad (commit)
via 54c5cfe8659a49054659a693098c0fba4fdf76cd (commit)
via 9a00035c9c815736d0a5909dfc4de7f4c3ac41d4 (commit)
from 8ae93da7f6341f1cddb15786df67644f29648b9b (commit)
http://gitweb.samba.org/?p=tridge/ctdb.git;a=shortlog;h=1.0.69
- Log -
commit 3848f8a8f809bf3eb5d6818b62b6e4af967348ad
Author: Andrew Tridgell tri...@samba.org
Date: Wed May 6 08:18:21 2009 +1000
use less intrusive smbstatus call in periodic connections cleanup
commit 54c5cfe8659a49054659a693098c0fba4fdf76cd
Author: root r...@rcn1.vsofs1.com
Date: Wed May 6 07:30:36 2009 +1000
change the control opcode number for transaction_kill so it will not
conflict with newer controls in the master branch
commit 9a00035c9c815736d0a5909dfc4de7f4c3ac41d4
Author: root r...@rcn1.vsofs1.com
Date: Tue May 5 16:33:21 2009 +1000
change the talloc hierarchy for the main transaction_start context and the
individual transaction_all handles
---
Summary of changes:
config/events.d/50.samba |2 +-
include/ctdb_private.h |2 +-
server/ctdb_traverse.c | 11 +++
3 files changed, 5 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/events.d/50.samba b/config/events.d/50.samba
index 9ec5f1c..2040f9d 100755
--- a/config/events.d/50.samba
+++ b/config/events.d/50.samba
@@ -109,7 +109,7 @@ periodic_cleanup() {
# running smbstatus scrubs any dead entries from the connections
# and sessionid database
# echo Running periodic cleanup of samba databases
-smbstatus -n /dev/null 21
+smbstatus -np /dev/null 21
}
case $cmd in
diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index e14a272..7439ada 100644
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -565,7 +565,7 @@ enum ctdb_controls {CTDB_CONTROL_PROCESS_EXISTS =
0,
CTDB_CONTROL_TAKEOVER_IP = 89,
CTDB_CONTROL_GET_PUBLIC_IPS = 90,
CTDB_CONTROL_GET_NODEMAP = 91,
- CTDB_CONTROL_TRAVERSE_KILL = 92,
+ CTDB_CONTROL_TRAVERSE_KILL = 97,
};
/*
diff --git a/server/ctdb_traverse.c b/server/ctdb_traverse.c
index 60a8e90..dbb4b4f 100644
--- a/server/ctdb_traverse.c
+++ b/server/ctdb_traverse.c
@@ -92,7 +92,6 @@ static int ctdb_traverse_local_fn(struct tdb_context *tdb,
TDB_DATA key, TDB_DAT
struct ctdb_rec_data *d;
struct ctdb_ltdb_header *hdr;
-
hdr = (struct ctdb_ltdb_header *)data.dptr;
if (h-ctdb_db-persistent == 0) {
@@ -229,10 +228,10 @@ static void ctdb_traverse_all_timeout(struct
event_context *ev, struct timed_eve
{
struct ctdb_traverse_all_handle *state = talloc_get_type(private_data,
struct ctdb_traverse_all_handle);
+ DEBUG(DEBUG_ERR,(__location__ Traverse all timeout on database:%s\n,
state-ctdb_db-db_name));
state-ctdb-statistics.timeouts.traverse++;
state-callback(state-private_data, tdb_null, tdb_null);
- talloc_free(state);
}
@@ -265,7 +264,7 @@ static struct ctdb_traverse_all_handle
*ctdb_daemon_traverse_all(struct ctdb_db_
struct ctdb_traverse_all r;
uint32_t destination;
- state = talloc(ctdb_db, struct ctdb_traverse_all_handle);
+ state = talloc(start_state, struct ctdb_traverse_all_handle);
if (state == NULL) {
return NULL;
}
@@ -450,11 +449,6 @@ int32_t ctdb_control_traverse_data(struct ctdb_context
*ctdb, TDB_DATA data, TDB
private_data = state-private_data;
callback(private_data, key, data);
- if (key.dsize == 0 data.dsize == 0) {
- /* we've received all of the null replies, so all
- nodes are finished */
- talloc_free(state);
- }
return 0;
}
@@ -495,6 +489,7 @@ static int ctdb_traverse_start_destructor(struct
traverse_start_state *state)
struct ctdb_traverse_start r;
TDB_DATA data;
+ DEBUG(DEBUG_ERR,(__location__ Traverse cancelled by client disconnect
for database:0x%08x\n, state-db_id));
r.db_id = state-db_id;
r.reqid = state-reqid;
r.srvid = state-srvid;
--
CTDB repository
[SCM] CTDB repository - branch 1.0.69 updated - ctdb-1.0.69-23-ga3dd310
The branch, 1.0.69 has been updated
via a3dd310af4cc6f2dd26f65ecf04a9ab081d5e5a4 (commit)
from 54c5cfe8659a49054659a693098c0fba4fdf76cd (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=1.0.69
- Log -
commit a3dd310af4cc6f2dd26f65ecf04a9ab081d5e5a4
Author: Andrew Tridgell tri...@samba.org
Date: Wed May 6 08:18:21 2009 +1000
use less intrusive smbstatus call in periodic connections cleanup
---
Summary of changes:
config/events.d/50.samba |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/events.d/50.samba b/config/events.d/50.samba
index 9ec5f1c..2040f9d 100755
--- a/config/events.d/50.samba
+++ b/config/events.d/50.samba
@@ -109,7 +109,7 @@ periodic_cleanup() {
# running smbstatus scrubs any dead entries from the connections
# and sessionid database
# echo Running periodic cleanup of samba databases
-smbstatus -n /dev/null 21
+smbstatus -np /dev/null 21
}
case $cmd in
--
CTDB repository
[SCM] CTDB repository - branch master updated - ctdb-1.0.79-19-ga152fdc
The branch, master has been updated
via a152fdc79e3360049aee66c3e628237a91df181f (commit)
from 919b29850671b59bcf748aec25658ea09d8b4f1c (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit a152fdc79e3360049aee66c3e628237a91df181f
Author: Andrew Tridgell tri...@samba.org
Date: Wed May 6 08:18:21 2009 +1000
use less intrusive smbstatus call in periodic connections cleanup
---
Summary of changes:
config/events.d/50.samba |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/events.d/50.samba b/config/events.d/50.samba
index e0e2ad7..0343ce4 100755
--- a/config/events.d/50.samba
+++ b/config/events.d/50.samba
@@ -135,7 +135,7 @@ periodic_cleanup() {
# running smbstatus scrubs any dead entries from the connections
# and sessionid database
# echo Running periodic cleanup of samba databases
-smbstatus -n /dev/null 21
+smbstatus -np /dev/null 21
}
case $cmd in
--
CTDB repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1447-gd521726
The branch, master has been updated via d52172654cf248b5b772c34383c176c73438d9d2 (commit) from 798389c49aa7167157d052f1513f1c81f77e10f7 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit d52172654cf248b5b772c34383c176c73438d9d2 Author: Simo Sorce i...@samba.org Date: Tue May 5 19:04:17 2009 -0400 Update tdb and talloc web pages --- Summary of changes: lib/talloc/web/index.html | 15 ++- lib/tdb/web/index.html| 14 ++ 2 files changed, 20 insertions(+), 9 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/talloc/web/index.html b/lib/talloc/web/index.html index 5deab93..388ec2c 100644 --- a/lib/talloc/web/index.html +++ b/lib/talloc/web/index.html @@ -8,12 +8,17 @@ h1talloc/h1 talloc is a hierarchical pool based memory allocator with -destructors. It is the core memory allocator used in Samba4, and has +destructors. It is the core memory allocator used in Samba, and has made a huge difference in many aspects of Samba4 development.p To get started with talloc, I would recommend you read the a href=http://samba.org/ftp/unpacked/talloc/talloc_guide.txt;talloc guide/a. +h2Download/h2 +You can download the latest releases of talloc from the a +href=http://samba.org/ftp/talloc;talloc directory/a on the samba public +source archive. + h2Discussion and bug reports/h2 talloc does not currently have its own mailing list or bug tracking @@ -22,18 +27,18 @@ href=https://lists.samba.org/mailman/listinfo/samba-technical;samba-technical mailing list, and the a href=http://bugzilla.samba.org/;Samba bugzilla/a bug tracking system. -h2Download/h2 +h2Development/h2 -You can download the latest release either via rsync or git.br +You can download the latest code either via git or rsync.br br To fetch via git see the following guide:br a href=http://wiki.samba.org/index.php/Using_Git_for_Samba_Development;Using Git for Samba Development/abr -Once you have cloned the tree switch to the v4-0-test branch and cd into the source/lib/talloc directory.br +Once you have cloned the tree switch to the master branch and cd into the lib/talloc directory.br br To fetch via rsync use this command: pre - rsync -Pavz samba.org::ftp/unpacked/talloc . + rsync -Pavz samba.org::ftp/unpacked/standalone_projects/lib/talloc . /pre hr diff --git a/lib/tdb/web/index.html b/lib/tdb/web/index.html index a53da6b..99e8a2f 100644 --- a/lib/tdb/web/index.html +++ b/lib/tdb/web/index.html @@ -12,6 +12,12 @@ except that it allows multiple simultaneous writers and uses locking internally to keep writers from trampling on each other. TDB is also extremely small. +h2Download/h2 +You can download the latest releases of tdb from the a +href=http://samba.org/ftp/tdb;tdb directory/a on the samba public +source archive. + + h2Discussion and bug reports/h2 tdb does not currently have its own mailing list or bug tracking @@ -22,17 +28,17 @@ bugzilla/a bug tracking system. h2Download/h2 -You can download the latest release either via rsync or git.br +You can download the latest code either via git or rsync.br br To fetch via git see the following guide:br a href=http://wiki.samba.org/index.php/Using_Git_for_Samba_Development;Using Git for Samba Development/abr -Once you have cloned the tree switch to the v4-0-test branch and cd into the source/lib/tdb directory.br +Once you have cloned the tree switch to the master branch and cd into the source/lib/tdb directory.br br To fetch via rsync use these commands: pre - rsync -Pavz samba.org::ftp/unpacked/tdb . - rsync -Pavz samba.org::ftp/unpacked/libreplace . + rsync -Pavz samba.org::ftp/unpacked/standalone_projects/lib/tdb . + rsync -Pavz samba.org::ftp/unpacked/standalone_projects/lib/replace . /pre and build in tdb. It will find the replace library in the directory -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1448-ge091fdc
The branch, master has been updated
via e091fdc5658e65be290ebb3b62a1bdf517781a65 (commit)
from d52172654cf248b5b772c34383c176c73438d9d2 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e091fdc5658e65be290ebb3b62a1bdf517781a65
Author: Jeremy Allison j...@samba.org
Date: Tue May 5 16:28:44 2009 -0700
Make cli_getattrE async.
Jeremy.
---
Summary of changes:
source3/client/client.c |6 +-
source3/include/proto.h | 23 +-
source3/lib/time.c |2 +-
source3/libsmb/clifile.c| 156 ---
source3/libsmb/libsmb_file.c|5 +-
source3/libsmb/libsmb_stat.c|4 +-
source3/utils/net_rpc_printer.c |4 +-
7 files changed, 156 insertions(+), 44 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/client/client.c b/source3/client/client.c
index d3cf08c..9c53472 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -1060,8 +1060,8 @@ static int do_get(const char *rname, const char
*lname_in, bool reget)
if (!cli_qfileinfo(targetcli, fnum,
attr, size, NULL, NULL, NULL, NULL, NULL)
- !cli_getattrE(targetcli, fnum,
- attr, size, NULL, NULL, NULL)) {
+ !NT_STATUS_IS_OK(cli_getattrE(targetcli, fnum,
+ attr, size, NULL, NULL, NULL))) {
d_printf(getattrib: %s\n,cli_errstr(targetcli));
return 1;
}
@@ -1639,7 +1639,7 @@ static int do_put(const char *rname, const char *lname,
bool reput)
status = cli_open(targetcli, targetname, O_RDWR|O_CREAT,
DENY_NONE, fnum);
if (NT_STATUS_IS_OK(status)) {
if (!cli_qfileinfo(targetcli, fnum, NULL, start, NULL,
NULL, NULL, NULL, NULL)
- !cli_getattrE(targetcli, fnum, NULL, start, NULL,
NULL, NULL)) {
+ !NT_STATUS_IS_OK(cli_getattrE(targetcli, fnum,
NULL, start, NULL, NULL, NULL))) {
d_printf(getattrib: %s\n,cli_errstr(cli));
return 1;
}
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 936a724..30c11a5 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1017,6 +1017,7 @@ void set_mtimespec(SMB_STRUCT_STAT *pst, struct timespec
ts);
struct timespec get_ctimespec(const SMB_STRUCT_STAT *pst);
void set_ctimespec(SMB_STRUCT_STAT *pst, struct timespec ts);
void dos_filetime_timespec(struct timespec *tsp);
+time_t make_unix_date2(const void *date_ptr, int zone_offset);
time_t srv_make_unix_date(const void *date_ptr);
time_t srv_make_unix_date2(const void *date_ptr);
time_t srv_make_unix_date3(const void *date_ptr);
@@ -2441,11 +2442,23 @@ bool cli_posix_lock(struct cli_state *cli, uint16_t
fnum,
bool wait_lock, enum brl_type lock_type);
bool cli_posix_unlock(struct cli_state *cli, uint16_t fnum, uint64_t offset,
uint64_t len);
bool cli_posix_getlock(struct cli_state *cli, uint16_t fnum, uint64_t
*poffset, uint64_t *plen);
-bool cli_getattrE(struct cli_state *cli, int fd,
- uint16_t *attr, SMB_OFF_T *size,
- time_t *change_time,
- time_t *access_time,
- time_t *write_time);
+struct tevent_req *cli_getattrE_send(TALLOC_CTX *mem_ctx,
+ struct event_context *ev,
+ struct cli_state *cli,
+uint16_t fnum);
+NTSTATUS cli_getattrE_recv(struct tevent_req *req,
+uint16_t *attr,
+SMB_OFF_T *size,
+time_t *change_time,
+time_t *access_time,
+time_t *write_time);
+NTSTATUS cli_getattrE(struct cli_state *cli,
+ uint16_t fnum,
+ uint16_t *attr,
+ SMB_OFF_T *size,
+ time_t *change_time,
+ time_t *access_time,
+ time_t *write_time);
bool cli_getatr(struct cli_state *cli, const char *fname,
uint16_t *attr, SMB_OFF_T *size, time_t *write_time);
bool cli_setattrE(struct cli_state *cli, int fd,
diff --git a/source3/lib/time.c b/source3/lib/time.c
index 865456b..3e45a2e 100644
--- a/source3/lib/time.c
+++ b/source3/lib/time.c
@@ -605,7 +605,7 @@ static time_t make_unix_date(const void *date_ptr, int
zone_offset)
Like make_unix_date() but the words are reversed.
/
-static time_t make_unix_date2(const void *date_ptr, int zone_offset)
+time_t make_unix_date2(const void *date_ptr, int zone_offset)
{
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1450-g3242c6c
The branch, master has been updated
via 3242c6caf751423a690a011a49a31dee445bf63b (commit)
via 69d61453df6019caef4e7960fa78c6a3c51f3d2a (commit)
from e091fdc5658e65be290ebb3b62a1bdf517781a65 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 3242c6caf751423a690a011a49a31dee445bf63b
Author: tprouty tpro...@b72e2a10-2d34-0410-9a71-d3beadf02b57
Date: Tue May 5 01:17:04 2009 +
s3 onefs: Turn up the debug level for non-error cases
commit 69d61453df6019caef4e7960fa78c6a3c51f3d2a
Author: tprouty tpro...@b72e2a10-2d34-0410-9a71-d3beadf02b57
Date: Sat May 2 00:28:38 2009 +
s3: Fix trans2 path to use case-insensitive stat optimization
Often times before creating a file, a client will first query to see
if it already exists. Since some systems have a case-insensitive stat
that is called from unix_convert, we can definitively return
STATUS_NO_SUCH_FILE to the client without scanning the whole
directory.
This code path is taken from trans2querypathinfo, but trans2findfirst
still does a full directory scan even though the get_real_filename
(the case-insensitive stat vfs call) can prevent this.
This patch adds the get_real_filename call to the trans2find* path,
and also changes the vfs_default behavior for
SMB_VFS_GET_REAL_FILENAME. Previously, in the absence of a
get_real_filename implementation, we would fallback to the full
directory scan. The default behavior now returns -1 and sets errno to
EOPNOTSUPP. This allows SMB_VFS_GET_REALFILENAME to be called from
trans2* and unix_convert.
---
Summary of changes:
source3/modules/onefs_system.c |6 +++---
source3/modules/vfs_default.c |8 ++--
source3/smbd/dir.c | 17 +
source3/smbd/filename.c| 40 ++--
4 files changed, 60 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/onefs_system.c b/source3/modules/onefs_system.c
index bc2ed46..cf99a27 100644
--- a/source3/modules/onefs_system.c
+++ b/source3/modules/onefs_system.c
@@ -580,7 +580,7 @@ ssize_t onefs_sys_recvfile(int fromfd, int tofd, SMB_OFF_T
offset,
/* Log if recvfile didn't write everything it read. */
if (total_rbytes != total_wbytes) {
- DEBUG(0, (partial recvfile: total_rbytes=%llu but
+ DEBUG(3, (partial recvfile: total_rbytes=%llu but
total_wbytes=%llu, diff = %llu\n, total_rbytes,
total_wbytes, total_rbytes - total_wbytes));
SMB_ASSERT(total_rbytes total_wbytes);
@@ -591,7 +591,7 @@ ssize_t onefs_sys_recvfile(int fromfd, int tofd, SMB_OFF_T
offset,
*/
while (total_rbytes count) {
- DEBUG(0, (shallow recvfile (%s), reading %llu\n,
+ DEBUG(3, (shallow recvfile (%s), reading %llu\n,
strerror(errno), count - total_rbytes));
/*
@@ -628,7 +628,7 @@ ssize_t onefs_sys_recvfile(int fromfd, int tofd, SMB_OFF_T
offset,
*/
while (total_wbytes count) {
- DEBUG(0, (partial recvfile, writing %llu\n, count -
total_wbytes));
+ DEBUG(3, (partial recvfile, writing %llu\n, count -
total_wbytes));
ret = sys_pwrite(tofd, spill_buffer, count - total_wbytes,
offset + total_wbytes);
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index bb01f98..6c1946a 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -1120,8 +1120,12 @@ static int vfswrap_get_real_filename(struct
vfs_handle_struct *handle,
TALLOC_CTX *mem_ctx,
char **found_name)
{
- return get_real_filename(handle-conn, path, name, mem_ctx,
-found_name);
+ /*
+* Don't fall back to get_real_filename so callers can differentiate
+* between a full directory scan and an actual case-insensitive stat.
+*/
+ errno = EOPNOTSUPP;
+ return -1;
}
static NTSTATUS vfswrap_brl_lock_windows(struct vfs_handle_struct *handle,
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index b4a8f94..e790287 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -576,6 +576,9 @@ const char *dptr_ReadDirName(TALLOC_CTX *ctx,
{
char *name = NULL;
char *pathreal = NULL;
+ char *found_name = NULL;
+ int ret;
+
SET_STAT_INVALID(*pst);
if (dptr-has_wild || dptr-did_stat) {
@@ -640,6 +643,20 @@ const char *dptr_ReadDirName(TALLOC_CTX *ctx,
goto clean;
}
+ /*
+* Try case-insensitive
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-881-ge4628c6
The branch, v3-4-test has been updated
via e4628c6fc7348f5adc69722809ea539c4fe7 (commit)
via 92558a875ebf842e652614a5519ae101dd62ffd1 (commit)
from f4e2f7bc23da5f73311bb7adeab2838af14bdeaf (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit e4628c6fc7348f5adc69722809ea539c4fe7
Author: tprouty tpro...@b72e2a10-2d34-0410-9a71-d3beadf02b57
Date: Tue May 5 01:17:04 2009 +
s3 onefs: Turn up the debug level for non-error cases
commit 92558a875ebf842e652614a5519ae101dd62ffd1
Author: tprouty tpro...@b72e2a10-2d34-0410-9a71-d3beadf02b57
Date: Sat May 2 00:28:38 2009 +
s3: Fix trans2 path to use case-insensitive stat optimization
Often times before creating a file, a client will first query to see
if it already exists. Since some systems have a case-insensitive stat
that is called from unix_convert, we can definitively return
STATUS_NO_SUCH_FILE to the client without scanning the whole
directory.
This code path is taken from trans2querypathinfo, but trans2findfirst
still does a full directory scan even though the get_real_filename
(the case-insensitive stat vfs call) can prevent this.
This patch adds the get_real_filename call to the trans2find* path,
and also changes the vfs_default behavior for
SMB_VFS_GET_REAL_FILENAME. Previously, in the absence of a
get_real_filename implementation, we would fallback to the full
directory scan. The default behavior now returns -1 and sets errno to
EOPNOTSUPP. This allows SMB_VFS_GET_REALFILENAME to be called from
trans2* and unix_convert.
---
Summary of changes:
source3/modules/onefs_system.c |6 +++---
source3/modules/vfs_default.c |8 ++--
source3/smbd/dir.c | 17 +
source3/smbd/filename.c| 40 ++--
4 files changed, 60 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/onefs_system.c b/source3/modules/onefs_system.c
index bc2ed46..cf99a27 100644
--- a/source3/modules/onefs_system.c
+++ b/source3/modules/onefs_system.c
@@ -580,7 +580,7 @@ ssize_t onefs_sys_recvfile(int fromfd, int tofd, SMB_OFF_T
offset,
/* Log if recvfile didn't write everything it read. */
if (total_rbytes != total_wbytes) {
- DEBUG(0, (partial recvfile: total_rbytes=%llu but
+ DEBUG(3, (partial recvfile: total_rbytes=%llu but
total_wbytes=%llu, diff = %llu\n, total_rbytes,
total_wbytes, total_rbytes - total_wbytes));
SMB_ASSERT(total_rbytes total_wbytes);
@@ -591,7 +591,7 @@ ssize_t onefs_sys_recvfile(int fromfd, int tofd, SMB_OFF_T
offset,
*/
while (total_rbytes count) {
- DEBUG(0, (shallow recvfile (%s), reading %llu\n,
+ DEBUG(3, (shallow recvfile (%s), reading %llu\n,
strerror(errno), count - total_rbytes));
/*
@@ -628,7 +628,7 @@ ssize_t onefs_sys_recvfile(int fromfd, int tofd, SMB_OFF_T
offset,
*/
while (total_wbytes count) {
- DEBUG(0, (partial recvfile, writing %llu\n, count -
total_wbytes));
+ DEBUG(3, (partial recvfile, writing %llu\n, count -
total_wbytes));
ret = sys_pwrite(tofd, spill_buffer, count - total_wbytes,
offset + total_wbytes);
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index bb01f98..6c1946a 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -1120,8 +1120,12 @@ static int vfswrap_get_real_filename(struct
vfs_handle_struct *handle,
TALLOC_CTX *mem_ctx,
char **found_name)
{
- return get_real_filename(handle-conn, path, name, mem_ctx,
-found_name);
+ /*
+* Don't fall back to get_real_filename so callers can differentiate
+* between a full directory scan and an actual case-insensitive stat.
+*/
+ errno = EOPNOTSUPP;
+ return -1;
}
static NTSTATUS vfswrap_brl_lock_windows(struct vfs_handle_struct *handle,
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index b4a8f94..e790287 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -576,6 +576,9 @@ const char *dptr_ReadDirName(TALLOC_CTX *ctx,
{
char *name = NULL;
char *pathreal = NULL;
+ char *found_name = NULL;
+ int ret;
+
SET_STAT_INVALID(*pst);
if (dptr-has_wild || dptr-did_stat) {
@@ -640,6 +643,20 @@ const char *dptr_ReadDirName(TALLOC_CTX *ctx,
goto clean;
}
+ /*
+* Try
Build status as of Wed May 6 00:00:02 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-05-05 00:00:45.0 + +++ /home/build/master/cache/broken_results.txt 2009-05-06 00:00:33.0 + @@ -1,4 +1,4 @@ -Build status as of Tue May 5 00:00:02 2009 +Build status as of Wed May 6 00:00:02 2009 Build counts: Tree Total Broken Panic @@ -8,15 +8,15 @@ ldb 32 32 0 libreplace 32 11 0 lorikeet 0 0 0 -pidl 21 3 0 +pidl 22 3 0 ppp 15 0 0 rsync32 10 0 samba-docs 0 0 0 samba-web0 0 0 -samba_3_current 30 16 0 -samba_3_master 31 29 1 +samba_3_current 30 20 0 +samba_3_master 31 30 0 samba_3_next 31 30 1 samba_4_0_test 32 31 1 talloc 32 32 0 -tdb 30 12 0 +tdb 30 11 0
[SCM] CTDB repository - branch master updated - ctdb-1.0.79-22-g48c0111
The branch, master has been updated via 48c011188c624f10c9a754d4ead27db558088fd4 (commit) via 68da42c4ee92fcdfe65baf04c1a2d6446583858b (commit) via 9ce9a500543de4f0aef5e8c28cda9bbc3c9d1b77 (commit) from a152fdc79e3360049aee66c3e628237a91df181f (commit) http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master - Log - commit 48c011188c624f10c9a754d4ead27db558088fd4 Author: Andrew Tridgell tri...@samba.org Date: Tue May 5 16:06:58 2009 +1000 added link to michaels sambaxp papers commit 68da42c4ee92fcdfe65baf04c1a2d6446583858b Author: Andrew Tridgell tri...@samba.org Date: Tue May 5 16:49:05 2009 +1000 allow pages in subdirs commit 9ce9a500543de4f0aef5e8c28cda9bbc3c9d1b77 Author: Andrew Tridgell tri...@samba.org Date: Tue May 5 16:52:24 2009 +1000 more subdir html support --- Summary of changes: web/documentation.html |6 ++ web/footer.html|2 +- web/header.html| 16 3 files changed, 15 insertions(+), 9 deletions(-) Changeset truncated at 500 lines: diff --git a/web/documentation.html b/web/documentation.html index 6636869..d78a1f0 100644 --- a/web/documentation.html +++ b/web/documentation.html @@ -27,4 +27,10 @@ Man pages: lia href=http://ctdb.samba.org/~tridge/ctdb/doc/onnode.1.html;onnode manual page/a /ul +Articles: +ul +lia href=http://samba.org/~obnox/presentations/sambaXP-2009/;Michael +Adam's clustered NAS articles/a +/ul + !--#include virtual=footer.html -- diff --git a/web/footer.html b/web/footer.html index a66b5c9..a9758e8 100644 --- a/web/footer.html +++ b/web/footer.html @@ -2,7 +2,7 @@ /tr TR ALIGN=center -TDBRa name=search/aimg src=bar1.jpg WIDTH=493 HEIGHT=26 BORDER=0 alt==-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +TDBRa name=search/aimg src=/bar1.jpg WIDTH=493 HEIGHT=26 BORDER=0 alt==-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= !-- SiteSearch Google -- form method=get action=http://www.google.com/custom; diff --git a/web/header.html b/web/header.html index e2b904f..a356b08 100644 --- a/web/header.html +++ b/web/header.html @@ -11,19 +11,19 @@ tr VALIGN=middle td ALIGN=left ul - lismalla href=.home/a/small - lismalla href=documentation.htmldocumentation/a/small - lismalla href=configuring.htmlconfiguring/a/small - lismalla href=building.htmlbuilding/a/small + lismalla href=/home/a/small + lismalla href=/documentation.htmldocumentation/a/small + lismalla href=/configuring.htmlconfiguring/a/small + lismalla href=/building.htmlbuilding/a/small /ul /td td align=center - a href=.img src=ctdblogo.png border=0 alt=CTDB/a + a href=.img src=/ctdblogo.png border=0 alt=CTDB/a /td td align=left ul - lismalla href=download.htmldownload/a/small - lismalla href=testing.htmltesting/a/small + lismalla href=/download.htmldownload/a/small + lismalla href=/testing.htmltesting/a/small lismalla href=http://wiki.samba.org/index.php/CTDB_Setup;wiki/a/small lismalla href=http://bugzilla.samba.org/;bug-tracking/a/small /ul @@ -32,7 +32,7 @@ TR ALIGN=center TD COLSPAN=3 -img src=bar1.jpg WIDTH=493 HEIGHT=26 +img src=/bar1.jpg WIDTH=493 HEIGHT=26 BORDER=0 alt==-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= /TD -- CTDB repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1451-g4842e45
The branch, master has been updated
via 4842e45d59dbd6c9ac138e796d30fcf747807d1c (commit)
from 3242c6caf751423a690a011a49a31dee445bf63b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4842e45d59dbd6c9ac138e796d30fcf747807d1c
Author: Michael Adam ob...@samba.org
Date: Wed May 6 02:08:33 2009 +0200
s3:loadparm: handle registry config source in file_list - fixes bug #6320
Michael
---
Summary of changes:
source3/param/loadparm.c | 78 ++
1 files changed, 44 insertions(+), 34 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 670746e..6dd8dbc 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -682,6 +682,8 @@ static void set_allowed_client_auth(void);
static void *lp_local_ptr(struct service *service, void *ptr);
+static void add_to_file_list(const char *fname, const char *subfname);
+
static const struct enum_list enum_protocol[] = {
{PROTOCOL_NT1, NT1},
{PROTOCOL_LANMAN2, LANMAN2},
@@ -6875,6 +6877,8 @@ static bool process_registry_globals(void)
{
bool ret;
+ add_to_file_list(INCLUDE_REGISTRY_NAME, INCLUDE_REGISTRY_NAME);
+
ret = do_parameter(registry shares, yes, NULL);
if (!ret) {
return ret;
@@ -6998,45 +7002,51 @@ bool lp_file_list_changed(void)
DEBUG(6, (lp_file_list_changed()\n));
- if (lp_config_backend_is_registry()) {
- struct smbconf_ctx *conf_ctx = lp_smbconf_ctx();
-
- if (conf_ctx == NULL) {
- return false;
- }
- if (smbconf_changed(conf_ctx, conf_last_csn, NULL, NULL)) {
- DEBUGADD(6, (registry config changed\n));
- return true;
- }
- }
-
while (f) {
char *n2 = NULL;
time_t mod_time;
- n2 = alloc_sub_basic(get_current_username(),
- current_user_info.domain,
- f-name);
- if (!n2) {
- return false;
- }
- DEBUGADD(6, (file %s - %s last mod_time: %s\n,
-f-name, n2, ctime(f-modtime)));
-
- mod_time = file_modtime(n2);
-
- if (mod_time ((f-modtime != mod_time) || (f-subfname ==
NULL) || (strcmp(n2, f-subfname) != 0))) {
- DEBUGADD(6,
-(file %s modified: %s\n, n2,
- ctime(mod_time)));
- f-modtime = mod_time;
- SAFE_FREE(f-subfname);
- f-subfname = n2; /* Passing ownership of
-return from alloc_sub_basic
-above. */
- return true;
+ if (strequal(f-name, INCLUDE_REGISTRY_NAME)) {
+ struct smbconf_ctx *conf_ctx = lp_smbconf_ctx();
+
+ if (conf_ctx == NULL) {
+ return false;
+ }
+ if (smbconf_changed(conf_ctx, conf_last_csn, NULL,
+ NULL))
+ {
+ DEBUGADD(6, (registry config changed\n));
+ return true;
+ }
+ } else {
+ n2 = alloc_sub_basic(get_current_username(),
+ current_user_info.domain,
+ f-name);
+ if (!n2) {
+ return false;
+ }
+ DEBUGADD(6, (file %s - %s last mod_time: %s\n,
+f-name, n2, ctime(f-modtime)));
+
+ mod_time = file_modtime(n2);
+
+ if (mod_time
+ ((f-modtime != mod_time) ||
+(f-subfname == NULL) ||
+(strcmp(n2, f-subfname) != 0)))
+ {
+ DEBUGADD(6,
+(file %s modified: %s\n, n2,
+ ctime(mod_time)));
+ f-modtime = mod_time;
+ SAFE_FREE(f-subfname);
+ f-subfname = n2; /* Passing ownership of
+return from alloc_sub_basic
+above. */
+ return
[SCM] CTDB repository - branch master updated - ctdb-1.0.79-29-ga87ef6a
The branch, master has been updated
via a87ef6a9206820d5110a7117240f743af010ff19 (commit)
via 96c79bddf7895e57ccf90f0d250bd08b7c4daf40 (commit)
via fce851621fe2099c9692acfbfaade24c3d69727a (commit)
via 300e84f7023e9194b313e96db943e4050bd64e68 (commit)
via 200de8f299c8fa44d6dc696532f1a947132e7ec4 (commit)
via fe59ecb697fb4686ad8ea2fe4ec1cc7b4629e74f (commit)
via 8a86f65826b58c2ee3f07f221a4fc82193beec81 (commit)
from 48c011188c624f10c9a754d4ead27db558088fd4 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit a87ef6a9206820d5110a7117240f743af010ff19
Author: Michael Adam ob...@samba.org
Date: Tue May 5 13:16:38 2009 +0200
ping_pong: add GPL comment header with Tridge's copyright
Michael
commit 96c79bddf7895e57ccf90f0d250bd08b7c4daf40
Author: Michael Adam ob...@samba.org
Date: Thu Apr 30 00:35:55 2009 +0200
ping_pong: get pread/pwrite prototypes from unistd.h
by defining _XOPEN_SOURCE to be 500 before including headers
Michael
commit fce851621fe2099c9692acfbfaade24c3d69727a
Author: Michael Adam ob...@samba.org
Date: Wed Apr 29 18:03:03 2009 +0200
ping_pong: reduce a couple of prototype warnings
Michael
commit 300e84f7023e9194b313e96db943e4050bd64e68
Author: Michael Adam ob...@samba.org
Date: Wed Apr 29 17:58:17 2009 +0200
packaging: also package ping_pong
Michael
commit 200de8f299c8fa44d6dc696532f1a947132e7ec4
Author: Michael Adam ob...@samba.org
Date: Wed Apr 29 17:57:43 2009 +0200
build: also build and install ping_pong
Michael
commit fe59ecb697fb4686ad8ea2fe4ec1cc7b4629e74f
Author: Michael Adam ob...@samba.org
Date: Wed Apr 29 17:50:38 2009 +0200
add tridge's ping_pong.c to the utils folder
Michael
commit 8a86f65826b58c2ee3f07f221a4fc82193beec81
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Wed May 6 10:29:07 2009 +1000
From Sumit Bose sb...@redhat.com
add more 64bit plattforms to configure.ac and preserve cli settings
---
Summary of changes:
Makefile.in |8 ++-
configure.ac| 18 ++--
packaging/RPM/ctdb.spec |1 +
utils/ping_pong/ping_pong.c | 197 +++
4 files changed, 215 insertions(+), 9 deletions(-)
create mode 100644 utils/ping_pong/ping_pong.c
Changeset truncated at 500 lines:
diff --git a/Makefile.in b/Makefile.in
index f1c5f36..1288317 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -63,7 +63,7 @@ TEST_BINS=tests/bin/ctdb_bench tests/bin/ctdb_fetch
tests/bin/ctdb_store \
tests/bin/ctdb_traverse tests/bin/rb_test tests/bin/ctdb_transaction \
@INFINIBAND_BINS@
-BINS = bin/ctdb @CTDB_SCSI_IO@ bin/ctdb_ipmux bin/smnotify
+BINS = bin/ctdb @CTDB_SCSI_IO@ bin/ctdb_ipmux bin/smnotify bin/ping_pong
SBINS = bin/ctdbd
DIRS = lib bin tests/bin
@@ -130,6 +130,11 @@ utils/smnotify/gen_smnotify.c: utils/smnotify/smnotify.x
utils/smnotify/smnotify
@echo Generating $@
rpcgen -l utils/smnotify/smnotify.x utils/smnotify/gen_smnotify.c
+bin/ping_pong: utils/ping_pong/ping_pong.o
+ @echo Linking $@
+ @$(CC) $(CFLAGS) -o $@ utils/ping_pong/ping_pong.o
+
+
tests/bin/rb_test: $(CTDB_CLIENT_OBJ) tests/src/rb_test.o
@echo Linking $@
@$(CC) $(CFLAGS) -o $@ tests/src/rb_test.o $(CTDB_CLIENT_OBJ)
$(LIB_FLAGS)
@@ -200,6 +205,7 @@ install: all
${INSTALLCMD} -m 755 bin/ctdb_ipmux $(DESTDIR)$(bindir)
${INSTALLCMD} -m 755 bin/ctdbd $(DESTDIR)$(sbindir)
${INSTALLCMD} -m 755 bin/smnotify $(DESTDIR)$(bindir)
+ $(INSTALLCMD) -m 755 bin/ping_pong $(DESTDIR)$(bindir)
${INSTALLCMD} -m 644 include/ctdb.h $(DESTDIR)$(includedir)
${INSTALLCMD} -m 644 include/ctdb_private.h $(DESTDIR)$(includedir) #
for samba3
${INSTALLCMD} -m 644 config/functions $(DESTDIR)$(etcdir)/ctdb
diff --git a/configure.ac b/configure.ac
index a7bd2bb..0e8f150 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,14 +14,16 @@ AC_DEFUN([SMB_ENABLE], [echo -n ])
AC_INIT(ctdb.h)
AC_CONFIG_SRCDIR([server/ctdbd.c])
-case `uname -m` in
- x86_64)
-libdir='${exec_prefix}/lib64'
-;;
- *)
-libdir='${exec_prefix}/lib'
-;;
-esac
+if test ${libdir} = '${exec_prefix}/lib'; then
+ case `uname -m` in
+x86_64|ppc64|powerpc64)
+ libdir='${exec_prefix}/lib64'
+ ;;
+*)
+ libdir='${exec_prefix}/lib'
+ ;;
+ esac
+fi
case `uname` in
Linux*)
diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index bbd467b..12f7bdc 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -120,6 +120,7 @@ fi
%{_sbindir}/ctdbd
%{_bindir}/ctdb
%{_bindir}/smnotify
+%{_bindir}/ping_pong
%{_bindir}/ctdb_ipmux
%{_bindir}/ctdb_diagnostics
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1452-g1db0b20
The branch, master has been updated
via 1db0b20d8a26fb60299d0ed7553d7a4847aee84f (commit)
from 4842e45d59dbd6c9ac138e796d30fcf747807d1c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1db0b20d8a26fb60299d0ed7553d7a4847aee84f
Author: Steven Danneman steven.danne...@isilon.com
Date: Tue May 5 17:42:56 2009 -0700
s3 Reorder loadparm to keep aliases together
This keeps the browseable and browsable aliases together.
---
Summary of changes:
source3/param/loadparm.c | 12 ++--
1 files changed, 6 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 6dd8dbc..a6c535c 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -3354,22 +3354,22 @@ static struct parm_struct parm_table[] = {
.flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE |
FLAG_PRINT,
},
{
- .label = access based share enum,
+ .label = browsable,
.type = P_BOOL,
.p_class= P_LOCAL,
- .ptr= sDefault.bAccessBasedShareEnum,
+ .ptr= sDefault.bBrowseable,
.special= NULL,
.enum_list = NULL,
- .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE
+ .flags = FLAG_HIDE,
},
{
- .label = browsable,
+ .label = access based share enum,
.type = P_BOOL,
.p_class= P_LOCAL,
- .ptr= sDefault.bBrowseable,
+ .ptr= sDefault.bAccessBasedShareEnum,
.special= NULL,
.enum_list = NULL,
- .flags = FLAG_HIDE,
+ .flags = FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE
},
{
.label = enhanced browsing,
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1453-g4cbd0c7
The branch, master has been updated
via 4cbd0c77e42627c76dda88af5326ef91415a652d (commit)
from 1db0b20d8a26fb60299d0ed7553d7a4847aee84f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4cbd0c77e42627c76dda88af5326ef91415a652d
Author: Jeremy Allison j...@samba.org
Date: Tue May 5 20:59:22 2009 -0700
Make cli_getatr() async.
Jeremy.
---
Summary of changes:
source3/client/clitar.c |4 +-
source3/include/proto.h | 16 -
source3/lib/time.c |2 +-
source3/libsmb/clifile.c | 151 ++---
source3/libsmb/libsmb_file.c |2 +-
source3/torture/torture.c| 10 ++--
6 files changed, 149 insertions(+), 36 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index fd6c4cc..80f6c81 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -594,7 +594,9 @@ static void do_setrattr(char *name, uint16 attr, int set)
{
uint16 oldattr;
- if (!cli_getatr(cli, name, oldattr, NULL, NULL)) return;
+ if (!NT_STATUS_IS_OK(cli_getatr(cli, name, oldattr, NULL, NULL))) {
+ return;
+ }
if (set == ATTRSET) {
attr |= oldattr;
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 30c11a5..194d74d 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1018,6 +1018,7 @@ struct timespec get_ctimespec(const SMB_STRUCT_STAT *pst);
void set_ctimespec(SMB_STRUCT_STAT *pst, struct timespec ts);
void dos_filetime_timespec(struct timespec *tsp);
time_t make_unix_date2(const void *date_ptr, int zone_offset);
+time_t make_unix_date3(const void *date_ptr, int zone_offset);
time_t srv_make_unix_date(const void *date_ptr);
time_t srv_make_unix_date2(const void *date_ptr);
time_t srv_make_unix_date3(const void *date_ptr);
@@ -2459,12 +2460,23 @@ NTSTATUS cli_getattrE(struct cli_state *cli,
time_t *change_time,
time_t *access_time,
time_t *write_time);
-bool cli_getatr(struct cli_state *cli, const char *fname,
- uint16_t *attr, SMB_OFF_T *size, time_t *write_time);
bool cli_setattrE(struct cli_state *cli, int fd,
time_t change_time,
time_t access_time,
time_t write_time);
+struct tevent_req *cli_getatr_send(TALLOC_CTX *mem_ctx,
+ struct event_context *ev,
+ struct cli_state *cli,
+ const char *fname);
+NTSTATUS cli_getatr_recv(struct tevent_req *req,
+ uint16_t *attr,
+ SMB_OFF_T *size,
+ time_t *write_time);
+NTSTATUS cli_getatr(struct cli_state *cli,
+ const char *fname,
+ uint16_t *attr,
+ SMB_OFF_T *size,
+ time_t *write_time);
bool cli_setatr(struct cli_state *cli, const char *fname, uint16_t attr,
time_t t);
struct tevent_req *cli_chkpath_send(TALLOC_CTX *mem_ctx,
struct event_context *ev,
diff --git a/source3/lib/time.c b/source3/lib/time.c
index 3e45a2e..611debe 100644
--- a/source3/lib/time.c
+++ b/source3/lib/time.c
@@ -621,7 +621,7 @@ time_t make_unix_date2(const void *date_ptr, int
zone_offset)
these generally arrive as localtimes, with corresponding DST.
**/
-static time_t make_unix_date3(const void *date_ptr, int zone_offset)
+time_t make_unix_date3(const void *date_ptr, int zone_offset)
{
time_t t = (time_t)IVAL(date_ptr,0);
if (!null_mtime(t)) {
diff --git a/source3/libsmb/clifile.c b/source3/libsmb/clifile.c
index bc466d1..357923a 100644
--- a/source3/libsmb/clifile.c
+++ b/source3/libsmb/clifile.c
@@ -2243,49 +2243,148 @@ NTSTATUS cli_getattrE(struct cli_state *cli,
Do a SMBgetatr call
/
-bool cli_getatr(struct cli_state *cli, const char *fname,
- uint16_t *attr, SMB_OFF_T *size, time_t *write_time)
-{
- char *p;
+static void cli_getatr_done(struct tevent_req *subreq);
- memset(cli-outbuf,'\0',smb_size);
- memset(cli-inbuf,'\0',smb_size);
+struct cli_getatr_state {
+ int zone_offset;
+ uint16_t attr;
+ SMB_OFF_T size;
+ time_t write_time;
+};
- cli_set_message(cli-outbuf,0,0,True);
+struct tevent_req *cli_getatr_send(TALLOC_CTX *mem_ctx,
+ struct event_context *ev,
+ struct cli_state *cli,
+ const char *fname)
+{
+ struct
