[Samba] changing ACLs only as owner possible
Hello! I have the following problem: I have an linux file server (member server ADS), with authenticating against ADS. It works fine. All user data / memberships are correct. ACLs works successfully for reading and so on. But I'll can change ACLs, if i'm the owner of this file/folder. If I'm member of an ownerproup or I have full access via ACLs (as user or as a member of a group) I always get an error message: setfacl: test_unixgrpvoll: Operation not permitted Any Ideas? Thanks!! -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] changing ACLs only as owner possible
-- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: changing ACLs only as owner possible
Sven Geggus schrieb: [EMAIL PROTECTED] wrote: But I'll can change ACLs, if i'm the owner of this file/folder. If I'm member of an ownerproup or I have full access via ACLs (as user or as a member of a group) I always get an error message: setfacl: test_unixgrpvoll: Operation not permitted RTFL hels in this case! from smb.conf(5) --cut-- dos filemode (S) The default behavior in Samba is to provide UNIX-like behavior where only the owner of a file/directory is able to change the permissions on it. However, this behavior is often confusing to DOS/Windows users. Enabling this parameter allows a user who has write access to the file (by whatever means) to modify the permissions (including ACL) on it. Note that a user belonging to the group owning the file will not be allowed to change permissions if the group is only granted read access. Ownership of the file/directory may also be changed. Default: dos filemode = no --cut-- from setfacl(1) --cut-- PERMISSIONS The file owner and processes capable of CAP_FOWNER are granted the right to modify ACLs of a file. This is analogous to the permissions required for accessing the file mode. (On current Linux systems, root is the only user with the CAP_FOWNER capability.) --cut-- Regards Sven Hello! Dos filemode works for the main unixgroup, but not for ACL-Users/Groups (with full access). Is there an opportunity also for ACL-Users/Groups Regards... Björn -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: Samba authentication slow after upgrade to Samba 3
I have a gut feeling that this is to do with encrypted passwords. I have encrypt passwords = no set and pc's have the clear text password hack - could this be causing it? I really don't want to go t encrypted passwords if I can help it as it will mean another password file to keep in sync. Regards Gary -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Repost: Can't follow DFS link
Hi, I am using 3.0.22 on Ubuntu 6.06. I'm trying to setup a DFS root. Here is the smb.conf share section: My smb.conf file is: [global] # use default ; security = user host msdfs = yes [Share] path=/var/Share writable=yes msdfs root=yes The dfs link is: # ls -l /var/Share/Data/2007/OfficeAdmin/pdf lrwxrwxrwx 1 root root 19 2007-05-23 09:14 /var/Share/Data/2007/OfficeAdmin/pdf - msdfs:cladms004\pdf All the clients have been rebooted. They can all connect to \\cladms004\pdf directly. On one Win2K client the DFS link works fine. But on another Win2K client and a Win2K terminal server, I can't go into the pdf folder. I can see the pdf folder inside the share. But when I try to go into the pdf folder, Windows says the folder is inaccessible. The level 10 log is: [2007/05/28 17:24:14, 10] lib/util_sock.c:read_smb_length_return_keepalive(618) got smb length of 128 [2007/05/28 17:24:14, 6] smbd/process.c:process_smb(1193) got message type 0x0 of len 0x80 [2007/05/28 17:24:14, 3] smbd/process.c:process_smb(1194) Transaction 257270 of length 132 [2007/05/28 17:24:14, 5] lib/util.c:show_msg(454) [2007/05/28 17:24:14, 5] lib/util.c:show_msg(464) size=128 smb_com=0x32 smb_rcls=0 smb_reh=0 smb_err=0 smb_flg=24 smb_flg2=51203 smb_tid=10 smb_pid=2264 smb_uid=187 smb_mid=9153 smt_wct=15 smb_vwv[ 0]= 60 (0x3C) smb_vwv[ 1]=0 (0x0) smb_vwv[ 2]=2 (0x2) smb_vwv[ 3]= 40 (0x28) smb_vwv[ 4]=0 (0x0) smb_vwv[ 5]=0 (0x0) smb_vwv[ 6]=0 (0x0) smb_vwv[ 7]=0 (0x0) smb_vwv[ 8]=0 (0x0) smb_vwv[ 9]= 60 (0x3C) smb_vwv[10]= 68 (0x44) smb_vwv[11]=0 (0x0) smb_vwv[12]=0 (0x0) smb_vwv[13]=1 (0x1) smb_vwv[14]=5 (0x5) smb_bcc=63 [2007/05/28 17:24:14, 10] lib/util.c:dump_data(2058) [000] 00 00 00 EC 03 00 00 00 00 5C 00 44 00 61 00 74 .\.D.a.t [010] 00 61 00 5C 00 32 00 30 00 30 00 37 00 5C 00 4F .a.\.2.0 .0.7.\.O [020] 00 66 00 66 00 69 00 63 00 65 00 41 00 64 00 6D .f.f.i.c .e.A.d.m [030] 00 69 00 6E 00 5C 00 70 00 64 00 66 00 00 00 .i.n.\.p .d.f... [2007/05/28 17:24:14, 3] smbd/process.c:switch_message(993) switch message SMBtrans2 (pid 3864) conn 0x83ed558 [2007/05/28 17:24:14, 4] smbd/uid.c:change_to_user(222) change_to_user: Skipping user change - already user [2007/05/28 17:24:14, 3] smbd/trans2.c:call_trans2qfilepathinfo(2861) call_trans2qfilepathinfo: TRANSACT2_QPATHINFO: level = 1004 [2007/05/28 17:24:14, 5] smbd/filename.c:unix_convert(108) unix_convert called on file Data/2007/OfficeAdmin/pdf [2007/05/28 17:24:14, 10] smbd/statcache.c:stat_cache_lookup(215) stat_cache_lookup: lookup failed for name [DATA/2007/OFFICEADMIN/PDF] [2007/05/28 17:24:14, 10] smbd/statcache.c:stat_cache_lookup(248) stat_cache_lookup: lookup succeeded for name [DATA/2007/OFFICEADMIN] - [Data/2007/OfficeAdmin] [2007/05/28 17:24:14, 5] smbd/filename.c:unix_convert(185) unix_convert begin: name = Data/2007/OfficeAdmin/pdf, dirpath = Data/2007/Offi ceAdmin, start = pdf [2007/05/28 17:24:14, 10] smbd/mangle_hash2.c:is_mangled(276) is_mangled pdf ? [2007/05/28 17:24:14, 10] smbd/mangle_hash2.c:is_mangled_component(215) is_mangled_component pdf (len 3) ? [2007/05/28 17:24:14, 10] smbd/mangle_hash2.c:is_mangled(276) is_mangled pdf ? [2007/05/28 17:24:14, 10] smbd/mangle_hash2.c:is_mangled_component(215) is_mangled_component pdf (len 3) ? [2007/05/28 17:24:14, 5] smbd/statcache.c:stat_cache_add(140) stat_cache_add: Added entry (83e4d88:size1a) DATA/2007/OFFICEADMIN/PDF - Data /2007/OfficeAdmin/pdf [2007/05/28 17:24:14, 5] smbd/statcache.c:stat_cache_add(140) stat_cache_add: Added entry (83e4d88:size1a) DATA/2007/OFFICEADMIN/PDF - Data /2007/OfficeAdmin/pdf [2007/05/28 17:24:14, 5] smbd/filename.c:unix_convert(400) conversion finished Data/2007/OfficeAdmin/pdf - Data/2007/OfficeAdmin/pdf [2007/05/28 17:24:14, 3] smbd/trans2.c:call_trans2qfilepathinfo(2886) call_trans2qfilepathinfo: SMB_VFS_STAT of Data/2007/OfficeAdmin/pdf failed (No such file or directory) [2007/05/28 17:24:14, 10] smbd/trans2.c:set_bad_path_error(2623) set_bad_path_error: err = 2 bad_path = 0 [2007/05/28 17:24:14, 3] smbd/error.c:error_packet(146) error packet at smbd/trans2.c(2629) cmd=50 (SMBtrans2) NT_STATUS_OBJECT_NAME_NOT_FOUND -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] samba problem: Multiple Heap Overflows Allow Remote Code Execution
Dear Jeremy:We use samba 2.2.12 as our samba server, and it worked perfectly before, but now there is one security problem found in samba 3.0 now, so we worry about our samba server, but for some reason we can't update to samba 3.0.25, so can you tell us whether the problem be existent in samba 2.2.12, or how can I test our samba server with some tools software? Thanks, Jack _ 通过 Live.com 查看资讯、娱乐信息和您关心的其他信息！ http://www.live.com/getstarted.aspx -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Fwd: Samba 3.025 wbinfo checking the trust secret via RPC calls failed
On Thu, 31 May 2007 17:53:10 -0400 Gaiseric Vandal [EMAIL PROTECTED] wrote: GV I joined 2 Windows 2003 machines to the domain. I was able to log as GV administrator and root but no other accounts, whether local or GV not. The user accounts them self seem OK- it just seems to be a GV winbind or trusts issue. You are, perhaps, looking at the wrong place! Are you trying to log in with remote desktop? In this case users have to be members of the Remote Desktop Users group. try to log in att the console to see if it make a difference! Regards! -- Jean-Jacques Moulis Tel: (013) 281684 ISYFax: (013) 139282 Linköping UniversityE-mail: [EMAIL PROTECTED] 581 83 Linköping -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] policy files
Hi Adam, Thanks for your reply. A couple a questions inline: On 5/31/07, Adam Tauno Williams [EMAIL PROTECTED] wrote: This is a Windows issue, not a Samba issue. All the information I've been able to find references windows tools - the part I'm missing is where the windows tools stop and Samba takes over. I hope you don't mind me clarifying a couple of things below. Is there a simple howto that I've missed on this? Thanks in advance for any tips. Yes, the Windows documentation. O'Reilly has a title: Windows NT User Administration you need a book like that. Most of the HOWTOs and what not on the Internet are confusing garbage, or at best only half complete, my advise is to skip them entirely. Thanks for the tip - I think half my problem is I'm not exactly sure what I'm looking for. I have Samba happily running as a Domain Controller and have the computers on the network in the domain. However, I don't have any windows servers, and hence don't have a Windows Active Directory on my network. All my searching for information regarding policies and so on aren't turning up much because they all seem to refer to AD. Can I ask if you (or anyone else) know if what I'm trying to do is possible using Samba on its own (and the GPO approach)? I'm assuming that I need to learn and understand firstly how to create my policy (thanks for the help on this) and how to distribute it. I'm hoping that the distribution is simply a matter of putting the appropriate file on a Samba share (once I know which share it is). Re the book, thanks - I've ordred a copy on amazon, unfortunately its not available on Safari. The *OFFICIAL* Samba documentation does cover this to some extend, beyond that get a book. http://us1.samba.org/samba/docs/man/Samba-HOWTO-Collection/PolicyMgmt.html I had read that, and thought I was doing the right thing (although missing the link between POL and ADM files). Not sure how I'm going to get my hands on poledit.exe which I figure is my next step. Thanks again for your help. cheers, dim -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Samba authentication slow after upgrade to Samba 3
Hi, I have just upgraded a server from Samba 2 to Samba 3 and some of the Windows clients are taking a long time to authenticate shares (1 or 2 minutes). Eventually the username/password box appears and then when you enter a correct password, all is fine - it is just the initial authentication. This is a simple UNIX password Samba server (with NIS) and I have set it to not use encrypted passwords. I get these errors, repeatedly, in the messages file: [2007/06/01 08:29:26, 2] auth/pampass.c:smb_pam_auth(514) smb_pam_auth: PAM: Athentication Error for user mcr3 [2007/06/01 08:29:26, 2] auth/pampass.c:smb_pam_error_handler(73) smb_pam_error_handler: PAM: Authentication Failure : Authentication failure [2007/06/01 08:29:26, 0] auth/pampass.c:smb_pam_passcheck(810) smb_pam_passcheck: PAM: smb_pam_auth failed - Rejecting User mcr3 ! Here is my testparm output: # Global parameters [global] workgroup = DFGSRV server string = dfgsrv Samba Server %v encrypt passwords = No password level = 8 username level = 8 log level = 2 log file = /var/log/samba/%m.log max log size = 200 deadtime = 30 socket options = SO_KEEPALIVE SO_BROADCAST TCP_NODELAY IPTOS_THROUGHPUT dns proxy = No idmap uid = 16777216-33554431 idmap gid = 16777216-33554431 cups options = raw oplocks = No level2 oplocks = No [homes] comment = Home Directories read only = No create mask = 0664 directory mask = 0775 Any help gladly received as it is taking some of my users half an hour to disconnect from their previously mapped shares and to reconnect to them. The problem persists if a user logs out and back in again and after a Windows client machine reboot. Regards Gary - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - This e-mail and any files transmitted with it are confidential and intended solely for the use of the individual or entity to whom they are addressed.If you have received this e-mail in error please notify the sender immediately and delete this e-mail from your system.Please note that any views or opinions presented in this e-mail are solely those of the author and do not necessarily represent those of Ricardo (save for reports and other documentation formally approved and signed for release to the intended recipient).Only Directors are authorised to enter into legally binding obligations on behalf of Ricardo. Ricardo may monitor outgoing and incoming e-mails and other telecommunications systems. By replying to this e-mail you give consent to such monitoring.The recipient should check e-mail and any attachments for the presence of viruses. Ricardo accepts no liability for any damage caused by any virus transmitted by this e-mail. Ricardo means Ricardo plc and its subsidiary companies. Ricardo plc is a public limited company registered in England with registered number 00222915. The registered office of Ricardo plc is Shoreham Technical Centre, Shoreham-by Sea, West Sussex, BN43 5FG. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: changing ACLs only as owner possible
[EMAIL PROTECTED] wrote: But I'll can change ACLs, if i'm the owner of this file/folder. If I'm member of an ownerproup or I have full access via ACLs (as user or as a member of a group) I always get an error message: setfacl: test_unixgrpvoll: Operation not permitted RTFL hels in this case! from smb.conf(5) --cut-- dos filemode (S) The default behavior in Samba is to provide UNIX-like behavior where only the owner of a file/directory is able to change the permissions on it. However, this behavior is often confusing to DOS/Windows users. Enabling this parameter allows a user who has write access to the file (by whatever means) to modify the permissions (including ACL) on it. Note that a user belonging to the group owning the file will not be allowed to change permissions if the group is only granted read access. Ownership of the file/directory may also be changed. Default: dos filemode = no --cut-- from setfacl(1) --cut-- PERMISSIONS The file owner and processes capable of CAP_FOWNER are granted the right to modify ACLs of a file. This is analogous to the permissions required for accessing the file mode. (On current Linux systems, root is the only user with the CAP_FOWNER capability.) --cut-- Regards Sven -- /* Fuck me gently with a chainsaw... */ (David S. Miller in /usr/src/linux/arch/sparc/kernel/ptrace.c) /me is [EMAIL PROTECTED], http://sven.gegg.us/ on the Web -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] policy files
Hi Dimitri, I think I have two questions - one which is samba and one which is windows policy files. I'll try to limit this question to the samba side but will give the full picture for completeness. I'm trying to implement a simple policy to redirect a few simple folders (for starters). I have a policy file called NTConfig.POL that is available on my share \\wilson\netlogon (wilson is the name of the server running samba). I'll append its contents at the end of this email in case that's where my problem lies (although that's a windows question, so I don't expect an answer here). folder redirection can be performed quite easily with a .reg file loaded throught the logon script (like explained in http://isg.ee.ethz.ch/tools/realmen/det/skel.en.html) a reg file like below should do it ��Windows Registry Editor Version 5.00 [HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders] Desktop=U:\.desktop Personal=U: My Pictures=U: My Music=U: My Video=U: Actually you can do quite a lot of things in logon script, as long as they can be launch with plain user rights. I advise you to use .vbs scripts, they are much more powerful than .bat scripts. cheers, Denis I don't have anything that mentions the policy file in my samba config, but according to http://www.pcc-services.com/custom_poledit.html I don't need to (other than having NTConfig.POL readable at \\wilson\netlogon\NTPolicy.POL, which it is). I've seen lots of stuff that suggests I need special windows programs (that seem to only be available on NT or 2003) to edit these files, and then other pages (such as the link above) that say they are just text files. Is there a simple howto that I've missed on this? Thanks in advance for any tips. cheers dim CLASS USER CATEGORY Custom Folder Redirection KEYNAME Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders POLICY Custom Internet Cookies Folder PART Path to User's Internet Cookies Folder EDITTEXTREQUIREDEXPANDABLETEXT DEFAULT Z:\Cookies VALUENAME Cookies END PART END POLICY POLICY Custom Internet Favorites Folder PART Path to User's Internet Favorites Folder EDITTEXTREQUIREDEXPANDABLETEXT DEFAULT Z:\Favorites VALUENAME Favorites END PART END POLICY POLICY Custom Internet History Folder PART Path to User's Internet History Folder EDITTEXTREQUIREDEXPANDABLETEXT DEFAULT Z:\History VALUENAME History END PART END POLICY POLICY Custom My Documents Folder PART Path to User's My Documents Folder EDITTEXTREQUIREDEXPANDABLETEXT DEFAULT Z:\Documents VALUENAME Personal END PART END POLICY END CATEGORY ;Custom Folder Redirection -- Denis Cardon Tranquil IT Systems 10 rue du Docteur Bouchard 49400 Saumur tel : +33 (0) 2.41.67.56.99 http://www.tranquil-it-systems.fr -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] samba problem: Multiple Heap Overflows Allow Remote Code Execution
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 liujack, Dear Jeremy:We use samba 2.2.12 as our samba server, and it worked perfectly before, but now there is one security problem found in samba 3.0 now, so we worry about our samba server, but for some reason we can't update to samba 3.0.25, so can you tell us whether the problem be existent in samba 2.2.12, or how can I test our samba server with some tools software? Thanks, Jack For the record: CVE-2007-2447 was present in some form in the 2.2.x branch. CVE-2007-2444 does not apply to 3.0.23c or earlier releases. CVE-2007-2446 probably applies in some fashion to 2.2.x But Samba 2.2. was declared EOL in Oct of 2004. Your only option is to backport the patches yourself or contact a vendor for paid support and have them do it. cheers, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGYAxEIR7qMdg1EfYRAiOuAJ4yoTBF28Zadx9vGv1OA8k7Mt0lYgCdGglQ iYoLUmtywlj6kEJ4dBi8DVw= =fqrj -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Re: changing ACLs only as owner possible
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 [EMAIL PROTECTED] wrote: Dos filemode works for the main unixgroup, but not for ACL-Users/Groups (with full access). Is there an opportunity also for ACL-Users/Groups It does apply to acls in current releases. Easlier release use the acl group control (cannot remember the exact name off the top of my head) option. cheers, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGYAzIIR7qMdg1EfYRAp9eAKDwa85AuQKCqpJhCuDQ9/JrV2+vfwCeLIWo It8X3mrV64NGSldlT0Evths= =RUYn -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] net groupmap -- HELP!
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Urs Golla wrote: Hello I still have a problem with the net groupmap add command. If I add a domain group to a lcoal group, the memebers of the domain group should show up as members of the local group. Or am I totaly wrong? Yes. But that is only supported by WInbindd and the winbind nested groups option. jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGYAz/IR7qMdg1EfYRAj7KAKDnqQ7M3qHuiXJLDUPfHxXt8IwvWwCg6ruD F582h67Ji3d1BO8BEN39zYY= =MctI -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] samba problem: Multiple Heap Overflows Allow Remote Code Execution
On Fri, Jun 01, 2007 at 03:54:05PM +0800, liujack wrote: Dear Jeremy:We use samba 2.2.12 as our samba server, and it worked perfectly before, but now there is one security problem found in samba 3.0 now, so we worry about our samba server, but for some reason we can't update to samba 3.0.25, so can you tell us whether the problem be existent in samba 2.2.12, or how can I test our samba server with some tools software? Thanks, Sorry, Samba 2.2 has been declared end of life for ages now. What are your reasons that you can not upgrade? Volker pgpmuijPweeir.pgp Description: PGP signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] net groupmap -- HELP!
Hello I still have a problem with the net groupmap add command. If I add a domain group to a lcoal group, the memebers of the domain group should show up as members of the local group. Or am I totaly wrong? cheers -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba 3.025 wbinfo checking the trust secret via RPC calls failed
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Gaiseric Vandal wrote: pdc # ./wbinfo -t checking the trust secret via RPC calls failed error code was NT_STATUS_INVALID_HANDLE (0xc008) Could not check secret Known issue. I'll fix this for 3.0.25b. In the middle of server upgrades right now so I cannot point you at the open bug erport. cheers, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGYAsZIR7qMdg1EfYRAk9VAJ99603aN1+B4NiX41K8Hol2IjF94ACg1bVp ESkOL27tzpbrP5+dBiPUct4= =jEGi -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Do Machine Accounts Expire?
I recently started playing with pdbedit to set the maximum password age policy on v3.0.25a. After setting this policy, I see that running pdbedit -Lv shows the machine accounts expiring in the same time frame as the user accounts. So my question is do the machine accounts actually expire just like user accounts? If they do, is there any way to set the machine accounts not to expire as a group instead of setting them not to expire one at a time? Thank you in advance. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] policy files
All the information I've been able to find references windows tools
Of course.
- the
part I'm missing is where the windows tools stop and Samba takes over
It doesn't, at all. NT4 domain policies require no action from the PDC
at all. It is just a file loaded by the client from a specific place
and applied as a mask to the registry. Samba does nothing and knows
nothing.
Thanks for the tip - I think half my problem is I'm not exactly sure what
I'm looking for.
ADM files and POLEDIT.EXE
I have Samba happily running as a Domain Controller and
have the computers on the network in the domain. However, I don't have any
windows servers, and hence don't have a Windows Active Directory on my
network.
It has nothing to do with AD.
All my searching for information regarding policies and so on
aren't turning up much because they all seem to refer to AD.
You are seeing documentation on GPOs / Group Policies. You want NT4
Domain Policies. You need to look at *OLD* Windows documentation. If
it doesn't mention NT4, or it mentions AD, ignore it.
you (or anyone else) know if what I'm trying to do is possible using Samba
on its own (and the GPO approach)?
No, Samba 3.x cannot use GPOs.
I'm assuming that I need to learn and
understand firstly how to create my policy (thanks for the help on this) and
how to distribute it.
Putting in \\{server}\netlogon distributes is.
I'm hoping that the distribution is simply a matter
of putting the appropriate file on a Samba share (once I know which share it
is).
Yep.
Re the book, thanks - I've ordred a copy on amazon, unfortunately its not
available on Safari.
The *OFFICIAL* Samba documentation does cover this to some extend,
beyond that get a book.
http://us1.samba.org/samba/docs/man/Samba-HOWTO-Collection/PolicyMgmt.html
I had read that, and thought I was doing the right thing (although missing
the link between POL and ADM files). Not sure how I'm going to get my hands
on poledit.exe which I figure is my next step.
You have to find a copy of POLEDIT.EXE, or dig a copy of an older
Windows CD.
--
Adam Tauno Williams, Network Systems Administrator
Consultant - http://www.whitemiceconsulting.com
Developer - http://www.opengroupware.org
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] policy files
Hi again, On 6/1/07, Adam Tauno Williams [EMAIL PROTECTED] wrote: You are seeing documentation on GPOs / Group Policies. You want NT4 Domain Policies. You need to look at *OLD* Windows documentation. If it doesn't mention NT4, or it mentions AD, ignore it. A... now that, makes sense. Thanks a heap. you (or anyone else) know if what I'm trying to do is possible using Samba on its own (and the GPO approach)? No, Samba 3.x cannot use GPOs. Right so that's why asking my windows mates for help has done nothing but confuse me! Thanks again - that makes a heap of sense, I feel like I have a much better idea of what I'm after now. cheers, dim -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] net groupmap -- HELP!
Hi I mean, if i do a net groupmap add mydomaingroup mylocalgroup. what is exactly the result of this? cheers On 6/1/07, Gerald (Jerry) Carter [EMAIL PROTECTED] wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Urs Golla wrote: Hello I still have a problem with the net groupmap add command. If I add a domain group to a lcoal group, the memebers of the domain group should show up as members of the local group. Or am I totaly wrong? Yes. But that is only supported by WInbindd and the winbind nested groups option. jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGYAz/IR7qMdg1EfYRAj7KAKDnqQ7M3qHuiXJLDUPfHxXt8IwvWwCg6ruD F582h67Ji3d1BO8BEN39zYY= =MctI -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] net groupmap -- HELP!
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Urs Golla wrote: Hi I mean, if i do a net groupmap add mydomaingroup mylocalgroup. what is exactly the result of this? That's not valid syntax. run net group for the syntax help text. cheers, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGYCH+IR7qMdg1EfYRApAoAKCLmGTO4VLGa4N7Ppv9TiT9/7DGPwCg51qO Fn8OmHta0DG8XLz/4MQpLmw= =97FK -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] roaming profiles in a home environment
On 5/31/07, Charles Marcus [EMAIL PROTECTED] wrote: I would recommend against doing this... Microsoft itself recommends against it, but I have also had problems with corruption in .pst files that are stored on a network share, both on Windows shares *and* Samba shares... Just to share my own experience, we've been running our PSTs off of Samba shares for several years now without seeing any corruption. We used to have some locking errors with this setup, but adding the following line to smb.conf stopped them: veto oplock files = /*.pst/*.PST/ Josh Kelley -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Bulk] [Samba] Trying to mount a Linux share on Windows
You can mount Linux file systems on Windows you just have to have the right utilities to do so. Linux supports NTFS (NTVFS is another matter) with ntfs-3g now. So for instance, I could take a partition on a Windows server (NTFS) and share it using Samba instead of the Windows share service? Miguel -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] groupmapping impossible?
Does someone know how to do this group mapping in samba? why does net groupmap x y has no effect? If I map a domain group to a local group, then the members of the domain group should be treated as members of the local group, or not? On 6/1/07, Urs Golla [EMAIL PROTECTED] wrote: Usage: net time to view or set time information net lookupto lookup host name or ip address net user to manage users net group to manage groups net sam to edit the local user database directly net lookupto look up various things net groupmap to manage group mappings net join to join a domain net cache to operate on cache tdb file net getlocalsid [NAME]to get the SID for local name net setlocalsid SID to set the local domain SID net setdomainsid SID to set the domain SID on member servers net changesecretpwto change the machine password in the local secrets database only this requires the -f flag as a safety barrier net statusShow server status net usersidlist to get a list of all users with their SIDs net usershare to add, delete and list locally user-modifiable shares net ads command to run ADS commands net rap command to run RAP (pre-RPC) commands net rpc command to run RPC commands Type net help option to get more information on that option Valid targets: choose one (none defaults to localhost) -S or --server=server server name -I or --ipaddress=ipaddr address of target server -w or --workgroup=wg target workgroup or domain Valid miscellaneous options are: -p or --port=port connection port on target -W or --myworkgroup=wgclient workgroup -d or --debuglevel=level debug level (0-10) -n or --myname=name client name -U or --user=name user name -s or --configfile=path pathname of smb.conf file -l or --longDisplay full information -V or --version Print samba version information -P or --machine-passAuthenticate as machine account On 6/1/07, Gerald (Jerry) Carter [EMAIL PROTECTED] wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Urs Golla wrote: Hi I mean, if i do a net groupmap add mydomaingroup mylocalgroup. what is exactly the result of this? That's not valid syntax. run net group for the syntax help text. cheers, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGYCH+IR7qMdg1EfYRApAoAKCLmGTO4VLGa4N7Ppv9TiT9/7DGPwCg51qO Fn8OmHta0DG8XLz/4MQpLmw= =97FK -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Bulk] [Samba] Trying to mount a Linux share on Windows
You can mount Linux file systems on Windows you just have to have the right utilities to do so. Linux supports NTFS (NTVFS is another matter) with ntfs-3g now. So for instance, I could take a partition on a Windows server (NTFS) and share it using Samba instead of the Windows share service? You could probably make it work, but that would be insane. Read the documentation on ntfs-3g. -- Adam Tauno Williams, Network Systems Administrator Consultant - http://www.whitemiceconsulting.com Developer - http://www.opengroupware.org -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] groupmapping impossible?
On Friday 01 June 2007, Urs Golla wrote: Does someone know how to do this group mapping in samba? why does net groupmap x y has no effect? If I map a domain group to a local group, then the members of the domain group should be treated as members of the local group, or not? Maybe spending a minute with the official howto might help: http://us3.samba.org/samba/docs/man/Samba-HOWTO-Collection/groupmapping.html Chris -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] net groupmap -- HELP!
Usage: net time to view or set time information net lookupto lookup host name or ip address net user to manage users net group to manage groups net sam to edit the local user database directly net lookupto look up various things net groupmap to manage group mappings net join to join a domain net cache to operate on cache tdb file net getlocalsid [NAME]to get the SID for local name net setlocalsid SID to set the local domain SID net setdomainsid SID to set the domain SID on member servers net changesecretpwto change the machine password in the local secrets database only this requires the -f flag as a safety barrier net statusShow server status net usersidlist to get a list of all users with their SIDs net usershare to add, delete and list locally user-modifiable shares net ads command to run ADS commands net rap command to run RAP (pre-RPC) commands net rpc command to run RPC commands Type net help option to get more information on that option Valid targets: choose one (none defaults to localhost) -S or --server=server server name -I or --ipaddress=ipaddr address of target server -w or --workgroup=wg target workgroup or domain Valid miscellaneous options are: -p or --port=port connection port on target -W or --myworkgroup=wgclient workgroup -d or --debuglevel=level debug level (0-10) -n or --myname=name client name -U or --user=name user name -s or --configfile=path pathname of smb.conf file -l or --longDisplay full information -V or --version Print samba version information -P or --machine-passAuthenticate as machine account On 6/1/07, Gerald (Jerry) Carter [EMAIL PROTECTED] wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Urs Golla wrote: Hi I mean, if i do a net groupmap add mydomaingroup mylocalgroup. what is exactly the result of this? That's not valid syntax. run net group for the syntax help text. cheers, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGYCH+IR7qMdg1EfYRApAoAKCLmGTO4VLGa4N7Ppv9TiT9/7DGPwCg51qO Fn8OmHta0DG8XLz/4MQpLmw= =97FK -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: groupmapping impossible?
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Urs,
Does someone know how to do this group mapping in samba?
Please read the documentation or at least the right
help text.
# /opt/samba/bin/net groupmap add
Usage: net groupmap add {rid=int|sid=string} unixgroup=string
[type=domain|local|builtin] [ntgroup=string] [comment=string]
No offense, but I think you are jumping ahead without
fully knowing what it is you are trying to do. Perhaps if
you simply restate your objective and ask for advice on
the best practice to accomplish it, you would get a better
response.
cheers, jerry
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFGYDUqIR7qMdg1EfYRAivFAKDG6khWxHUw+PYsu7dv80Mr/oeMMgCfURl0
DBCtLtw3XIc2sWjsE6l1Ev8=
=TMxT
-END PGP SIGNATURE-
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Fwd: Samba 3.025 wbinfo checking the trust secret via RPC calls failed
This affects local logins as well as RDP. On 6/1/07, Jean-Jacques Moulis [EMAIL PROTECTED] wrote: On Thu, 31 May 2007 17:53:10 -0400 Gaiseric Vandal [EMAIL PROTECTED] wrote: GV I joined 2 Windows 2003 machines to the domain. I was able to log as GV administrator and root but no other accounts, whether local or GV not. The user accounts them self seem OK- it just seems to be a GV winbind or trusts issue. You are, perhaps, looking at the wrong place! Are you trying to log in with remote desktop? In this case users have to be members of the Remote Desktop Users group. try to log in att the console to see if it make a difference! Regards! -- Jean-Jacques Moulis Tel: (013) 281684 ISYFax: (013) 139282 Linköping UniversityE-mail: [EMAIL PROTECTED] 581 83 Linköping -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] What makes excel file opening so slow??
Can you set Excel to use the local drive for the temporary files? By default, MS Office creates temporary files in the same directory as the original file. In the past, troubleshooting a LAN related issue, it seemed that when saving a file, excel would rewrite the entire file to a new file then delete the old file, while Word would just update the same file. My guess is that Excel also creates much bigger temporary files. On 5/31/07, Chan Jason [EMAIL PROTECTED] wrote: Hi list, Despite the question I asked last time (I will re-install the FC3 with Samba 3.0.14a on another computer for replacement soon), I still have one more question on Excel files. I found that Excel file opening is extremely slow (especially on slow connections, i.e. VPN). The case is really bad, it takes around 2 mins to open a excel file of around 400k. Actually we got both side having 4M/4M DSL line. One side is Hong Kong, and the other side is China. However if we build a VPN inside Hong Kong, it takes 10~20 seconds to open a 400k excel file. However if I just copy a 400k file, neither of them take such a long time. Both situation can finish the transmission within some seconds. So what is so special about opening a excel file, and how can I improve the speed? Thanks for comments! Yours sincerely, Jason Chan -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Difficulty w/Offline Files and Samba 3.0.25
Good morning,
I have a working Offline Files setup w/Samba 3.0.24 (FreeBSD 6.2 host OS)
and a Win XP SP2 client. Upon updating to Samba 3.0.25, the XP client's
offline cache would show (as viewed via the Offline Files Folder) that
synced files are write-only ('User W' in the Access column). When
offline, theses files appeared to be available via Explorer and double
clicking would launch the appropriate program, but would then generate a
file not found error. Reverting to Samba 3.0.24 and resyncing has
corrected the problem ('User R/W' in the Access column and proper access
restored when offline).
My smb.conf is attached. Apart from the 'map acl inherit' parameter,
which I added when upgrading to 3.0.25 at the suggestion of WHATSNEW.txt,
this configuration file has not been changed in several months. Any
suggestions as to what the cause of this problem could be? Are any of
the recent changes in 3.0.25a likely applicable to this problem?
Thanks for the help!
David
# This is the main Samba configuration file. You should read the
# smb.conf(5) manual page in order to understand the options listed
# here. Samba has a huge number of configurable options (perhaps too
# many!) most of which are not shown in this example
#
# Any line which starts with a ; (semi-colon) or a # (hash)
# is a comment and is ignored. In this example we will use a #
# for commentry and a ; for parts of the config file that you
# may wish to enable
#
# NOTE: Whenever you modify this file you should run the command testparm
# to check that you have not many any basic syntactic errors.
#
#=== Global Settings =
[global]
# Disallow the use of opportunistic locks to try to avoid delayed write errors
oplocks = yes
#oplocks = no
#level2 oplocks = no
#locking = no
#passdb backend = ldapsam:ldap://geoff.deadheaven.com
passdb backend = ldapsam:ldapi://%2Fvar%2Frun%Fopenldap%2Fldapi
#enable net rpc rights privileges
enable privileges = yes
#this sets only the smbpasswd backend file, not the tdbsam file
smb passwd file = /usr/local/private/smbpasswd
ldap ssl = no
#ldap ssl = start_tls
ldap admin dn = cn=Manager,dc=deadheaven,dc=com
ldap user suffix = ou=Accounts
ldap group suffix = ou=Groups
ldap machine suffix = ou=Computers
ldap suffix = dc=deadheaven,dc=com
ldap passwd sync = yes
#idmap backend = ldap:ldap://geoff.deadheaven.com/
idmap backend = ldap:ldapi://%2Fvar%2Frun%2Fopenldap%Fldapi
ldap idmap suffix = ou=idmap
idmap uid = 4-5
idmap gid = 4-5
#u ncomment this chunkwhen ready to turn on smbldap scripts
#ldap delete dn = Yes
#add user script = /usr/local/sbin/smbldap-useradd -m %u
#delete user script = /usr/local/sbin/smbldap-userdel %u
#add machine script = /usr/local/sbin/smbldap-useradd -w %u
#add group script = /usr/local/sbin/smbldap-groupadd -p %g
#delete group script = /usr/local/sbin/smbldap-groupdel %g
#add user to group script = /usr/local/sbin/smbldap-groupmod -m %u % g
#delete user from group script = /usr/local/sbin/smbldap-groupmod -x % u %g
#set primary group script = /usr/local/sbin/smbldap-usermod -g %g %u
# workgroup = NT-Domain-Name or Workgroup-Name, eg: REDHAT4
workgroup = DEADHEAVEN
# server string is the equivalent of the NT Description field
server string = Geoff - The Deadheaven Domain Server
# This option is important for security. It allows you to restrict
# connections to machines which are on your local network. The
# following example restricts access to two C class networks and
# the loopback interface. For more examples of the syntax see
# the smb.conf man page
; hosts allow = 192.168.1. 192.168.2. 127.
hosts allow = 192.168.0. 192.168.1. 172.16.0.
# By default, load all local printers for browsing
load printers = yes
# Use CUPS printing system
printcap name = cups
printing = cups
# Set logging level to one above the default of 0
log level = 1
# Create a log for each machine that connects, max of 500 Kb
log file = /var/log/samba/log.%m
max log size = 500
# Authenticate user credentials locally
security = user
# You may wish to use password encryption. Please read
# ENCRYPTION.txt, Win95.txt and WinNT.txt in the Samba documentation.
# Do not enable this option unless you have read those documents
encrypt passwords = yes
# Disable lanman and NTLMv1 authentication (NTLMv2 required)
lanman auth = no
ntlm auth = yes
# Offer server side signing of transactions
server signing = mandatory
#client signing, NTLMv2, and SPNEGO settings
client signing = mandatory
client ntlmv2 auth = yes
client use spnego = yes
client schannel = yes
# Listen only on the internal and loopback interfaces
interfaces = fxp0 ath0 lo1
#Listen only on TCP/445
disable netbios = yes
# Browser Control Options:
local master = yes
# Domain Master specifies Samba to be the Domain Master Browser. This
# allows Samba to collate browse lists between subnets. Don't use this
# if you already have a Windows NT domain controller doing this job
Re: [Samba] Samba 3.025 wbinfo checking the trust secret via RPC calls failed
Do you know if this was specific to Solaris? Or is linux also affected?I had configure warnings building on solaris 9 and 10. Thanks On 6/1/07, Gerald (Jerry) Carter [EMAIL PROTECTED] wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Gaiseric Vandal wrote: pdc # ./wbinfo -t checking the trust secret via RPC calls failed error code was NT_STATUS_INVALID_HANDLE (0xc008) Could not check secret Known issue. I'll fix this for 3.0.25b. In the middle of server upgrades right now so I cannot point you at the open bug erport. cheers, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGYAsZIR7qMdg1EfYRAk9VAJ99603aN1+B4NiX41K8Hol2IjF94ACg1bVp ESkOL27tzpbrP5+dBiPUct4= =jEGi -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] Difficulty w/Offline Files and Samba 3.0.25
I filed a bug report about this exact issue yesterday. Everything you
are describing aligns 100% with what I'm experiencing too. I can use
the exact same smb.conf with 3.0.24 and it works fine. The bug report
is at https://bugzilla.samba.org/show_bug.cgi?id=4673 (down for
maintenance as I type this).
Jeremy Allison requested that I generate some level 10 debug logs which
I have done, just waiting for bugzilla to come back online so I can
submit my logs.
Please keep an eye on the bug report and add anything you feel might be
pertinent.
Thanks,
Tom Schaefer
-Original Message-
From: [EMAIL PROTECTED]
[mailto:[EMAIL PROTECTED] On Behalf Of David
F. Severski
Sent: Friday, June 01, 2007 10:51 AM
To: samba@lists.samba.org
Subject: [Samba] Difficulty w/Offline Files and Samba 3.0.25
Good morning,
I have a working Offline Files setup w/Samba 3.0.24 (FreeBSD 6.2 host
OS) and a Win XP SP2 client. Upon updating to Samba 3.0.25, the XP
client's offline cache would show (as viewed via the Offline Files
Folder) that synced files are write-only ('User W' in the Access
column). When offline, theses files appeared to be available via
Explorer and double clicking would launch the appropriate program, but
would then generate a file not found error. Reverting to Samba 3.0.24
and resyncing has corrected the problem ('User R/W' in the Access column
and proper access restored when offline).
My smb.conf is attached. Apart from the 'map acl inherit' parameter,
which I added when upgrading to 3.0.25 at the suggestion of
WHATSNEW.txt, this configuration file has not been changed in several
months. Any suggestions as to what the cause of this problem could be?
Are any of the recent changes in 3.0.25a likely applicable to this
problem?
Thanks for the help!
David
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Interdomain Trust the NT-style
I have upgraded to SAMBA 3.0.25a and that broke my interdomain trust to Windows 2003. I have seen a similar error before, so I don't think it is directly related to the new version. But I still need som help... Creating the trust (CALYPSO is the Windows 2003-server): [EMAIL PROTECTED] /root]# net rpc trustdom establish kontor Password: Could not connect to server CALYPSO Trust to domain KONTOR established Looking up: [EMAIL PROTECTED] /root]# wbinfo -u Error looking up domain users And the winbindd.log says: [2007/06/01 19:08:29, 0] libads/kerberos.c:ads_kinit_password(226) kerberos_kinit_password [EMAIL PROTECTED] failed: Cannot find KDC for requested realm [2007/06/01 19:08:29, 1] nsswitch/winbindd_ads.c:ads_cached_connection(127) ads_connect for domain KONTOR failed: Cannot find KDC for requested realm Of course it cannot connect the domain using kerberos, but why does it try? How do I convince SAMBA to use old-fashioned RPC for the Interdomain Trust? -- Thorkil Olesen Hanstholm, Denmark. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba 3.025 wbinfo checking the trust secret via RPC calls failed
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Gaiseric Vandal wrote: Do you know if this was specific to Solaris? Or is linux also affected?I had configure warnings building on solaris 9 and 10. Generic bug to all platforms I think. Have not confirmed it yet though. jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGYFzdIR7qMdg1EfYRAkfaAJsHzXxpNrritl55FyDVD7PaF3IWVgCdFHit QY2qa6hEYfAd30ktWUnve44= =Gq7b -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] net ads dns register question
Hello, First time using the new ads function and have some questions. I'm issuing the command 5 times with different parameters and only one succeeds. #net ads dns register DNS update failed! #net ads dns register -P DNS update failed! #net ads dns register -P -I 10.170.4.10 DNS update failed! #net ads dns register -I 10.170.4.10 -U Administrator Administrator's password: Successfully registered hostname with DNS #net ads dns register -I 10.170.4.10 -U Administrator%secret DNS update failed! net ads info LDAP server: 10.170.4.10 LDAP server name: ad-server.foo.com Realm: FOO.COM Bind Path: dc=FOO,dc=COM LDAP port: 389 Server time: Fri, 01 Jun 2007 21:17:57 CEST KDC server: 10.170.4.10 Server time offset: -128 So the questions are: Which DNS IP adress is the command targeting initially? Why do I have to specify a user/password? Why can't I specify a password together with the username so that I can script it? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Net command help. Please!
Hello, What user flags are available to the net ads | rpc user add command. It states in the man pages that you can add [-F user flags] but not which flags? Please help this is important as I now only can create disabled users in my AD. Regards, Henrik -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Not seeing the expected group memberships with ifmember.exe /list
We have bumped into a most odd problem. Server: Debian Etch and their Samba 3.0.24-2 Client: WinXP SP2, MSI v3, all hot fixes The following settings are in place on the server: #!/bin/bash # # initGrps.sh # Map Windows Domain Groups to UNIX groups net groupmap add ntgroup=Domain Admins unixgroup=domadmin rid=512 type=d net groupmap add ntgroup=Domain Users unixgroup=domusers rid=513 type=d net groupmap add ntgroup=Domain Guests unixgroup=domguest rid=514 type=d # Create some Domain Groups to administer local security net groupmap add ntgroup=ntadmins unixgroup=ntadmins type=d net groupmap add ntgroup=ntpwrusr unixgroup=ntpwrusr type=d net groupmap add ntgroup=ntusers unixgroup=ntusers type=d net groupmap add ntgroup=ntguests unixgroup=ntguests type=d When we join the domain, we run roughly the following script: REM JoinDomain.cmd NETDOM.EXE JOIN %ComputerName% /Domain:LDS-DEMO /UserD:ldsinst /PasswordD:password REM Remove domain to local group mapping done by NETDOM NET LOCALGROUP Users LDS-DEMO\Domain Users /DEL NET LOCALGROUP Administrators LDS-DEMO\Domain Admins /DEL REM Add domain to local group mapping NET LOCALGROUP Administrators LDS-DEMO\ntadmins /ADD NET LOCALGROUP Power Users LDS-DEMO\ntpwrusr /ADD NET LOCALGROUP Users LDS-DEMO\ntusers /ADD NET LOCALGROUP Guests LDS-DEMO\ntguests /ADD What is specifically missing in ifmember /list are: LDS-DEMO\Domains Admins LDS-DEMO\ntadmins We are at least getting membership to: LDS-DEMO\Domain Users What steps should we try as we try to track down this case of missing group memberships? -- Michael Lueck Lueck Data Systems http://www.lueckdatasystems.com/ -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] roaming profiles in a home environment
Josh Kelley wrote: On 5/31/07, Charles Marcus [EMAIL PROTECTED] wrote: I would recommend against doing this... Microsoft itself recommends against it, but I have also had problems with corruption in .pst files that are stored on a network share, both on Windows shares *and* Samba shares... Just to share my own experience, we've been running our PSTs off of Samba shares for several years now without seeing any corruption. We used to have some locking errors with this setup, but adding the following line to smb.conf stopped them: veto oplock files = /*.pst/*.PST/ Yes, I tried that, but after the next corrupted file, moved them back to local disk that gets synced at logout. Thankfully, I don't have to deal with Outlook any more, and all email is served via IMAP... -- Best regards, Charles -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Weird behaviour when using kernel oplocks = yes leading to corrupt files - bug in samba?
Hi folks, Today I noticed some strange behaviour when accessing a samba server (samba 3.0.25a) from windows: On our Debian fileserver I prepared a file testfile.txt being owned by user usera and group dpt-a. Then I setfacl -m g:admins:rwx testfile.txt. User userb who is only in group admins, but not in dpt-a is thus permitted to access and change this file by its POSIX-ACL, which works flawlessly from linux. $ getfacl testfile.txt # file: testfile.txt # owner: usera # group: dpt-a user::rwx group::r-- group:admins:rwx mask::rwx other::r-- Then I did some changes to that file from a windows machine via notepad.exe and noticed, that notepad seemed to succeed in saving, but the changes were *not* written to that file! Very strange IMHO. So I did some more digging with strace, since I didn't find a clue in the logs. strace -e open,close,write -f smbd -D yielded: [pid 17704] open(foo/testfile.txt, O_RDWR|O_CREAT|O_NOFOLLOW, 0744) = 29 [some write()s to FD 24] [pid 17704] open(foo/testfile.txt, O_WRONLY|O_NOFOLLOW) = -1 EAGAIN (Resource temporarily unavailable) [pid 17704] --- SIGIO (I/O possible) @ 0 (0) --- [pid 17704] +++ killed by SIGIO +++ [pid 17478] --- SIGCHLD (Child exited) @ 0 (0) --- So this seemed to explain notepad thinking the file was saved successfully when I assume the SMB-protocol to not do hard checks for successful writes. Since the child serving my windows-access was killed, no error-message was probably be sent out. When googling for SIGIO and samba, I noticed some google-hits talking about oplocks, so I just tried disabling kernel oplocks in smb.conf: kernel oplocks = no. This did the trick, after restarting samba, the writes were successsful again. Since the manpage states I would want oplocks (and I do *g*), I enabled them again and tried debugging using gdb (to provide the samba-team with a more detailed report). As I don't really know gdb, I failed in the first attempt because of samba forking multiple processes which were not caught by my gdb call (but the error occurred). So as weekend was approaching, I did'nt dig further into gdb, but read the manpage for smbd and started gdb /usr/sbin/smbd -F -i. When trying to reproduce the error, I failed. I could reproduce this change even without gdb: smbd -F -i -d 5 started from the shell did the writes, whereas normal smbd (smbd -F) failed to write the changes. One wild guess: maybe oplocks can only be done by the file owner / group owner and the samba-process crashes because of such a thing? Is there a difference in privilege-handling between smbd -F and smbd -F -i that could explain this? I'd assume this to be a samba bug, because I could reproduce this both with a not-so-recent linux-2.6 i386 and with a more recent linux-2.6 amd64. I can provide more debugging output etc. at the earliest on monday; sorry I forgot taking a log of a full strace-call as well as writing down the exact kernel versions which would of course have been very useful for you. Thanks for your replies and any help in solving this issue, Yours Matthias Merz -- Beware of bugs in the above code; I have only proved it correct, not tried it.(Donald E. Knuth) -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] 3.0.24 -- Office read only issue, bizarre EAs and disappearing ACLs
Everyone,
I have finally resolved the new heartburn 3.0.24 on Ubuntu Feisty was
giving me and have stumbled upon some information that might help others
out there.
I was seeing problems with ACL entries getting mangled and disappearing,
Excel making files read only and extended attributes doing bizarre
things. The solution revolved around what appears to be a change in how
ACLs are managed. With 3.0.22 on Ubuntu 6.06 and 6.10, I didn't see have
this issue.
Without properly configured default entries on folders, Excel seems to
mangle user and group ACLs. In the share definition below, you see map
read only, archive, system and hidden all set to no. Without this (at
least for read only) saving files in Excel sets the user.DOSATTRIB value
to 0x1 (read only) when it should be 0x20 (archive).
On a related issue, I still can't get Microsoft Word 2003 to set the
archive bit when changes are made. I've posted a workaround here before,
but this one still bugs me. I wish there were a way to tell Samba to set
the archive flag on a file using user.DOSATTRIB whenever a file is
modified. Perhaps this is not reasonable or would create too much
overhead. I'm thinking comparing the modified date at the time a file
was opened to the modified date when it is closed. Hopefully the
developers out there can provide insight.
Here are steps to reproduce the problem I described above:
1) Configure server with settings below (minus the map read only = no
setting on the share)
2) Create a folder called testfolder in the common share with no default
ACL entries
3) Create an Excel spreadsheet in testfolder
4) Add UserA to the group GroupA that has rwx ACL permissions to the
folder and file (command to add rwx is setfacl -m
group:domain+GroupA:rwx /share/common/testfolder)
5) Make UserB and GroupB the UNIX owner file and group (chown
domain+UserB /share/common/testfolder/test.xls and chgrp
domain+GroupB /share/common/testfolder/test.xls)
6) Open the file with UserA
7) Make a change and save it
ACL on testfolder before
# file: ../testfolder
# owner: DOMAIN+UserB
# group: DOMAIN+GroupB
user::rwx
user:DOMAIN+UserB:rwx
group::rwx
group:DOMAIN+GroupA:rwx
group:DOMAIN+GroupB:rwx
mask::rwx
other::---
ACL on test.xls before UserA makes a change:
# file: test.xls
# owner: DOMAIN+UserB
# group: DOMAIN+GroupB
user::rwx
user:DOMAIN+UserB:rwx
group::rwx
group:DOMAIN+GroupA:rwx
group:DOMAIN+GroupBA:rwx
mask::rwx
other::---
ACL on test.xls after UserA makes a change:
# file: test.xls
# owner: DOMAIN+UserA
# group: DOMAIN+GroupB
user::r--
user:DOMAIN+UserB:rwx
group::---
group:DOMAIN+GroupA:rwx
group:DOMAIN+GroupBA:rwx
mask::rwx
other::---
Reopening the file at this point shows that it is read only in Excel.
Now, reset permissions and add map read only = no to the share definition:
setfattr -n user.DOSATTRIB -v \0x0\ /share/common/testfolder/test.xls
chown domain+UserB /share/common/testfolder/test.xls
chgrp domain+GroupB /share/common/testfolder/test.xls
setfacl -m user::rwx /share/common/testfolder/test.xls
setfacl -m group::rwx /share/common/testfolder/test.xls
setfacl -m user::rwx /share/common/testfolder
setfacl -m group::rwx /share/common/testfolder
setfacl -d -m user::rwx /share/common/testfolder
setfacl -d -m user:UserB:rwx /share/common/testfolder
setfacl -d -m group::rwx /share/common/testfolder
setfacl -d -m group:domain+GroupA:rwx /share/common/testfolder
setfacl -d -m group:domain+GroupB:rwx /share/common/testfolder
Then the problem is solved. The ACL for testfolder now looks like this:
# file: testfolder
# owner: DOMAIN+UserB
# group: DOMAIN+GroupB
user::rwx
user:DOMAIN+UserB:rwx
group::rwx
group:DOMAIN+GroupA:rwx
group:DOMAIN+GroupB:rwx
mask::rwx
other::---
default:user::rwx
default:user:DOMAIN+UserB:rwx
default:group::rwx
default:group:DOMAIN+GroupA:rwx
default:group:DOMAIN+GroupB:rwx
default:mask::rwx
default:other::---
If you want to propagate the default settings throughout the directory
structure, you can do this:
find -type d /share/common -exec setfacl -d -m user::rwx {} \;
Here is information on my setup:
OS: Ubuntu 7.04 Feisty Server
Samba: 3.0.24 (3.0.24-2ubuntu according to dpkg)
acl: 2.2.42 (2.2.42-1ubuntu1)
attr: 2.4.32 (2.4.32-1.1ubuntu1)
File system: ext3 with acl and user_xattr enabled
Network environment: Active Directory native via Windows Server 2003
Samba configuration:
assume:
domain name: domain
long name: domain.local
file server name: FS01
local subnet: 192.168.1.0/24
remote subnet: 192.168.0.0/24
domain controllers: DC01 and DC02
shares root folder location: /share/
[global]
kernel oplocks = yes
client use spnego = yes
workgroup = DOMAIN
realm = DOMAIN.LOCAL
server string = FS01
security = ADS
log level = 2
log file = /var/log/samba/%m.log
max log size = 1000
server signing = auto
printcap name = /etc/printcap
os level = 0
preferred master = no
local master =
Re: [Samba] roaming profiles in a home environment
Hi Charles, Josh, et al, Firstly, this is getting off topic a little, so don't read on unless you're interested in how Samba might be used to make email usage easier in a home environment with multiple computers. On 6/2/07, Charles Marcus [EMAIL PROTECTED] wrote: Josh Kelley wrote: On 5/31/07, Charles Marcus [EMAIL PROTECTED] wrote: I would recommend against doing this... Microsoft itself recommends against it, but I have also had problems with corruption in .pst files that are stored on a network share, both on Windows shares *and* Samba shares... Just to share my own experience, we've been running our PSTs off of Samba shares for several years now without seeing any corruption. We used to have some locking errors with this setup, but adding the following line to smb.conf stopped them: veto oplock files = /*.pst/*.PST/ Yes, I tried that, but after the next corrupted file, moved them back to local disk that gets synced at logout. Something I hadn't really thought of is that my wife is likely (at some point) to be logged onto two computers at once, and have outlook running on both of them. I assume this is a guarenteed road to disaster and I should be ruling out sharing the .PST files based on this. Thankfully, I don't have to deal with Outlook any more, and all email is served via IMAP... Ok - really off topic now, what clients are you finding handing IMAP the best? My wife uses IMAP, and I suppose if I were to setup LDAP then I could use that for her contacts (which are the main problem atm). Feel free to reply off-list if you think its more appropriate as I realise this question has absolutely nothing to do with Samba. cheers, dim -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Weird behaviour when using kernel oplocks = yes leading to corrupt files - bug in samba?
On Fri, Jun 01, 2007 at 11:44:29PM +0200, Matthias Merz wrote: Hi folks, Today I noticed some strange behaviour when accessing a samba server (samba 3.0.25a) from windows: On our Debian fileserver I prepared a file testfile.txt being owned by user usera and group dpt-a. Then I setfacl -m g:admins:rwx testfile.txt. User userb who is only in group admins, but not in dpt-a is thus permitted to access and change this file by its POSIX-ACL, which works flawlessly from linux. $ getfacl testfile.txt # file: testfile.txt # owner: usera # group: dpt-a user::rwx group::r-- group:admins:rwx mask::rwx other::r-- Then I did some changes to that file from a windows machine via notepad.exe and noticed, that notepad seemed to succeed in saving, but the changes were *not* written to that file! Very strange IMHO. So I did some more digging with strace, since I didn't find a clue in the logs. strace -e open,close,write -f smbd -D yielded: [pid 17704] open(foo/testfile.txt, O_RDWR|O_CREAT|O_NOFOLLOW, 0744) = 29 [some write()s to FD 24] [pid 17704] open(foo/testfile.txt, O_WRONLY|O_NOFOLLOW) = -1 EAGAIN (Resource temporarily unavailable) [pid 17704] --- SIGIO (I/O possible) @ 0 (0) --- [pid 17704] +++ killed by SIGIO +++ [pid 17478] --- SIGCHLD (Child exited) @ 0 (0) --- This actually looks like an old kernel bug that has been fixed - sorry I can't remember the version. The kernel shouldn't be sending a SIGIO for an oplock break, it should be sending a POSIX RT signal #define RT_SIGNAL_LEASE (SIGRTMIN+1) in the Samba source. I recall this as a kernel bug that got fixed a few months or so ago. This isn't a Samba bug IMHO. Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] policy files
Hi again, I've now got this all working, and thought I'd outline what I did for others: On 6/1/07, Adam Tauno Williams [EMAIL PROTECTED] wrote: Thanks for the tip - I think half my problem is I'm not exactly sure what I'm looking for. ADM files and POLEDIT.EXE With that piece of information I found http://www.zisman.ca/poledit/ where I downloaded poledit from. When you run it on an XP machine it complains that it cant find files in c:\windows\inf - this makes perfect sense as they don't exist. Ignore those errors and in the Options menu select Policy template. From there remove the missing policy files, and open the one you want (I used custom.adm from http://www.pcc-services.com/custom_poledit.html. From there its simply a matter of File - New Policy. Double-click on Default User and modify the policy as you want. Then File - Save as \\sambaserver\netlogon\ntconfig.pol and it will be used when you logon. I hope this is useful for someone else as well. Thanks a heap to Adam for pointing out where I was going wrong, and for putting up with my windows questions on the samba list. cheers, dim -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] OES Samba question
We are currently running Open Enterprise Server from Novell and have been migrating to Samba. We have ran into an issue where occasionally a user will click on a directory and it will just sit there forever with an hour glass or flashlight. If you go to the same directory through a command prompt and do a dir on the directory it goes into a continuous loop and reads the contents of the directory over and over again. We are running samba-3.0.20b-3.14 and I was curious if anyone else had seen this problem. Thanks, Jordan -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Rev 414: added package download in http://samba.org/~tridge/ctdb
revno: 414 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: tridge timestamp: Fri 2007-06-01 16:07:13 +1000 message: added package download modified: .bzrignore bzrignore-20061117235536-slq8jlz2b5161dfm-1 web/ctdb.html ctdb.html-20070601052353-vgod9lfo4an4o83j-2 === modified file '.bzrignore' --- a/.bzrignore2007-05-31 01:09:45 + +++ b/.bzrignore2007-06-01 06:07:13 + @@ -16,3 +16,4 @@ ctdb-3 nodes.txt TAGS +web/packages === modified file 'web/ctdb.html' --- a/web/ctdb.html 2007-06-01 05:31:23 + +++ b/web/ctdb.html 2007-06-01 06:07:13 + @@ -37,6 +37,14 @@ rsync -Pavz samba.org::ftp/unpacked/samba4/source/cluster/ctdb . /pre +h2Packages/h2 + +Note that packages are so far only available for RHEL4. Other packages +will come later. p + +See a href=packages/packages/a directory for package +downloads. + hr h2Developers/h2 a href=http://samba.org/~tridge/;Andrew Tridgell/abr
Rev 415: better download instructions in http://samba.org/~tridge/ctdb
revno: 415 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: tridge timestamp: Fri 2007-06-01 17:16:19 +1000 message: better download instructions modified: web/ctdb.html ctdb.html-20070601052353-vgod9lfo4an4o83j-2 === modified file 'web/ctdb.html' --- a/web/ctdb.html 2007-06-01 06:07:13 + +++ b/web/ctdb.html 2007-06-01 07:16:19 + @@ -24,20 +24,22 @@ h2Download/h2 -You can download the latest release either via rsync or anonymous -svn. To fetch via svn use the following command: - -pre - svn co svn://svnanon.samba.org/samba/branches/SAMBA_4_0/source/cluster/ctdb ctdb -/pre - -To fetch via rsync use this command: - -pre - rsync -Pavz samba.org::ftp/unpacked/samba4/source/cluster/ctdb . -/pre - -h2Packages/h2 +You can download the latest source release +using a href=http://bazaar-vcs.org/;bzr/a. Install bzr, then run +this command: + +pre + bzr branch http://samba.org/~tridge/ctdb +/pre + +Or alternatively you can use rsync like this: + +pre + rsync -avz samba.org::ftp/unpacked/ctdb . +/pre + + +h2Binary Packages/h2 Note that packages are so far only available for RHEL4. Other packages will come later. p @@ -49,6 +51,7 @@ h2Developers/h2 a href=http://samba.org/~tridge/;Andrew Tridgell/abr Ronnie Sahlbergbr +Peter Somogyibr /BODY
svn commit: samba r23287 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_26/source/nsswitch
Author: obnox
Date: 2007-06-01 10:10:57 + (Fri, 01 Jun 2007)
New Revision: 23287
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23287
Log:
Use talloc_move instead of talloc_steal as this is what I really
wanted to do.
Michael
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2007-06-01 03:47:35 UTC
(rev 23286)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2007-06-01 10:10:57 UTC
(rev 23287)
@@ -1054,7 +1054,7 @@
{
sid_copy((*sid_mem)[*num_names],
sid_mem_nocache[i]);
- (*names)[*num_names] =
talloc_steal(names, names_nocache[i]);
+ (*names)[*num_names] =
talloc_move(names, names_nocache[i]);
(*name_types)[*num_names] =
name_types_nocache[i];
(*num_names)++;
}
Modified: branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c
===
--- branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c2007-06-01
03:47:35 UTC (rev 23286)
+++ branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c2007-06-01
10:10:57 UTC (rev 23287)
@@ -1054,7 +1054,7 @@
{
sid_copy((*sid_mem)[*num_names],
sid_mem_nocache[i]);
- (*names)[*num_names] =
talloc_steal(names, names_nocache[i]);
+ (*names)[*num_names] =
talloc_move(names, names_nocache[i]);
(*name_types)[*num_names] =
name_types_nocache[i];
(*num_names)++;
}
svn commit: samba r23288 - in branches/SAMBA_4_0/source/smbd: .
Author: metze
Date: 2007-06-01 10:17:02 + (Fri, 01 Jun 2007)
New Revision: 23288
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23288
Log:
give more info...
metze
Modified:
branches/SAMBA_4_0/source/smbd/server.c
Changeset:
Modified: branches/SAMBA_4_0/source/smbd/server.c
===
--- branches/SAMBA_4_0/source/smbd/server.c 2007-06-01 10:10:57 UTC (rev
23287)
+++ branches/SAMBA_4_0/source/smbd/server.c 2007-06-01 10:17:02 UTC (rev
23288)
@@ -234,6 +234,8 @@
if (sizeof(uint16_t) 2 || sizeof(uint32_t) 4 || sizeof(uint64_t)
8) {
DEBUG(0,(ERROR: Samba is not configured correctly for the word
size on your machine\n));
+ DEBUGADD(0,(sizeof(uint16_t) = %u, sizeof(uint32_t) %u,
sizeof(uint64_t) = %u\n,
+ sizeof(uint16_t), sizeof(uint32_t), sizeof(uint64_t)));
exit(1);
}
svn commit: samba r23290 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_26/source/nsswitch
Author: obnox
Date: 2007-06-01 12:18:16 + (Fri, 01 Jun 2007)
New Revision: 23290
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23290
Log:
Fix another small and stupid but severe typo.
Hopfully, I have finally got this right... :-)
Michael
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2007-06-01 12:01:53 UTC
(rev 23289)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2007-06-01 12:18:16 UTC
(rev 23290)
@@ -1054,7 +1054,7 @@
{
sid_copy((*sid_mem)[*num_names],
sid_mem_nocache[i]);
- (*names)[*num_names] =
talloc_move(names, names_nocache[i]);
+ (*names)[*num_names] =
talloc_move(*names, names_nocache[i]);
(*name_types)[*num_names] =
name_types_nocache[i];
(*num_names)++;
}
Modified: branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c
===
--- branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c2007-06-01
12:01:53 UTC (rev 23289)
+++ branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c2007-06-01
12:18:16 UTC (rev 23290)
@@ -1054,7 +1054,7 @@
{
sid_copy((*sid_mem)[*num_names],
sid_mem_nocache[i]);
- (*names)[*num_names] =
talloc_move(names, names_nocache[i]);
+ (*names)[*num_names] =
talloc_move(*names, names_nocache[i]);
(*name_types)[*num_names] =
name_types_nocache[i];
(*num_names)++;
}
Rev 421: - make symlink relative in install in http://samba.org/~tridge/ctdb
revno: 421 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: tridge timestamp: Fri 2007-06-01 21:20:05 +1000 message: - make symlink relative in install - include ctdb functions in samba and nfslock event scripts modified: Makefile.inmakefile.in-20061117234101-o3qt14umlg9en8z0-1 tools/events.d/nfslock nfslock-20070601105340-vlcvnp6euoj3zdwy-2 tools/events.d/samba samba-20070601105340-vlcvnp6euoj3zdwy-3 === modified file 'Makefile.in' --- a/Makefile.in 2007-06-01 11:10:49 + +++ b/Makefile.in 2007-06-01 11:20:05 + @@ -124,12 +124,13 @@ install -m644 include/ctdb.h $(DESTDIR)$(includedir) install -m644 include/ctdb_private.h $(DESTDIR)$(includedir) # for samba3 install -m755 tools/events $(DESTDIR)$(etcdir)/ctdb + install -m755 tools/functions $(DESTDIR)$(etcdir)/ctdb install -m755 tools/statd-callout $(DESTDIR)$(etcdir)/ctdb install -m755 tools/events.d/samba $(DESTDIR)$(etcdir)/ctdb/events.d install -m755 tools/events.d/nfslock $(DESTDIR)$(etcdir)/ctdb/events.d install -m755 tools/onnode.ssh $(DESTDIR)$(bindir) install -m755 tools/onnode.rsh $(DESTDIR)$(bindir) - ln -sf $(DESTDIR)$(bindir)/onnode.ssh $(DESTDIR)$(bindir)/onnode + cd $(DESTDIR)$(bindir) ln -sf onnode.ssh onnode test: all tests/run_tests.sh === modified file 'tools/events.d/nfslock' --- a/tools/events.d/nfslock2007-06-01 10:54:26 + +++ b/tools/events.d/nfslock2007-06-01 11:20:05 + @@ -2,6 +2,7 @@ # event strict to manage lockd and statd in a cluster environment . /etc/sysconfig/ctdb +. /etc/ctdb/functions cmd=$1 shift === modified file 'tools/events.d/samba' --- a/tools/events.d/samba 2007-06-01 10:54:26 + +++ b/tools/events.d/samba 2007-06-01 11:20:05 + @@ -4,6 +4,7 @@ PATH=/bin:/usr/bin:$PATH . /etc/sysconfig/ctdb +. /etc/ctdb/functions cmd=$1 shift
Rev 420: tidy up the install somewhat in http://samba.org/~tridge/ctdb
revno: 420
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Fri 2007-06-01 21:10:49 +1000
message:
tidy up the install somewhat
modified:
Makefile.inmakefile.in-20061117234101-o3qt14umlg9en8z0-1
packaging/RHEL/ctdb.spec ctdb.spec-20070527204758-biuh7znabuwan3zn-3
packaging/RHEL/setup/ctdb.sysconfig
ctdb.sysconfig-20070527204758-biuh7znabuwan3zn-7
=== modified file 'Makefile.in'
--- a/Makefile.in 2007-05-29 05:52:03 +
+++ b/Makefile.in 2007-06-01 11:10:49 +
@@ -117,9 +117,19 @@
install: all
mkdir -p $(DESTDIR)$(bindir)
mkdir -p $(DESTDIR)$(includedir)
- rsync $(BINS) $(DESTDIR)$(bindir)
- rsync $(SBINS) $(DESTDIR)$(sbindir)
- rsync $(srcdir)/include/ctdb.h $(DESTDIR)$(includedir)
+ mkdir -p $(DESTDIR)$(etcdir)/ctdb
+ mkdir -p $(DESTDIR)$(etcdir)/ctdb/events.d
+ install -m755 bin/ctdb $(DESTDIR)$(bindir)
+ install -m755 bin/ctdbd $(DESTDIR)$(sbindir)
+ install -m644 include/ctdb.h $(DESTDIR)$(includedir)
+ install -m644 include/ctdb_private.h $(DESTDIR)$(includedir) # for
samba3
+ install -m755 tools/events $(DESTDIR)$(etcdir)/ctdb
+ install -m755 tools/statd-callout $(DESTDIR)$(etcdir)/ctdb
+ install -m755 tools/events.d/samba $(DESTDIR)$(etcdir)/ctdb/events.d
+ install -m755 tools/events.d/nfslock $(DESTDIR)$(etcdir)/ctdb/events.d
+ install -m755 tools/onnode.ssh $(DESTDIR)$(bindir)
+ install -m755 tools/onnode.rsh $(DESTDIR)$(bindir)
+ ln -sf $(DESTDIR)$(bindir)/onnode.ssh $(DESTDIR)$(bindir)/onnode
test: all
tests/run_tests.sh
=== modified file 'packaging/RHEL/ctdb.spec'
--- a/packaging/RHEL/ctdb.spec 2007-06-01 10:54:26 +
+++ b/packaging/RHEL/ctdb.spec 2007-06-01 11:10:49 +
@@ -9,12 +9,12 @@
Epoch: 0
License: GNU GPL version 2
Group: System Environment/Daemons
-URL: bzr://www.samba.org/~tridge/ctdb/
+URL: http://ctdb.samba.org/
Source: ctdb-%{version}.tar.bz2
Source999: ctdb-setup.tar.bz2
-Prereq: /sbin/chkconfig /bin/mktemp /usr/bin/killall
+Prereq: /sbin/chkconfig /bin/mktemp /usr/bin/killall /usr/bin/nc
Prereq: fileutils sed /etc/init.d
Requires: initscripts = 5.54-1
@@ -66,17 +66,6 @@
install -m644 setup/ctdb.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ctdb
install -m755 setup/ctdb.init $RPM_BUILD_ROOT%{initdir}/ctdb
-install -m755 tools/events $RPM_BUILD_ROOT%{_sysconfdir}/ctdb/events
-install -m755 tools/events.d/samba
$RPM_BUILD_ROOT%{_sysconfdir}/ctdb/events.d/samba
-install -m755 tools/events.d/nfslock
$RPM_BUILD_ROOT%{_sysconfdir}/ctdb/events.d/nfslock
-install -m755 tools/statd-callout
$RPM_BUILD_ROOT%{_sysconfdir}/ctdb/statd-callout
-install -m755 tools/onnode.ssh $RPM_BUILD_ROOT%{_bindir}
-install -m755 tools/onnode.rsh $RPM_BUILD_ROOT%{_bindir}
-ln -sf %{_bindir}/onnode.ssh $RPM_BUILD_ROOT%{_bindir}/onnode
-
-# unfortunately samba3 needs ctdb_private.h too
-install -m644 include/ctdb_private.h
$RPM_BUILD_ROOT%{_includedir}/ctdb_private.h
-
# Remove *.old files
find $RPM_BUILD_ROOT -name *.old -exec rm -f {} \;
=== modified file 'packaging/RHEL/setup/ctdb.sysconfig'
--- a/packaging/RHEL/setup/ctdb.sysconfig 2007-06-01 03:50:18 +
+++ b/packaging/RHEL/setup/ctdb.sysconfig 2007-06-01 11:10:49 +
@@ -42,16 +42,6 @@
# the default is 0
# DEBUGLEVEL=0
-# use this to specify any local tcp ports to wait on before starting
-# ctdb. Use 445 and 139 for Samba
-# the default is not to wait for any local services
-# CTDB_WAIT_TCP_PORTS=445 139
-
-# use this to specify any local directories to wait on before starting
-# ctdb. You should list any critical Samba or NFS shared directories
-# the default is not to wait for any local directories
-# CTDB_WAIT_DIRECTORIES=/some/directory
-
# the shared directory where you want to put statd information on
# which clients to notify on a NFS restart
# there is no default
Rev 419: split out events for each subsystem separately in http://samba.org/~tridge/ctdb
revno: 419 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: tridge timestamp: Fri 2007-06-01 20:54:26 +1000 message: split out events for each subsystem separately added: tests/events events-20070601105359-jc8p0xp6iq7phful-1 tools/events.d/events.d-20070601105340-vlcvnp6euoj3zdwy-1 tools/events.d/nfslock nfslock-20070601105340-vlcvnp6euoj3zdwy-2 tools/events.d/samba samba-20070601105340-vlcvnp6euoj3zdwy-3 tools/functionsfunctions-20070601105405-gajwirydr5a9zd6x-1 modified: packaging/RHEL/ctdb.spec ctdb.spec-20070527204758-biuh7znabuwan3zn-3 tools/events events-20070529030121-04fjh63cxfh8v1pj-1 tools/statd-calloutstatdcallout-20070531010857-6sdlz455vusye5y5-1 Diff too large for email (438, the limit is 200).
Rev 418: use a subdirectory for ctdb state files in http://samba.org/~tridge/ctdb
revno: 418
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Fri 2007-06-01 19:16:58 +1000
message:
use a subdirectory for ctdb state files
modified:
tools/events events-20070529030121-04fjh63cxfh8v1pj-1
tools/statd-calloutstatdcallout-20070531010857-6sdlz455vusye5y5-1
=== modified file 'tools/events'
--- a/tools/events 2007-06-01 05:23:16 +
+++ b/tools/events 2007-06-01 09:16:58 +
@@ -8,6 +8,8 @@
case $cmd in
startup)
+ /bin/rm -rf /etc/ctdb/state
+ /bin/mkdir -p /etc/ctdb/state
# wait for local services to come up.
[ -z $CTDB_WAIT_TCP_PORTS ] || {
all_ok=0
@@ -58,15 +60,15 @@
echo `/bin/date` Failed to add $ip/$maskbits on dev $iface
exit 1
}
- echo $ip /etc/ctdb/taken_ips
- echo $ip /etc/ctdb/changed_ips
+ echo $ip /etc/ctdb/state/taken_ips
+ echo $ip /etc/ctdb/state/changed_ips
- # if we have a local arp entry for this IP then remove it
- /sbin/arp -d $ip 2 /dev/null
+ # flush our route cache
+ echo 1 /proc/sys/net/ipv4/route/flush
# having a list of what IPs we have allows statd to do the right
# thing via /etc/ctdb/statd-callout
- /bin/touch /etc/ctdb/ip.$ip
+ /bin/touch /etc/ctdb/state/ip.$ip
exit 0
;;
@@ -82,30 +84,32 @@
echo `/bin/date` Failed to del $ip on dev $iface
exit 1
}
- # if we have a local arp entry for this IP then remove it
- /sbin/arp -d $ip 2 /dev/null
- echo $ip /etc/ctdb/released_ips
- echo $ip /etc/ctdb/changed_ips
- /bin/rm -f /etc/ctdb/ip.$ip
+
+ # flush our route cache
+ echo 1 /proc/sys/net/ipv4/route/flush
+
+ echo $ip /etc/ctdb/state/released_ips
+ echo $ip /etc/ctdb/state/changed_ips
+ /bin/rm -f /etc/ctdb/state/ip.$ip
exit 0
;;
recovered)
# if we have taken or released any ips we must send out
# statd notifications to recover lost nfs locks
- [ -x /etc/ctdb/statd-callout ] [ -f /etc/ctdb/changed_ips ] {
+ [ -x /etc/ctdb/statd-callout ] [ -f /etc/ctdb/state/changed_ips ]
{
/etc/ctdb/statd-callout notify
} /dev/null 21
# restart NFS to ensure that all TCP connections to the released ip
# are closed
- [ -f /etc/ctdb/released_ips ] {
+ [ -f /etc/ctdb/state/released_ips ] {
( /sbin/service nfs status /dev/null 21
/sbin/service nfs restart /dev/null 21 )
} /dev/null 21
- /bin/rm -f /etc/ctdb/changed_ips
- /bin/rm -f /etc/ctdb/released_ips
- /bin/rm -f /etc/ctdb/taken_ips
+ /bin/rm -f /etc/ctdb/state/changed_ips
+ /bin/rm -f /etc/ctdb/state/released_ips
+ /bin/rm -f /etc/ctdb/state/taken_ips
exit 0
;;
=== modified file 'tools/statd-callout'
--- a/tools/statd-callout 2007-06-01 03:14:05 +
+++ b/tools/statd-callout 2007-06-01 09:16:58 +
@@ -8,7 +8,7 @@
case $1 in
add-client)
-for f in `/bin/ls /etc/ctdb/ip.*`; do
+for f in `/bin/ls /etc/ctdb/state/ip.*`; do
fname=`/bin/basename $f`
ip=`echo $fname | cut -d. -f2-`
[ -d $STATD_SHARED_DIRECTORY/$ip ] || /bin/mkdir
$STATD_SHARED_DIRECTORY/$ip
@@ -16,7 +16,7 @@
done
;;
del-client)
-for f in `/bin/ls /etc/ctdb/ip.*`; do
+for f in `/bin/ls /etc/ctdb/state/ip.*`; do
fname=`/bin/basename $f`
ip=`echo $fname | cut -d. -f2-`
/bin/rm -f $STATD_SHARED_DIRECTORY/$ip/$2
@@ -27,7 +27,7 @@
/sbin/service nfslock stop /dev/null 21
/sbin/service nfslock start /dev/null 21
# send out notifications to any additional ips we now serve
-for f in `/bin/ls /etc/ctdb/ip.*`; do
+for f in `/bin/ls /etc/ctdb/state/ip.*`; do
fname=`/bin/basename $f`
ip=`echo $fname | cut -d. -f2-`
[ -d $STATD_SHARED_DIRECTORY/$ip ] {
Rev 417: make the running of the takeover and release event scripts async, to prevent outages due to slow scripts in http://samba.org/~tridge/ctdb
revno: 417 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: tridge timestamp: Fri 2007-06-01 19:05:41 +1000 message: make the running of the takeover and release event scripts async, to prevent outages due to slow scripts modified: common/ctdb.c ctdb.c-20061127094323-t50f58d65iaao5of-2 common/ctdb_control.c ctdb_control.c-20070426122724-j6gkpiofhbwdin63-1 common/ctdb_daemon.c ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1 include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13 takeover/ctdb_takeover.c ctdb_takeover.c-20070525071636-a5n1ihghjtppy08r-2 takeover/system.c system.c-20070525071636-a5n1ihghjtppy08r-3 Diff too large for email (401, the limit is 200).
Rev 416: convert ctdbd.sh tests to use an event script in http://samba.org/~tridge/ctdb
revno: 416 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: tridge timestamp: Fri 2007-06-01 19:04:51 +1000 message: convert ctdbd.sh tests to use an event script modified: tests/ctdbd.sh ctdbd.sh-20070411085038-phusiewluwzyqjpc-2 === modified file 'tests/ctdbd.sh' --- a/tests/ctdbd.sh2007-05-29 02:16:59 + +++ b/tests/ctdbd.sh2007-06-01 09:04:51 + @@ -3,8 +3,10 @@ killall -q ctdbd echo Starting 2 ctdb daemons -$VALGRIND bin/ctdbd --nlist direct/nodes.txt -$VALGRIND bin/ctdbd --nlist direct/nodes.txt +$VALGRIND bin/ctdbd --nlist direct/nodes.txt --event-script=tests/events --logfile=- +$VALGRIND bin/ctdbd --nlist direct/nodes.txt --event-script=tests/events --logfile=- + +sleep 2 echo Testing ping $VALGRIND bin/ctdb ping || exit 1 @@ -19,7 +21,7 @@ $VALGRIND bin/ctdb -n all statisticsreset || exit 1 echo Testing debug -$VALGRIND bin/ctdb -n all setdebug 5 || exit 1 +$VALGRIND bin/ctdb -n all setdebug 3 || exit 1 $VALGRIND bin/ctdb -n all getdebug || exit 1 $VALGRIND bin/ctdb -n all setdebug 0 || exit 1 $VALGRIND bin/ctdb -n all getdebug || exit 1 @@ -31,6 +33,15 @@ echo Testing getdbmap $VALGRIND bin/ctdb getdbmap || exit 1 +echo Testing status +$VALGRIND bin/ctdb status || exit 1 + +sleep 1 + +echo Testing shutdown +$VALGRIND bin/ctdb shutdown -n all || exit 1 + +sleep 1 + echo All done - killall -q ctdbd
svn commit: samba r23291 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_26/source/nsswitch
Author: obnox
Date: 2007-06-01 12:24:57 + (Fri, 01 Jun 2007)
New Revision: 23291
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23291
Log:
Undo the somewhat naive change of r23279:
The clear text presentaion of the sid in the ldap expression
does work with w2k3 but not with w2k
Thanks to Guenther for advising me of this issue.
Michael
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2007-06-01 12:18:16 UTC
(rev 23290)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2007-06-01 12:24:57 UTC
(rev 23291)
@@ -901,6 +901,7 @@
ADS_STRUCT *ads = NULL;
char *ldap_exp;
NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
+ char *sidbinstr;
char **members = NULL;
int i;
size_t num_members = 0;
@@ -939,14 +940,21 @@
goto done;
}
+ if ((sidbinstr = sid_binstring(group_sid)) == NULL) {
+ status = NT_STATUS_NO_MEMORY;
+ goto done;
+ }
+
/* search for all members of the group */
- if (!(ldap_exp = talloc_asprintf(tmp_ctx, (objectSid=%s),
-sid_string_static(group_sid
+ if (!(ldap_exp = talloc_asprintf(tmp_ctx, (objectSid=%s),
+sidbinstr)))
{
+ SAFE_FREE(sidbinstr);
DEBUG(1, (ads: lookup_groupmem: talloc_asprintf for ldap_exp
failed!\n));
status = NT_STATUS_NO_MEMORY;
goto done;
}
+ SAFE_FREE(sidbinstr);
args.control = ADS_EXTENDED_DN_OID;
args.val = ADS_EXTENDED_DN_HEX_STRING;
Modified: branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c
===
--- branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c2007-06-01
12:18:16 UTC (rev 23290)
+++ branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c2007-06-01
12:24:57 UTC (rev 23291)
@@ -901,6 +901,7 @@
ADS_STRUCT *ads = NULL;
char *ldap_exp;
NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
+ char *sidbinstr;
char **members = NULL;
int i;
size_t num_members = 0;
@@ -939,14 +940,21 @@
goto done;
}
+ if ((sidbinstr = sid_binstring(group_sid)) == NULL) {
+ status = NT_STATUS_NO_MEMORY;
+ goto done;
+ }
+
/* search for all members of the group */
- if (!(ldap_exp = talloc_asprintf(tmp_ctx, (objectSid=%s),
-sid_string_static(group_sid
+ if (!(ldap_exp = talloc_asprintf(tmp_ctx, (objectSid=%s),
+sidbinstr)))
{
+ SAFE_FREE(sidbinstr);
DEBUG(1, (ads: lookup_groupmem: talloc_asprintf for ldap_exp
failed!\n));
status = NT_STATUS_NO_MEMORY;
goto done;
}
+ SAFE_FREE(sidbinstr);
args.control = ADS_EXTENDED_DN_OID;
args.val = ADS_EXTENDED_DN_HEX_STRING;
svn commit: samba r23289 - in branches/SAMBA_4_0: . source/cluster/ctdb/common source/include source/lib/json source/lib/util source/script
Author: jelmer
Date: 2007-06-01 12:01:53 + (Fri, 01 Jun 2007)
New Revision: 23289
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23289
Log:
Provide support for GCC attributes _PURE_, _NONNULL_, _DEPRECATED_, _NORETURN_
and _WARN_UNUSED_RESULT_.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_util.c
branches/SAMBA_4_0/source/include/includes.h
branches/SAMBA_4_0/source/lib/json/debug.c
branches/SAMBA_4_0/source/lib/json/linkhash.c
branches/SAMBA_4_0/source/lib/util/fault.c
branches/SAMBA_4_0/source/lib/util/util_str.c
branches/SAMBA_4_0/source/script/mkproto.pl
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
- timestamp: Mon 2007-05-28 23:02:10.54255 +0200
committer: Jelmer Vernooij [EMAIL PROTECTED]
properties:
branch-nick: SAMBA_4_0
+ timestamp: Fri 2007-06-01 13:45:21.21387 +0200
committer: Jelmer Vernooij [EMAIL PROTECTED]
properties:
branch-nick: SAMBA_4_0
Name: bzr:revision-id-v3
- [EMAIL PROTECTED]
[EMAIL PROTECTED]
+ [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
Name: bzr:merge
...skipped...
Modified: branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_util.c
===
--- branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_util.c 2007-06-01
10:17:02 UTC (rev 23288)
+++ branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_util.c 2007-06-01
12:01:53 UTC (rev 23289)
@@ -52,7 +52,7 @@
/*
a fatal internal error occurred - no hope for recovery
*/
-void ctdb_fatal(struct ctdb_context *ctdb, const char *msg)
+_NORETURN_ void ctdb_fatal(struct ctdb_context *ctdb, const char *msg)
{
DEBUG(0,(ctdb fatal error: %s\n, msg));
fprintf(stderr, ctdb fatal error: '%s'\n, msg);
Modified: branches/SAMBA_4_0/source/include/includes.h
===
--- branches/SAMBA_4_0/source/include/includes.h2007-06-01 10:17:02 UTC
(rev 23288)
+++ branches/SAMBA_4_0/source/include/includes.h2007-06-01 12:01:53 UTC
(rev 23289)
@@ -62,18 +62,46 @@
#endif
#endif
-#ifndef NORETURN_ATTRIBUTE
-#if (__GNUC__ = 3)
-#define NORETURN_ATTRIBUTE __attribute__ ((noreturn))
+#ifndef _DEPRECATED_
+#if (__GNUC__ = 3) (__GNUC_MINOR__ = 1 )
+#define _DEPRECATED_ __attribute__ ((deprecated))
#else
-#define NORETURN_ATTRIBUTE
+#define _DEPRECATED_
#endif
#endif
-/* mark smb_panic() as noreturn, so static analysers know that it is
- used like abort */
-_PUBLIC_ void smb_panic(const char *why) NORETURN_ATTRIBUTE;
+#ifndef _WARN_UNUSED_RESULT_
+#if (__GNUC__ = 3) (__GNUC_MINOR__ = 1 )
+#define _WARN_UNUSED_RESULT_ __attribute__ ((warn_unused_result))
+#else
+#define _WARN_UNUSED_RESULT_
+#endif
+#endif
+#ifndef _NORETURN_
+#if (__GNUC__ = 3) (__GNUC_MINOR__ = 1 )
+#define _NORETURN_ __attribute__ ((noreturn))
+#else
+#define _NORETURN_
+#endif
+#endif
+
+#ifndef _PURE_
+#if (__GNUC__ = 3) (__GNUC_MINOR__ = 1)
+#define _PURE_ __attribute__((pure))
+#else
+#define _PURE_
+#endif
+#endif
+
+#ifndef NONNULL
+#if (__GNUC__ = 3) (__GNUC_MINOR__ = 1)
+#define NONNULL(param) param __attribute__((nonnull))
+#else
+#define NONNULL(param) param
+#endif
+#endif
+
#include system/time.h
#include system/wait.h
Modified: branches/SAMBA_4_0/source/lib/json/debug.c
===
--- branches/SAMBA_4_0/source/lib/json/debug.c 2007-06-01 10:17:02 UTC (rev
23288)
+++ branches/SAMBA_4_0/source/lib/json/debug.c 2007-06-01 12:01:53 UTC (rev
23289)
@@ -41,7 +41,7 @@
_syslog = syslog;
}
-void mc_abort(const char *msg, ...)
+_NORETURN_ void mc_abort(const char *msg, ...)
{
va_list ap;
va_start(ap, msg);
Modified: branches/SAMBA_4_0/source/lib/json/linkhash.c
===
--- branches/SAMBA_4_0/source/lib/json/linkhash.c 2007-06-01 10:17:02 UTC
(rev 23288)
+++ branches/SAMBA_4_0/source/lib/json/linkhash.c 2007-06-01 12:01:53 UTC
(rev 23289)
@@ -20,7 +20,7 @@
#include linkhash.h
-void lh_abort(const char *msg, ...)
+_NORETURN_ void lh_abort(const char *msg, ...)
{
va_list ap;
va_start(ap, msg);
Modified: branches/SAMBA_4_0/source/lib/util/fault.c
===
--- branches/SAMBA_4_0/source/lib/util/fault.c 2007-06-01 10:17:02 UTC (rev
23288)
+++ branches/SAMBA_4_0/source/lib/util/fault.c 2007-06-01 12:01:53 UTC (rev
23289)
@@ -118,7 +118,7 @@
/**
Something really nasty happened - panic !
**/
-_PUBLIC_ void smb_panic(const char *why)
+_PUBLIC_ _NORETURN_ void smb_panic(const char *why)
{
int result;
Modified: branches/SAMBA_4_0/source/lib/util/util_str.c
===
---
svn commit: samba r23292 - in branches/SAMBA_4_0/source/libnet: .
Author: mimir
Date: 2007-06-01 12:29:22 + (Fri, 01 Jun 2007)
New Revision: 23292
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23292
Log:
check for errors returned in a call result.
rafal
Modified:
branches/SAMBA_4_0/source/libnet/userman.c
Changeset:
Modified: branches/SAMBA_4_0/source/libnet/userman.c
===
--- branches/SAMBA_4_0/source/libnet/userman.c 2007-06-01 12:24:57 UTC (rev
23291)
+++ branches/SAMBA_4_0/source/libnet/userman.c 2007-06-01 12:29:22 UTC (rev
23292)
@@ -246,8 +246,13 @@
{
/* receive samr_LookupNames result */
c-status = dcerpc_ndr_request_recv(s-req);
+
+ /* check rpc layer status */
NT_STATUS_NOT_OK_RETURN(c-status);
+ /* check the call itself status */
+ NT_STATUS_NOT_OK_RETURN(s-lookupname.out.result);
+
/* what to do when there's no user account to delete
and what if there's more than one rid resolved */
if (!s-lookupname.out.rids.count) {
svn commit: samba r23293 - in branches/SAMBA_4_0/source/lib/replace: .
Author: metze Date: 2007-06-01 13:04:56 + (Fri, 01 Jun 2007) New Revision: 23293 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23293 Log: the fix for HP-UX 11.11 doesn't work on HP-UX 11.00 we end up with sozeof(uint64_t) == 4 :-( the _APP32_64BIT_OFF_T section in sys/unistd.h missed to redirect pread, pwrite to pread64, pwrite64 in HP-UX 11.00 so try it manually as a workarround metze Modified: branches/SAMBA_4_0/source/lib/replace/libreplace_cc.m4 Changeset: Modified: branches/SAMBA_4_0/source/lib/replace/libreplace_cc.m4 === --- branches/SAMBA_4_0/source/lib/replace/libreplace_cc.m4 2007-06-01 12:29:22 UTC (rev 23292) +++ branches/SAMBA_4_0/source/lib/replace/libreplace_cc.m4 2007-06-01 13:04:56 UTC (rev 23293) @@ -60,7 +60,11 @@ *hpux*) # mmap on HPUX is completely broken... AC_DEFINE(MMAP_BLACKLIST, 1, [Whether MMAP is broken]) - if test `uname -r` = B.11.00 -o `uname -r` = B.11.11; then + if test `uname -r` = B.11.00; then + AC_MSG_WARN([Enabling HPUX 11.00 header bug workaround]) + CFLAGS=$CFLAGS -Dpread=pread64 -Dpwrite=pwrite64 + fi + if test `uname -r` = B.11.11; then AC_MSG_WARN([Enabling HPUX 11.11 header bug workaround]) CFLAGS=$CFLAGS -D_LARGEFILE64_SUPPORT -D__LP64__ -DO_LARGEFILE=04000 fi
Rev 422: make the packaging much more portable - tested on SLES9 and RHEL4 in http://samba.org/~tridge/ctdb
revno: 422 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: tridge timestamp: Fri 2007-06-01 23:25:33 +1000 message: make the packaging much more portable - tested on SLES9 and RHEL4 removed: packaging/RHEL/rhel-20070527204758-biuh7znabuwan3zn-2 packaging/RHEL/setup/ setup-20070527204758-biuh7znabuwan3zn-5 added: packaging/RPM/ rpm-20070601113914-ib68c0nm044ublvo-1 renamed: packaging/RHEL/ctdb.spec = packaging/RPM/ctdb.spec ctdb.spec-20070527204758-biuh7znabuwan3zn-3 packaging/RHEL/makerpms.sh = packaging/RPM/makerpms.sh makerpms.sh-20070527204758-biuh7znabuwan3zn-4 packaging/RHEL/setup/ctdb.init = packaging/ctdb.init ctdb.init-20070527204758-biuh7znabuwan3zn-6 packaging/RHEL/setup/ctdb.sysconfig = tools/ctdb.sysconfig ctdb.sysconfig-20070527204758-biuh7znabuwan3zn-7 modified: Makefile.inmakefile.in-20061117234101-o3qt14umlg9en8z0-1 takeover/system.c system.c-20070525071636-a5n1ihghjtppy08r-3 tools/events.d/samba samba-20070601105340-vlcvnp6euoj3zdwy-3 tools/functionsfunctions-20070601105405-gajwirydr5a9zd6x-1 tools/statd-calloutstatdcallout-20070531010857-6sdlz455vusye5y5-1 packaging/RPM/ctdb.specctdb.spec-20070527204758-biuh7znabuwan3zn-3 packaging/RPM/makerpms.sh makerpms.sh-20070527204758-biuh7znabuwan3zn-4 packaging/ctdb.initctdb.init-20070527204758-biuh7znabuwan3zn-6 Diff too large for email (348, the limit is 200).
Rev 423: don't strictly need netcat in http://samba.org/~tridge/ctdb
revno: 423
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Fri 2007-06-01 23:33:01 +1000
message:
don't strictly need netcat
modified:
packaging/RPM/ctdb.specctdb.spec-20070527204758-biuh7znabuwan3zn-3
=== modified file 'packaging/RPM/ctdb.spec'
--- a/packaging/RPM/ctdb.spec 2007-06-01 13:25:33 +
+++ b/packaging/RPM/ctdb.spec 2007-06-01 13:33:01 +
@@ -13,7 +13,7 @@
Source: ctdb-%{version}.tar.bz2
-Prereq: /sbin/chkconfig /bin/mktemp /usr/bin/killall /usr/bin/nc
+Prereq: /sbin/chkconfig /bin/mktemp /usr/bin/killall
Prereq: fileutils sed /etc/init.d
Provides: ctdb = %{version}
svn commit: samba r23294 - in branches/SAMBA_4_0/source/lib/appweb/mpr: .
Author: metze Date: 2007-06-01 13:49:19 + (Fri, 01 Jun 2007) New Revision: 23294 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23294 Log: try to fix the build metze Modified: branches/SAMBA_4_0/source/lib/appweb/mpr/miniMpr.h Changeset: Modified: branches/SAMBA_4_0/source/lib/appweb/mpr/miniMpr.h === --- branches/SAMBA_4_0/source/lib/appweb/mpr/miniMpr.h 2007-06-01 13:04:56 UTC (rev 23293) +++ branches/SAMBA_4_0/source/lib/appweb/mpr/miniMpr.h 2007-06-01 13:49:19 UTC (rev 23294) @@ -255,7 +255,7 @@ extern int mprAllocSprintf(char **msgbuf, int maxSize, const char *fmt, ...) PRINTF_ATTRIBUTE(3,4); extern char*mprItoa(int num, char *buf, int width); extern voidmprLog(int level, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3); -extern voidmprBreakpoint(const char *file, int line, const char *msg) NORETURN_ATTRIBUTE; +extern voidmprBreakpoint(const char *file, int line, const char *msg) _NORETURN_; #endif /* BLD_GOAHEAD_WEBSERVER */ extern MprArray*mprCreateArray(void);
Rev 425: put nfs events in spec and Makefile.in in http://samba.org/~tridge/ctdb
revno: 425
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Sat 2007-06-02 00:11:53 +1000
message:
put nfs events in spec and Makefile.in
modified:
Makefile.inmakefile.in-20061117234101-o3qt14umlg9en8z0-1
packaging/RPM/ctdb.specctdb.spec-20070527204758-biuh7znabuwan3zn-3
=== modified file 'Makefile.in'
--- a/Makefile.in 2007-06-01 13:25:33 +
+++ b/Makefile.in 2007-06-01 14:11:53 +
@@ -128,6 +128,7 @@
install -m755 tools/functions $(DESTDIR)$(etcdir)/ctdb
install -m755 tools/statd-callout $(DESTDIR)$(etcdir)/ctdb
install -m755 tools/events.d/samba $(DESTDIR)$(etcdir)/ctdb/events.d
+ install -m755 tools/events.d/nfs $(DESTDIR)$(etcdir)/ctdb/events.d
install -m755 tools/events.d/nfslock $(DESTDIR)$(etcdir)/ctdb/events.d
install -m755 tools/onnode.ssh $(DESTDIR)$(bindir)
install -m755 tools/onnode.rsh $(DESTDIR)$(bindir)
=== modified file 'packaging/RPM/ctdb.spec'
--- a/packaging/RPM/ctdb.spec 2007-06-01 13:33:01 +
+++ b/packaging/RPM/ctdb.spec 2007-06-01 14:11:53 +
@@ -95,6 +95,7 @@
%{_sysconfdir}/ctdb/functions
%{_sysconfdir}/ctdb/events.d/samba
%{_sysconfdir}/ctdb/events.d/nfslock
+%{_sysconfdir}/ctdb/events.d/nfs
%{_sysconfdir}/ctdb/statd-callout
%{_sbindir}/ctdbd
%{_bindir}/ctdb
Rev 424: added nfs event script in http://samba.org/~tridge/ctdb
revno: 424
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Sat 2007-06-02 00:10:22 +1000
message:
added nfs event script
added:
tools/events.d/nfs nfs-20070601141008-hy3h4qgbk1jd2jci-1
modified:
tools/events.d/samba samba-20070601105340-vlcvnp6euoj3zdwy-3
=== added file 'tools/events.d/nfs'
--- a/tools/events.d/nfs1970-01-01 00:00:00 +
+++ b/tools/events.d/nfs2007-06-01 14:10:22 +
@@ -0,0 +1,36 @@
+#!/bin/sh
+# script to manage nfs in a clustered environment
+
+. /etc/sysconfig/ctdb
+. /etc/ctdb/functions
+
+cmd=$1
+shift
+
+case $cmd in
+ startup)
+ mkdir -p /etc/ctdb/state/nfs
+ ;;
+
+ releaseip)
+ iface=$1
+ ip=$2
+ maskbits=$3
+
+ echo $ip /etc/ctdb/state/nfs/restart
+ exit 0
+ ;;
+
+ recovered)
+# restart NFS to ensure that all TCP connections to the released ip
+ # are closed
+ [ -f /etc/ctdb/state/nfs/restart ] {
+ ( /sbin/service nfs status /dev/null 21
+ /sbin/service nfs restart /dev/null 21 )
+ } /dev/null 21
+ /bin/rm -f /etc/ctdb/state/nfs/restart
+ ;;
+
+esac
+
+exit 0
=== modified file 'tools/events.d/samba'
--- a/tools/events.d/samba 2007-06-01 13:25:33 +
+++ b/tools/events.d/samba 2007-06-01 14:10:22 +
@@ -34,9 +34,8 @@
;;
shutdown)
- # shutdown Samba cleanly when ctdb goes down
- /etc/init.d/smb stop
- /etc/init.d/winbind stop
+ # shutdown Samba when ctdb goes down
+ killall -q smbd nmbd winbindd
;;
esac
Rev 12013: Couple of small cleanups. in file:///home/jelmer/bzr.samba-old/python/
At file:///home/jelmer/bzr.samba-old/python/
revno: 12013
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij [EMAIL PROTECTED]
branch nick: python
timestamp: Fri 2007-06-01 16:56:42 +0200
message:
Couple of small cleanups.
modified:
source/scripting/python/parammodule.c
param.c-20070425124147-y6pej29g7xqsb3n6-1
source/scripting/python/talloc.c talloc.c-20070508214200-ruf43htj5k9dlrwj-1
=== modified file 'source/scripting/python/parammodule.c'
--- a/source/scripting/python/parammodule.c 2007-05-08 21:57:44 +
+++ b/source/scripting/python/parammodule.c 2007-06-01 14:56:42 +
@@ -80,7 +80,6 @@
PyObject *loadparm_object(void)
{
-
return NULL; /* FIXME */
}
@@ -91,5 +90,5 @@
return;
/* FIXME: Check error code */
- /*PyModule_AddObject(mod, default_config, loadparm_object());*/
+ PyModule_AddObject(mod, global_params, loadparm_object());
}
=== modified file 'source/scripting/python/talloc.c'
--- a/source/scripting/python/talloc.c 2007-05-08 21:57:44 +
+++ b/source/scripting/python/talloc.c 2007-06-01 14:56:42 +
@@ -21,10 +21,11 @@
*/
#include includes.h
-#include scripting/ejs/smbcalls.h
#include Python.h
#include param/param.h
+#include scripting/python/talloc.h
-TALLOC_CTX *PyMemCtx() {
+TALLOC_CTX *PyMemCtx(void)
+{
return talloc_autofree_context();
}
svn commit: samba r23295 - in branches: SAMBA_3_0/source SAMBA_3_0_26/source
Author: jpeach Date: 2007-06-01 16:06:40 + (Fri, 01 Jun 2007) New Revision: 23295 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23295 Log: Apply proto_exists and bin/.dummy dependencies consistently for all binaries. Fix vfs_zfsacl build rule in SAMBA_3_0. Modified: branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0_26/source/Makefile.in Changeset: Sorry, the patch is too large (1473 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23295
svn commit: samba r23296 - in branches/SAMBA_4_0/source/lib/replace: .
Author: metze Date: 2007-06-01 18:36:55 + (Fri, 01 Jun 2007) New Revision: 23296 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23296 Log: HP-UX 11.11 also gets sizeof(uint64_t) == 4 so try the same fix as for 11.00 metze Modified: branches/SAMBA_4_0/source/lib/replace/libreplace_cc.m4 Changeset: Modified: branches/SAMBA_4_0/source/lib/replace/libreplace_cc.m4 === --- branches/SAMBA_4_0/source/lib/replace/libreplace_cc.m4 2007-06-01 16:06:40 UTC (rev 23295) +++ branches/SAMBA_4_0/source/lib/replace/libreplace_cc.m4 2007-06-01 18:36:55 UTC (rev 23296) @@ -66,7 +66,8 @@ fi if test `uname -r` = B.11.11; then AC_MSG_WARN([Enabling HPUX 11.11 header bug workaround]) - CFLAGS=$CFLAGS -D_LARGEFILE64_SUPPORT -D__LP64__ -DO_LARGEFILE=04000 + #CFLAGS=$CFLAGS -D_LARGEFILE64_SUPPORT -D__LP64__ -DO_LARGEFILE=04000 + CFLAGS=$CFLAGS -Dpread=pread64 -Dpwrite=pwrite64 fi if test `uname -r` = B.11.23; then AC_MSG_WARN([Enabling HPUX 11.23 machine/sys/getppdp.h bug workaround])
svn commit: samba r23297 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_26/source/nsswitch
Author: vlendec
Date: 2007-06-01 18:39:50 + (Fri, 01 Jun 2007)
New Revision: 23297
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23297
Log:
This introduces the winbind:ads parameter which defaults to True. Setting it
to False makes winbind use RPC and not LDAP methods to connect to the DCs,
even when it figured out they are AD.
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c
branches/SAMBA_3_0_26/source/nsswitch/winbindd_cache.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c 2007-06-01 18:36:55 UTC
(rev 23296)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c 2007-06-01 18:39:50 UTC
(rev 23297)
@@ -169,7 +169,9 @@
if ( !domain-primary )
our_domain = find_our_domain();
- if ( (our_domain-active_directory || IS_DC)
domain-active_directory ) {
+ if ((our_domain-active_directory || IS_DC)
+domain-active_directory
+lp_parm_bool(-1, winbind, ads, True)) {
DEBUG(5,(get_cache: Setting ADS methods for domain
%s\n, domain-name));
domain-backend = ads_methods;
} else {
Modified: branches/SAMBA_3_0_26/source/nsswitch/winbindd_cache.c
===
--- branches/SAMBA_3_0_26/source/nsswitch/winbindd_cache.c 2007-06-01
18:36:55 UTC (rev 23296)
+++ branches/SAMBA_3_0_26/source/nsswitch/winbindd_cache.c 2007-06-01
18:39:50 UTC (rev 23297)
@@ -169,7 +169,9 @@
if ( !domain-primary )
our_domain = find_our_domain();
- if ( (our_domain-active_directory || IS_DC)
domain-active_directory ) {
+ if ((our_domain-active_directory || IS_DC)
+domain-active_directory
+lp_parm_bool(-1, winbind, ads, True)) {
DEBUG(5,(get_cache: Setting ADS methods for domain
%s\n, domain-name));
domain-backend = ads_methods;
} else {
svn commit: samba r23298 - in branches/SAMBA_3_0_26/source: .
Author: jpeach Date: 2007-06-01 19:28:13 + (Fri, 01 Jun 2007) New Revision: 23298 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23298 Log: Fix bad merge. Modified: branches/SAMBA_3_0_26/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0_26/source/Makefile.in === --- branches/SAMBA_3_0_26/source/Makefile.in2007-06-01 18:39:50 UTC (rev 23297) +++ branches/SAMBA_3_0_26/source/Makefile.in2007-06-01 19:28:13 UTC (rev 23298) @@ -1193,7 +1193,7 @@ @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(LOCKTEST2_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) -bin/[EMAIL PROTECTED](BINARY_PREREQS) @: $(RPCTORTURE_OBJ) +bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(RPCTORTURE_OBJ) @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(RPCTORTURE_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
svn commit: samba r23299 - in branches: SAMBA_3_0/source/smbd SAMBA_3_0_26/source/smbd
Author: jpeach
Date: 2007-06-01 19:34:08 + (Fri, 01 Jun 2007)
New Revision: 23299
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23299
Log:
Fix the build for !WITH_SENDFILE.
Modified:
branches/SAMBA_3_0/source/smbd/reply.c
branches/SAMBA_3_0_26/source/smbd/reply.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/reply.c
===
--- branches/SAMBA_3_0/source/smbd/reply.c 2007-06-01 19:28:13 UTC (rev
23298)
+++ branches/SAMBA_3_0/source/smbd/reply.c 2007-06-01 19:34:08 UTC (rev
23299)
@@ -2246,11 +2246,10 @@
return;
}
-
- normal_readbraw:
-
#endif
+normal_readbraw:
+
if (nread 0) {
ret = read_file(fsp,outbuf+4,startpos,nread);
#if 0 /* mincount appears to be ignored in a W2K server. JRA. */
@@ -2646,7 +2645,7 @@
#endif
- normal_read:
+normal_read:
if ((smb_maxcnt 0xFF) 0x1) {
int sendlen = setup_readX_header(inbuf,outbuf,smb_maxcnt) -
smb_maxcnt;
Modified: branches/SAMBA_3_0_26/source/smbd/reply.c
===
--- branches/SAMBA_3_0_26/source/smbd/reply.c 2007-06-01 19:28:13 UTC (rev
23298)
+++ branches/SAMBA_3_0_26/source/smbd/reply.c 2007-06-01 19:34:08 UTC (rev
23299)
@@ -2246,10 +2246,10 @@
return;
}
- normal_readbraw:
-
#endif
+normal_readbraw:
+
if (nread 0) {
ret = read_file(fsp,outbuf+4,startpos,nread);
#if 0 /* mincount appears to be ignored in a W2K server. JRA. */
@@ -2641,11 +2641,10 @@
/* Returning -1 here means successful sendfile. */
return -1;
}
-
- normal_read:
-
#endif
+normal_read:
+
if ((smb_maxcnt 0xFF) 0x1) {
int sendlen = setup_readX_header(outbuf,smb_maxcnt) -
smb_maxcnt;
/* Send out the header. */
svn commit: samba r23300 - in branches: SAMBA_3_0/source/include SAMBA_3_0_26/source/include
Author: jpeach Date: 2007-06-01 19:42:23 + (Fri, 01 Jun 2007) New Revision: 23300 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23300 Log: AFAICT these are not needed. Jerry, can you please review and revert if this is not correct. Removed: branches/SAMBA_3_0/source/include/core/ branches/SAMBA_3_0_26/source/include/core/ Changeset:
svn commit: samba-web r1119 - in trunk: .
Author: deryck Date: 2007-06-01 19:44:21 + (Fri, 01 Jun 2007) New Revision: 1119 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1119 Log: Take out the news include will we upgrade news.samba.org. deryck Modified: trunk/index.html Changeset: Modified: trunk/index.html === --- trunk/index.html2007-05-29 06:55:13 UTC (rev 1118) +++ trunk/index.html2007-06-01 19:44:21 UTC (rev 1119) @@ -15,7 +15,7 @@ Conservancy/a./p h2Latest News/h2 -!--#include virtual=/samba/news/headlines.html -- +pNews headlines will return once the news server upgrade is complete/p h2Current Release/h2
Re: svn commit: samba r23290 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_26/source/nsswitch
On Fri, Jun 01, 2007 at 12:18:17PM +, [EMAIL PROTECTED] wrote:
Author: obnox
Date: 2007-06-01 12:18:16 + (Fri, 01 Jun 2007)
New Revision: 23290
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23290
Log:
Fix another small and stupid but severe typo.
Hopfully, I have finally got this right... :-)
Michael
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
branches/SAMBA_3_0_26/source/nsswitch/winbindd_ads.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2007-06-01 12:01:53 UTC
(rev 23289)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2007-06-01 12:18:16 UTC
(rev 23290)
@@ -1054,7 +1054,7 @@
{
sid_copy((*sid_mem)[*num_names],
sid_mem_nocache[i]);
- (*names)[*num_names] =
talloc_move(names, names_nocache[i]);
+ (*names)[*num_names] =
talloc_move(*names, names_nocache[i]);
(*name_types)[*num_names] =
name_types_nocache[i];
(*num_names)++;
}
Hmmm. I'd probably change *names to mem_ctx, there's no
real need for a heirarchy here, right ? You just want to
make sure both names and (*names)[*num_names] are
allocated from the passed in mem_ctx, correct ?
Jeremy.
Rev 426: - make calling of recovered event script async in http://samba.org/~tridge/ctdb
revno: 426 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: tridge timestamp: Sat 2007-06-02 08:41:19 +1000 message: - make calling of recovered event script async - shutdown sockets before calling shutdown script modified: common/ctdb_control.c ctdb_control.c-20070426122724-j6gkpiofhbwdin63-1 common/ctdb_recover.c ctdb_recover.c-20070503002147-admmfgt1oj6gexfo-1 common/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1 include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13 tcp/tcp_connect.c tcp_connect.c-20061128004937-x70q1cu5xzg5g2tm-1 tcp/tcp_init.c tcp_init.c-20061128004937-x70q1cu5xzg5g2tm-2 Diff too large for email (283, the limit is 200).
Rev 427: disable realtime scheduler in event scripts in http://samba.org/~tridge/ctdb
revno: 427
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Sat 2007-06-02 08:46:49 +1000
message:
disable realtime scheduler in event scripts
modified:
common/ctdb_daemon.c ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1
common/ctdb_util.c ctdb_util.c-20061128065342-to93h6eejj5kon81-3
include/ctdb_private.h
ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13
takeover/system.c system.c-20070525071636-a5n1ihghjtppy08r-3
=== modified file 'common/ctdb_daemon.c'
--- a/common/ctdb_daemon.c 2007-06-01 09:05:41 +
+++ b/common/ctdb_daemon.c 2007-06-01 22:46:49 +
@@ -766,7 +766,7 @@
block_signal(SIGPIPE);
/* try to set us up as realtime */
- ctdb_set_realtime();
+ ctdb_set_realtime(true);
/* ensure the socket is deleted on exit of the daemon */
domain_socket_name = talloc_strdup(talloc_autofree_context(),
ctdb-daemon.name);
=== modified file 'common/ctdb_util.c'
--- a/common/ctdb_util.c2007-05-31 03:50:53 +
+++ b/common/ctdb_util.c2007-06-01 22:46:49 +
@@ -204,16 +204,20 @@
/*
if possible, make this task real time
*/
-void ctdb_set_realtime(void)
+void ctdb_set_realtime(bool enable)
{
#if HAVE_SCHED_SETSCHEDULER
struct sched_param p;
p.__sched_priority = 1;
- if (sched_setscheduler(getpid(), SCHED_FIFO, p) == -1) {
- DEBUG(0,(Unable to set scheduler to SCHED_FIFO (%s)\n,
strerror(errno)));
+ if (enable) {
+ if (sched_setscheduler(getpid(), SCHED_FIFO, p) == -1) {
+ DEBUG(0,(Unable to set scheduler to SCHED_FIFO
(%s)\n, strerror(errno)));
+ } else {
+ DEBUG(0,(Set scheduler to SCHED_FIFO\n));
+ }
} else {
- DEBUG(0,(Set scheduler to SCHED_FIFO\n));
+ sched_setscheduler(getpid(), SCHED_OTHER, p);
}
#endif
}
=== modified file 'include/ctdb_private.h'
--- a/include/ctdb_private.h2007-06-01 22:41:19 +
+++ b/include/ctdb_private.h2007-06-01 22:46:49 +
@@ -928,7 +928,7 @@
uint32_t destnode, uint32_t db_id, uint64_t rsn);
int ctdb_ctrl_delete_low_rsn(struct ctdb_context *ctdb, struct timeval
timeout,
uint32_t destnode, uint32_t db_id, uint64_t rsn);
-void ctdb_set_realtime(void);
+void ctdb_set_realtime(bool enable);
int32_t ctdb_control_takeover_ip(struct ctdb_context *ctdb,
struct ctdb_req_control *c,
TDB_DATA indata,
=== modified file 'takeover/system.c'
--- a/takeover/system.c 2007-06-01 13:25:33 +
+++ b/takeover/system.c 2007-06-01 22:46:49 +
@@ -385,6 +385,7 @@
if (state-child == 0) {
close(state-fd[0]);
+ ctdb_set_realtime(false);
va_start(ap, fmt);
ret = ctdb_event_script_v(ctdb, fmt, ap);
va_end(ap);
Build status as of Sat Jun 2 00:00:02 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-06-01 00:00:37.0 + +++ /home/build/master/cache/broken_results.txt 2007-06-02 00:00:37.0 + @@ -1,25 +1,25 @@ -Build status as of Fri Jun 1 00:00:02 2007 +Build status as of Sat Jun 2 00:00:02 2007 Build counts: Tree Total Broken Panic SOC 0 0 0 build_farm 0 0 0 -ccache 34 6 0 +ccache 35 7 0 ctdb 0 0 0 distcc 2 0 0 -ldb 33 9 0 +ldb 34 9 0 libreplace 32 12 0 -lorikeet-heimdal 28 17 0 -pidl 17 2 0 +lorikeet-heimdal 29 17 0 +pidl 18 3 0 ppp 13 0 0 python 0 0 0 -rsync34 13 0 +rsync35 13 0 samba0 0 0 samba-docs 0 0 0 samba-gtk3 3 0 -samba4 31 22 1 -samba_3_033 17 0 -smb-build31 31 0 +samba4 32 21 2 +samba_3_034 16 0 +smb-build32 32 0 talloc 34 7 0 -tdb 33 3 0 +tdb 34 3 0
Rev 428: another place we need to cope with the strange epoll fork semantics in http://samba.org/~tridge/ctdb
revno: 428
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Sat 2007-06-02 10:01:17 +1000
message:
another place we need to cope with the strange epoll fork semantics
modified:
lib/events/events_aio.cevents_aio.c-20070501213746-4fxluwiq4rcxib8p-1
lib/events/events_epoll.c
events_epoll.c-20070501213746-4fxluwiq4rcxib8p-2
lib/events/events_standard.c
events_standard.c-20061117234101-o3qt14umlg9en8z0-30
=== modified file 'lib/events/events_aio.c'
--- a/lib/events/events_aio.c 2007-05-17 22:33:10 +
+++ b/lib/events/events_aio.c 2007-06-02 00:01:17 +
@@ -393,6 +393,8 @@
struct aio_event_context *aio_ev = talloc_get_type(ev-additional_data,
struct
aio_event_context);
+ epoll_check_reopen(aio_ev);
+
aio_ev-num_fd_events--;
aio_ev-destruction_count++;
=== modified file 'lib/events/events_epoll.c'
--- a/lib/events/events_epoll.c 2007-05-17 22:33:10 +
+++ b/lib/events/events_epoll.c 2007-06-02 00:01:17 +
@@ -342,6 +342,8 @@
struct epoll_event_context *epoll_ev =
talloc_get_type(ev-additional_data,
struct
epoll_event_context);
+ epoll_check_reopen(epoll_ev);
+
epoll_ev-num_fd_events--;
epoll_ev-destruction_count++;
=== modified file 'lib/events/events_standard.c'
--- a/lib/events/events_standard.c 2007-05-18 01:24:45 +
+++ b/lib/events/events_standard.c 2007-06-02 00:01:17 +
@@ -379,6 +379,8 @@
struct std_event_context *std_ev = talloc_get_type(ev-additional_data,
struct
std_event_context);
+ epoll_check_reopen(std_ev);
+
if (std_ev-maxfd == fde-fd) {
std_ev-maxfd = EVENT_INVALID_MAXFD;
}
Rev 429: - moved cmdline options that are only relevant to ctdbd into ctdbd.c in http://samba.org/~tridge/ctdb
revno: 429 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: tridge timestamp: Sat 2007-06-02 10:03:28 +1000 message: - moved cmdline options that are only relevant to ctdbd into ctdbd.c - fixed a valgrind error on failing to send a control - don't mark node dead when already disconnected - moved node list lock code into common code modified: common/cmdline.c cmdline.c-20070416041216-w1zvz91bkdsgjckw-1 common/ctdb_daemon.c ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1 common/ctdb_monitor.c ctdb_monitor.c-20070518100625-8jf4ft1mjzmb22ck-1 common/ctdb_recover.c ctdb_recover.c-20070503002147-admmfgt1oj6gexfo-1 common/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1 direct/ctdbd.c ctdbd.c-20070411085044-dqmhr6mfeexnyt4m-1 include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13 Diff too large for email (385, the limit is 200).
svn commit: samba r23301 - in branches/SAMBA_4_0/source/lib/events: .
Author: tridge
Date: 2007-06-02 00:32:49 + (Sat, 02 Jun 2007)
New Revision: 23301
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23301
Log:
merged from ctdb
Modified:
branches/SAMBA_4_0/source/lib/events/events_aio.c
branches/SAMBA_4_0/source/lib/events/events_epoll.c
branches/SAMBA_4_0/source/lib/events/events_standard.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/events/events_aio.c
===
--- branches/SAMBA_4_0/source/lib/events/events_aio.c 2007-06-01 19:42:23 UTC
(rev 23300)
+++ branches/SAMBA_4_0/source/lib/events/events_aio.c 2007-06-02 00:32:49 UTC
(rev 23301)
@@ -393,6 +393,8 @@
struct aio_event_context *aio_ev = talloc_get_type(ev-additional_data,
struct
aio_event_context);
+ epoll_check_reopen(aio_ev);
+
aio_ev-num_fd_events--;
aio_ev-destruction_count++;
Modified: branches/SAMBA_4_0/source/lib/events/events_epoll.c
===
--- branches/SAMBA_4_0/source/lib/events/events_epoll.c 2007-06-01 19:42:23 UTC
(rev 23300)
+++ branches/SAMBA_4_0/source/lib/events/events_epoll.c 2007-06-02 00:32:49 UTC
(rev 23301)
@@ -342,6 +342,8 @@
struct epoll_event_context *epoll_ev =
talloc_get_type(ev-additional_data,
struct
epoll_event_context);
+ epoll_check_reopen(epoll_ev);
+
epoll_ev-num_fd_events--;
epoll_ev-destruction_count++;
Modified: branches/SAMBA_4_0/source/lib/events/events_standard.c
===
--- branches/SAMBA_4_0/source/lib/events/events_standard.c 2007-06-01
19:42:23 UTC (rev 23300)
+++ branches/SAMBA_4_0/source/lib/events/events_standard.c 2007-06-02
00:32:49 UTC (rev 23301)
@@ -379,6 +379,8 @@
struct std_event_context *std_ev = talloc_get_type(ev-additional_data,
struct
std_event_context);
+ epoll_check_reopen(std_ev);
+
if (std_ev-maxfd == fde-fd) {
std_ev-maxfd = EVENT_INVALID_MAXFD;
}
Rev 430: - make specification of a recovery lock file compulsory in http://samba.org/~tridge/ctdb
revno: 430 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: tridge timestamp: Sat 2007-06-02 11:36:42 +1000 message: - make specification of a recovery lock file compulsory - die if someone other than the recmaster can get the recovery lock modified: common/ctdb.c ctdb.c-20061127094323-t50f58d65iaao5of-2 common/ctdb_recover.c ctdb_recover.c-20070503002147-admmfgt1oj6gexfo-1 common/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1 direct/ctdbd.c ctdbd.c-20070411085044-dqmhr6mfeexnyt4m-1 include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13 packaging/ctdb.initctdb.init-20070527204758-biuh7znabuwan3zn-6 tests/ctdbd.sh ctdbd.sh-20070411085038-phusiewluwzyqjpc-2 tools/ctdb.sysconfig ctdb.sysconfig-20070527204758-biuh7znabuwan3zn-7 Diff too large for email (287, the limit is 200).
Rev 431: first step towards fixing make test with the new daemon system in http://samba.org/~tridge/ctdb
revno: 431 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: tridge timestamp: Sat 2007-06-02 13:16:11 +1000 message: first step towards fixing make test with the new daemon system removed: tests/1node.txt1node.txt-20061130223406-mp2y4jqnzxzaxbhc-1 tests/4nodes.txt 4nodes.txt-20061218050513-sfjylm5onz95575c-1 tests/bench-ssh.sh benchssh.sh-20070220022243-k2evfudau0j1bwmn-1 tests/ctdb_fetch1.cctdb_fetch1.c-20070412111848-xawz6wqk9r0v8jdk-1 tests/ctdb_messaging.c ctdb_messaging.c-20070411034205-6d6vne56pbih2x1p-1 tests/ctdb_test.c ctdb_test.c-20061117234101-o3qt14umlg9en8z0-16 tests/fetch1.shfetch1.sh-20070412111854-6s84l3myac9ncl79-1 tests/messaging.sh messaging.sh-20070411034158-e1c175kqm9vzasb6-1 tests/test.sh test.sh-20061128065333-cla80zaxd9eb4o4a-2 tests/test1.sh test1.sh-20061130223403-jednzcvm60m0j75c-1 modified: Makefile.inmakefile.in-20061117234101-o3qt14umlg9en8z0-1 common/ctdb.c ctdb.c-20061127094323-t50f58d65iaao5of-2 common/ctdb_client.c ctdb_client.c-20070411010216-3kd8v37k61steeya-1 common/ctdb_ltdb.c ctdb_ltdb.c-20061128065342-to93h6eejj5kon81-2 common/ctdb_recover.c ctdb_recover.c-20070503002147-admmfgt1oj6gexfo-1 tests/bench.sh bench.sh-20070209014602-vdolpr6esqsa58s7-1 tests/ctdb_bench.c ctdb_bench.c-20061219052637-2liagoglohxb6p7s-1 tests/ctdb_fetch.c ctdb_fetch.c-20070405031748-f7gslozfj3rwh5ie-1 tests/fetch.sh fetch.sh-20070405031756-lomzqpjyqg3xd1kv-1 tests/run_tests.sh run_tests.sh-20070428085745-ec2w6vybjf07vtvg-1 Diff too large for email (1188, the limit is 200).
Rev 432: make test now works again in http://samba.org/~tridge/ctdb
revno: 432
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Sat 2007-06-02 13:31:36 +1000
message:
make test now works again
modified:
include/ctdb.h ctdb.h-20061117234101-o3qt14umlg9en8z0-11
include/ctdb_private.h
ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13
tests/bench.sh bench.sh-20070209014602-vdolpr6esqsa58s7-1
tests/ctdb_bench.c ctdb_bench.c-20061219052637-2liagoglohxb6p7s-1
tests/ctdb_fetch.c ctdb_fetch.c-20070405031748-f7gslozfj3rwh5ie-1
tests/ctdbd.sh ctdbd.sh-20070411085038-phusiewluwzyqjpc-2
tests/fetch.sh fetch.sh-20070405031756-lomzqpjyqg3xd1kv-1
=== modified file 'include/ctdb.h'
--- a/include/ctdb.h2007-05-31 03:50:53 +
+++ b/include/ctdb.h2007-06-02 03:31:36 +
@@ -72,6 +72,14 @@
*/
#define CTDB_SRVID_RELEASE_IP 0xF300LL
+/* used on the domain socket, send a pdu to the local daemon */
+#define CTDB_CURRENT_NODE 0xF001
+/* send a broadcast to all nodes in the cluster, active or not */
+#define CTDB_BROADCAST_ALL0xF002
+/* send a broadcast to all nodes in the current vnn map */
+#define CTDB_BROADCAST_VNNMAP 0xF003
+
+
struct event_context;
/*
=== modified file 'include/ctdb_private.h'
--- a/include/ctdb_private.h2007-06-02 01:36:42 +
+++ b/include/ctdb_private.h2007-06-02 03:31:36 +
@@ -38,13 +38,6 @@
#define CTDB_NULL_FUNC 0xFF01
#define CTDB_FETCH_FUNC 0xFF02
-/* used on the domain socket, send a pdu to the local daemon */
-#define CTDB_CURRENT_NODE 0xF001
-/* send a broadcast to all nodes in the cluster, active or not */
-#define CTDB_BROADCAST_ALL0xF002
-/* send a broadcast to all nodes in the current vnn map */
-#define CTDB_BROADCAST_VNNMAP 0xF003
-
#define CTDB_MAX_REDIRECT_COUNT 3
#define CTDB_DEFAULT_SEQNUM_FREQUENCY 1
=== modified file 'tests/bench.sh'
--- a/tests/bench.sh2007-06-02 03:16:11 +
+++ b/tests/bench.sh2007-06-02 03:31:36 +
@@ -20,8 +20,8 @@
killall -9 ctdb_bench
echo Trying $NUMNODES nodes
for i in `seq 1 $NUMNODES`; do
- $VALGRIND bin/ctdb_bench --nlist nodes.txt --socket sock.$i $*
+ valgrind -q $VALGRIND bin/ctdb_bench --socket sock.$i -n $NUMNODES $*
done
wait
-ctdb shutdown --socket sock.1 -n all
+bin/ctdb shutdown --socket sock.1 -n all
=== modified file 'tests/ctdb_bench.c'
--- a/tests/ctdb_bench.c2007-06-02 03:16:11 +
+++ b/tests/ctdb_bench.c2007-06-02 03:31:36 +
@@ -44,8 +44,7 @@
static int timelimit = 10;
static int num_records = 10;
-static int num_msgs = 1;
-static uint32_t num_nodes;
+static int num_nodes;
enum my_functions {FUNC_INCR=1, FUNC_FETCH=2};
@@ -109,7 +108,6 @@
int vnn=ctdb_get_vnn(ctdb);
if (vnn == 0) {
- int i;
/* two messages are injected into the ring, moving
in opposite directions */
int dest, incr;
@@ -118,15 +116,13 @@
data.dptr = (uint8_t *)incr;
data.dsize = sizeof(incr);
- for (i=0;inum_msgs;i++) {
- incr = 1;
- dest = (ctdb_get_vnn(ctdb) + incr) % num_nodes;
- ctdb_send_message(ctdb, dest, 0, data);
-
- incr = -1;
- dest = (ctdb_get_vnn(ctdb) + incr) % num_nodes;
- ctdb_send_message(ctdb, dest, 0, data);
- }
+ incr = 1;
+ dest = (ctdb_get_vnn(ctdb) + incr) % num_nodes;
+ ctdb_send_message(ctdb, dest, 0, data);
+
+ incr = -1;
+ dest = (ctdb_get_vnn(ctdb) + incr) % num_nodes;
+ ctdb_send_message(ctdb, dest, 0, data);
}
start_timer();
@@ -168,7 +164,7 @@
POPT_CTDB_CMDLINE
{ timelimit, 't', POPT_ARG_INT, timelimit, 0, timelimit,
integer },
{ num-records, 'r', POPT_ARG_INT, num_records, 0,
num_records, integer },
- { num-msgs, 'n', POPT_ARG_INT, num_msgs, 0, num_msgs,
integer },
+ { NULL, 'n', POPT_ARG_INT, num_nodes, 0, num_nodes,
integer },
POPT_TABLEEND
};
int opt;
@@ -220,12 +216,13 @@
goto error;
printf(Waiting for cluster\n);
- while (!cluster_ready) {
+ while (1) {
+ uint32_t recmode=1;
+ ctdb_ctrl_getrecmode(ctdb, timeval_zero(), CTDB_CURRENT_NODE,
recmode);
+ if (recmode == 0) break;
event_loop_once(ev);
}
- ctdb_get_connected_nodes(ctdb, timeval_zero(), ctdb, num_nodes);
-
bench_ring(ctdb, ev);
error:
=== modified file 'tests/ctdb_fetch.c'
---
