Re: [Samba] Tuning the performance of Samba over LAN network to improve I/O performance
Hallo, Himanshu, Du meintest am 05.08.09: The approximate average numbers I am getting over LAN are: Write: around 23Mbits/sec Read: around 33Mbits/sec Try netio for checking the possible transfer rate: http://arktur.de/Wiki/Zusatzprogramme:netio Viele Gruesse! Helmut -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Tuning the performance of Samba over LAN network to improve I/O performance
Hallo, Jeremy, Du meintest am 05.08.09: For the numbers I am gettingWriting averages around 23Mbytes/sec and Reading averages around 33Mbytes/sec. I am aiming for 30 plus for writing and around 40 for reading. Both seem to be reasonable. True, but first use hdparm to see what your raw disk numbers should be. Also you first posted Mbits/sec, not Mbytes, which were *very* low numbers :-). And if he uses PCI network cards then there's a PCI bus limit to about 33 MByte/s. Even with Gigabit cards. Viele Gruesse! Helmut -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] inotify_handler No data on inotify fd?
On Wed, Aug 05, 2009 at 09:06:50AM -0500, Kyle Schmitt wrote: When I logged into the server, lsof told me the offending client had a single Excel file open about 1300 times, and I found their samba process had been running for 14 hours. This is the second time someone reports a mad excel. If there was a way to reproduce this here, I would be very happy... Volker signature.asc Description: Digital signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] wbinfo returns no domain users
Are you joining to a Samba or Windows PDC? On Wed, 5 Aug 2009 17:30:03 -0700 Jeremy Allison j...@samba.org wrote: On Mon, Jul 27, 2009 at 05:51:45PM -0300, Herbert G. Fischer wrote: Hi, I've spent two days trying to figure out how to solve this, researching on the web, etc, and found no answer... :S I've setup a Ubuntu 9.04 with Samba and Winbind, joined the domain (using RPC) and when I try to list users and groups using wbinfo I got nothing. I already tryed deleting tdb files from /var/lib/samba and restarting samba and winbind, joined the domain again, etc, and nothing changed this behavior. Any idea on where may be the problem and how to solve it? I think Guenther just checked a fix for this into the 3.3 and 3.2 trees. Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Trust relationship and trusting member servers
I'm in the process of migrating from a Samba PDC to a Win2k3 PDC (all member servers will remain as Samba boxes). NEWDOMAIN = new Win2k3 PDC OLDDOMAIN = current samba PDC OLDDOMAIN_MEMBER = a current samba box that's a member of OLDDOMAIN I've successfully established a trust relationship between OLDOMAIN and NEWDOMAIN where OLDDOMAIN trusts NEWDOMAIN. Users in NEWDOMAIN have full access to resources on the OLDDOMAIN PDC. Where I'm stuck is granting access to OLDDOMAIN_MEMBER to users in NEWDOMAIN. OLDDOMAIN_MEMBER is joined to OLDDOMAIN and works as expected (Users in OLDDOMAIN can access resources on OLDDOMAIN_MEMBER. But users in NEWDOMAIN do not. Can someone help with the general concept here? Should it work as I've configured it? Does OLDDOMAIN_MEMBER need to be running winbind against OLDDOMAIN PDC, or even NEWDOMAIN? (although I don't see how the latter would work without moving OLDDOMAIN_MEMBER to NEWDOMAIN). Sorry if this is confusing -- tried to make it as clear as possible. Steve -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] wbinfo returns no domain users
hi:) check your steps with this tutorial: http://www.aliencgi.com/Active-Directory/16/ when you installed the kerberos packages did you get a blue window where you entered the ad server, the realm? Gabi a great photo story about Dracula's Castle: http://www.setimes.com/cocoon/setimes/xhtml/en_GB/features/setimes/features/2009/07/31/feature-03 On Thu, Aug 6, 2009 at 3:55 PM, Steve Chupacksteve.chup...@dealer.com wrote: Are you joining to a Samba or Windows PDC? On Wed, 5 Aug 2009 17:30:03 -0700 Jeremy Allison j...@samba.org wrote: On Mon, Jul 27, 2009 at 05:51:45PM -0300, Herbert G. Fischer wrote: Hi, I've spent two days trying to figure out how to solve this, researching on the web, etc, and found no answer... :S I've setup a Ubuntu 9.04 with Samba and Winbind, joined the domain (using RPC) and when I try to list users and groups using wbinfo I got nothing. I already tryed deleting tdb files from /var/lib/samba and restarting samba and winbind, joined the domain again, etc, and nothing changed this behavior. Any idea on where may be the problem and how to solve it? I think Guenther just checked a fix for this into the 3.3 and 3.2 trees. Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Tuning the performance of Samba over LAN network to improve I/O performance
And if he uses PCI network cards then there's a PCI bus limit to about 33 MByte/s. Even with Gigabit cards. What leads you to say that? All the documentation I know gives 32 bit PCI a theoretical bandwidth of *133.33* MByte/s, sometimes a 127.2 practical one. You can Google PCI bandwidth and look at what comes out. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] moving from nt4 to active directory
I have 2 AIX systems that run Samba. We are currently on an NT4 domain and moving to Active directory. I am trying to find out what all would be needed to make that transition. The only authenification is for users connecting to their shares. I read one site via Google that states I need to create a user (Rocky) on both Samba and the AD server with different passwords but this does not seem right. My AIX servers are version 5.3 I am running an older version of Samba 2.2.7-4 but could upgrade if needed. The AD servers are Win2K3. I was just wondering if anyone else has done this and if maybe someone could shed some light on the procedure to do this. I am not well versed in Samba (I can bang around but don't know all the ins and outs) Thanks -- View this message in context: http://www.nabble.com/moving-from-nt4-to-active-directory-tp24834321p24834321.html Sent from the Samba - General mailing list archive at Nabble.com. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Reverse Veto Files - let's try again!
Charles Marcus wrote: It would be much more flexible if the use of the ! as an exception designator was allowed for both the Allow and Veto Files options, so for the above, you could: Allowed Files = !foo.jpg, *.jpg But now we've gone full circle, and you may as well just extend the Veto Files syntax to allow: Veto Files = foo.jpg, !*.jpg, * To allow the same thing, and save us from introducting another configuration option (assuming a first match and that matching anything following a ! is allowed) *Taking the suggestion that Veto Files takes precedence, and that Allowed Files implies that all other files are vetoed, then your requirement would be met by: Veto Files = foo.jpg Allowed Files = *.jpg Although that could be confusing for a user - why is my bar.gif file not allowed, it's not in the Veto Files list? ...unless there's more direction on this, I'll just (try to) implement * above and somebdy else can throw it all out and do Something Better. I won't have time to look at this until September at the earliest. -- Illtud Daniel illtud.dan...@llgc.org.uk Prif Swyddog Technegol Chief Technical Officer Llyfrgell Genedlaethol Cymru National Library of Wales -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Reverse Veto Files - let's try again!
On 8/6/2009, Illtud Daniel (illtud.dan...@llgc.org.uk) wrote: But now we've gone full circle, and you may as well just extend the Veto Files syntax to allow: Veto Files = foo.jpg, !*.jpg, * This is what I meant. Keep both options, just give them the ability to take the ! as an exception character. Actually, I think *all* options like this - where you can express a list of valid/invalid items should allow the use of the ! not character. It just adds a lot more flexibility... -- Best regards, Charles -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Reverse Veto Files - let's try again!
On Thu, Aug 06, 2009 at 04:36:51PM +0100, Illtud Daniel wrote: But now we've gone full circle, and you may as well just extend the Veto Files syntax to allow: Veto Files = foo.jpg, !*.jpg, * To allow the same thing, and save us from introducting another configuration option (assuming a first match and that matching anything following a ! is allowed) *Taking the suggestion that Veto Files takes precedence, and that Allowed Files implies that all other files are vetoed, then your requirement would be met by: Veto Files = foo.jpg Allowed Files = *.jpg Although that could be confusing for a user - why is my bar.gif file not allowed, it's not in the Veto Files list? ...unless there's more direction on this, I'll just (try to) implement * above and somebdy else can throw it all out and do Something Better. I won't have time to look at this until September at the earliest. Don't change the veto files semantics please. Just add the Allowed files option. Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Reverse Veto Files - let's try again!
On Thu, Aug 06, 2009 at 12:19:21PM -0400, Charles Marcus wrote: On 8/6/2009, Illtud Daniel (illtud.dan...@llgc.org.uk) wrote: But now we've gone full circle, and you may as well just extend the Veto Files syntax to allow: Veto Files = foo.jpg, !*.jpg, * This is what I meant. Keep both options, just give them the ability to take the ! as an exception character. No, don't do this. Leave veto files alone, and just add an allowed files option we can layer on top. Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba HA issue
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 David Christensen wrote: David Markey wrote: Yup unfortunately rights granted using net sam/rpc and usrmgr are saved locally in a TDB file(account_policy), this should probably be in LDAP, i suppose it sould be possible to rsync the tdb file. On Wed, 5 Aug 2009 17:10:54 -0500, David Christensen david.christen...@viveli.com wrote: John Du wrote: David Christensen wrote: Liutauras Adomaitis wrote: On Tue, Aug 4, 2009 at 7:39 PM, David Christensendavid.christen...@viveli.commailto:david.christen...@viveli.com wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 With samba configured for high availability using heartbeat, I am not able to join new computers to the domain after a fail over. If I fail back to the main samba instance I can join the computer to the domain. However With samba in a fail over state and running on the backup PDC users can still authenticate and gain access to their shares. I have the two instances of samba configured nearly identical except for having them pointed to the instance of ldap that is running on the server itself (which is being replicated). Is there something else, some tdb file etc, that needs to be shared between the two instances of samba so a fail over appears identical to the ldap backend? Thanks. If you are running PDC+BDC configuration with LDAP backend with replication, then you must have master to master replication. In case of master - slave replication you canot write ot slave while your muster is not accessible. Usual slave has a redirection to master for write operations. Slave is readonly and thats why you can authenticate to BDC, but cannot join new machines to the domain. This may be your case Liutauras Liutauras, I have ldap using master-master replication so writing to either ldap instance is no problem. In addition I have both instances of samba configured as PDC's (the smb.conf file is identical on both PDC's except for two things, the ldap each talks to and the host name of the PDC itself; not using the netbios parameter), however only one of them is running at a time. The issue occurs when the 2nd PDC comes online. Based on the ldap logs the query I am seeing from the 2nd PDC in a failed over state is not the same query that the primary PDC does when I add a new computer successfuly. I never see the lookup for the admin user who has the right to add a computer, along with other missing search strings. Is there some SID or some other serial number etc. that the 2nd PDC is lacking that is causing this symptom? Why would a query from a near identical instance of samba to the same ldap DB be so different? I had the same problem with samba 3.0.28 on rhel 4. I fixed my problem by issuing net rpc grant .. commands on the backup PDC. I never understood why it behaved that way but those commands worked for me. I thought those rights were in the LDAP database but it seemed that those rights are stored on the individual servers somehow. John, Not familiar with net rpc grant, where is the invoked or added? David, I did a diff between the two account_policy files on either instance of samba and they are identical. Is this the only file where server rights are stored? I ran the net rpc grant rights on the offending server however the issue remains. I am using samba 3.2.11, is there any documentation on how to setup a second PDC for disaster recovery purposes and grant it the same rights to add computers as the primary? Based on the ldap queries the issue does look to be privilege related but I am at a loss, being a samba newbie. How and where does the hostname affect queries for the same domain? -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (GNU/Linux) Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org iEYEARECAAYFAkp7GLYACgkQ5B+8XEnAvqudFwCfeaVnTv1Nui08s19nKrG3DOBT JggAn2LdTldCNaHPpmajPQ9Mk5/s07uL =Gee2 -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Problem after upgrade to 3.0.28a-1ubuntu4.8
Hi all, I have just upgraded my Ubuntu 8.04.3 LTS to samba 3.0.28a-1ubuntu4.8. Now I cannot run some apps (installed on network mapped drives) I used to be able to run. My user is a domain admin. I don't even know how to start debugging this problem. It happens with only some users but not all, regardless of group membership or file permissions. Translating from portuguese, the error means Windows cannot access the device, path or file specified. Maybe you don't have rights to access the item. But I can copy, move, delete, write, etc with no problem. Just can't run it. Can any kind soul please help me? This is urgent, sorry. -- Marcio Merlone -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] migrating from freebsd to linux - wbinfo mismatch
We're beginning a migration from FreeBSD w/ Samba Version 3.0.28a to Gentoo Linux w/ Samba Version 3.0.33. Both the BSD system and the Linux system are joined to the domain, using the same krb5.conf file and nearly identical global sections of the smb.conf file. What I've found is the UID and GID are not aligned with each other. For example: (dc2: 14:52:53 /var/db/samba) 0 # wbinfo -i jofficer jofficer:*:10019:10018:Joey Officer fs1 private # wbinfo -i jofficer jofficer:*:10017:1:Joey Officer In this case, dc2 is the original BSD system and fs1 is the new Linux box. In addition to the UIDs being off, the GIDs are also off: (dc2: 14:54:54 /var/db/samba) 0 # wbinfo --group-info domain users domain users:x:10018 fs1 private # wbinfo --group-info domain users domain users:x:1 Normally, I wouldn't immediately recognize this as a problem, however since I migrated the files and directories from DC2, all of the user/group ownerships are skewed and therefore a user would be unable to gain access to their files. Can anyone offer any insight into the problem here? Joey Officer Systems Administrator iStream Financial Services 262-432-1536 CONFIDENTIALITY NOTICE This electronic mail and the information contained herein are intended for the named recipient only. It may contain confidential, proprietary and/or privileged information. If you have received this electronic mail in error, please do not read any text other than the text of this notice and do not open any attachments. Also, please immediately notify the sender by replying to this electronic mail or by collect call to (262) 796-0925. After notifying the sender as described above, please delete this electronic mail message immediately and purge the item from the deleted items folder (or the equivalent) of your electronic mail system. Thank you. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Michael Weiss ist außer Haus.
Ich werde ab 06.08.2009 nicht im Büro sein. Ich kehre zurück am 26.08.2009. Bitte wenden Sie sich mit dringenden Angelegenheiten an strohb...@denic.de. Danke. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Reverse Veto Files - let's try again!
Jeremy Allison wrote: Don't change the veto files semantics please. Just add the Allowed files option. Just to clear up any confusion, that's what I said. (or tried to say). -- Illtud Daniel illtud.dan...@llgc.org.uk Prif Swyddog Technoleg Chief Technical Officer Llyfrgell Genedlaethol Cymru National Library of Wales -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Reverse Veto Files - let's try again!
On Thu, Aug 06, 2009 at 09:40:50PM +0100, Illtud Daniel wrote: Jeremy Allison wrote: Don't change the veto files semantics please. Just add the Allowed files option. Just to clear up any confusion, that's what I said. (or tried to say). Oh, ok - thanks. I misunderstood. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] migrating from freebsd to linux - wbinfo mismatch
For testing sake, we did opt to copy the winbind cache files. And once we finalize the conversion, we can do the same thing. When you say ... each machine will hand them out to users independently of other machines, in the order in which they first hit the server. Do you mean in the order that getend passwd and getend group lists the users and groups available? As a side note, another Linux box I use for testing appears to use the same UID/GID as the new Linux file server (fs1 from earlier). I'm not familiar with using RID ids, but Dale also mentioned this as a solution. I will spend some time reading up on RIDs tomorrow. Thanks for the feed back. -Original Message- From: Steve Rippl [mailto:rip...@woodlandschools.org] Sent: Thursday, August 06, 2009 3:28 PM To: Joey Officer Subject: Re: [Samba] migrating from freebsd to linux - wbinfo mismatch Assuming you're using winbind to map uid/gid, each machine will hand them out to users independently of other machines, in the order in which they first hit the server. If you want consistent uid/gid between machines you need to use rid or ldap. I guess if you're migrating away from one to the other you could move your winbind cache files over to the new machine, but you couldn't have them running at the same time with new users and expect them to stay synced. Joey Officer wrote: We're beginning a migration from FreeBSD w/ Samba Version 3.0.28a to Gentoo Linux w/ Samba Version 3.0.33. Both the BSD system and the Linux system are joined to the domain, using the same krb5.conf file and nearly identical global sections of the smb.conf file. What I've found is the UID and GID are not aligned with each other. For example: (dc2: 14:52:53 /var/db/samba) 0 # wbinfo -i jofficer jofficer:*:10019:10018:Joey Officer fs1 private # wbinfo -i jofficer jofficer:*:10017:1:Joey Officer In this case, dc2 is the original BSD system and fs1 is the new Linux box. In addition to the UIDs being off, the GIDs are also off: (dc2: 14:54:54 /var/db/samba) 0 # wbinfo --group-info domain users domain users:x:10018 fs1 private # wbinfo --group-info domain users domain users:x:1 Normally, I wouldn't immediately recognize this as a problem, however since I migrated the files and directories from DC2, all of the user/group ownerships are skewed and therefore a user would be unable to gain access to their files. Can anyone offer any insight into the problem here? Joey Officer Systems Administrator iStream Financial Services 262-432-1536 CONFIDENTIALITY NOTICE This electronic mail and the information contained herein are intended for the named recipient only. It may contain confidential, proprietary and/or privileged information. If you have received this electronic mail in error, please do not read any text other than the text of this notice and do not open any attachments. Also, please immediately notify the sender by replying to this electronic mail or by collect call to (262) 796-0925. After notifying the sender as described above, please delete this electronic mail message immediately and purge the item from the deleted items folder (or the equivalent) of your electronic mail system. Thank you. -- Steve Rippl Technology Director Woodland School District 360 225 9451 x326 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] 20 second delays when accessing Samba on Fedora 11
I had samba running fine on a Fedora 6 machine. I've upgraded to Fedora 11 and I'm getting huge delays when first accessing a folder. With Fedora 11 I'm ussing samba-3.3.2-0.33.fc11.i586. I'm getting about 60+ second delays before being requested to enter my username/password. I've used WireShark and can see 1) Session Setup AndX Request, NTLMSSP_NEGOTIATE 2) 20 seconds pass 3) Session Setup AndX Request, NTLMSSP_AUTH, User: xxx/yyy from my PC 4) 20 seconds passes 5) Session Setup AndX Request, NTLMSSP_AUTH, User: xxx/yyy from my PC 6) again, 20 sec 7) Session Setup AndX Request, NTLMSSP_AUTH, User: xxx/yyy from my PC Then it asks me for username/password and I can access the share. There isn't anything unique in my smb.conf compared to before (when it worked well with Fedora 6). Highlights are below. workgroup = HOME server string = Wonka netbios name = Wonka interfaces = lo eth1 security = user passdb backend = tdbsam [homes] comment = Home Directories browseable = no writable = yes [Miscellaneous] path = /media/home/public/Miscellaneous writeable = yes browseable = yes guest ok = no All my PCs have this problem and they all run XP. Any thoughts or suggestions are greatly appreciated. ... Altan -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] I am try to install samba on debian 2.6
i am new to samba i want install PDC on debian2.6 with xp prop. please help me -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Build status as of Thu Aug 6 06:00:01 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-08-05 00:00:06.0 -0600 +++ /home/build/master/cache/broken_results.txt 2009-08-06 00:00:11.0 -0600 @@ -1,22 +1,22 @@ -Build status as of Wed Aug 5 06:00:01 2009 +Build status as of Thu Aug 6 06:00:01 2009 Build counts: Tree Total Broken Panic build_farm 0 0 0 -ccache 3 1 0 +ccache 23 6 0 distcc 0 0 0 ldb 32 32 0 libreplace 2 0 0 lorikeet 0 0 0 pidl 3 0 0 -ppp 1 0 0 -rsync32 13 0 +ppp 8 0 0 +rsync4 2 0 samba-docs 0 0 0 samba-web0 0 0 -samba_3_current 28 17 0 -samba_3_master 29 29 0 -samba_3_next 29 25 1 -samba_4_0_test 31 25 5 +samba_3_current 29 17 0 +samba_3_master 29 26 6 +samba_3_next 29 26 2 +samba_4_0_test 32 27 2 talloc 4 4 0 -tdb 4 4 0 +tdb 25 25 0
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-851-g54dffbe
The branch, master has been updated via 54dffbea663ecf4542d6c5e30da6e346d5d60424 (commit) from 252f7da702fd0409f7bfff05ef594911ededa32f (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 54dffbea663ecf4542d6c5e30da6e346d5d60424 Author: Karolin Seeger ksee...@samba.org Date: Thu Aug 6 10:06:29 2009 +0200 s3/smbldap: Fix typo in debug message. Karolin --- Summary of changes: source3/lib/smbldap.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c index 4833b96..c96801a 100644 --- a/source3/lib/smbldap.c +++ b/source3/lib/smbldap.c @@ -1449,7 +1449,7 @@ int smbldap_search_paged(struct smbldap_state *ldap_state, goto done; } - DEBUG(3,(smbldap_search_paged: search was successfull\n)); + DEBUG(3,(smbldap_search_paged: search was successful\n)); rc = ldap_parse_result(ldap_state-ldap_struct, *res, NULL, NULL, NULL, NULL, rcontrols, 0); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1202-gbddd55f
The branch, v3-4-test has been updated via bddd55fa8a20a7a2d6d521ec951d13f548950b26 (commit) from 5c6aa5ce9fb0cc5d63d04b0777d296c82e61c0a5 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit bddd55fa8a20a7a2d6d521ec951d13f548950b26 Author: Karolin Seeger ksee...@samba.org Date: Thu Aug 6 10:06:29 2009 +0200 s3/smbldap: Fix typo in debug message. Karolin (cherry picked from commit 54dffbea663ecf4542d6c5e30da6e346d5d60424) --- Summary of changes: source3/lib/smbldap.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c index f86b711..8c2b26d 100644 --- a/source3/lib/smbldap.c +++ b/source3/lib/smbldap.c @@ -1409,7 +1409,7 @@ int smbldap_search_paged(struct smbldap_state *ldap_state, goto done; } - DEBUG(3,(smbldap_search_paged: search was successfull\n)); + DEBUG(3,(smbldap_search_paged: search was successful\n)); rc = ldap_parse_result(ldap_state-ldap_struct, *res, NULL, NULL, NULL, NULL, rcontrols, 0); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5338-g2538df1
The branch, v3-3-test has been updated via 2538df1ea3229ea6d8242b5ae6fdd3d453395609 (commit) from 4e854cb52cfb4f3c25c92324c6e7505f1c8290b3 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 2538df1ea3229ea6d8242b5ae6fdd3d453395609 Author: Karolin Seeger ksee...@samba.org Date: Thu Aug 6 10:06:29 2009 +0200 s3/smbldap: Fix typo in debug message. Karolin (cherry picked from commit 54dffbea663ecf4542d6c5e30da6e346d5d60424) --- Summary of changes: source/lib/smbldap.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/lib/smbldap.c b/source/lib/smbldap.c index 03c6573..704a516 100644 --- a/source/lib/smbldap.c +++ b/source/lib/smbldap.c @@ -1409,7 +1409,7 @@ int smbldap_search_paged(struct smbldap_state *ldap_state, goto done; } - DEBUG(3,(smbldap_search_paged: search was successfull\n)); + DEBUG(3,(smbldap_search_paged: search was successful\n)); rc = ldap_parse_result(ldap_state-ldap_struct, *res, NULL, NULL, NULL, NULL, rcontrols, 0); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3641-g85f3b70
The branch, v3-2-test has been updated via 85f3b70d4aca641339b86f71b551156fa9aa27cb (commit) from eb1c74737e5d40ae85102613a4dfcd89a3235feb (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 85f3b70d4aca641339b86f71b551156fa9aa27cb Author: Karolin Seeger ksee...@samba.org Date: Thu Aug 6 10:06:29 2009 +0200 s3/smbldap: Fix typo in debug message. Karolin (cherry picked from commit 54dffbea663ecf4542d6c5e30da6e346d5d60424) (cherry picked from commit 2538df1ea3229ea6d8242b5ae6fdd3d453395609) --- Summary of changes: source/lib/smbldap.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/lib/smbldap.c b/source/lib/smbldap.c index 315b1e3..9189627 100644 --- a/source/lib/smbldap.c +++ b/source/lib/smbldap.c @@ -1348,7 +1348,7 @@ int smbldap_search_paged(struct smbldap_state *ldap_state, goto done; } - DEBUG(3,(smbldap_search_paged: search was successfull\n)); + DEBUG(3,(smbldap_search_paged: search was successful\n)); rc = ldap_parse_result(ldap_state-ldap_struct, *res, NULL, NULL, NULL, NULL, rcontrols, 0); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-853-g915b789
The branch, master has been updated via 915b789c874e661dbd240e1fe3ba35f67746fdd0 (commit) via 1ce36ed74745632baca9a55a00ab748c21367632 (commit) from 54dffbea663ecf4542d6c5e30da6e346d5d60424 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 915b789c874e661dbd240e1fe3ba35f67746fdd0 Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de Date: Thu Aug 6 11:38:06 2009 +0200 s4: Simplify two lines in the samdb.py file (cosmetic) commit 1ce36ed74745632baca9a55a00ab748c21367632 Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de Date: Wed Aug 5 23:17:21 2009 +0200 s4:enableaccount script: Remove a redundant line --- Summary of changes: source4/scripting/python/samba/samdb.py |3 +-- source4/setup/enableaccount |1 - 2 files changed, 1 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py index 6cb2469..631f31c 100644 --- a/source4/scripting/python/samba/samdb.py +++ b/source4/scripting/python/samba/samdb.py @@ -81,8 +81,7 @@ description: %s res = self.search(user_dn, ldb.SCOPE_BASE, None, [userAccountControl]) assert len(res) == 1 -userAccountControl = res[0][userAccountControl][0] -userAccountControl = int(userAccountControl) +userAccountControl = int(res[0][userAccountControl][0]) if (userAccountControl 0x2): userAccountControl = userAccountControl ~0x2 # remove disabled bit if (userAccountControl 0x20): diff --git a/source4/setup/enableaccount b/source4/setup/enableaccount index b270da0..1b73419 100755 --- a/source4/setup/enableaccount +++ b/source4/setup/enableaccount @@ -56,7 +56,6 @@ else: samdb = SamDB(url=url, session_info=system_session(), credentials=creds, lp=lp) -domain_dn = opts.base if opts.base is None: res = samdb.search(, scope=ldb.SCOPE_BASE, expression=(defaultNamingContext=*), -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-854-g857140a
The branch, master has been updated
via 857140a79fb9cd186ed7f33aaf92934080256a3c (commit)
from 915b789c874e661dbd240e1fe3ba35f67746fdd0 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 857140a79fb9cd186ed7f33aaf92934080256a3c
Author: Bo Yang boy...@samba.org
Date: Fri Aug 7 13:42:51 2009 +0800
Unable to browse DFS when using kerberos
Signed-off-by: Bo Yang boy...@samba.org
---
Summary of changes:
source3/libsmb/libsmb_context.c | 22 ++
1 files changed, 14 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/libsmb_context.c b/source3/libsmb/libsmb_context.c
index 8b22ee5..78c9a55 100644
--- a/source3/libsmb/libsmb_context.c
+++ b/source3/libsmb/libsmb_context.c
@@ -692,22 +692,28 @@ void smbc_set_credentials_with_fallback(SMBCCTX *context,
{
smbc_bool use_kerberos = false;
const char *signing_state = off;
- struct user_auth_info *auth_info = user_auth_info_init(NULL);
+ struct user_auth_info *auth_info = NULL;
- if (auth_info) {
+ if (! context) {
+
+ return;
+ }
+
+ if (! workgroup || ! *workgroup) {
+ workgroup = smbc_getWorkgroup(context);
}
- if (! context ||
- ! workgroup || ! *workgroup ||
- ! user || ! *user ||
- ! password || ! *password) {
+ if (! user) {
+ user = smbc_getUser(context);
+ }
- return;
+ if (! password) {
+ password = ;
}
auth_info = user_auth_info_init(NULL);
- if (auth_info) {
+ if (! auth_info) {
DEBUG(0, (smbc_set_credentials_with_fallback: allocation
fail\n));
return;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-855-g8a5cc13
The branch, master has been updated
via 8a5cc1317ad4f5705b8a74286eb2b7dfdc9d89b4 (commit)
from 857140a79fb9cd186ed7f33aaf92934080256a3c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 8a5cc1317ad4f5705b8a74286eb2b7dfdc9d89b4
Author: Günther Deschner g...@samba.org
Date: Thu Aug 6 17:17:26 2009 +0200
s3-ldap: Fix Bug #5879. Update LDAP schema for Netscape DS 5.
Patch from TAKEDA Yasuma yas...@osstech.co.jp.
Guenther
---
Summary of changes:
examples/LDAP/samba-schema-netscapeds5.x |7 ++-
1 files changed, 6 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/examples/LDAP/samba-schema-netscapeds5.x
b/examples/LDAP/samba-schema-netscapeds5.x
index efc528b..661521c 100644
--- a/examples/LDAP/samba-schema-netscapeds5.x
+++ b/examples/LDAP/samba-schema-netscapeds5.x
@@ -4,9 +4,11 @@
## Thomas Mueller 12.04.2003, thomas.muel...@christ-wasser.de
## Richard Renard rren...@idealx.com 2005-01-28
## - added support for MungedDial, BadPasswordCount, BadPasswordTime,
PasswordHistory, LogonHours
+## TAKEDA Yasuma yas...@osstech.co.jp 2008-11-06
+## - added sambaTrustedDomainPassword objectClasses
## - in Sun One 5.2 copy it as 99samba-schema-netscapeds5.ldif
##
-## Samba 3.0 schema file for Netscape DS 5.x
+## Samba 3.2 schema file for Netscape DS 5.x
##
##
INSTALL-DIRECTORY/slapd-your_name/config/schema/samba-schema-netscapeds5.ldif
@@ -33,6 +35,7 @@ objectClasses: ( 1.3.6.1.4.1.7165.2.2.5 NAME 'sambaDomain'
SUP top STRUCTURAL DE
objectClasses: ( 1.3.6.1.4.1.7165.1.2.2.7 NAME 'sambaUnixIdPool' SUP top
AUXILIARY DESC 'Pool for allocating UNIX uids/gids' MUST ( uidNumber $
gidNumber ) X-ORIGIN 'user defined' )
objectClasses: ( 1.3.6.1.4.1.7165.1.2.2.8 NAME 'sambaIdmapEntry' SUP top
AUXILIARY DESC 'Mapping from a SID to an ID' MUST ( sambaSID ) MAY ( uidNumber
$ gidNumber ) X-ORIGIN 'user defined' )
objectClasses: ( 1.3.6.1.4.1.7165.1.2.2.9 NAME 'sambaSidEntry' SUP top
STRUCTURAL DESC 'Structural Class for a SID' MUST ( sambaSID ) X-ORIGIN 'user
defined' )
+objectClasses: ( 1.3.6.1.4.1.7165.2.2.15 NAME 'sambaTrustedDomainPassword' SUP
top STRUCTURAL DESC 'Samba Trusted Domain Password' MUST ( sambaDomainName $
sambaSID $ sambaClearTextPassword $ sambaPwdLastSet ) MAY (
sambaPreviousClearTextPassword ) X-ORIGIN 'user defined')
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.24 NAME 'sambaLMPassword' DESC
'LanManager Password' EQUALITY caseIgnoreIA5Match SYNTAX
1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE X-ORIGIN 'user defined' )
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.25 NAME 'sambaNTPassword' DESC 'MD4
hash of the unicode password' EQUALITY caseIgnoreIA5Match SYNTAX
1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE X-ORIGIN 'user defined' )
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.26 NAME 'sambaAcctFlags'DESC
'Account Flags' EQUALITY caseIgnoreIA5Match SYNTAX
1.3.6.1.4.1.1466.115.121.1.26{16} SINGLE-VALUE X-ORIGIN 'user defined' )
@@ -60,3 +63,5 @@ attributeTypes: ( 1.3.6.1.4.1.7165.2.1.21 NAME
'sambaNextUserRid' DESC 'Next NT
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.22 NAME 'sambaNextGroupRid' DESC 'Next
NT rid to give out for groups' EQUALITY integerMatch SYNTAX
1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user defined' )
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.39 NAME 'sambaNextRid' DESC 'Next NT
rid to give out for anything' EQUALITY integerMatch SYNTAX
1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user defined' )
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.40 NAME 'sambaAlgorithmicRidBase' DESC
'Base at which the samba RID generation algorithm should operate' EQUALITY
integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user
defined' )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.68 NAME 'sambaClearTextPassword' DESC
'Clear text password (used for trusted domain passwords)' EQUALITY
octetStringMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 X-ORIGIN 'user defined')
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.69 NAME
'sambaPreviousClearTextPassword' DESC 'Previous clear text password (used for
trusted domain passwords)' EQUALITY octetStringMatch SYNTAX
1.3.6.1.4.1.1466.115.121.1.40 X-ORIGIN 'user defined')
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-856-g4fc9f9c
The branch, master has been updated
via 4fc9f9c3f943cdeb27e37f0ee068cdd0da7cb00c (commit)
from 8a5cc1317ad4f5705b8a74286eb2b7dfdc9d89b4 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4fc9f9c3f943cdeb27e37f0ee068cdd0da7cb00c
Author: Jeremy Allison j...@samba.org
Date: Thu Aug 6 11:47:08 2009 -0700
Add define guards around otherwise unused variable.
Jeremy.
---
Summary of changes:
lib/tdb/common/open.c |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tdb/common/open.c b/lib/tdb/common/open.c
index 2dcdd4b..2e6a707 100644
--- a/lib/tdb/common/open.c
+++ b/lib/tdb/common/open.c
@@ -407,7 +407,10 @@ void *tdb_get_logging_private(struct tdb_context *tdb)
static int tdb_reopen_internal(struct tdb_context *tdb, bool active_lock)
{
+#if !defined(LIBREPLACE_PREAD_NOT_REPLACED) || \
+ !defined(LIBREPLACE_PWRITE_NOT_REPLACED)
struct stat st;
+#endif
if (tdb-flags TDB_INTERNAL) {
return 0; /* Nothing to do. */
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-857-ge76af51
The branch, master has been updated
via e76af514c3a99a6c65398a9d7a99012ff73583eb (commit)
from 4fc9f9c3f943cdeb27e37f0ee068cdd0da7cb00c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e76af514c3a99a6c65398a9d7a99012ff73583eb
Author: Jeremy Allison j...@samba.org
Date: Thu Aug 6 12:50:16 2009 -0700
Put SMB_INFO_STANDARD back into setfileinfo, but do it right
this time :-).
Jeremy.
---
Summary of changes:
source3/smbd/trans2.c | 45 +
1 files changed, 45 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 184a858..21c5062 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -6110,6 +6110,41 @@ static NTSTATUS
smb_set_file_basic_info(connection_struct *conn,
}
/
+ Deal with SMB_INFO_STANDARD.
+/
+
+static NTSTATUS smb_set_info_standard(connection_struct *conn,
+ const char *pdata,
+ int total_data,
+ files_struct *fsp,
+ const struct smb_filename *smb_fname)
+{
+ struct smb_file_time ft;
+
+ ZERO_STRUCT(ft);
+
+ if (total_data 12) {
+ return NT_STATUS_INVALID_PARAMETER;
+ }
+
+ /* create time */
+ ft.create_time = convert_time_t_to_timespec(srv_make_unix_date2(pdata));
+ /* access time */
+ ft.atime = convert_time_t_to_timespec(srv_make_unix_date2(pdata+4));
+ /* write time */
+ ft.mtime = convert_time_t_to_timespec(srv_make_unix_date2(pdata+8));
+
+ DEBUG(10,(smb_set_info_standard: file %s\n,
+ smb_fname_str_dbg(smb_fname)));
+
+return smb_set_file_time(conn,
+fsp,
+ smb_fname,
+ ft,
+true);
+}
+
+/
Deal with SMB_SET_FILE_ALLOCATION_INFO.
/
@@ -7086,6 +7121,16 @@ NTSTATUS smbd_do_setfilepathinfo(connection_struct *conn,
switch (info_level) {
+ case SMB_INFO_STANDARD:
+ {
+ status = smb_set_info_standard(conn,
+ pdata,
+ total_data,
+ fsp,
+ smb_fname);
+ break;
+ }
+
case SMB_INFO_SET_EA:
{
status = smb_info_set_ea(conn,
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-858-g650445f
The branch, master has been updated via 650445fc3cb8f61fdb6e570e46226fff101bb174 (commit) from e76af514c3a99a6c65398a9d7a99012ff73583eb (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 650445fc3cb8f61fdb6e570e46226fff101bb174 Author: Jeremy Allison j...@samba.org Date: Thu Aug 6 15:09:01 2009 -0700 Fix bug #5714 - NetBSD, ENODATA undefined, at least some releases. Jeremy. --- Summary of changes: source3/include/includes.h |4 1 files changed, 4 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/includes.h b/source3/include/includes.h index a636716..2d82e6e 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -207,7 +207,11 @@ typedef int ber_int_t; #endif #ifndef ENOATTR +#if defined(ENODATA) #define ENOATTR ENODATA +#else +#define ENOATTR ENOENT +#endif #endif /* mutually exclusive (SuSE 8.2) */ -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-859-g890dfe0
The branch, master has been updated
via 890dfe003c91f8df737e5e2e4e440e1a9f416ae8 (commit)
from 650445fc3cb8f61fdb6e570e46226fff101bb174 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 890dfe003c91f8df737e5e2e4e440e1a9f416ae8
Author: Jeremy Allison j...@samba.org
Date: Thu Aug 6 15:47:05 2009 -0700
Remove a const warning.
Jeremy.
---
Summary of changes:
source3/include/proto.h |3 ++-
source3/smbd/posix_acls.c |2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 00cfd61..ccd8746 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -6745,7 +6745,8 @@ int chmod_acl(connection_struct *conn, const char *name,
mode_t mode);
int inherit_access_posix_acl(connection_struct *conn, const char
*inherit_from_dir,
const char *name, mode_t mode);
int fchmod_acl(files_struct *fsp, mode_t mode);
-bool set_unix_posix_default_acl(connection_struct *conn, const char *fname,
SMB_STRUCT_STAT *psbuf,
+bool set_unix_posix_default_acl(connection_struct *conn, const char *fname,
+ const SMB_STRUCT_STAT *psbuf,
uint16 num_def_acls, const char *pdata);
bool set_unix_posix_acl(connection_struct *conn, files_struct *fsp, const char
*fname, uint16 num_acls, const char *pdata);
SEC_DESC *get_nt_acl_no_snum( TALLOC_CTX *ctx, const char *fname);
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 0a3b0df..8c53938 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -4360,7 +4360,7 @@ static SMB_ACL_T
create_posix_acl_from_wire(connection_struct *conn, uint16 num_
on the directory.
/
-bool set_unix_posix_default_acl(connection_struct *conn, const char *fname,
SMB_STRUCT_STAT *psbuf,
+bool set_unix_posix_default_acl(connection_struct *conn, const char *fname,
const SMB_STRUCT_STAT *psbuf,
uint16 num_def_acls, const char *pdata)
{
SMB_ACL_T def_acl = NULL;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-861-g457191e
The branch, master has been updated
via 457191e9f396898b8a511cf860f24986f36fd879 (commit)
via 09e9904f18634b135944f466c48c4be1a43b4272 (commit)
from 890dfe003c91f8df737e5e2e4e440e1a9f416ae8 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 457191e9f396898b8a511cf860f24986f36fd879
Author: Tim Prouty tpro...@samba.org
Date: Thu Aug 6 15:53:33 2009 -0700
s3: Fix a bug in renames of directories
Recently code was added to match windows semantics of denying the
rename of a directory if there are open files underneath it. This
does partly match windows semantics, but it turns out the rename
should be allowed if the open file handle is for the directory being
renamed, or for a stream on the directory being renamed. This patch
refines the check to better follow these rename semantics.
commit 09e9904f18634b135944f466c48c4be1a43b4272
Author: Tim Prouty tpro...@samba.org
Date: Thu Aug 6 11:23:23 2009 -0700
s4 torture: Extend the RAW-RENAME test to more fully test directory renames.
The existing test was only covering files opened underneath the
directory that was being renamed. It is not uncommon for windows
clients to actually hold a read-only handle to a directory open across
the rename, which it turns out doesn't return NT_STATUS_ACCESS_DENIED.
Additionally, holding a handle open to a stream on the directory is
also allowed.
---
Summary of changes:
source3/smbd/files.c | 25 -
source4/torture/raw/rename.c | 50 ++
2 files changed, 69 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index a170f77..146d809 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -404,14 +404,15 @@ bool file_find_subpath(files_struct *dir_fsp)
{
files_struct *fsp;
size_t dlen;
- char *d_fullname;
+ char *d_fullname = NULL;
+ bool ret = false;
d_fullname = talloc_asprintf(talloc_tos(), %s/%s,
dir_fsp-conn-connectpath,
dir_fsp-fsp_name-base_name);
if (!d_fullname) {
- return false;
+ goto out;
}
dlen = strlen(d_fullname);
@@ -429,15 +430,27 @@ bool file_find_subpath(files_struct *dir_fsp)
fsp-fsp_name-base_name);
if (strnequal(d_fullname, d1_fullname, dlen)) {
- TALLOC_FREE(d_fullname);
+ int d1_len = strlen(d1_fullname);
+
+ /*
+* If the open file is a second file handle to the
+* same name or is a stream on the original file, then
+* don't return true.
+*/
+ if (d1_len == dlen) {
+ TALLOC_FREE(d1_fullname);
+ continue;
+ }
+
TALLOC_FREE(d1_fullname);
- return true;
+ ret = true;
+ goto out;
}
TALLOC_FREE(d1_fullname);
}
-
+ out:
TALLOC_FREE(d_fullname);
- return false;
+ return ret;
}
/
diff --git a/source4/torture/raw/rename.c b/source4/torture/raw/rename.c
index e91c3b2..15fed0e 100644
--- a/source4/torture/raw/rename.c
+++ b/source4/torture/raw/rename.c
@@ -529,6 +529,7 @@ static bool test_dir_rename(struct torture_context *tctx,
struct smbcli_state *c
const char *dname1 = BASEDIR \\dir_for_rename;
const char *dname2 = BASEDIR \\renamed_dir;
const char *fname = BASEDIR \\dir_for_rename\\file.txt;
+ const char *sname = BASEDIR \\dir_for_rename:a stream:$DATA;
bool ret = true;
int fnum = -1;
@@ -593,6 +594,55 @@ static bool test_dir_rename(struct torture_context *tctx,
struct smbcli_state *c
status = smb_raw_rename(cli-tree, ren_io);
CHECK_STATUS(status, NT_STATUS_ACCESS_DENIED);
+ /* Close the file and try the rename. */
+ smbcli_close(cli-tree, fnum);
+
+ status = smb_raw_rename(cli-tree, ren_io);
+ CHECK_STATUS(status, NT_STATUS_OK);
+
+ /*
+* Now try just holding a second handle on the directory and holding
+* it open across a rename. This should be allowed.
+*/
+ io.ntcreatex.in.fname = dname2;
+ io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN_IF;
+
+ io.ntcreatex.in.access_mask = SEC_STD_READ_CONTROL |
+ SEC_FILE_READ_ATTRIBUTE |
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-864-gdd557cc
The branch, master has been updated
via dd557cc3613fa791d44cf34d2a1ddaaff93ab3fd (commit)
via 37b8235afe4036f7defd9465ae431cae9804fa18 (commit)
via 11ff224e13a26e4ff9fbd01dec395262aac0f9f9 (commit)
from 457191e9f396898b8a511cf860f24986f36fd879 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit dd557cc3613fa791d44cf34d2a1ddaaff93ab3fd
Author: Andrew Bartlett abart...@samba.org
Date: Fri Aug 7 14:22:54 2009 +1000
s4:ldb Make error message in rnd_name more useful
commit 37b8235afe4036f7defd9465ae431cae9804fa18
Merge: 11ff224e13a26e4ff9fbd01dec395262aac0f9f9
457191e9f396898b8a511cf860f24986f36fd879
Author: Andrew Bartlett abart...@samba.org
Date: Fri Aug 7 13:08:35 2009 +1000
Merge branch 'master' of ssh://git.samba.org/data/git/samba into
master-devel
commit 11ff224e13a26e4ff9fbd01dec395262aac0f9f9
Author: Oliver Liebel oli...@itc.li
Date: Fri Aug 7 12:38:51 2009 +1000
s4:setup Remove extra newlines that break OpenLDAP backend
---
Summary of changes:
source4/lib/ldb/modules/rdn_name.c | 12 +---
source4/setup/secrets_sasl_ldap.ldif |2 --
2 files changed, 9 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/lib/ldb/modules/rdn_name.c
b/source4/lib/ldb/modules/rdn_name.c
index 65cdb25..8b54f52 100644
--- a/source4/lib/ldb/modules/rdn_name.c
+++ b/source4/lib/ldb/modules/rdn_name.c
@@ -156,9 +156,15 @@ static int rdn_name_add(struct ldb_module *module, struct
ldb_request *req)
}
}
if (i == attribute-num_values) {
- ldb_debug_set(ldb, LDB_DEBUG_FATAL,
- RDN mismatch on %s: %s (%s),
- ldb_dn_get_linearized(msg-dn), rdn_name,
rdn_val.data);
+ char *rdn_errstring = talloc_asprintf(ac, RDN mismatch
on %s: %s (%.*s) should match one of:,
+
ldb_dn_get_linearized(msg-dn), rdn_name,
+ (int)rdn_val.length,
(const char *)rdn_val.data);
+ for (i = 0; i attribute-num_values; i++) {
+ rdn_errstring =
talloc_asprintf_append(rdn_errstring, (%.*s),
+
(int)attribute-values[i].length,
+ (const
char *)attribute-values[i].data);
+ }
+ ldb_debug_set(ldb, LDB_DEBUG_FATAL, %s,
rdn_errstring);
talloc_free(ac);
/* Match AD's error here */
return LDB_ERR_INVALID_DN_SYNTAX;
diff --git a/source4/setup/secrets_sasl_ldap.ldif
b/source4/setup/secrets_sasl_ldap.ldif
index 81ccfee..cccbedb 100644
--- a/source4/setup/secrets_sasl_ldap.ldif
+++ b/source4/setup/secrets_sasl_ldap.ldif
@@ -5,5 +5,3 @@ cn: SAMDB Credentials
secret:: ${LDAPADMINPASS_B64}
samAccountName: ${LDAPADMINUSER}
realm: ${LDAPADMINREALM}
-
-
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-865-g4aad790
The branch, master has been updated
via 4aad79041b2ababc3336db3bea90f115c5634427 (commit)
from dd557cc3613fa791d44cf34d2a1ddaaff93ab3fd (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4aad79041b2ababc3336db3bea90f115c5634427
Author: Andrew Tridgell tri...@samba.org
Date: Fri Aug 7 14:34:01 2009 +1000
make sure we never look past the end of either string in
ldb_comparison_fold()
This fixes a bug in the samba3sam test with the python libraries as
noticed by abartlet
---
Summary of changes:
source4/lib/ldb/common/attrib_handlers.c | 70 +++---
1 files changed, 44 insertions(+), 26 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/lib/ldb/common/attrib_handlers.c
b/source4/lib/ldb/common/attrib_handlers.c
index 9cb9ff8..3ea9857 100644
--- a/source4/lib/ldb/common/attrib_handlers.c
+++ b/source4/lib/ldb/common/attrib_handlers.c
@@ -187,13 +187,13 @@ int ldb_comparison_fold(struct ldb_context *ldb, void
*mem_ctx,
{
const char *s1=(const char *)v1-data, *s2=(const char *)v2-data;
size_t n1 = v1-length, n2 = v2-length;
- const char *u1, *u2;
char *b1, *b2;
+ const char *u1, *u2;
int ret;
- while (*s1 == ' ' n1) { s1++; n1--; };
- while (*s2 == ' ' n2) { s2++; n2--; };
- /* TODO: make utf8 safe, possibly with helper function from application
*/
- while (*s1 *s2 n1 n2) {
+ while (n1 *s1 == ' ') { s1++; n1--; };
+ while (n2 *s2 == ' ') { s2++; n2--; };
+
+ while (n1 n2 *s1 *s2) {
/* the first 127 (0x7F) chars are ascii and utf8 guarantes they
* never appear in multibyte sequences */
if (((unsigned char)s1[0]) 0x80) goto utf8str;
@@ -201,40 +201,58 @@ int ldb_comparison_fold(struct ldb_context *ldb, void
*mem_ctx,
if (toupper((unsigned char)*s1) != toupper((unsigned char)*s2))
break;
if (*s1 == ' ') {
- while (s1[0] == s1[1] n1) { s1++; n1--; }
- while (s2[0] == s2[1] n2) { s2++; n2--; }
+ while (n1 s1[0] == s1[1]) { s1++; n1--; }
+ while (n2 s2[0] == s2[1]) { s2++; n2--; }
}
s1++; s2++;
n1--; n2--;
}
- if (! (*s1 *s2)) {
- /* check for trailing spaces only if one of the pointers
-* has reached the end of the strings otherwise we
-* can mistakenly match.
-* ex. domain users - domainUpdates
-*/
- while (*s1 == ' ') { s1++; n1--; }
- while (*s2 == ' ') { s2++; n2--; }
+
+ /* check for trailing spaces only if the other pointers has
+* reached the end of the strings otherwise we can
+* mistakenly match. ex. domain users -
+* domainUpdates
+*/
+ if (n1 *s1 == ' ' (!n2 || !*s2)) {
+ while (n1 *s1 == ' ') { s1++; n1--; }
+ }
+ if (n2 *s2 == ' ' (!n1 || !*s1)) {
+ while (n2 *s2 == ' ') { s2++; n2--; }
+ }
+ if (n1 == 0 n2 != 0) {
+ return -(int)toupper(*s2);
+ }
+ if (n2 == 0 n1 != 0) {
+ return (int)toupper(*s1);
}
- return (int)(toupper(*s1)) - (int)(toupper(*s2));
+ if (n2 == 0 n2 == 0) {
+ return 0;
+ }
+ return (int)toupper(*s1) - (int)toupper(*s2);
utf8str:
/* no need to recheck from the start, just from the first utf8 char
found */
b1 = ldb_casefold(ldb, mem_ctx, s1, n1);
b2 = ldb_casefold(ldb, mem_ctx, s2, n2);
- if (b1 b2) {
- /* Both strings converted correctly */
-
- u1 = b1;
- u2 = b2;
- } else {
- /* One of the strings was not UTF8, so we have no options but
to do a binary compare */
-
- u1 = s1;
- u2 = s2;
+ if (!b1 || !b2) {
+ /* One of the strings was not UTF8, so we have no
+* options but to do a binary compare */
+ talloc_free(b1);
+ talloc_free(b2);
+ if (memcmp(s1, s2, MIN(n1, n2)) == 0) {
+ if (n1 == n2) return 0;
+ if (n1 n2) {
+ return (int)toupper(s1[n2]);
+ } else {
+ return -(int)toupper(s2[n1]);
+ }
+ }
}
+ u1 = b1;
+ u2 = b2;
+
while (*u1 *u2) {
if (*u1 != *u2)
break;
--
Samba Shared Repository
