RE: [Samba] Samba write performance in kernel
hi, Does using splice would really do help in performance much? Since the performance improvement might comes from two advantage: 1. no going to user space. 2. no memory copy splice surely have advantage 1, but doest it have the second? Can we avoid memory copy with splice, while writing files to samba? (scatter-gather in block write?) Just to get things straight: Recently I've seen a Xeon box ship almost 500 megabytes (!) per second to smbclient using a single SMB connection via RAMdisk-smbd-10GigE-smbclient-/dev/null. This was without sendfile. So unless you want to squeeze the last 5% out of a heavily loaded server, I'd say the advantages of sendfile/recvfile are close to negligible. I might be wrong well, in my condition, it might be 30% instead of 5%, IF splice can cover advantage 1 and 2. 1. I'm using a slow CPU (FA526) , and the memory copy is even slower. 2. The reading performance is over 7 MB/s, with mmap and sendfile enabled, while writing is only 4-5 MB/s. Without mmap and sendfile, reading from samba is also about 4-5 MB/s. 3. I used Oprofile to profile writing file to samba and found that CPU takes over 30% CPU time on copy_from/to_user, so I think going to user space and back again is the bottleneck. 4. My device is only 100Mbps Ethernet 5. I uses Windows client to measure throughput here, but the network latencies together with non-optimally queued requests by the client have a MUCH greater influence. 1. If splice works, can memory copy be avoided? 2. Sorry I don't really get what the non-optimally queued requests means. And what could I do to make it optimized? Thanks. Best Regards, Mac Lin _ 5 GB 超大容量 、創新便捷、安全防護垃圾郵件和病毒 — 立即升級 Windows Live Hotmail http://mail.live.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba write performance in kernel
On Fri, Sep 12, 2008 at 02:43:25PM +0800, Lin Mac wrote: well, in my condition, it might be 30% instead of 5%, IF splice can cover advantage 1 and 2. 1. I'm using a slow CPU (FA526) , and the memory copy is even slower. 2. The reading performance is over 7 MB/s, with mmap and sendfile enabled, while writing is only 4-5 MB/s. Without mmap and sendfile, reading from samba is also about 4-5 MB/s. 3. I used Oprofile to profile writing file to samba and found that CPU takes over 30% CPU time on copy_from/to_user, so I think going to user space and back again is the bottleneck. 4. My device is only 100Mbps Ethernet 5. I uses Windows client to measure throughput Ok, this is different. I had missed that you are talking about a small device with slow memory bandwith. In that case, you might certainly gain something by avoiding the copies. If you are really memcpy-bound, you should definitely make splice work. here, but the network latencies together with non-optimally queued requests by the client have a MUCH greater influence. 1. If splice works, can memory copy be avoided? 2. Sorry I don't really get what the non-optimally queued requests means. And what could I do to make it optimized? At the high end, latencies is mostly what kills your performance. Mostly you have enough bandwidth, but if you just do a simple request-response scheme, you can't get beyond a certain overall bandwith that is way below the theoretical network bandwith. To fill that, you need to make the client issue parallel requests. Multi-threaded windows client apps can do it, smbclient from 3.2 does it. Volker pgpLIonfsRTrR.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
Re : [Samba] Solaris nss_ldap vs PADL nss_ldap
Hi Duncan, I have the same issue on Solaris and Samba (3.028a and 3.31) that is OK for primary groups but not for secondaries. can you describe how do you get / configurePADL's nss_ldap? Thanks in advance Regards Alban - Message d'origine De : Duncan Brannen [EMAIL PROTECTED] À : samba@lists.samba.org Envoyé le : Mercredi, 27 Août 2008, 18h09mn 55s Objet : [Samba] Solaris nss_ldap vs PADL nss_ldap Hi All, Any thoughts on why, while everything seems ok at the OS level (getent , id -a ) Samba doesn't pickup any supplementary groups when Solaris is configured with 'group: files ldap' in nsswitch.conf and using it's own native nss_ldap.so.1 but does when using PADL's nss_ldap? Everything else is equal. Do they use/accept different calls or could it be an openldap vs native ldap incompatibility, Samba being compiled against the openldap libraries. Samba seems not to compile against the native libraries due to a lack of ldap_start_tls_s Solaris 10 and Samba 3.2.2 Cheers, Duncan -- The University of St Andrews is a charity registered in Scotland : No SC013532 -- 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
Re: [Samba] Re: samaba winwind
Hi, Andreas Ladanyi wrote: vishesh schrieb: dear all i am running samba 3.0.28 on two server and using winbind to get active directory users and group. the problem i facing is attach the uid assigned for same user is diffrent on samba servers. The uid saved in the Active Directory is different from the winbind Linux side ? No, the problem is that the uids on the two samba servers are different for the same user. This is because you are using (the default of) idmap backend = tdb. This assigns increasing uids (per server) to users in the the order the access the server. If you need the same user ids, you have (at least) the following two options: 1. Use idmap backend = rid. Then a user gets the the uid built as LOW_RANGE_UID + RID. Here LOW_RANGE_UID is the lower bound of the range idmap uid = LOW_RANGE_UID - HIGH_RANGE_UID and RID is the relative identifyer: the user SID is built as follows: DOMAIN_SID-RID. i.e. the rid is the last block of digits of the user's sid, hence is unique inside one domain, and users will get the same uid on all samba servers using idmap backend = rid. See the man paget idmap_rid(8). 2. Use idmap backend = ad: When you install the SFU (Services For Unix) schema extensions, then you can set unix attributes for users and groups in actice directory. and the same uid is obtained for users on all samba servers using this backend. Hope this helps, Michael -- Michael Adam [EMAIL PROTECTED] [EMAIL PROTECTED] SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen phone: +49-551-37-0, fax: +49-551-37-9 AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen http://www.SerNet.DE, mailto: Info @ SerNet.DE pgp4tb4JCb8le.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
RE: [Samba] Samba write performance in kernel
hi, Ok, this is different. I had missed that you are talking about a small device with slow memory bandwith. In that case, you might certainly gain something by avoiding the copies. If you are really memcpy-bound, you should definitely make splice work. yes, but the question is by how much can it improve. We would like to see it reach 7Mbps in 2 or 3 months, can't just waiting for linux kernel fix the problem. Is there any individuals/company capable of doing such performance improvement for charge? At the high end, latencies is mostly what kills your performance. Mostly you have enough bandwidth, but if you just do a simple request-response scheme, you can't get beyond a certain overall bandwith that is way below the theoretical network bandwith. To fill that, you need to make the client issue parallel requests. Multi-threaded windows client apps can do it, smbclient from 3.2 does it. I have tried multiple threads but it doesn't help the performance in my case. The delay caused by memory copy seems dominate. Best Regards, Mac Lin Date: Fri, 12 Sep 2008 09:45:32 +0200 From: [EMAIL PROTECTED] To: [EMAIL PROTECTED] CC: [EMAIL PROTECTED]; samba@lists.samba.org Subject: Re: [Samba] Samba write performance in kernel On Fri, Sep 12, 2008 at 02:43:25PM +0800, Lin Mac wrote: well, in my condition, it might be 30% instead of 5%, IF splice can cover advantage 1 and 2. 1. I'm using a slow CPU (FA526) , and the memory copy is even slower. 2. The reading performance is over 7 MB/s, with mmap and sendfile enabled, while writing is only 4-5 MB/s. Without mmap and sendfile, reading from samba is also about 4-5 MB/s. 3. I used Oprofile to profile writing file to samba and found that CPU takes over 30% CPU time on copy_from/to_user, so I think going to user space and back again is the bottleneck. 4. My device is only 100Mbps Ethernet 5. I uses Windows client to measure throughput Ok, this is different. I had missed that you are talking about a small device with slow memory bandwith. In that case, you might certainly gain something by avoiding the copies. If you are really memcpy-bound, you should definitely make splice work. here, but the network latencies together with non-optimally queued requests by the client have a MUCH greater influence. 1. If splice works, can memory copy be avoided? 2. Sorry I don't really get what the non-optimally queued requests means. And what could I do to make it optimized? At the high end, latencies is mostly what kills your performance. Mostly you have enough bandwidth, but if you just do a simple request-response scheme, you can't get beyond a certain overall bandwith that is way below the theoretical network bandwith. To fill that, you need to make the client issue parallel requests. Multi-threaded windows client apps can do it, smbclient from 3.2 does it. Volker _ 聰明搜尋和瀏覽網路的免費工具列 — MSN 搜尋工具列 http://toolbar.live.com/ -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: Re : [Samba] Solaris nss_ldap vs PADL nss_ldap
Hi Alban, You can download padl's nss_ldap library from http://www.padl.com/Contents/OpenSourceSoftware.html If you've already configured solaris for groups and password in LDAP, it should just work once you replace the Solaris nss_ldap with the padl one ( back it up first ;) and add / configure /etc/ldap.conf mine looks like TLS_CACERT /etc/certs/cacert.pem TLSCIPHERSUITE TLSv1 host ldap.st-andrews.ac.uk rootbinddn DN of admin user for doing lookups base ou=People,dc=st-andrews,dc=ac,dc=uk ldap_version 3 nss_base_passwd ou=People,dc=st-andrews,dc=ac,dc=uk?one nss_base_shadow ou=People,dc=st-andrews,dc=ac,dc=uk?one nss_base_group ou=Groups,dc=st-andrews,dc=ac,dc=uk?one ssl start_tls tls_cacertfile /etc/certs/pem encoded public key of our signing certificate? tls_cacertdir /etc/certs tls_ciphers TLSv1 With the admin user password in /etc/ldap.secret permission 600. You could also try group: compat as suggested by Douglas Engert, I've not managed to get back to trying this yet. Have you tried using Solaris version withthis in the nsswitch.conf: group: compat group_compat ldap and adding the + in the /etc/group file. This appears to work as expected, getting groups info from both local and ldap. Or (I have not tried this): group: files [SUCCESS=continue] ldap Cheers, Duncan [EMAIL PROTECTED] wrote: Hi Duncan, I have the same issue on Solaris and Samba (3.028a and 3.31) that is OK for primary groups but not for secondaries. can you describe how do you get / configurePADL's nss_ldap? Thanks in advance Regards Alban - Message d'origine De : Duncan Brannen [EMAIL PROTECTED] À : samba@lists.samba.org Envoyé le : Mercredi, 27 Août 2008, 18h09mn 55s Objet : [Samba] Solaris nss_ldap vs PADL nss_ldap Hi All, Any thoughts on why, while everything seems ok at the OS level (getent , id -a ) Samba doesn't pickup any supplementary groups when Solaris is configured with 'group: files ldap' in nsswitch.conf and using it's own native nss_ldap.so.1 but does when using PADL's nss_ldap? Everything else is equal. Do they use/accept different calls or could it be an openldap vs native ldap incompatibility, Samba being compiled against the openldap libraries. Samba seems not to compile against the native libraries due to a lack of ldap_start_tls_s Solaris 10 and Samba 3.2.2 Cheers, Duncan -- The University of St Andrews is a charity registered in Scotland : No SC013532 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- The University of St Andrews is a charity registered in Scotland : No SC013532 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] NT_STATUS_MEDIA_WRITE_PROTECTED
Shot in the dark, it's not app-armor related is it? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re : Re : [Samba] Solaris nss_ldap vs PADL nss_ldap
Thanks Duncan. Before going to get the nss_ldap, I just create fresh user accounts in my AD and it works fine! I recreate the existing ones everything is OK. There is no difference detected with the former accounts. so it's an unexplained working tips So, as an advice from the filed, for future readres of this message, check the entire line of responsablity, starting from the infra to the data (ALL kind of involved data) Best regards Alban - Message d'origine De : Duncan Brannen [EMAIL PROTECTED] À : [EMAIL PROTECTED] Cc : samba@lists.samba.org Envoyé le : Vendredi, 12 Septembre 2008, 13h20mn 30s Objet : Re: Re : [Samba] Solaris nss_ldap vs PADL nss_ldap Hi Alban, You can download padl's nss_ldap library from http://www.padl.com/Contents/OpenSourceSoftware.html If you've already configured solaris for groups and password in LDAP, it should just work once you replace the Solaris nss_ldap with the padl one ( back it up first ;) and add / configure /etc/ldap.conf mine looks like TLS_CACERT /etc/certs/cacert.pem TLSCIPHERSUITE TLSv1 host ldap.st-andrews.ac.uk rootbinddn base ou=People,dc=st-andrews,dc=ac,dc=uk ldap_version 3 nss_base_passwd ou=People,dc=st-andrews,dc=ac,dc=uk?one nss_base_shadow ou=People,dc=st-andrews,dc=ac,dc=uk?one nss_base_group ou=Groups,dc=st-andrews,dc=ac,dc=uk?one ssl start_tls tls_cacertfile /etc/certs/ certificate? tls_cacertdir /etc/certs tls_ciphers TLSv1 With the admin user password in /etc/ldap.secret permission 600. You could also try group: compat as suggested by Douglas Engert, I've not managed to get back to trying this yet. Have you tried using Solaris version withthis in the nsswitch.conf: group: compat group_compat ldap and adding the + in the /etc/group file. This appears to work as expected, getting groups info from both local and ldap. Or (I have not tried this): group: files [SUCCESS=continue] ldap Cheers, Duncan [EMAIL PROTECTED] wrote: Hi Duncan, I have the same issue on Solaris and Samba (3.028a and 3.31) that is OK for primary groups but not for secondaries. can you describe how do you get / configurePADL's nss_ldap? Thanks in advance Regards Alban - Message d'origine De : Duncan Brannen À : samba@lists.samba.org Envoyé le : Mercredi, 27 Août 2008, 18h09mn 55s Objet : [Samba] Solaris nss_ldap vs PADL nss_ldap Hi All, Any thoughts on why, while everything seems ok at the OS level (getent , id -a ) Samba doesn't pickup any supplementary groups when Solaris is configured with 'group: files ldap' in nsswitch.conf and using it's own native nss_ldap.so.1 but does when using PADL's nss_ldap? Everything else is equal. Do they use/accept different calls or could it be an openldap vs native ldap incompatibility, Samba being compiled against the openldap libraries. Samba seems not to compile against the native libraries due to a lack of ldap_start_tls_s Solaris 10 and Samba 3.2.2 Cheers, Duncan -- The University of St Andrews is a charity registered in Scotland : No SC013532 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- The University of St Andrews is a charity registered in Scotland : No SC013532 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Samba Shortfalls?
Hello, 1) Can not support .chm help files 2) Does not support locks for multi-user access to Access 3) Does support URLs from windows with '%' in the path 4) Numerous problems with multiple users accessing same folder. Comments/suggestions for fixing the above mentioned problems? Justin. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] CUPS log files flooding
The latest updates to my 2.6.9-78.ELsmp system has caused the /var/log/ cups/access_log files to fill up the /var partition in short order. This causes havoc with samba connections to Windows computers and printing through the RedHat server stops working after awhile. Thanks, Adrian Sender, for the temporary fix, ie. modifying /etc/cups/ cupsd.conf to set the LogLevel to none. When will a fix be out for this problem? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba Shortfalls?
On Fri, Sep 12, 2008 at 09:46:34AM -0400, Justin Piszcz wrote: 1) Can not support .chm help files 2) Does not support locks for multi-user access to Access 3) Does support URLs from windows with '%' in the path 4) Numerous problems with multiple users accessing same folder. Comments/suggestions for fixing the above mentioned problems? Can you be a bit more specific? For example, multi-user access to .mdb files is definitely correctly supported and runs as fine as it can run against a CIFS share. So I'd say the general statement 2) needs at least a bit more of an explanation, as do your statements 1, 3 and 4. Thanks, Volker pgpVeydKTCyDg.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
Re: [Samba] Samba Shortfalls?
1) Can not support .chm help files This works on my network 2) Does not support locks for multi-user access to Access This too works on my network 3) Does support URLs from windows with '%' in the path Have not tested this 4) Numerous problems with multiple users accessing same folder. Not really any problems here. Comments/suggestions for fixing the above mentioned problems? For any help you need to provide what version of samba you are using, what you tried and how it failed and most likely you will have to provide your configuration file. Also if you are using an ancient version of samba for example any version less than 3.0.24, you probably will not get much help. John -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba Shortfalls?
On Friday 12 September 2008 08:46:34 Justin Piszcz wrote: Hello, 1) Can not support .chm help files 2) Does not support locks for multi-user access to Access This is an MS Access configuration issue. I have a large customer who has no problems with an MS Access application that resides on a Samba 3.2.3 server. Is it possible that you have changed the path (URI path) for the MDB file? If so, you need to get into MS Access to reset the multi-user access settings. 3) Does support URLs from windows with '%' in the path 4) Numerous problems with multiple users accessing same folder. The large site has up to 400 users accessing a single folder (directory) without any problems. Comments/suggestions for fixing the above mentioned problems? - John T. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba Shortfalls?
Justin Piszcz wrote: 1) Can not support .chm help files They're just files. In what way aren't they supported? 2) Does not support locks for multi-user access to Access Access doesn't really support that either. But 2 staff at the school I work for often have the same Access file open. Not sure if they both get read/write, but as I understand it, MS limited Access network performance by design to encourage people to use MS-SQL Server instead. 3) Does support URLs from windows with '%' in the path I just renamed a file to have a % in it's name, so yes, it works. 4) Numerous problems with multiple users accessing same folder. We use Samba at a school, where often students are saving work into the one folder for staff to mark. Works fine. TB -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba Shortfalls?
Justin Piszcz wrote: Hello, 1) Can not support .chm help files I am unable to use .chm files even when shared from a 'real' windows 2000 machine either. I believe the limitation is in the help file viewer, not in the server (samba or otherwise). -Brian -- --- Brian H. Nelson Youngstown State University System Administrator Media and Academic Computing bnelson[at]cis.ysu.edu --- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba Shortfalls?
On Fri, Sep 12, 2008 at 11:09 AM, Brian H. Nelson [EMAIL PROTECTED] wrote: Justin Piszcz wrote: Hello, 1) Can not support .chm help files I am unable to use .chm files even when shared from a 'real' windows 2000 machine either. I believe the limitation is in the help file viewer, not in the server (samba or otherwise). http://www.west-wind.com/Weblog/posts/2928.aspx John -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba Shortfalls?
On Sat, 2008-09-13 at 00:23 +1000, Tim Bates wrote: Justin Piszcz wrote: 1) Can not support .chm help files They're just files. In what way aren't they supported? Ditto. 2) Does not support locks for multi-user access to Access Access doesn't really support that either. But 2 staff at the school I work for often have the same Access file open. Not sure if they both get read/write, but as I understand it, MS limited Access network performance by design to encourage people to use MS-SQL Server instead. I don't think the above is true; Multi-user Access works without issue. Whatever limitations it has are just specific to the product and its architecture; you can't expect a shared-file system to have the same performance metrics as a client/server system. 3) Does support URLs from windows with '%' in the path I just renamed a file to have a % in it's name, so yes, it works. Ditto, works fine. 4) Numerous problems with multiple users accessing same folder. We use Samba at a school, where often students are saving work into the one folder for staff to mark. Works fine. Ditto, works fine. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba Shortfalls?
On Fri, Sep 12, 2008 at 11:35 AM, Adam Tauno Williams [EMAIL PROTECTED] wrote: On Sat, 2008-09-13 at 00:23 +1000, Tim Bates wrote: Justin Piszcz wrote: 1) Can not support .chm help files They're just files. In what way aren't they supported? Ditto. This is a result of a security policy and will happen on all network shares windows, samba or other: http://www.west-wind.com/Weblog/posts/2928.aspx John -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba write performance in kernel
On Fri, Sep 12, 2008 at 02:43:25PM +0800, Lin Mac wrote: 1. If splice works, can memory copy be avoided? Yes, that's the whole point of splice - copy from the socket buffer directly to the disk buffer cache without going through userspace. Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Solaris 10 - Samba authentication Question
Greetings list: OS :Solaris 10 (sparc)05/08 Samba version: 11.10.0,REV=2005.01.08.05.16 I think his equates to on version 3.28 Overview We have 2 shares on UNIX side that are used to transfer files from Windows to Solaris. One share is read-only and the other is writable This is working great for the users. The current setting is : security=share All clients are Windows XP. - Change We want to make - We want to add a protected share for a certain number of users to access via password. While not affecting the other shares or requiring users to enter a password. I know we will have to change to : security=user After several attempts to accomplish this but have not had any success.. What I have done: Added a UNIX user to smbpasswd Added a UNIX group to /etc/group and added the UNIX user. The below smb.conf does not work for the private area (logs). It seems to *behave like* the security =share as it pops up a Greyed out box with Guest in it and prompts for a password. Thx Charles Particulars /etc/group logs::700:charles /etc/sfw/private/smbpasswd charles:104:9CEBF93A3F7BA80A8B0EA5A7DF135B03:7112CEA3B9A87EBEC3B84CC6066091DE:[U ]:LCT-48CA6DF5: smb.conf (not working) [global] netbios name = samba server string = Samba Server workgroup = Workgroup security = user guest ok = yes map to guest = Bad User log file = /var/samba/log/log.%m dos filemode = Yes hide unreadable = Yes wins server = xxx.xxx.xxx.xxx encrypt passwords = Yes null passwords = Yes domain master = No dns proxy = No os level = 50 hide special files = Yes dont descend = lost+found preferred master = no max log size = 50 log level = 9 [SUNshare] comment = SUN Share (read-only) path = /export/sunfiles force user = nobody4 force group = nogroup inherit permissions = Yes inherit acls = Yes inherit owner = Yes dont descend = [WINshare] comment = Windows Share (write) path = /export/winfiles force user = nobody4 force group = nogroup read only = No dont descend = [logs] comment = Logs Share path = /export/logs force group = logs guest ok = no write list = charles -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Problems getting list of shares
I'm trying to do something that should be simple, but my current solution isn't working 100% All I need is a list of smb shares on the network. I'm doing this: /usr/bin/nmblookup -M -- - and then use this on each ip returned: /usr/bin/smbclient -g -p 139 -NL ip addr That works for most cases but it fails to find all the shares (compared to the mac Finder) -steve -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Problems getting list of shares
smbtree may do what you are looking for. Jon 2008/9/12 Steve Gehrman [EMAIL PROTECTED]: I'm trying to do something that should be simple, but my current solution isn't working 100% All I need is a list of smb shares on the network. I'm doing this: /usr/bin/nmblookup -M -- - and then use this on each ip returned: /usr/bin/smbclient -g -p 139 -NL ip addr That works for most cases but it fails to find all the shares (compared to the mac Finder) -steve -- 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
Re: [Samba] smbldaptools not creating unix group/users
Tc, I think you might be expecting these commands to do something more than they will do. smbldap-populate will create 4 OUs and the standard windows groups (Domain Users, Backup Operators, etc.) and a sambaDomainName object. smbldap-useradd will only create a new posix user (with or without Samba/windows attributes depending on the -a option) in the LDAP tree. If you want to create a new group in LDAP, use smbldap-groupadd. If you want to migrate existing linux groups from /etc/group then you can use the smbldap-migrate-unix-groups script, that is part of the smbldap-tools package. Maybe this article written for Hardy Ubuntu might clarify things a bit .. https://help.ubuntu.com/community/OpenLDAP-SambaPDC-OrgInfo-Posix Regards, David Collins On Fri, 2008-09-12 at 09:03 +0800, Tc Chung wrote: Dear all, I have setup a samba PDC on a debian lenny machine and everything works fine. Recently, i want to integrate Samba with LDAP. When I use smbldap-populate, the corresponding structures are created in the LDAP tree, however, the unix groups are not created at all! smbldap-populate did not complaint anything. I have tested by using smbldap-useradd. The same problem appears. What are the possible reasons for this? Thanks in advance. Regards, Tc Chung -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha5-506-g42fffd1
The branch, v4-0-test has been updated
via 42fffd1d1c7303afb4139734cdc0c909f81154b2 (commit)
from 48578bd4925a675bf30d4f2452f147c3ee11154f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit 42fffd1d1c7303afb4139734cdc0c909f81154b2
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Fri Sep 12 11:51:08 2008 +0200
rename packaging = packaging4
metze
---
Summary of changes:
packaging/Fedora/cplusplus-headers.patch | 32 ---
packaging/Fedora/samba4.init | 113 -
packaging/Fedora/samba4.log |7 -
packaging/Fedora/samba4.spec | 373 -
packaging/Fedora/samba4.sysconfig |2 -
packaging/debian/README | 30 ---
packaging4/Fedora/cplusplus-headers.patch | 32 +++
packaging4/Fedora/samba4.init | 113 +
packaging4/Fedora/samba4.log |7 +
packaging4/Fedora/samba4.spec | 373 +
packaging4/Fedora/samba4.sysconfig|2 +
packaging4/debian/README | 30 +++
12 files changed, 557 insertions(+), 557 deletions(-)
delete mode 100644 packaging/Fedora/cplusplus-headers.patch
delete mode 100644 packaging/Fedora/samba4.init
delete mode 100644 packaging/Fedora/samba4.log
delete mode 100644 packaging/Fedora/samba4.spec
delete mode 100644 packaging/Fedora/samba4.sysconfig
delete mode 100644 packaging/debian/README
create mode 100644 packaging4/Fedora/cplusplus-headers.patch
create mode 100644 packaging4/Fedora/samba4.init
create mode 100644 packaging4/Fedora/samba4.log
create mode 100644 packaging4/Fedora/samba4.spec
create mode 100644 packaging4/Fedora/samba4.sysconfig
create mode 100644 packaging4/debian/README
Changeset truncated at 500 lines:
diff --git a/packaging/Fedora/cplusplus-headers.patch
b/packaging/Fedora/cplusplus-headers.patch
deleted file mode 100644
index ce05f54..000
--- a/packaging/Fedora/cplusplus-headers.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Naur samba-4.0.0alpha5-orig/source/lib/events/events.h
samba-4.0.0alpha5/source/lib/events/events.h
samba-4.0.0alpha5-orig/source/lib/events/events.h 2008-06-30
19:34:11.0 +1000
-+++ samba-4.0.0alpha5/source/lib/events/events.h 2008-07-25
20:02:56.0 +1000
-@@ -53,24 +53,24 @@
-
- struct fd_event *event_add_fd(struct event_context *ev, TALLOC_CTX *mem_ctx,
- int fd, uint16_t flags, event_fd_handler_t
handler,
--void *private);
-+void *private_data);
-
- struct timed_event *event_add_timed(struct event_context *ev, TALLOC_CTX
*mem_ctx,
- struct timeval next_event,
- event_timed_handler_t handler,
-- void *private);
-+ void *private_data);
-
- struct signal_event *event_add_signal(struct event_context *ev, TALLOC_CTX
*mem_ctx,
- int signum, int sa_flags,
- event_signal_handler_t handler,
--void *private);
-+void *private_data);
-
- struct iocb;
- struct aio_event *event_add_aio(struct event_context *ev,
- TALLOC_CTX *mem_ctx,
- struct iocb *iocb,
- event_aio_handler_t handler,
-- void *private);
-+ void *private_data);
-
- int event_loop_once(struct event_context *ev);
- int event_loop_wait(struct event_context *ev);
diff --git a/packaging/Fedora/samba4.init b/packaging/Fedora/samba4.init
deleted file mode 100644
index a04cce9..000
--- a/packaging/Fedora/samba4.init
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/sh
-#
-# chkconfig: - 91 35
-# description: Starts and stops the Samba smbd daemon \
-# used to provide SMB network services.
-#
-# pidfile: /var/run/samba4/smbd.pid
-# config: /etc/samba4/smb.conf
-
-SAMBA_NAME=samba4
-
-# Source function library.
-if [ -f /etc/init.d/functions ] ; then
- . /etc/init.d/functions
-elif [ -f /etc/rc.d/init.d/functions ] ; then
- . /etc/rc.d/init.d/functions
-else
- exit 1
-fi
-
-# Avoid using root's TMPDIR
-unset TMPDIR
-
-# Source networking configuration.
-. /etc/sysconfig/network
-
-if [ -f /etc/sysconfig/$SAMBA_NAME ]; then
- . /etc/sysconfig/$SAMBA_NAME
-fi
-
-# Check that networking is up.
-[ ${NETWORKING} = no ] exit 1
-
-# Check that smb.conf exists.
-[ -f /etc/$SAMBA_NAME/smb.conf ] || exit 6
-
-RETVAL=0
-
-
-start() {
- echo -n $Starting Samba services:
- daemon smbd $SMBDOPTIONS
- RETVAL=$?
- echo
-
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4146-g3111428
The branch, v3-devel has been updated
via 3111428dd42abf856f646f2a3aa2ee78ff3d3702 (commit)
from e695c1cc2b715afd713595e8daa77910d9f04138 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit 3111428dd42abf856f646f2a3aa2ee78ff3d3702
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Thu Sep 11 18:45:26 2008 +0200
fix nonempty blank lines
---
Summary of changes:
source/libsmb/libsmb_server.c | 196
1 files changed, 98 insertions(+), 98 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libsmb/libsmb_server.c b/source/libsmb/libsmb_server.c
index 0a3287b..aeec255 100644
--- a/source/libsmb/libsmb_server.c
+++ b/source/libsmb/libsmb_server.c
@@ -7,17 +7,17 @@
Copyright (C) Tom Jansen (Ninja ISD) 2002
Copyright (C) Derrell Lipman 2003-2008
Copyright (C) Jeremy Allison 2007, 2008
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see http://www.gnu.org/licenses/.
*/
@@ -40,7 +40,7 @@ SMBC_check_server(SMBCCTX * context,
{
socklen_t size;
struct sockaddr addr;
-
+
size = sizeof(addr);
return (getpeername(server-cli-fd, addr, size) == -1);
}
@@ -56,12 +56,12 @@ SMBC_remove_unused_server(SMBCCTX * context,
SMBCSRV * srv)
{
SMBCFILE * file;
-
+
/* are we being fooled ? */
if (!context || !context-internal-initialized || !srv) {
return 1;
}
-
+
/* Check all open files/directories for a relation with this server */
for (file = context-internal-files; file; file = file-next) {
if (file-srv == srv) {
@@ -72,16 +72,16 @@ SMBC_remove_unused_server(SMBCCTX * context,
return 1;
}
}
-
+
DLIST_REMOVE(context-internal-servers, srv);
-
+
cli_shutdown(srv-cli);
srv-cli = NULL;
-
+
DEBUG(3, (smbc_remove_usused_server: %p removed.\n, srv));
-
+
smbc_getFunctionRemoveCachedServer(context)(context, srv);
-
+
SAFE_FREE(srv);
return 0;
}
@@ -102,11 +102,11 @@ SMBC_call_auth_fn(TALLOC_CTX *ctx,
fstring username;
fstring password;
smbc_get_auth_data_with_context_fn auth_with_context_fn;
-
+
strlcpy(workgroup, *pp_workgroup, sizeof(workgroup));
strlcpy(username, *pp_username, sizeof(username));
strlcpy(password, *pp_password, sizeof(password));
-
+
/* See if there's an authentication with context function provided */
auth_with_context_fn = smbc_getFunctionAuthDataWithContext(context);
if (auth_with_context_fn)
@@ -124,11 +124,11 @@ SMBC_call_auth_fn(TALLOC_CTX *ctx,
username, sizeof(username),
password, sizeof(password));
}
-
+
TALLOC_FREE(*pp_workgroup);
TALLOC_FREE(*pp_username);
TALLOC_FREE(*pp_password);
-
+
*pp_workgroup = talloc_strdup(ctx, workgroup);
*pp_username = talloc_strdup(ctx, username);
*pp_password = talloc_strdup(ctx, password);
@@ -157,23 +157,23 @@ SMBC_find_server(TALLOC_CTX *ctx,
{
SMBCSRV *srv;
int auth_called = 0;
-
+
if (!pp_workgroup || !pp_username || !pp_password) {
return NULL;
}
-
+
check_server_cache:
-
+
srv = smbc_getFunctionGetCachedServer(context)(context,
server, share,
*pp_workgroup,
*pp_username);
-
+
if (!auth_called !srv (!*pp_username || !(*pp_username)[0] ||
!*pp_password || !(*pp_password)[0])) {
SMBC_call_auth_fn(ctx, context, server, share,
pp_workgroup, pp_username, pp_password);
-
+
/*
* However, smbc_auth_fn may have picked up info relating to
* an existing
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4147-gfe36d83
The branch, v3-devel has been updated
via fe36d83508a6b1a8de5ad58ec1d0c80cda7b4a21 (commit)
from 3111428dd42abf856f646f2a3aa2ee78ff3d3702 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit fe36d83508a6b1a8de5ad58ec1d0c80cda7b4a21
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Fri Sep 12 12:38:54 2008 +0200
Reorder defines for version for consistency with Samba 4.
---
Summary of changes:
source/lib/version.c | 13 +
source/script/mkversion.sh | 16 +++-
2 files changed, 16 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/version.c b/source/lib/version.c
index 3982646..55fb53c 100644
--- a/source/lib/version.c
+++ b/source/lib/version.c
@@ -23,16 +23,5 @@
const char *samba_version_string(void)
{
-#ifdef SAMBA_VERSION_VENDOR_FUNCTION
- return SAMBA_VERSION_VENDOR_FUNCTION;
-#else /* SAMBA_VERSION_VENDOR_FUNCTION */
- #ifdef SAMBA_VERSION_VENDOR_SUFFIX
- #ifdef SAMBA_VERSION_VENDOR_PATCH
- return SAMBA_VERSION_OFFICIAL_STRING - SAMBA_VERSION_VENDOR_SUFFIX \
- - SAMBA_VERSION_VENDOR_PATCH;
- #endif /* SAMBA_VERSION_VENDOR_PATCH */
- return SAMBA_VERSION_OFFICIAL_STRING - SAMBA_VERSION_VENDOR_SUFFIX;
- #endif /* SAMBA_VERSION_VENDOR_SUFFIX */
-#endif /* SAMBA_VERSION_VENDOR_FUNCTION */
- return SAMBA_VERSION_OFFICIAL_STRING;
+ return SAMBA_VERSION_STRING;
}
diff --git a/source/script/mkversion.sh b/source/script/mkversion.sh
index 695fc7d..a55aafc 100755
--- a/source/script/mkversion.sh
+++ b/source/script/mkversion.sh
@@ -124,7 +124,21 @@ if test -n ${SAMBA_VERSION_RELEASE_NICKNAME};then
SAMBA_VERSION_STRING=${SAMBA_VERSION_STRING}
(${SAMBA_VERSION_RELEASE_NICKNAME})
fi
-echo #define SAMBA_VERSION_STRING samba_version_string() $OUTPUT_FILE
+cat $OUTPUT_FILECEOF
+#ifdef SAMBA_VERSION_VENDOR_FUNCTION
+# define SAMBA_VERSION_STRING SAMBA_VERSION_VENDOR_FUNCTION
+#else /* SAMBA_VERSION_VENDOR_FUNCTION */
+# ifdef SAMBA_VERSION_VENDOR_SUFFIX
+#ifdef SAMBA_VERSION_VENDOR_PATCH
+# define SAMBA_VERSION_STRING SAMBA_VERSION_OFFICIAL_STRING -
SAMBA_VERSION_VENDOR_SUFFIX - SAMBA_VERSION_VENDOR_PATCH
+#else /* SAMBA_VERSION_VENDOR_PATCH */
+# define SAMBA_VERSION_STRING SAMBA_VERSION_OFFICIAL_STRING -
SAMBA_VERSION_VENDOR_SUFFIX
+#endif /* SAMBA_VERSION_VENDOR_SUFFIX */
+# else /* SAMBA_VERSION_VENDOR_FUNCTION */
+#define SAMBA_VERSION_STRING SAMBA_VERSION_OFFICIAL_STRING
+# endif
+#endif
+CEOF
echo $0: '$OUTPUT_FILE' created for Samba(\${SAMBA_VERSION_STRING}\)
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4148-g6c346d0
The branch, v3-devel has been updated via 6c346d0eb20af5ba9b09f30319420f7c91480da6 (commit) from fe36d83508a6b1a8de5ad58ec1d0c80cda7b4a21 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel - Log - commit 6c346d0eb20af5ba9b09f30319420f7c91480da6 Author: Günther Deschner [EMAIL PROTECTED] Date: Thu Sep 4 15:13:22 2008 +0200 messaging: move types to IDL. Guenther --- Summary of changes: source/include/includes.h |1 + source/include/messages.h | 85 source/librpc/gen_ndr/messaging.h | 116 - source/librpc/gen_ndr/ndr_messaging.c | 81 ++- source/librpc/gen_ndr/ndr_messaging.h |3 + source/librpc/idl/messaging.idl | 84 +++- 6 files changed, 280 insertions(+), 90 deletions(-) Changeset truncated at 500 lines: diff --git a/source/include/includes.h b/source/include/includes.h index 958e7cb..9c5ea08 100644 --- a/source/include/includes.h +++ b/source/include/includes.h @@ -702,6 +702,7 @@ typedef char fstring[FSTRING_LEN]; #include rpc_perfcount_defs.h #include librpc/gen_ndr/notify.h #include librpc/gen_ndr/xattr.h +#include librpc/gen_ndr/messaging.h #include librpc/rpc/dcerpc.h #include nt_printing.h #include idmap.h diff --git a/source/include/messages.h b/source/include/messages.h index b3ac5e4..db805a2 100644 --- a/source/include/messages.h +++ b/source/include/messages.h @@ -24,91 +24,6 @@ /* change the message version with any incompatible changes in the protocol */ #define MESSAGE_VERSION 2 - -#define MSG_TYPE_MASK 0x - -/* general messages */ -#define MSG_DEBUG 0x0001 -#define MSG_PING 0x0002 -#define MSG_PONG 0x0003 -#define MSG_PROFILE0x0004 -#define MSG_REQ_DEBUGLEVEL 0x0005 -#define MSG_DEBUGLEVEL 0x0006 -#define MSG_REQ_PROFILELEVEL 0x0007 -#define MSG_PROFILELEVEL 0x0008 -#define MSG_REQ_POOL_USAGE 0x0009 -#define MSG_POOL_USAGE 0x000A - -/* If dmalloc is included, set a steady-state mark */ -#define MSG_REQ_DMALLOC_MARK 0x000B - -/* If dmalloc is included, dump to the dmalloc log a description of - * what has changed since the last MARK */ -#define MSG_REQ_DMALLOC_LOG_CHANGED0x000C - -#define MSG_SHUTDOWN 0x000D - -/* nmbd messages */ -#define MSG_FORCE_ELECTION 0x0101 -#define MSG_WINS_NEW_ENTRY 0x0102 -#define MSG_SEND_PACKET0x0103 - -/* printing messages */ -/* #define MSG_PRINTER_NOTIFY 2001*/ /* Obsolete */ -#define MSG_PRINTER_NOTIFY20x0202 - -#define MSG_PRINTER_DRVUPGRADE 0x0203 -#define MSG_PRINTERDATA_INIT_RESET 0x0204 -#define MSG_PRINTER_UPDATE 0x0205 -#define MSG_PRINTER_MOD0x0206 - -/* smbd messages */ -#define MSG_SMB_CONF_UPDATED 0x0301 -#define MSG_SMB_FORCE_TDIS 0x0302 -#define MSG_SMB_SAM_SYNC 0x0303 -#define MSG_SMB_SAM_REPL 0x0304 -#define MSG_SMB_UNLOCK 0x0305 -#define MSG_SMB_BREAK_REQUEST 0x0306 -#define MSG_SMB_BREAK_RESPONSE 0x0307 -#define MSG_SMB_ASYNC_LEVEL2_BREAK 0x0308 -#define MSG_SMB_OPEN_RETRY 0x0309 -#define MSG_SMB_KERNEL_BREAK 0x030A -#define MSG_SMB_FILE_RENAME0x030B -#define MSG_SMB_INJECT_FAULT 0x030C -#define MSG_SMB_BLOCKING_LOCK_CANCEL 0x030D -#define MSG_SMB_NOTIFY 0x030E -#define MSG_SMB_STAT_CACHE_DELETE 0x030F -/* - * Samba4 compatibility - */ -#define MSG_PVFS_NOTIFY0x0310 -/* - * cluster reconfigure events - */ -#define MSG_SMB_BRL_VALIDATE 0x0311 -#define MSG_SMB_RELEASE_IP 0x0312 -/* - * Close a specific file given a share entry. - */ -#define MSG_SMB_CLOSE_FILE 0x0313 - -/* winbind messages */ -#define MSG_WINBIND_FINISHED 0x0401 -#define MSG_WINBIND_FORGET_STATE 0x0402 -#define MSG_WINBIND_ONLINE 0x0403 -#define MSG_WINBIND_OFFLINE0x0404 -#define MSG_WINBIND_ONLINESTATUS 0x0405 -#define MSG_WINBIND_TRY_TO_GO_ONLINE 0x0406 -#define MSG_WINBIND_FAILED_TO_GO_ONLINE 0x0407 -#define MSG_WINBIND_VALIDATE_CACHE 0x0408 -#define MSG_WINBIND_DUMP_DOMAIN_LIST 0x0409 - -/* event messages */ -#define MSG_DUMP_EVENT_LIST0x0500 - -/* dbwrap messages 4001-4999 */ -#define MSG_DBWRAP_TDB2_CHANGES4001 - /* * Special flags passed to message_send. Allocated from the top, lets see when * it collides with the message types in the lower 16 bits :-) diff --git a/source/librpc/gen_ndr/messaging.h
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4153-g5d91c91
The branch, v3-devel has been updated
via 5d91c9184c27def47f20fc089cc127d780387ed8 (commit)
via a94318be4656a668be0295988ed0743105d830c9 (commit)
via e8b27b69f33fb33c670026b3a24ed95a2f0099fe (commit)
via 735bc2e425ce629745495190cd1c721ccb583d24 (commit)
from e065802a61f22e9fdcd4b911805c42c46a79b3f2 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit 5d91c9184c27def47f20fc089cc127d780387ed8
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Sep 12 11:47:39 2008 +0200
netapi: fix NetUserGetLocalGroups.
Guenther
commit a94318be4656a668be0295988ed0743105d830c9
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Sep 12 11:28:42 2008 +0200
netapi: fix NetGroupGetUsers (only enumerates users).
Guenther
commit e8b27b69f33fb33c670026b3a24ed95a2f0099fe
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Sep 12 11:28:03 2008 +0200
netapi: fix NetUserSetGroups.
Guenther
commit 735bc2e425ce629745495190cd1c721ccb583d24
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Sep 12 11:13:20 2008 +0200
netapi: fix NetGroupSetUsers.
Guenther
---
Summary of changes:
source/lib/netapi/group.c | 49 +---
source/lib/netapi/user.c | 44
2 files changed, 50 insertions(+), 43 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/netapi/group.c b/source/lib/netapi/group.c
index 2e0c4dc..c3fccb4 100644
--- a/source/lib/netapi/group.c
+++ b/source/lib/netapi/group.c
@@ -1391,10 +1391,15 @@ WERROR NetGroupGetUsers_r(struct libnetapi_ctx *ctx,
}
for (i=0; i names.count; i++) {
+
+ if (member_types.ids[i] != SID_NAME_USER) {
+ continue;
+ }
+
status = add_GROUP_USERS_INFO_X_buffer(ctx,
r-in.level,
names.names[i].string,
- member_types.ids[i],
+ 7,
r-out.buffer,
entries_read);
if (!NT_STATUS_IS_OK(status)) {
@@ -1454,6 +1459,7 @@ WERROR NetGroupSetUsers_r(struct libnetapi_ctx *ctx,
struct samr_Ids user_rids, name_types;
struct samr_Ids group_rids, group_types;
struct samr_RidTypeArray *rid_array = NULL;
+ struct lsa_String *lsa_names = NULL;
uint32_t *add_rids = NULL;
uint32_t *del_rids = NULL;
@@ -1549,39 +1555,40 @@ WERROR NetGroupSetUsers_r(struct libnetapi_ctx *ctx,
break;
}
+ lsa_names = talloc_array(ctx, struct lsa_String, r-in.num_entries);
+ if (!lsa_names) {
+ werr = WERR_NOMEM;
+ goto done;
+ }
+
for (i=0; i r-in.num_entries; i++) {
switch (r-in.level) {
case 0:
- init_lsa_String(lsa_account_name,
i0-grui0_name);
+ init_lsa_String(lsa_names[i], i0-grui0_name);
i0++;
break;
case 1:
- init_lsa_String(lsa_account_name,
i1-grui1_name);
+ init_lsa_String(lsa_names[i], i1-grui1_name);
i1++;
break;
}
+ }
- status = rpccli_samr_LookupNames(pipe_cli, ctx,
-domain_handle,
-1,
-lsa_account_name,
-user_rids,
-name_types);
- if (!NT_STATUS_IS_OK(status)) {
- werr = ntstatus_to_werror(status);
- goto done;
- }
-
- if (!add_rid_to_array_unique(ctx,
-user_rids.ids[0],
-member_rids,
-num_member_rids)) {
- werr = WERR_GENERAL_FAILURE;
- goto done;
- }
+ status = rpccli_samr_LookupNames(pipe_cli, ctx,
+domain_handle,
+r-in.num_entries,
+lsa_names,
+user_rids,
+
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4149-ge065802
The branch, v3-devel has been updated
via e065802a61f22e9fdcd4b911805c42c46a79b3f2 (commit)
from 6c346d0eb20af5ba9b09f30319420f7c91480da6 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit e065802a61f22e9fdcd4b911805c42c46a79b3f2
Author: Günther Deschner [EMAIL PROTECTED]
Date: Fri Sep 12 10:12:01 2008 +0200
doserr: add WERR_NO_SUCH_ALIAS.
Guenther
---
Summary of changes:
source/include/doserr.h |1 +
source/libsmb/doserr.c |1 +
2 files changed, 2 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/doserr.h b/source/include/doserr.h
index c901df2..5d3b866 100644
--- a/source/include/doserr.h
+++ b/source/include/doserr.h
@@ -223,6 +223,7 @@
#define WERR_INVALID_DOMAIN_STATE W_ERROR(1353)
#define WERR_INVALID_DOMAIN_ROLE W_ERROR(1354)
#define WERR_SPECIAL_ACCOUNT W_ERROR(1371)
+#define WERR_NO_SUCH_ALIAS W_ERROR(1376)
#define WERR_MEMBER_IN_ALIAS W_ERROR(1378)
#define WERR_ALIAS_EXISTS W_ERROR(1379)
#define WERR_TIME_SKEW W_ERROR(1398)
diff --git a/source/libsmb/doserr.c b/source/libsmb/doserr.c
index c62918e..2716e04 100644
--- a/source/libsmb/doserr.c
+++ b/source/libsmb/doserr.c
@@ -100,6 +100,7 @@ werror_code_struct dos_errs[] =
{ WERR_INVALID_DOMAIN_ROLE, WERR_INVALID_DOMAIN_ROLE },
{ WERR_SPECIAL_ACCOUNT, WERR_SPECIAL_ACCOUNT },
{ WERR_ALIAS_EXISTS, WERR_ALIAS_EXISTS },
+ { WERR_NO_SUCH_ALIAS, WERR_NO_SUCH_ALIAS },
{ WERR_MEMBER_IN_ALIAS, WERR_MEMBER_IN_ALIAS },
{ WERR_TIME_SKEW, WERR_TIME_SKEW },
{ WERR_INVALID_OWNER, WERR_INVALID_OWNER },
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4154-g768aa82
The branch, v3-devel has been updated
via 768aa82361a2c4b0aab71433b7593723a2868f0a (commit)
from 5d91c9184c27def47f20fc089cc127d780387ed8 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit 768aa82361a2c4b0aab71433b7593723a2868f0a
Author: Michael Adam [EMAIL PROTECTED]
Date: Fri Sep 12 15:07:00 2008 +0200
packaging: use find instead of du to find files... :-)
Michael
---
Summary of changes:
packaging/bin/update-pkginfo |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/bin/update-pkginfo b/packaging/bin/update-pkginfo
index 020c773..9d8006a 100755
--- a/packaging/bin/update-pkginfo
+++ b/packaging/bin/update-pkginfo
@@ -17,7 +17,7 @@ fi
# PREV=`echo ${REVISION} | sed 's/[^0-9]//g'`
# PREV=.`echo ${REVISION} | sed 's/[0-9]//g'`.${PREV}
-for f in `du -a | awk '{print $2}' | grep \.tmpl$`; do
+for f in `find . -type f -name *.tmpl`; do
f2=`echo $f | sed s/.tmpl//g`
echo $f2
sed -e s/PVERSION/$VERSION/g \
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha5-507-gbaddefd
The branch, v4-0-test has been updated
via baddefd0a6fa430af1a3001064149127e0d29361 (commit)
from 42fffd1d1c7303afb4139734cdc0c909f81154b2 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit baddefd0a6fa430af1a3001064149127e0d29361
Author: Simo Sorce [EMAIL PROTECTED]
Date: Fri Sep 12 13:26:45 2008 -0400
Fix spellings and file names
---
Summary of changes:
source/lib/ldb/tests/python/api.py | 62 +-
source/lib/ldb/tests/test-generic.sh |2 +-
2 files changed, 32 insertions(+), 32 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/ldb/tests/python/api.py
b/source/lib/ldb/tests/python/api.py
index 1ae3fde..99ad1a9 100755
--- a/source/lib/ldb/tests/python/api.py
+++ b/source/lib/ldb/tests/python/api.py
@@ -27,14 +27,14 @@ class NoContextTests(unittest.TestCase):
class SimpleLdb(unittest.TestCase):
def test_connect(self):
-ldb.Ldb(foo.tdb)
+ldb.Ldb(foo.ldb)
def test_connect_none(self):
ldb.Ldb()
def test_connect_later(self):
x = ldb.Ldb()
-x.connect(foo.tdb)
+x.connect(foo.ldb)
def test_repr(self):
x = ldb.Ldb()
@@ -49,19 +49,19 @@ class SimpleLdb(unittest.TestCase):
x.set_modules_dir(/tmp)
def test_search(self):
-l = ldb.Ldb(foo.tdb)
+l = ldb.Ldb(foo.ldb)
self.assertEquals(len(l.search()), 1)
def test_search_controls(self):
-l = ldb.Ldb(foo.tdb)
-self.assertEquals(len(l.search(controls=[paged_results:1:5])), 1)
+l = ldb.Ldb(foo.ldb)
+self.assertEquals(len(l.search(controls=[paged_results:0:5])), 1)
def test_search_attrs(self):
-l = ldb.Ldb(foo.tdb)
+l = ldb.Ldb(foo.ldb)
self.assertEquals(len(l.search(ldb.Dn(l, ), ldb.SCOPE_SUBTREE,
(dc=*), [dc])), 0)
def test_search_string_dn(self):
-l = ldb.Ldb(foo.tdb)
+l = ldb.Ldb(foo.ldb)
self.assertEquals(len(l.search(, ldb.SCOPE_SUBTREE, (dc=*),
[dc])), 0)
def test_search_attr_string(self):
@@ -69,29 +69,29 @@ class SimpleLdb(unittest.TestCase):
self.assertRaises(TypeError, l.search, attrs=dc)
def test_opaque(self):
-l = ldb.Ldb(foo.tdb)
+l = ldb.Ldb(foo.ldb)
l.set_opaque(my_opaque, l)
self.assertTrue(l.get_opaque(my_opaque) is not None)
self.assertEquals(None, l.get_opaque(unknown))
def test_parse_control_strings(self):
-l = ldb.Ldb(foo.tdb)
+l = ldb.Ldb(foo.ldb)
self.assertRaises(ldb.LdbError, l.parse_control_strings, [foo,
bar])
-self.assertTrue(l.parse_control_strings([paged_results:1:5]) is not
None)
+self.assertTrue(l.parse_control_strings([paged_results:0:5]) is not
None)
def test_search_scope_base(self):
-l = ldb.Ldb(foo.tdb)
+l = ldb.Ldb(foo.ldb)
self.assertEquals(len(l.search(ldb.Dn(l, dc=foo),
ldb.SCOPE_ONELEVEL)), 0)
def test_delete(self):
-l = ldb.Ldb(foo.tdb)
+l = ldb.Ldb(foo.ldb)
self.assertRaises(ldb.LdbError, lambda: l.delete(ldb.Dn(l, dc=foo)))
def test_contains(self):
-l = ldb.Ldb(foo.tdb)
+l = ldb.Ldb(foo.ldb)
self.assertFalse(ldb.Dn(l, dc=foo) in l)
-l = ldb.Ldb(foo.tdb)
+l = ldb.Ldb(foo.ldb)
m = ldb.Message()
m.dn = ldb.Dn(l, dc=foo)
m[b] = [a]
@@ -102,23 +102,23 @@ class SimpleLdb(unittest.TestCase):
l.delete(m.dn)
def test_get_config_basedn(self):
-l = ldb.Ldb(foo.tdb)
+l = ldb.Ldb(foo.ldb)
self.assertEquals(None, l.get_config_basedn())
def test_get_root_basedn(self):
-l = ldb.Ldb(foo.tdb)
+l = ldb.Ldb(foo.ldb)
self.assertEquals(None, l.get_root_basedn())
def test_get_schema_basedn(self):
-l = ldb.Ldb(foo.tdb)
+l = ldb.Ldb(foo.ldb)
self.assertEquals(None, l.get_schema_basedn())
def test_get_default_basedn(self):
-l = ldb.Ldb(foo.tdb)
+l = ldb.Ldb(foo.ldb)
self.assertEquals(None, l.get_default_basedn())
def test_add(self):
-l = ldb.Ldb(foo.tdb)
+l = ldb.Ldb(foo.ldb)
m = ldb.Message()
m.dn = ldb.Dn(l, dc=foo)
m[bla] = bla
@@ -130,7 +130,7 @@ class SimpleLdb(unittest.TestCase):
l.delete(ldb.Dn(l, dc=foo))
def test_add_dict(self):
-l = ldb.Ldb(foo.tdb)
+l = ldb.Ldb(foo.ldb)
m = {dn: ldb.Dn(l, dc=foo),
bla: bla}
self.assertEquals(len(l.search()), 1)
@@ -141,7 +141,7 @@ class SimpleLdb(unittest.TestCase):
l.delete(ldb.Dn(l, dc=foo))
def test_add_dict_string_dn(self):
-l = ldb.Ldb(foo.tdb)
+l =
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3021-gfe28099
The branch, v3-2-test has been updated via fe280993dea71b87b6042d6aded389b10bcd0b56 (commit) via 7f1193d3c83b0c19f17c8f70542491222c9644da (commit) from 1ca6239b9f67caafed50db5f284df00c5988ba03 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit fe280993dea71b87b6042d6aded389b10bcd0b56 Author: Jeff Layton [EMAIL PROTECTED] Date: Fri Sep 12 13:37:13 2008 -0400 cifs.upcall: move default install location to EPREFIX/sbin cifs.upcall links to libraries that live under /usr, so installing it in /sbin doesn't seem appropriate. Move it to EPREFIX/sbin instead (i.e. /usr/sbin). Signed-off-by: Jeff Layton [EMAIL PROTECTED] commit 7f1193d3c83b0c19f17c8f70542491222c9644da Author: Jeff Layton [EMAIL PROTECTED] Date: Fri Sep 12 13:37:13 2008 -0400 cifs.upcall: enable building by default on linux When building on linux, default to building cifs.upcall. Throw a warning if ADS support is disabled or keyutils isn't installed. Signed-off-by: Jeff Layton [EMAIL PROTECTED] --- Summary of changes: source/Makefile.in |8 source/configure.in | 23 +++ 2 files changed, 23 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/source/Makefile.in b/source/Makefile.in index 2a8bec0..12c62e1 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -175,9 +175,9 @@ PATH_FLAGS = -DSMB_PASSWD_FILE=\$(SMB_PASSWD_FILE)\ \ # Note that all executable programs now provide for an optional executable suffix. -SBIN_PROGS = bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@ +SBIN_PROGS = bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ @SWAT_SBIN_TARGETS@ @EXTRA_SBIN_PROGS@ @CIFSUPCALL_PROGS@ -ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@ @CIFSUPCALL_PROGS@ +ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@ BIN_PROGS1 = bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ \ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ bin/[EMAIL PROTECTED]@ @@ -2439,8 +2439,8 @@ installcifsmount:: @CIFSMOUNT_PROGS@ @$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(ROOTSBINDIR) @CIFSMOUNT_PROGS@ installcifsupcall:: @CIFSUPCALL_PROGS@ - @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(ROOTSBINDIR) - @$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(ROOTSBINDIR) @CIFSUPCALL_PROGS@ + @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(SBINDIR) + @$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(SBINDIR) @CIFSUPCALL_PROGS@ # Some symlinks are required for the 'probing' of modules. # This mechanism should go at some point.. diff --git a/source/configure.in b/source/configure.in index a7d1f94..548dea4 100644 --- a/source/configure.in +++ b/source/configure.in @@ -4113,7 +4113,7 @@ INSTALL_CIFSUPCALL= UNINSTALL_CIFSUPCALL= AC_MSG_CHECKING(whether to build cifs.upcall) AC_ARG_WITH(cifsupcall, -[AS_HELP_STRING([--with-cifsupcall], [Include cifs.upcall (Linux only) support (default=no)])], +[AS_HELP_STRING([--with-cifsupcall], [Include cifs.upcall (Linux only) support (default=yes)])], [ case $withval in no) AC_MSG_RESULT(no) @@ -4139,9 +4139,24 @@ AC_ARG_WITH(cifsupcall, esac ;; esac ], -[ - AC_MSG_RESULT(no) - ] +[ case $host_os in + *linux*) + if test x$use_ads != xyes; then + AC_MSG_WARN(ADS support should be enabled for building cifs.upcall) + elif test x$HAVE_KEYUTILS_H != x1; then + AC_MSG_WARN(keyutils package is required for cifs.upcall) + else + AC_MSG_RESULT(yes) + AC_DEFINE(WITH_CIFSUPCALL,1,[whether to build cifs.upcall]) + CIFSUPCALL_PROGS=bin/cifs.upcall + INSTALL_CIFSUPCALL=installcifsupcall + UNINSTALL_CIFSUPCALL=uninstallcifsupcall + fi + ;; + *) + AC_MSG_RESULT(no) + ;; + esac ] ) -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha5-508-g53b5730
The branch, v4-0-test has been updated
via 53b57300c799a079b4d64815243fe6120e0a9fa2 (commit)
from baddefd0a6fa430af1a3001064149127e0d29361 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit 53b57300c799a079b4d64815243fe6120e0a9fa2
Author: Simo Sorce [EMAIL PROTECTED]
Date: Fri Sep 12 13:57:50 2008 -0400
Remove ancient remains of first experimentations about
supporting a schema
---
Summary of changes:
source/dsdb/samdb/ldb_modules/config.mk | 11 -
source/dsdb/samdb/ldb_modules/schema.c| 1230 -
source/dsdb/samdb/ldb_modules/schema_syntax.c | 469 --
source/dsdb/samdb/ldb_modules/schema_syntax.h | 71 --
4 files changed, 0 insertions(+), 1781 deletions(-)
delete mode 100644 source/dsdb/samdb/ldb_modules/schema.c
delete mode 100644 source/dsdb/samdb/ldb_modules/schema_syntax.c
delete mode 100644 source/dsdb/samdb/ldb_modules/schema_syntax.h
Changeset truncated at 500 lines:
diff --git a/source/dsdb/samdb/ldb_modules/config.mk
b/source/dsdb/samdb/ldb_modules/config.mk
index 830f7c9..00e4f1a 100644
--- a/source/dsdb/samdb/ldb_modules/config.mk
+++ b/source/dsdb/samdb/ldb_modules/config.mk
@@ -204,17 +204,6 @@ INIT_FUNCTION = LDB_MODULE(partition)
ldb_partition_OBJ_FILES = $(dsdbsrcdir)/samdb/ldb_modules/partition.o
-# Start MODULE ldb_schema
-[MODULE::ldb_schema]
-SUBSYSTEM = LIBLDB
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBEVENTS LIBLDB
-INIT_FUNCTION = LDB_MODULE(schema)
-# End MODULE ldb_schema
-
-
-ldb_schema_OBJ_FILES = $(addprefix $(dsdbsrcdir)/samdb/ldb_modules/, schema.o
schema_syntax.o)
-
-
# Start MODULE ldb_update_kt
[MODULE::ldb_update_keytab]
SUBSYSTEM = LIBLDB
diff --git a/source/dsdb/samdb/ldb_modules/schema.c
b/source/dsdb/samdb/ldb_modules/schema.c
deleted file mode 100644
index f2c4d38..000
--- a/source/dsdb/samdb/ldb_modules/schema.c
+++ /dev/null
@@ -1,1230 +0,0 @@
-/*
- ldb database library
-
- Copyright (C) Simo Sorce 2004-2006
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see http://www.gnu.org/licenses/.
-*/
-
-/*
- * Name: ldb
- *
- * Component: ldb schema module
- *
- * Description: add schema check functionality
- *
- * Author: Simo Sorce
- */
-
-#include includes.h
-#include libcli/ldap/ldap.h
-#include ldb/include/ldb_errors.h
-#include ldb/include/ldb_private.h
-#include lib/util/dlinklist.h
-#include schema_syntax.h
-
-/* Syntax-Table
-
- see ldap_server/devdocs/AD-syntaxes.txt
-*/
-
-enum schema_class_type {
- SCHEMA_CT_88= 0,
- SCHEMA_CT_STRUCTURAL= 1,
- SCHEMA_CT_ABSTRACT = 2,
- SCHEMA_CT_AUXILIARY = 3
-};
-
-struct schema_attribute {
- char *OID; /* attributeID */
- char *name; /* lDAPDisplayName */
- enum schema_internal_syntax syntax; /* generated from
attributeSyntax, oMSyntax, oMObjectClass */
- bool single;/* isSingleValued */
- int min;/* rangeLower */
- int max;/* rangeUpper */
- int systemflag; /* systemFlag */
- int searchflag; /* searchFlag */
- bool isdefunct; /* isDefunct */
-};
-
-struct schema_class {
- char *OID; /* governsID */
- char *name; /* lDAPDisplayName */
- enum schema_class_type type;/* objectClassCategory */
- bool systemOnly;/* systemOnly*/
- bool isdefunct; /* isDefunct */
- int systemflag; /* systemFlag*/
- char *defobjcat;/* defaultObjectCategory */
- struct schema_class *parent;/* subClassOf*/
- struct schema_class **sysaux; /* systemAuxiliaryClass */
- struct schema_class **aux; /*
[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-32-17-g5e73ddb
The branch, v3-0-test has been updated
via 5e73ddba11cbf9ea2d6ca63be098720ff0d5a0d1 (commit)
from d3e790fa70d083a53de221907c951580ce2537a4 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test
- Log -
commit 5e73ddba11cbf9ea2d6ca63be098720ff0d5a0d1
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Fri Sep 12 11:16:03 2008 -0700
Backport of bugfix for #5751, smbclient: cannot show ACLs on DFS, done by
SATOH Fumiyasu [EMAIL PROTECTED].
Jeremy.
---
Summary of changes:
source/libsmb/libsmbclient.c | 47 ++---
1 files changed, 34 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libsmb/libsmbclient.c b/source/libsmb/libsmbclient.c
index a9cf023..49f3d1f 100644
--- a/source/libsmb/libsmbclient.c
+++ b/source/libsmb/libsmbclient.c
@@ -4526,20 +4526,30 @@ cacl_get(SMBCCTX *context,
* attributes have been requested...
*/
if (ipc_cli (all || some_nt || all_nt_acls)) {
+ pstring targetpath;
+ struct cli_state *targetcli;
+
/* Point to the portion after system.nt_sec_desc. */
name += 19; /* if (all) this will be invalid but unused */
+ if (!cli_resolve_path(, cli, filename,
+ targetcli, targetpath))
+ {
+ d_printf(Could not resolve %s\n, filename);
+ return -1;
+ }
+
/* ... then obtain any NT attributes which were requested */
-fnum = cli_nt_create(cli, filename, CREATE_ACCESS_READ);
+fnum = cli_nt_create(targetcli, targetpath,
CREATE_ACCESS_READ);
if (fnum == -1) {
DEBUG(5, (cacl_get failed to open %s: %s\n,
- filename, cli_errstr(cli)));
+ targetpath, cli_errstr(targetcli)));
errno = 0;
return -1;
}
-sd = cli_query_secdesc(cli, fnum, ctx);
+sd = cli_query_secdesc(targetcli, fnum, ctx);
if (!sd) {
DEBUG(5,
@@ -4548,7 +4558,7 @@ cacl_get(SMBCCTX *context,
return -1;
}
-cli_close(cli, fnum);
+cli_close(targetcli, fnum);
if (! exclude_nt_revision) {
if (all || all_nt) {
@@ -5148,6 +5158,9 @@ cacl_set(TALLOC_CTX *ctx,
char *p;
BOOL numeric = True;
+ pstring targetpath;
+ struct cli_state *targetcli;
+
/* the_acl will be null for REMOVE_ALL operations */
if (the_acl) {
numeric = ((p = strchr(the_acl, ':')) != NULL
@@ -5177,19 +5190,27 @@ cacl_set(TALLOC_CTX *ctx,
return -1;
}
+ if (!cli_resolve_path(, cli, filename,
+ targetcli, targetpath))
+ {
+ d_printf(Could not resolve %s\n, filename);
+ errno = ENOENT;
+ return -1;
+ }
+
/* The desired access below is the only one I could find that works
with NT4, W2KP and Samba */
- fnum = cli_nt_create(cli, filename, CREATE_ACCESS_READ);
+ fnum = cli_nt_create(targetcli, targetpath, CREATE_ACCESS_READ);
if (fnum == -1) {
DEBUG(5, (cacl_set failed to open %s: %s\n,
- filename, cli_errstr(cli)));
+ targetpath, cli_errstr(targetcli)));
errno = 0;
return -1;
}
- old = cli_query_secdesc(cli, fnum, ctx);
+ old = cli_query_secdesc(targetcli, fnum, ctx);
if (!old) {
DEBUG(5, (cacl_set Failed to query old descriptor\n));
@@ -5197,7 +5218,7 @@ cacl_set(TALLOC_CTX *ctx,
return -1;
}
- cli_close(cli, fnum);
+ cli_close(targetcli, fnum);
switch (mode) {
case SMBC_XATTR_MODE_REMOVE_ALL:
@@ -5286,25 +5307,25 @@ cacl_set(TALLOC_CTX *ctx,
sd = make_sec_desc(ctx, old-revision, SEC_DESC_SELF_RELATIVE,
owner_sid, group_sid, NULL, dacl, sd_size);
- fnum = cli_nt_create(cli, filename,
+ fnum = cli_nt_create(targetcli, targetpath,
WRITE_DAC_ACCESS | WRITE_OWNER_ACCESS);
if (fnum == -1) {
DEBUG(5, (cacl_set failed to open %s: %s\n,
- filename, cli_errstr(cli)));
+ targetpath, cli_errstr(targetcli)));
errno = 0;
return -1;
}
- if (!cli_set_secdesc(cli, fnum, sd)) {
- DEBUG(5, (ERROR:
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha5-510-geff2774
The branch, v4-0-test has been updated via eff27744d3dcb4f6bcdf9bd03583bb38634c398d (commit) via 696f30fff249656409f2efcc81b86a421d0c6880 (commit) from 53b57300c799a079b4d64815243fe6120e0a9fa2 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log - commit eff27744d3dcb4f6bcdf9bd03583bb38634c398d Merge: 696f30fff249656409f2efcc81b86a421d0c6880 53b57300c799a079b4d64815243fe6120e0a9fa2 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Fri Sep 12 21:31:56 2008 +0200 Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into manpage commit 696f30fff249656409f2efcc81b86a421d0c6880 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Fri Sep 12 21:28:48 2008 +0200 Revert Add option for generating coverage data from python tests. This reverts commit 43c0fdfff02021caef2d8f73d6bfdc4b051a65ef. --- Summary of changes: source/scripting/bin/subunitrun |8 1 files changed, 0 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/source/scripting/bin/subunitrun b/source/scripting/bin/subunitrun index ee2d1e1..6f1086a 100755 --- a/source/scripting/bin/subunitrun +++ b/source/scripting/bin/subunitrun @@ -36,8 +36,6 @@ parser.add_option_group(credopts) sambaopts = options.SambaOptions(parser) parser.add_option_group(sambaopts) parser.add_option_group(options.VersionOptions(parser)) -parser.add_option(--coverage, metavar=CACHE, type=str, - help=Store coverage data in CACHE) args = parser.parse_args()[1] @@ -47,10 +45,4 @@ samba.tests.cmdline_credentials = credopts.get_credentials(samba.tests.cmdline_l param.cvar.default_config = samba.tests.cmdline_loadparm runner = SubunitTestRunner() -if opts.coverage is not None: - import coverage - coverage.use_cache(True, opts.coverage) - coverage.start() program = TestProgram(module=None, argv=[sys.argv[0]] + args, testRunner=runner) -if opts.coverage: - coverage.stop() -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4156-gfba250e
The branch, v3-devel has been updated
via fba250ece45f6632c7d89b0ea28baab047e41a8f (commit)
via 8b81b85200b7ca18cf81fdbbc3254d8578b35f43 (commit)
from 768aa82361a2c4b0aab71433b7593723a2868f0a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit fba250ece45f6632c7d89b0ea28baab047e41a8f
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Fri Sep 12 21:20:02 2008 +0200
remove a pointless empty line
commit 8b81b85200b7ca18cf81fdbbc3254d8578b35f43
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Fri Sep 12 21:19:37 2008 +0200
Add a paranoia check on incoming PDUs
---
Summary of changes:
source/libsmb/async_smb.c |6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libsmb/async_smb.c b/source/libsmb/async_smb.c
index eedc7d4..7b5 100644
--- a/source/libsmb/async_smb.c
+++ b/source/libsmb/async_smb.c
@@ -756,7 +756,13 @@ static void handle_incoming_pdu(struct cli_state *cli)
goto invalidate_requests;
}
}
+ }
+ if ((IVAL(pdu, 4) != 0x424d53ff) /* 0xFFSMB */
+(IVAL(pdu, 4) != 0x424d45ff)) /* 0xFFEMB */ {
+ DEBUG(10, (Got non-SMB PDU\n));
+ status = NT_STATUS_INVALID_NETWORK_RESPONSE;
+ goto invalidate_requests;
}
/*
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4157-gedd7083
The branch, v3-devel has been updated
via edd70836daef340f21df3cb102144935f36e5c4c (commit)
from fba250ece45f6632c7d89b0ea28baab047e41a8f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit edd70836daef340f21df3cb102144935f36e5c4c
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Fri Sep 12 21:56:14 2008 +0200
Add a more explaining comment
---
Summary of changes:
source/include/client.h |4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/client.h b/source/include/client.h
index 9b564fc..70b0421 100644
--- a/source/include/client.h
+++ b/source/include/client.h
@@ -223,7 +223,9 @@ struct cli_state {
struct cli_request *outstanding_requests;
/**
-* The place to build up the list of chained requests.
+* The place to build up the list of chained requests. In CIFS, a
+* single cli_request corresponds to a MID and can serve more than one
+* chained async_req.
*/
struct cli_request *chain_accumulator;
};
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4158-gc1d3ae8
The branch, v3-devel has been updated
via c1d3ae80b5f5f07c5efcd7f3ee301d5c3090f3c6 (commit)
from edd70836daef340f21df3cb102144935f36e5c4c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit c1d3ae80b5f5f07c5efcd7f3ee301d5c3090f3c6
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Fri Sep 12 22:26:10 2008 +0200
Fix make test -- gna...
---
Summary of changes:
source/libsmb/async_smb.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libsmb/async_smb.c b/source/libsmb/async_smb.c
index 7b5..c8d010a 100644
--- a/source/libsmb/async_smb.c
+++ b/source/libsmb/async_smb.c
@@ -759,7 +759,7 @@ static void handle_incoming_pdu(struct cli_state *cli)
}
if ((IVAL(pdu, 4) != 0x424d53ff) /* 0xFFSMB */
-(IVAL(pdu, 4) != 0x424d45ff)) /* 0xFFEMB */ {
+ (SVAL(pdu, 4) != 0x45ff)) /* 0xFFE */ {
DEBUG(10, (Got non-SMB PDU\n));
status = NT_STATUS_INVALID_NETWORK_RESPONSE;
goto invalidate_requests;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-32-36-gd2bea89
The branch, v3-0-test has been updated
via d2bea898942e213fb1e33f46c76274527928473d (commit)
via 59d7d3ae58432a07a858fc7e9161e27bb9478c9e (commit)
via be4adc6938b06fc6df79c6c129528fdbb8b0c041 (commit)
via ce937b28a75b8c72e36bd3853d52a9ac1a7606b9 (commit)
via b5cf5a34d227dd436b12a2d50ba8ddb728799089 (commit)
via 340fdd5fed64ec4a8d7fc937956c722d59a73ba8 (commit)
via 8ee20a90bf312ba8c98ae86439bb8365a4c55561 (commit)
via 186eb5b26e29b687e9eab981a0ef673462f68f78 (commit)
via de0e8337d4fdde8fc3e892710c1f27a697fdcef5 (commit)
via da92a35cae09d312f11f77d900132422162c435a (commit)
via fb47f5de055a444b8b7a4555da0160f8d624e286 (commit)
via c3d0508619e11f3c70fec3427d6cf1213b98895f (commit)
via af743c4407c41ef988ee99891e36b66153697330 (commit)
via 362092be7114d0ed4a8771ff3b4b5166350bac92 (commit)
via e2e41ff95cc2388dd41cee1e105a280fbfcf7c02 (commit)
via 64f1f899dc983196692f535e6142acc0c817c0ab (commit)
via 63aae3f3135741eab8702eb9b261f7cee2fbeca0 (commit)
via 88989075056fb7b14e3ed33b951d5587227a7be7 (commit)
via 9d2c5aee56d58930d4d982046b7164e12c12db5d (commit)
from 5e73ddba11cbf9ea2d6ca63be098720ff0d5a0d1 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test
- Log -
commit d2bea898942e213fb1e33f46c76274527928473d
Author: Jeff Layton [EMAIL PROTECTED]
Date: Fri Sep 12 16:58:00 2008 -0400
mount.cifs: don't prompt for password on krb5 mounts
krb5 mounts require that the user already have a valid krb5 ticket.
Since we can't currently use the password entered, don't prompt for it.
Also, switch to using strncmp instead of strcmp here.
Signed-off-by: Jeff Layton [EMAIL PROTECTED]
commit 59d7d3ae58432a07a858fc7e9161e27bb9478c9e
Author: Jeff Layton [EMAIL PROTECTED]
Date: Fri Sep 12 16:58:00 2008 -0400
mount.cifs: fix several problems when mounting subdirectories of shares
(try 2)
This patch is the second patch to attempt to fix up some of the problems
with mounting subdirectories of shares. The earlier patch didn't handle
this correctly when POSIX extensions were enabled. This one does.
This is a bit of a confusing area since the different components of
a service string have different rules:
1) hostname: no '/' (slash) or '\' (backslash) is allowed to be
embedded within the string
2) sharename: same rules as hostname
3) prefixpath: '\' *is* allowed to be embedded in a path component,
iff POSIX extensions are enabled. Otherwise, neither
character is allowed.
The idea here is to allow either character to act as a delimiter when we
know that the character can't be anything but a delimiter (namely
everywhere up to the start of the prefixpath). The patch will convert
any '\' unconditionally to '/' in the UNC portion of the string.
However, inside the prefixpath, we can't make assumptions about what
constitutes a delimiter because POSIX allows for embedded '\'
characters. So there we don't attempt to do any conversion, and pass the
prefixpath to the kernel as is. Once the kernel determines whether POSIX
extensions are enabled, it can then convert the path if needed and it's
able to do so. A patch to handle this has already been committed to the
cifs-2.6 git tree.
This patch also fixes an annoyance. When you mount a subdir of a share,
mount.cifs munges the device string so that you can't tell what the
prefixpath is. So if I mount:
//server/share/p1/p2/p3
..then /proc/mounts and mtab will show only:
//server/share
Finally, it also tries to apply some consistent rules to the uppercasing
of strings.
Signed-off-by: Jeff Layton [EMAIL PROTECTED]
commit be4adc6938b06fc6df79c6c129528fdbb8b0c041
Author: Jeff Layton [EMAIL PROTECTED]
Date: Fri Sep 12 16:58:00 2008 -0400
Introduce const DATA_BLOB data_blob_null = { NULL, 0, NULL };
Cherry picked from commit 3d3d61687ef00181f4f04e001d42181d93ac931e
Signed-off-by: Jeff Layton [EMAIL PROTECTED]
commit ce937b28a75b8c72e36bd3853d52a9ac1a7606b9
Author: Jeff Layton [EMAIL PROTECTED]
Date: Fri Sep 12 16:57:59 2008 -0400
cifs.upcall: bump SPNEGO msg version number and don't reject old versions
When we added the ability for the kernel to send sec=mskrb5 to the
upcall, we subtly broke old cifs.upcall versions that don't understand
it. Bump the spnego message version to 2 to make this clear. Also,
change cifs.upcall to not reject requests with a version that's lower
than the current one, and to send the reply with the same version that
the request sent. The idea is to try and keep cifs.upcall backward
compatible with old kernels.
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4159-g37fcc9d
The branch, v3-devel has been updated
via 37fcc9dc462dfb006fdac294e49c0dae7588c103 (commit)
from c1d3ae80b5f5f07c5efcd7f3ee301d5c3090f3c6 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit 37fcc9dc462dfb006fdac294e49c0dae7588c103
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Fri Sep 12 23:05:51 2008 +0200
Factor out validate_smb_crypto
---
Summary of changes:
source/libsmb/async_smb.c | 94 +---
1 files changed, 53 insertions(+), 41 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libsmb/async_smb.c b/source/libsmb/async_smb.c
index c8d010a..d5eac07 100644
--- a/source/libsmb/async_smb.c
+++ b/source/libsmb/async_smb.c
@@ -690,6 +690,57 @@ NTSTATUS cli_pull_reply(struct async_req *req,
}
/**
+ * Decrypt a PDU, check the signature
+ * @param[in] cli The cli_state that received something
+ * @param[in] pdu The incoming bytes
+ * @retval error code
+ */
+
+
+static NTSTATUS validate_smb_crypto(struct cli_state *cli, char *pdu)
+{
+ NTSTATUS status;
+
+ if ((IVAL(pdu, 4) != 0x424d53ff) /* 0xFFSMB */
+(SVAL(pdu, 4) != 0x45ff)) /* 0xFFE */ {
+ DEBUG(10, (Got non-SMB PDU\n));
+ return NT_STATUS_INVALID_NETWORK_RESPONSE;
+ }
+
+ if (cli_encryption_on(cli) CVAL(pdu, 0) == 0) {
+ uint16_t enc_ctx_num;
+
+ status = get_enc_ctx_num((uint8_t *)pdu, enc_ctx_num);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(10, (get_enc_ctx_num returned %s\n,
+ nt_errstr(status)));
+ return status;
+ }
+
+ if (enc_ctx_num != cli-trans_enc_state-enc_ctx_num) {
+ DEBUG(10, (wrong enc_ctx %d, expected %d\n,
+ enc_ctx_num,
+ cli-trans_enc_state-enc_ctx_num));
+ return NT_STATUS_INVALID_HANDLE;
+ }
+
+ status = common_decrypt_buffer(cli-trans_enc_state, pdu);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(10, (common_decrypt_buffer returned %s\n,
+ nt_errstr(status)));
+ return status;
+ }
+ }
+
+ if (!cli_check_sign_mac(cli, pdu)) {
+ DEBUG(10, (cli_check_sign_mac failed\n));
+ return NT_STATUS_ACCESS_DENIED;
+ }
+
+ return NT_STATUS_OK;
+}
+
+/**
* A PDU has arrived on cli-evt_inbuf
* @param[in] cli The cli_state that received something
*/
@@ -758,47 +809,8 @@ static void handle_incoming_pdu(struct cli_state *cli)
}
}
- if ((IVAL(pdu, 4) != 0x424d53ff) /* 0xFFSMB */
- (SVAL(pdu, 4) != 0x45ff)) /* 0xFFE */ {
- DEBUG(10, (Got non-SMB PDU\n));
- status = NT_STATUS_INVALID_NETWORK_RESPONSE;
- goto invalidate_requests;
- }
-
- /*
-* TODO: Handle oplock break requests
-*/
-
- if (cli_encryption_on(cli) CVAL(pdu, 0) == 0) {
- uint16_t enc_ctx_num;
-
- status = get_enc_ctx_num((uint8_t *)pdu, enc_ctx_num);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(10, (get_enc_ctx_num returned %s\n,
- nt_errstr(status)));
- goto invalidate_requests;
- }
-
- if (enc_ctx_num != cli-trans_enc_state-enc_ctx_num) {
- DEBUG(10, (wrong enc_ctx %d, expected %d\n,
- enc_ctx_num,
- cli-trans_enc_state-enc_ctx_num));
- status = NT_STATUS_INVALID_HANDLE;
- goto invalidate_requests;
- }
-
- status = common_decrypt_buffer(cli-trans_enc_state,
- pdu);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(10, (common_decrypt_buffer returned %s\n,
- nt_errstr(status)));
- goto invalidate_requests;
- }
- }
-
- if (!cli_check_sign_mac(cli, pdu)) {
- DEBUG(10, (cli_check_sign_mac failed\n));
- status = NT_STATUS_ACCESS_DENIED;
+ status = validate_smb_crypto(cli, pdu);
+ if (!NT_STATUS_IS_OK(status)) {
goto invalidate_requests;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha5-511-g2bf9074
The branch, v4-0-test has been updated
via 2bf9074c7751324483744f55b02cfb044bb0b2dd (commit)
from eff27744d3dcb4f6bcdf9bd03583bb38634c398d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit 2bf9074c7751324483744f55b02cfb044bb0b2dd
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Fri Sep 12 14:59:32 2008 -0700
Comment the delay write time tests so I know what they're
testing.
Jeremy.
---
Summary of changes:
source/torture/basic/delaywrite.c | 44 ++--
1 files changed, 41 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/torture/basic/delaywrite.c
b/source/torture/basic/delaywrite.c
index 1331968..af42beb 100644
--- a/source/torture/basic/delaywrite.c
+++ b/source/torture/basic/delaywrite.c
@@ -1612,6 +1612,11 @@ static bool test_delayed_write_update3(struct
torture_context *tctx,
return ret;
}
+/*
+ * Show that a truncate write always updates the write time even
+ * if an initial write has already updated the write time.
+ */
+
static bool test_delayed_write_update3a(struct torture_context *tctx,
struct smbcli_state *cli,
struct smbcli_state *cli2)
@@ -1819,6 +1824,11 @@ static bool test_delayed_write_update3a(struct
torture_context *tctx,
return ret;
}
+/*
+ * Show a close after write updates the write timestamp to
+ * the close time, not the last write time.
+ */
+
static bool test_delayed_write_update3b(struct torture_context *tctx,
struct smbcli_state *cli,
struct smbcli_state *cli2)
@@ -1979,6 +1989,13 @@ static bool test_delayed_write_update3b(struct
torture_context *tctx,
return ret;
}
+/*
+ * Check that a write after a truncate write doesn't update
+ * the timestamp, but a truncate write after a write does.
+ * Also prove that a close after a truncate write updates the
+ * timestamp to current, not the time of last write.
+ */
+
static bool test_delayed_write_update3c(struct torture_context *tctx,
struct smbcli_state *cli,
struct smbcli_state *cli2)
@@ -2184,6 +2201,12 @@ static bool test_delayed_write_update3c(struct
torture_context *tctx,
return ret;
}
+/*
+ * Show only the first write updates the timestamp, and a close
+ * after writes updates to current (I think this is the same
+ * as test 3b. JRA).
+ */
+
static bool test_delayed_write_update4(struct torture_context *tctx,
struct smbcli_state *cli,
struct smbcli_state *cli2)
@@ -2341,6 +2364,10 @@ static bool test_delayed_write_update4(struct
torture_context *tctx,
return ret;
}
+/*
+ * Show writes and closes have no effect on updating times once a SETWRITETIME
is done.
+ */
+
static bool test_delayed_write_update5(struct torture_context *tctx,
struct smbcli_state *cli,
struct smbcli_state *cli2)
@@ -2499,6 +2526,10 @@ static bool test_delayed_write_update5(struct
torture_context *tctx,
return ret;
}
+/*
+ * Show truncate writes and closes have no effect on updating times once a
SETWRITETIME is done.
+ */
+
static bool test_delayed_write_update5b(struct torture_context *tctx,
struct smbcli_state *cli,
struct smbcli_state *cli2)
@@ -2596,7 +2627,7 @@ static bool test_delayed_write_update5b(struct
torture_context *tctx,
torture_comment(tctx, Server did not update write_time
(correct)\n);
}
- /* sure any further write (truncates) update the write time */
+ /* Do any further write (truncates) update the write time ? */
start = timeval_current();
end = timeval_add(start, 15 * sec, 0);
while (!timeval_expired(end)) {
@@ -2657,6 +2688,14 @@ static bool test_delayed_write_update5b(struct
torture_context *tctx,
return ret;
}
+/*
+ * Open 2 handles on a file. Write one one and then set the
+ * WRITE TIME explicitly on the other. Ensure the write time
+ * update is cancelled. Ensure the write time is updated to
+ * the close time when the non-explicit set handle is closed.
+ *
+ */
+
static bool test_delayed_write_update6(struct torture_context *tctx,
struct smbcli_state *cli,
struct smbcli_state *cli2)
@@ -2852,8 +2891,7 @@ again:
return ret;
}
-
-/*
+/*
testing of delayed update of write_time
*/
struct torture_suite *torture_delay_write(void)
--
Samba Shared
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3994-g1933227
The branch, v3-3-test has been updated
via 1933227a8c7fad24e964b4085ecb626f3997a89c (commit)
from 352f8753586f594f4262b3cab988854de393ad97 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 1933227a8c7fad24e964b4085ecb626f3997a89c
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Fri Sep 12 15:03:45 2008 -0700
Modify a comment to make things clearer.
Jeremy.
---
Summary of changes:
source/smbd/fileio.c |4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/fileio.c b/source/smbd/fileio.c
index 0958418..60aeeef 100644
--- a/source/smbd/fileio.c
+++ b/source/smbd/fileio.c
@@ -204,7 +204,9 @@ void trigger_write_time_update(struct files_struct *fsp)
if (fsp-update_write_time_triggered) {
/*
-* No point - an event is already scheduled.
+* We only update the write time
+* on the first write. After that
+* no other writes affect this.
*/
return;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3022-g46a5c08
The branch, v3-2-test has been updated
via 46a5c08b101f1c218ecd6397614dde1d13a9077a (commit)
from fe280993dea71b87b6042d6aded389b10bcd0b56 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 46a5c08b101f1c218ecd6397614dde1d13a9077a
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Fri Sep 12 15:04:11 2008 -0700
Modify a comment to make things clearer.
Jeremy.
---
Summary of changes:
source/smbd/fileio.c |4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/fileio.c b/source/smbd/fileio.c
index 0958418..60aeeef 100644
--- a/source/smbd/fileio.c
+++ b/source/smbd/fileio.c
@@ -204,7 +204,9 @@ void trigger_write_time_update(struct files_struct *fsp)
if (fsp-update_write_time_triggered) {
/*
-* No point - an event is already scheduled.
+* We only update the write time
+* on the first write. After that
+* no other writes affect this.
*/
return;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4160-g9d55ca8
The branch, v3-devel has been updated
via 9d55ca85ffc73e3fa5fb9895fbcb1ee22f4e320d (commit)
from 37fcc9dc462dfb006fdac294e49c0dae7588c103 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit 9d55ca85ffc73e3fa5fb9895fbcb1ee22f4e320d
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Fri Sep 12 15:03:05 2008 -0700
Modify a comment to make things clearer.
Jeremy.
---
Summary of changes:
source/smbd/fileio.c |4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/fileio.c b/source/smbd/fileio.c
index 0958418..60aeeef 100644
--- a/source/smbd/fileio.c
+++ b/source/smbd/fileio.c
@@ -204,7 +204,9 @@ void trigger_write_time_update(struct files_struct *fsp)
if (fsp-update_write_time_triggered) {
/*
-* No point - an event is already scheduled.
+* We only update the write time
+* on the first write. After that
+* no other writes affect this.
*/
return;
}
--
Samba Shared Repository
Build status as of Sat Sep 13 00:00:03 2008
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2008-09-12 00:01:17.0 + +++ /home/build/master/cache/broken_results.txt 2008-09-13 00:00:17.0 + @@ -1,9 +1,9 @@ -Build status as of Fri Sep 12 00:00:02 2008 +Build status as of Sat Sep 13 00:00:03 2008 Build counts: Tree Total Broken Panic build_farm 0 0 0 -ccache 34 10 0 +ccache 33 10 0 ctdb 0 0 0 distcc 1 0 0 ldb 34 33 0 @@ -11,7 +11,7 @@ lorikeet-heimdal 30 20 0 pidl 21 11 0 ppp 15 0 0 -rsync34 11 0 +rsync33 11 0 samba-docs 0 0 0 samba-gtk7 7 0 samba_3_X_devel 29 15 0
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4161-gf0ee2c1
The branch, v3-devel has been updated
via f0ee2c145fa031f91c28a69a44b7652f18eea0f0 (commit)
from 9d55ca85ffc73e3fa5fb9895fbcb1ee22f4e320d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit f0ee2c145fa031f91c28a69a44b7652f18eea0f0
Author: Jeff Layton [EMAIL PROTECTED]
Date: Fri Sep 12 21:13:54 2008 -0400
cifs.upcall: make most functions static and silence compiler warnings
...to silence -Wmissing-prototypes and some uninit'ed variable
warnings. Thanks to GD for the extra-paranoid compiler flags.
Signed-off-by: Jeff Layton [EMAIL PROTECTED]
---
Summary of changes:
source/client/cifs.upcall.c | 18 +++---
1 files changed, 11 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/client/cifs.upcall.c b/source/client/cifs.upcall.c
index 7cb5166..4110de3 100644
--- a/source/client/cifs.upcall.c
+++ b/source/client/cifs.upcall.c
@@ -32,6 +32,7 @@ create dns_resolver * * /usr/local/sbin/cifs.upcall %k
const char *CIFSSPNEGO_VERSION = 1.2;
static const char *prog = cifs.upcall;
typedef enum _secType {
+ NONE = 0,
KRB5,
MS_KRB5
} secType_t;
@@ -56,7 +57,8 @@ typedef enum _secType {
*
* ret: 0 - success, others - failure
*/
-int handle_krb5_mech(const char *oid, const char *principal,
+static int
+handle_krb5_mech(const char *oid, const char *principal,
DATA_BLOB * secblob, DATA_BLOB * sess_key)
{
int retval;
@@ -88,7 +90,8 @@ int handle_krb5_mech(const char *oid, const char *principal,
#define DKD_HAVE_UID 32
#define DKD_MUSTHAVE_SET (DKD_HAVE_HOSTNAME|DKD_HAVE_VERSION|DKD_HAVE_SEC)
-int decode_key_description(const char *desc, int *ver, secType_t * sec,
+static int
+decode_key_description(const char *desc, int *ver, secType_t * sec,
char **hostname, uid_t * uid)
{
int retval = 0;
@@ -151,7 +154,8 @@ int decode_key_description(const char *desc, int *ver,
secType_t * sec,
return retval;
}
-int cifs_resolver(const key_serial_t key, const char *key_descr)
+static int
+cifs_resolver(const key_serial_t key, const char *key_descr)
{
int c;
struct addrinfo *addr;
@@ -203,7 +207,7 @@ int cifs_resolver(const key_serial_t key, const char
*key_descr)
return 0;
}
-void
+static void
usage(void)
{
syslog(LOG_WARNING, Usage: %s [-c] [-v] key_serial, prog);
@@ -215,12 +219,12 @@ int main(const int argc, char *const argv[])
struct cifs_spnego_msg *keydata = NULL;
DATA_BLOB secblob = data_blob_null;
DATA_BLOB sess_key = data_blob_null;
- secType_t sectype;
+ secType_t sectype = NONE;
key_serial_t key = 0;
size_t datalen;
long rc = 1;
- uid_t uid;
- int kernel_upcall_version;
+ uid_t uid = 0;
+ int kernel_upcall_version = 0;
int c, use_cifs_service_prefix = 0;
char *buf, *hostname = NULL;
const char *oid;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4162-gfc7c71f
The branch, v3-devel has been updated
via fc7c71f15b39158ac58beaa90cc9038db680b8cb (commit)
from f0ee2c145fa031f91c28a69a44b7652f18eea0f0 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit fc7c71f15b39158ac58beaa90cc9038db680b8cb
Author: Jeff Layton [EMAIL PROTECTED]
Date: Fri Sep 12 21:21:33 2008 -0400
mount.cifs: make local versions of strlcat and strlcpy static
...to silence -Wmissing-prototypes
Signed-off-by: Jeff Layton [EMAIL PROTECTED]
---
Summary of changes:
source/client/mount.cifs.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/client/mount.cifs.c b/source/client/mount.cifs.c
index 9d2b449..3b56e5f 100644
--- a/source/client/mount.cifs.c
+++ b/source/client/mount.cifs.c
@@ -94,7 +94,7 @@ char * prefixpath = NULL;
/* like strncpy but does not 0 fill the buffer and always null
*terminates. bufsize is the size of the destination buffer */
-size_t strlcpy(char *d, const char *s, size_t bufsize)
+static size_t strlcpy(char *d, const char *s, size_t bufsize)
{
size_t len = strlen(s);
size_t ret = len;
@@ -108,7 +108,7 @@ size_t strlcpy(char *d, const char *s, size_t bufsize)
/* like strncat but does not 0 fill the buffer and always null
*terminates. bufsize is the length of the buffer, which should
* be one more than the maximum resulting string length */
-size_t strlcat(char *d, const char *s, size_t bufsize)
+static size_t strlcat(char *d, const char *s, size_t bufsize)
{
size_t len1 = strlen(d);
size_t len2 = strlen(s);
--
Samba Shared Repository
