[Samba] IOZone: Number of outstanding requests..
Hello: Sorry for asking iozone ques in this mailing list but couldn't find any mailing list on iozone... In IOZone, is there a way to configure # of outstanding requests client sends to server side? Something on the lines of IOMeter option Number of outstanding requests. Thanks a lot! -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Vista clients having Issues Copying files from Samba Server
Anthony wrote: Please update to Samba 3.4.3 or later. Many Vista and Windows 7 support related issues have been addressed during the 3.4.x series. Firstly, if the Samba logs note an invalid function all, that may mean an upgrade to a more recent version of Samba is needed. When a Windows client notes an invalid function call or an invalid file handle the cause may be problems in the network transport layer. Secondly, note what the Samba server log message says. Short translation is: I was taking to the client, but the client went away and did not respond! The client dropped the connection. In all likeliness this is not a Samba problem and may actually be a network problem. It is a problem regularly seen with low-cost ethernet interfaces and cheap ether-switches. Kindest, John T. I think I already know the answer to this but do you know of any 3rd party repos that would have packages for samba 3.4.x on Centos 5.4? Cheers, Anthony ftp://ftp.sernet.de/pub/samba/experimental/centos/5/ The 3.4 series should make its way into their recent and tested repositories eventually. Moray. To err is human. To purr, feline -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] winbind issue with samba 3.3.9
Hi, This morning I had an issue with winbind where it lost all its uid's, I tried restarting samba and winbind but still no joy :-( The only way to fix it was to change the following : idmap config WEBHOSTING : schema_mode = rfc2307 idmap config WEBHOSTING : backend = ad idmap config WEBHOSTING : range= 500 - 3 to : idmap config ALLDOMAINS : schema_mode = rfc2307 idmap config ALLDOMAINS : backend = ad idmap config ALLDOMAINS : range= 500 - 3 Does anyone know why this problem occurs ? Is it winbind caching ? I previously had this problem when i upgraded to 3.3.9 for 3.2.15, again the fix was to change the name of the idmap config.. Any help greatly appreciated. Thanks. Wasim -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] kerberos configuration in samba
Hi All, I am using samba-3.2.11-0.1.145 in my setup. I have multiple domain controllers for a domain. I am confused on do I need to edit /etc/krb5.conf or not. I am using MIT kerberos (krb5-1.4.3-19.34) on SLES10. Here is what I got from Samba HOWTO: 1. Adding entries in /etc/krb5.conf for kdc =, admin server = and password server = is only necessary if SRV records are not there in DNS server. If SRV records are there, no need to configure /etc/krb5.conf. 2. /etc/samba/smb.conf should contain the list of domain controllers in password server = line (space separated) or can contain *, which will get the list from DNS SRV records. 3. If SRV records are not present (may be I migrated my DNS server to linux box), then I need to manually enter kdc =, etc, lines in /etc/krb5.conf. 4. I can have multiple kdc = entries in /etc/krb5.conf, if I need to manually configure /etc/krb5.conf, but only single admin server = and password server = line. How does this /etc/krb5.conf entry for admin server and password server becomes HA if the machine specified in admin server and password server goes down? Any help appreciated. Thanks, Rajesh -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] kerberos configuration in samba
Rajesh Ghanekar rajesh_ghane...@symantec.com wrote: 4. I can have multiple kdc = entries in /etc/krb5.conf, if I need to manually configure /etc/krb5.conf, but only single admin server = and password server = line. How does this /etc/krb5.conf entry for admin server and password server becomes HA if the machine specified in admin server and password server goes down? As I remember, you can only have one admin server (and password server?), since kerberos only supports read-only slaves, unless Microsoft changed something in the protocol. One idea to make an admin server HA in krb5.conf could be DNS round robin, as far as multiple admin server are really supported. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] kerberos configuration in samba
Ralf Hornik Mailings wrote: Rajesh Ghanekar rajesh_ghane...@symantec.com wrote: 4. I can have multiple kdc = entries in /etc/krb5.conf, if I need to manually configure /etc/krb5.conf, but only single admin server = and password server = line. How does this /etc/krb5.conf entry for admin server and password server becomes HA if the machine specified in admin server and password server goes down? As I remember, you can only have one admin server (and password server?), since kerberos only supports read-only slaves, unless Microsoft changed something in the protocol. One idea to make an admin server HA in krb5.conf could be DNS round robin, as far as multiple admin server are really supported. Hi Ralf, Does other points (#1 - #3) mentioned in my mail holds true or there is still some confusion from my side? Thanks, Rajesh -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] kerberos configuration in samba
Hi All, I am using samba-3.2.11-0.1.145 in my setup. I have multiple domain controllers for a domain. I am confused on do I need to edit /etc/krb5.conf or not. I am using MIT kerberos (krb5-1.4.3-19.34) on SLES10. Here is what I got from Samba HOWTO: 1. Adding entries in /etc/krb5.conf for kdc =, admin server = and password server = is only necessary if SRV records are not there in DNS server. If SRV records are there, no need to configure /etc/krb5.conf. 2. /etc/samba/smb.conf should contain the list of domain controllers in password server = line (space separated) or can contain *, which will get the list from DNS SRV records. 3. If SRV records are not present (may be I migrated my DNS server to linux box), then I need to manually enter kdc =, etc, lines in /etc/krb5.conf. 4. I can have multiple kdc = entries in /etc/krb5.conf, if I need to manually configure /etc/krb5.conf, but only single admin server = and password server = line. How does this /etc/krb5.conf entry for admin server and password server becomes HA if the machine specified in admin server and password server goes down? Any help appreciated. Thanks, Rajesh -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Cross compiling for ARM with some errors
On Monday 14 December 2009 10:29:03 Piotr Piwko wrote: I try to cross compile samba for my ARM platform, but I get the following error in the building process: Hm, I'm running Samba on ARM platforms as well, but so far I saved myself the trouble and compiled software natively :). Still, let's see if I can be of some help. What cross-compiler tool-chain are you using? What version of Samba are you trying to build? Cheers, Kai -- Kai Blin WorldForge developer http://www.worldforge.org/ Wine developerhttp://wiki.winehq.org/KaiBlin Samba team member http://www.samba.org/samba/team/ -- Will code for cotton. signature.asc Description: This is a digitally signed message part. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] how to join to AD ? -Annoyed
mistofeles wrote: I'm installing another Ubuntu 9.10 server from scratch with the advice above. It seems that you got to instal krb5-users and krb5-client to make it work. I spent hours with this. In the end I installed this samba4-bla-bla and managed to make 'net' run, but managed not to make a connection. In this time my previous servers started to give unnumbered and -documented error messages. I really wonder, if there is any way to make Samba work. There is too much undocumented material. New versions of programs are dripping in all the time and nobody seems to know how to make it work. I'm a professional with computers meaning that I have had possibilities and time to work with this. I just wonder how an normal user manages with this mess. -- View this message in context: http://old.nabble.com/how-to-join-to-AD---tp26513594p26793428.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] how to join to AD ?
2009/12/14 mistofeles ptmu...@utu.fi: I'm installing another Ubuntu 9.10 server from scratch with the advice above. It seems that you got to instal krb5-users and krb5-client to make it work. Here is what I got (not so important): r...@sandy:# net The program 'net' can be found in the following packages: * samba-common-bin * samba4-clients Try: apt-get install selected package net: command not found r...@sandy:# dpkg --get-selections |grep samba samba install samba-common install samba-common-bin install samba-doc install r...@sandy:# whereis net net: /usr/src/linux-headers-2.6.31-16/net /usr/src/linux-headers-2.6.31-16-generic-pae/net /usr/bin/net.samba3 This is what it should look like: $ ls -l /usr/bin/net lrwxrwxrwx 1 root root 21 2009-12-05 17:51 /usr/bin/net - /etc/alternatives/net $ ls -l /etc/alternatives/net lrwxrwxrwx 1 root root 19 2009-12-05 17:44 /etc/alternatives/net - /usr/bin/net.samba3 $ ls -l /usr/bin/net.samba3 -rwxr-xr-x 1 root root 5258980 2009-10-01 16:45 /usr/bin/net.samba3 So I think that on your machine, the /etc/alternatives links are not set up for the net command. Try this: $ sudo update-alternatives --auto net -- Michael Wood esiot...@gmail.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Cross compiling for ARM with some errors
-- Forwarded message -- From: Michael Wood esiot...@gmail.com Date: 2009/12/15 Subject: Re: [Samba] Cross compiling for ARM with some errors To: Piotr Piwko piotr.pi...@gmail.com 2009/12/14 Piotr Piwko piotr.pi...@gmail.com: Hello, I try to cross compile samba for my ARM platform, but I get the following error in the building process: % PICFLAG = -fPIE LIBS = -lresolv -lnsl -ldl LDFLAGS = -pie -Wl,-z,relro -L/home/piotr/mini2440/usr/local/arm/4.3.2/lib DYNEXP = LDSHFLAGS = shared-libraries-disabled -Wl,-z,relro -L/home/piotr/mini2440/usr/local/arm/4.3.2/lib SHLIBEXT = shared_libraries_disabled SONAMEFLAG = shared-libraries-disabled Linking bin/smbd /home/piotr/mini2440/usr/local/arm/4.3.2/bin/../lib/gcc/arm-none-linux-gnueabi/4.3.2/../../../../arm-none-linux-gnueabi/bin/ld: ../lib/util/asn1.o: Relocations in generic ELF (EM: 3) ../lib/util/asn1.o: could not read symbols: File in wrong format collect2: ld returned 1 exit status % My configure options are: ./configure --host=i686 \ --target=arm-linux \ System types: --build=BUILD configure for building on BUILD [guessed] --host=HOST cross-compile to build programs to run on HOST [BUILD] --target=TARGET configure for building compilers for TARGET [HOST] --target only really applies if you're building things like compilers. --build is auto-detected. --host should be the only thing you need to set. What you're telling configure is that you want to build something like a compiler that runs on i686 and produces binaries for arm-linux. Try: ./configure --host=arm-linux --prefix=... -- Michael Wood esiot...@gmail.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] [Announce] Samba 3.5.0pre2 Available for Download
Release Announcements = This is the second preview release of Samba 3.5. This is *not* intended for production environments and is designed for testing purposes only. Please report any defects via the Samba bug reporting system at https://bugzilla.samba.org/. Major enhancements in Samba 3.5.0 include: General changes: o Add support for full Windows timestamp resolution Protocol changes: o Experimental implementation of SMB2 Printing Changes: o Add encryption support for connections to a CUPS server Winbind changes: o Major refactoring o Asynchronous General changes: Support for full Windows timestamp resolution has been added. This effectively makes us use Windows' full 100ns timestamp resolution if supported by the kernel (2.6.22 and higher) and the glibc (2.6 and higher). Protocol changes An EXPERIMENTAL implementation of the SMB2 protocol has been added. SMB2 can be enabled by setting max protocol = smb2. SMB2 is a new implementation of the SMB protocol used by Windows Vista and higher. Printing Changes A new parameter cups encrypt has been added to control whether connections to CUPS servers will be encrypted or not. The default is to use unencrypted connections. Winbind changes === The Winbind daemon has been refactored internally to be asynchronous. The new Winbind will not be blocked by running 'wbinfo -g' or 'wbinfo -u'. ## Changes ### smb.conf changes Parameter Name Description Default -- --- --- create krb5 confNew yes ctdb timeoutNew 0 cups encryptNew no debug hires timestamp Changed Default yes ldap deref New auto ldap follow referralNew auto New configure options - --enable-external-libtalloc Enable external tdb --enable-netapi Turn on netapi support --enable-pthreadpoolEnable pthreads pool helper support --with-cifsumount Include umount.cifs (Linux only) support --with-codepagedir=DIR Where to put codepages Commit Highlights = o Björn Jacke b...@sernet.de * Add support for full Windows timestamp resolution. * Add encryption support for connections to a CUPS server. o Volker Lendecke v...@samba.org * Major internal refactoring of the Winbind daemon. * Make Winbind asynchronous. o Stefan Metzmacher me...@samba.org * Implement the new SMB2 protocol (experimental). Changes since 3.5.0pre1 --- o Michael Adam ob...@samba.org * Fix the build when no external talloc and tdb are installed. * Fix detection of CTDB headers on systems without system-libtalloc. o Jeremy Allison j...@samba.org * BUG 6802: A created folder does not properly inherit permissions from parent in vfs_acl_xattr. * BUG 6837: Too many open files when trying to access large number of files from Windows 7. * BUG 6938 : No hook exists to check creation rights when using acl_xattr module. * Fix vfs_acl_xattr which was failing to call the NEXT connect function. * Restructure the ACL code. * Refactor reply_rmdir to use handle based code. o Dan Cox d...@wep.net * BUG 2350: Add LDAP Alias Dereferencing support. o Günther Deschner g...@samba.org * BUG 6929: Fix build with recent heimdal. * Fix several printing issues. * Fix the build on Mac OS X 10.6.2. * Fix net and rpcclient after setprinterdataex changes. * Add full support for level 8 printer drivers. * Add more spoolss architectures to IDL. * Fix enumprinter key client and server. * Fix crash in EnumPrinterDataEx. o Björn Jacke b...@sernet.de * Prefer posix_fallocate for doing strict allocate. o Matt Kraai mkr...@beckman.com * BUG 6860: Fix shared library build on QNX. o Volker Lendecke v...@samba.org * BUG 6288: SWAT adds a second share when changing parameters of an existing share. * BUG 6435: Fix minor memory corruption. * Restore fake directory create times as a share parameter. * Fix explicit stat64 support. * Add support for NetWkstaGetInfo 101 and 102. * Add rpcclient wkssvc_enumerateusers. * De-deprecate write cache size to prevent its removal without a proper alternative. * Allow more than 1000 users in BUILTIN\Users. o Jim McDonough j...@samba.org * BUG 6967: Prevent glibc error on 'net ads join'. o Lars Müller l...@samba.org * BUG 6710: Only install the cifs.upcall man page if CIFSUPCALL_PROGS was set while configure. o Ian Puleston ipules...@sonicwall.com * Complete
Re: [Samba] kerberos configuration in samba
Rajesh Ghanekar rajesh_ghane...@symantec.com wrote: One idea to make an admin server HA in krb5.conf could be DNS round robin, as far as multiple admin server are really supported. Does other points (#1 - #3) mentioned in my mail holds true or there is still some confusion from my side? Regarding http://www.informit.com/guides/content.aspx?g=securityseqNum=37 kerberos libs should use nss (name service switch), but you can easyly figure it out by trying. ;-) When you have a working DNS with SRV records pointing g to your KDC you can simply move your krb5.conf and try a kinit to get credendials. This should work, when using DNS. However, you also might want to add some entries to nsswitch.conf like rpc: files dns services: files dns or something... -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] kerberos configuration in samba
Hi Ralf, Thanks for the help. But I was asking if all 4 points mentioned in my mail are correct or not, like what if SRV records are not present, etc, then what should go in krb5.conf and smb.conf? Thanks, Rajesh Ralf Hornik Mailings wrote: Rajesh Ghanekar rajesh_ghane...@symantec.com wrote: One idea to make an admin server HA in krb5.conf could be DNS round robin, as far as multiple admin server are really supported. Does other points (#1 - #3) mentioned in my mail holds true or there is still some confusion from my side? Regarding http://www.informit.com/guides/content.aspx?g=securityseqNum=37 kerberos libs should use nss (name service switch), but you can easyly figure it out by trying. ;-) When you have a working DNS with SRV records pointing g to your KDC you can simply move your krb5.conf and try a kinit to get credendials. This should work, when using DNS. However, you also might want to add some entries to nsswitch.conf like rpc: files dns services: files dns or something... -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Dynamic updates to interfaces parameter doesn't work
Hi All, I am trying to make changes to interfaces = parameter in smb.conf while samba is running but even after smbcontrol smbd reload-configuration , there is no effect of this change. Please tell me how to find the interfaces a running smbd is listening to since smb.conf file may have changed since smbd started and didn't detect these changes. Version : 3.0.33-3.7.el5 Platform: Red Hat Enterprise Linux Server release 5.3 Best Wishes Yatish -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] kerberos configuration in samba
Rajesh Ghanekar rajesh_ghane...@symantec.com wrote:
Hi Ralf,
Thanks for the help. But I was asking if all 4 points mentioned in my mail
are correct or not, like what if SRV records are not present, etc, then what
should go in krb5.conf and smb.conf?
Im not clear, what you are asking for. All points 1 - 3 are true.
Point 1 and 3. Have you got a working DNS? So getting kerberos
credendials works without any krb5.conf (testet 1 minute before). (You
only have to attach the kerberos realm when kinit e.g. kinit
u...@realm.org).
If not you have to set krb5.conf like:
[libdefaults]
default_realm = REALM.ORG
[realms]
REALM.ORG = {
kdc = master.realm.org:88
kdc = slave.realm.org:88
admin_server = master.realm.org:749
default_domain = realm.org
}
[domain_realm]
.realm.org = REALM.ORG
realm.org = REALM.ORG
Point 2. This is explained by itself and correct.
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Max Multiplex
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Maybe a final reply on your solution would be beneficial. There may be others who are wondering the same thing. It only helps to bolster the community and the project. On Mon, 14 Dec 2009, Learner Study wrote: Date: Mon, 14 Dec 2009 18:34:48 -0800 From: Learner Study learner.st...@gmail.com To: Andrew Bartlett abart...@samba.org Cc: samba@lists.samba.org, samba-techni...@lists.samba.org Subject: Re: [Samba] Max Multiplex Pls ignore it - I found the solution! But if there is any other performance trick I could use with 2003 client, pls do suggest... thanks! On Mon, Dec 14, 2009 at 6:23 PM, Learner Study learner.st...@gmail.com wrote: Hello: 1, Is there a limit on Max Multiplex (Max Mux count) in samba? 2. How can it be changed from a config file or command line? I couldn't find it so I changed it in the code but for some reason, I'm unable to set a value over 1000is 1000 the max for it? Thanks! -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba - ---Robert Freeman-Day - --- I would really like you to be on my side, but the side you show me isn't what I had in mind. - -Judybats GPG Public Key: http:keyserver.ubuntu.com:11371/pks/lookup?op=getsearch=0xBA9DF9ED3E4C7D36 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAksnmRwACgkQup357T5MfTZlmwCeMJiTRy2GbO68cne3mf6zhCcV OHwAn3+FF21jmADjV17R2C0wzMjrUppV =ekL+ -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] Auitomatic Password synchronisation
I have set up Samba on a Debian Lenny server. I have set up the users by using 'adduser' and then using 'smbpassword -a username' to add the users to the Samba users database. The users have the same username on both their Windows Client and the Samba server. my smb.conf security = user username level 2 encrypt passwords = true obey pam restrictions = yes unix password sync = yes passwd program = /usr/bin/passwd %u passwd chat = *Enter\snew\s*\spassword:* %n\n *Retype\snew\s*\spassword:* %n\n *password\supdated\ssuccessfully* . pam password change = yes I'm expecting the user to be prompted for his Windows password and for this to be applied to smbpassword but the user is simply being refused access. What am I doing wrong? Many Thanks, Dave Coventry -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Samba write permissions being set incorrectly on FreeBSD 7.2
I've found that write permissions get set after updating (copy over) read-only files from Windows XP to my Samba 3.3.3 mount on FreeBSD 7.2. I have the map archive = no option. If I change this option to yes then the write bits are cleared, as expected for either setting in this scenario. Why are the write bits getting mapped per this setting? fwiw: I've never seen this on Linux version of Samba. Could it be ext3 vs. ufs? Thanks, Mark Lokowich Compellent Technologies -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] no access from a Windows XP client
The Samba server is set up as a stand alone file server with a share available to guests and with read and write access. Access from one Windows XP machine works as expected, the share is visible and files in it can be edited. This applies with two different users on the Windows XP client. From a second Windows XP machine the server is visible when looking for computers on the network but access is not allowed. I am not able to 'see' the shares on the server. I can update the samba configuration file from that second Windows XP machine so there is connectivity. What am I missing? Dr Elizabeth Taylor Director Centre for Information and Communications Technology St John's University of Tanzania P O Box 47, Dodoma Tanzania email:etay...@sjut.ac.tz phone: +255 (0)26 239 0044 FAX: +255 (0)26 239 0025 mobile: +255 (0)784 659 548 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Dynamic updates to interfaces parameter doesn't work
Hi All, I am trying to make changes to interfaces = parameter in smb.conf while samba is running but even after smbcontrol smbd reload-configuration , there is no effect of this change. Developers please tell me whether it is the expected behavior ? Version : 3.0.33-3.7.el5 Platform: Red Hat Enterprise Linux Server release 5.3 Thanks and regards Yatish -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] IOZone: Number of outstanding requests..
Have you tried dbench.samba.org ? it can generate native smb,nfs,iscsi commands with a great amount of control of what is exactly passed on the wire. On Tue, Dec 15, 2009 at 7:50 PM, Learner Study learner.st...@gmail.com wrote: Hello: Sorry for asking iozone ques in this mailing list but couldn't find any mailing list on iozone... In IOZone, is there a way to configure # of outstanding requests client sends to server side? Something on the lines of IOMeter option Number of outstanding requests. Thanks a lot! -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Dynamic updates to interfaces parameter doesn't work
Hi All, I am trying to make changes to interfaces = parameter in smb.conf while samba is running but even after smbcontrol smbd reload-configuration , there is no effect of this change. Please tell me how to find the interfaces a running smbd is listening to since smb.conf file may have changed since smbd started and didn't detect these changes. Version : 3.0.33-3.7.el5 Platform: Red Hat Enterprise Linux Server release 5.3 Best Wishes Yatish -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Automatic password syncronisation.
I have set up Samba on a Debian Lenny server. I have set up the users by using 'adduser' and then using 'smbpassword -a username' to add the users to the Samba users database. The users have the same username on both their Windows Client and the Samba server. my smb.conf security = user username level 2 encrypt passwords = true obey pam restrictions = yes unix password sync = yes passwd program = /usr/bin/passwd %u passwd chat = *Enter\snew\s*\spassword:* %n\n *Retype\snew\s*\spassword:* %n\n *password\supdated\ssuccessfully* . pam password change = yes I'm expecting the user to be prompted for his Windows password and for this to be applied to smbpassword but the user is simply being refused access. What am I doing wrong? Many Thanks, Dave Coventry -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] How can I find my files in a shared folder?
Hi, there I have a Samba(3.0.22) PDC and 100 XP users. This configuration works perfect for me. Thanks for Samba team. My question is: Is there a way to show an XP user all files belong to her/him on a Samba shared folder? The reason I'm asking, is I want to find all my file on the shared Samba folder. Thanks, Allen -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] SerNet package spool directory
Hi Volker, It would be useful if your 3.3.9 build (currently in recent) included the /var/spool/samba directory - it just took me a while to figure out why Samba printing wasn't working on a new EL5 server ;-) Moray. To err is human. To purr, feline -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] kerberos configuration in samba
Hi Ralf,
Ralf Hornik Mailings wrote:
Rajesh Ghanekar rajesh_ghane...@symantec.com wrote:
Hi Ralf,
Thanks for the help. But I was asking if all 4 points mentioned in
my mail
are correct or not, like what if SRV records are not present, etc,
then what
should go in krb5.conf and smb.conf?
Im not clear, what you are asking for. All points 1 - 3 are true.
Point 1 and 3. Have you got a working DNS? So getting kerberos
credendials works without any krb5.conf (testet 1 minute before). (You
only have to attach the kerberos realm when kinit e.g. kinit
u...@realm.org).
Thanks for the information.
I have some more questions:
- I guess I don't need to do kinit manually if I am using net ads join
command, right?
- Does samba use SRV records for anything else other than finding out domain
controller names? If not, I can do away without them by writing manual
entries
in /etc/krb5.conf. I will be using DNS, but no SRV records.
- I found that even when no SRV records are present and wrong (invalid
hosts)
IP addresses configured for domain controllers (in smb.conf and
/etc/krb5.conf),
I am still able to join the domain. I am not sure if there is any
component which
actually does broadcasting and finds out if any domain controller
present using
this fallback method?
Thanks,
Rajesh
If not you have to set krb5.conf like:
[libdefaults]
default_realm = REALM.ORG
[realms]
REALM.ORG = {
kdc = master.realm.org:88
kdc = slave.realm.org:88
admin_server = master.realm.org:749
default_domain = realm.org
}
[domain_realm]
.realm.org = REALM.ORG
realm.org = REALM.ORG
Point 2. This is explained by itself and correct.
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/options/samba
[Samba] samba with full audit and trash
Hi list i running my samba with full audit module, when i run recycle together full audit fails. I can run samba with full audit + recycle? Thanks. My conf: in [GLOBAL]: #lixeira vfs object = recycle recycle:repository = /hda1/lixeira/.recycle/%U recycle:keeptree = Yes recycle:touch = Yes recycle:versions = Yes recycle:maxsize = 0 recycle:minsize = 1 recycle:exclude = *.tmp *.temp *.o *.obj ~$* *.~?? recycle:excludedir = /tmp /temp /cache recycle:noversions = *.doc *.xls *.ppt *.docx *.xlsx #auditoria vfs objects = full_audit full_audit:success = open, opendir, write, unlink, rename, mkdir, rmdir, chmod, chown full_audit:prefix = %u|%I|%S full_audit:failure = none full_audit:facility = local5 full_audit:priority = notice in shares: vfs object = recycle recicle:repository = /hda1/lixeira/.recycle/ -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] [Announce] Samba 3.5.0pre2 Available for Download
Quoting Karolin Seeger (ksee...@samba.org): Release Announcements = This is the second preview release of Samba 3.5. This is *not* Please notice that, contrary to what we generally did up to now, Debian maintainers have not been able to build a package for pre1 before pre2 went out... This is mostly because we apparently can't build with the packaged talloc libraries (Debian currently has 2.0.0 while 3.5.0pre version apprently need 2.0.1). Hopefully, that will be solved for pre2 if Jelmer manages to package talloc 2.0.1. Of course, as long as 3.5 is a prerelease, we will upload it to Debian experimental and 3.4.* series will remain the ones targeted for Debian squeeeze. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] samba with full audit and trash
On Tue, Dec 15, 2009 at 05:10:39PM -0200, Andre Losnak wrote: Hi list i running my samba with full audit module, when i run recycle together full audit fails. I can run samba with full audit + recycle? Thanks. My conf: in [GLOBAL]: #lixeira vfs object = recycle recycle:repository = /hda1/lixeira/.recycle/%U recycle:keeptree = Yes recycle:touch = Yes recycle:versions = Yes recycle:maxsize = 0 recycle:minsize = 1 recycle:exclude = *.tmp *.temp *.o *.obj ~$* *.~?? recycle:excludedir = /tmp /temp /cache recycle:noversions = *.doc *.xls *.ppt *.docx *.xlsx #auditoria vfs objects = full_audit full_audit:success = open, opendir, write, unlink, rename, mkdir, rmdir, chmod, chown full_audit:prefix = %u|%I|%S full_audit:failure = none full_audit:facility = local5 full_audit:priority = notice in shares: vfs object = recycle recicle:repository = /hda1/lixeira/.recycle/ So one says object the other objects. Do you have to pick one or the other? Do you have to perhaps combine them in one line? -- Len Sorensen -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Kerberos authentication when accessing samba domain member when PDC is also samba
Hi! I have next setup: PDC: Samba 3.0.25b-apple, Mac OS X 10.5.8 server. (Lets call it Serv2) Machines can join domain. Clients can use kerberos to authenticate. Everything works pretty good. Domain member: Samba 3.2.7-11.4.1-2210-SUSE-CODE11, OpenSUSE 11.1. (Lets call it Serv2) this server joined domain. Clients can connets, server authenticate clients on domain controller, everything good, with one exception. Clients can't use kerberos authentication when they access Serv2. Serv2 unable to check validity of tickets. Is it possible to have such config working (samba domain members accept kerberos authentication) without Windows-based ADS? Here I provide effective [global] section for both servers Serv1: Server role: ROLE_DOMAIN_PDC [global] dos charset = 437 unix charset = UTF-8-MAC display charset = UTF-8-MAC workgroup = MY_DOMAIN realm = XX.MY.REALM.HERE server string = PDC auth methods = guest, odsam map to guest = Bad User obey pam restrictions = Yes passdb backend = odsam lanman auth = No use kerberos keytab = Yes log level = 2 debug pid = Yes max xmit = 131072 name resolve order = lmhosts wins bcast host max smbd processes = 100 printcap name = cups add user script = /usr/bin/opendirectorypdbconfig -c create_user_account -r %u -n /LDAPv3/127.0.0.1 add machine script = /usr/bin/opendirectorypdbconfig -c create_computer_account -r %u -n /LDAPv3/127.0.0.1 logon script = logon.cmd logon path = XXX logon drive = XXX logon home = XXX domain logons = Yes os level = 65 preferred master = Yes domain master = Yes wins server = 130.89.4.21 usershare path = /var/samba/shares idmap domains = default idmap alloc backend = odsam idmap negative cache time = 5 com.apple:filter shares by access = yes darwin_streams:brlm = yes idmap config default:backend = odsam idmap config default:default = yes acl check permissions = No ea support = Yes stream support = Yes use sendfile = Yes printing = cups print command = lpq command = %p lprm command = include = /var/db/smb.conf vfs objects = darwinacl, darwin_streams Serv2: Server role: ROLE_DOMAIN_MEMBER [global] workgroup = MY_DOMAIN realm = XX.MY.REALM.HERE server string = file-server security = domain map to guest = Bad User password server = my.pdc.hostname.here log file = /var/log/samba/log.%m.%U printcap name = cups add machine script = /usr/sbin/useradd -c Machine -d /var/lib/nobody -s /bin/false %m$ domain master = No wins server = wins_servers_here winbind use default domain = Yes cups options = raw include = /etc/samba/dhcp.conf I tried to put security = ADS for Serv2, but it doesn't change a lot. And, obviously, you can't net ads join on Serv2. Because Serv1 isn't really ADS. Does anyone have ideas how to get this setup working? I'm pretty sure there should be some magical trick! Cause Serv1 definitely can accept krb5 tickets, and Serv2 able to use this method, at least in case of ADS controller above. Of course I can try to work it different way (put security=USER for Serv2 and spend days and hours trying to get it authorize against open-directory, but I would rather prefer to stick to domain concept). Anton. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] samba with full audit and trash
On 12/15/2009 01:10 PM, Andre Losnak wrote: Hi list i running my samba with full audit module, when i run recycle together full audit fails. I can run samba with full audit + recycle? Yes. Use the following: vfs object = recycle full_audit - John T. Thanks. My conf: in [GLOBAL]: #lixeira vfs object = recycle recycle:repository = /hda1/lixeira/.recycle/%U recycle:keeptree = Yes recycle:touch = Yes recycle:versions = Yes recycle:maxsize = 0 recycle:minsize = 1 recycle:exclude = *.tmp *.temp *.o *.obj ~$* *.~?? recycle:excludedir = /tmp /temp /cache recycle:noversions = *.doc *.xls *.ppt *.docx *.xlsx #auditoria vfs objects = full_audit full_audit:success = open, opendir, write, unlink, rename, mkdir, rmdir, chmod, chown full_audit:prefix = %u|%I|%S full_audit:failure = none full_audit:facility = local5 full_audit:priority = notice in shares: vfs object = recycle recicle:repository = /hda1/lixeira/.recycle/ -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] problems when trying to upgrade from Samba4 alpha 8 to alpha10
Hi, I have installed Samba 4 alpha8 on Ubuntu Server 9.10 with openldap backend (2.4.20) as described in http://wiki.samba.org/index.php/Samba4/HOWTO/Ubuntu_Server_9.04; which is working fine so far. Now, I tried to upgrade to alpha 10. The steps I took were: - checked out alpha 10 from git - run make (compiled everything fine) - shut down running samba daemon - tried to run ./scripting/bin/upgradeprovision - s path to smb.conf in samba4 install There, I always getting the following error: *** schema_load_init: no schema head present: (skip schema loading) Traceback (most recent call last): File ./scripting/bin/upgradeprovision, line 772, in module names = guess_names_from_current_provision(creds,session,paths) File ./scripting/bin/upgradeprovision, line 212, in guess_names_from_current_provision res3= samdb.search(expression=(objectClass=*),base=CN=Sites,+configdn, scope=SCOPE_ONELEVEL, attrs=attrs3) _ldb.LdbError: (32, 'No such Base DN: CN=Sites,CN=Configuration,DC=example,DC=com') *** Any ideas what I am making wrong? any things to look after? Thanks in advance for helpful pointers! Regards, Dirk -- GRATIS für alle GMX-Mitglieder: Die maxdome Movie-FLAT! Jetzt freischalten unter http://portal.gmx.net/de/go/maxdome01 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Auitomatic Password synchronisation
Does anybody else have experience of this? 2009/12/15 Dave Coventry dgcoven...@gmail.com: I have set up Samba on a Debian Lenny server. I have set up the users by using 'adduser' and then using 'smbpassword -a username' to add the users to the Samba users database. The users have the same username on both their Windows Client and the Samba server. my smb.conf security = user username level 2 encrypt passwords = true obey pam restrictions = yes unix password sync = yes passwd program = /usr/bin/passwd %u passwd chat = *Enter\snew\s*\spassword:* %n\n *Retype\snew\s*\spassword:* %n\n *password\supdated\ssuccessfully* . pam password change = yes I'm expecting the user to be prompted for his Windows password and for this to be applied to smbpassword but the user is simply being refused access. What am I doing wrong? Many Thanks, Dave Coventry -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] kerberos configuration in samba
On Tue, Dec 15, 2009 at 4:48 AM, Rajesh Ghanekar rajesh_ghane...@symantec.com wrote: Hi All, I am using samba-3.2.11-0.1.145 in my setup. I have multiple domain controllers for a domain. I am confused on do I need to edit /etc/krb5.conf or not. I am using MIT kerberos (krb5-1.4.3-19.34) on SLES10. Here is what I got from Samba HOWTO: 1. Adding entries in /etc/krb5.conf for kdc =, admin server = and password server = is only necessary if SRV records are not there in DNS server. If SRV records are there, no need to configure /etc/krb5.conf. 2. /etc/samba/smb.conf should contain the list of domain controllers in password server = line (space separated) or can contain *, which will get the list from DNS SRV records. 3. If SRV records are not present (may be I migrated my DNS server to linux box), then I need to manually enter kdc =, etc, lines in /etc/krb5.conf. Why not put put the SRV records into your own Linux DNS? 4. I can have multiple kdc = entries in /etc/krb5.conf, if I need to manually configure /etc/krb5.conf, but only single admin server = and password server = line. How does this /etc/krb5.conf entry for admin server and password server becomes HA if the machine specified in admin server and password server goes down? Any help appreciated. Thanks, Rajesh -- 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] dns lookups for SRV kerberos
On Thu, Dec 10, 2009 at 9:21 AM, apl...@netcourrier.com wrote:
Hi,
I have raised this question on the kerberos mailing list, but have been told
that Samba has it's own behavior regarding SRV lookups.
My configuration uses the following :
dns_lookup_realm = false
dns_lookup_kdc = false
[realms]
EXAMPLE.DOM = {
kdc = 10.0.0.1:88
kdc = 10.0.0.2:88
admin_server = 10.0.0.1:749
default_domain = example.dom
}
but I still see the DNS lookups for SRV _kerberos-master_udp
( same with kdc = adserver1.example.dom.:88 )
To be precise, the following happens (We don't have these records in the DNS
system) :
ASREQ -
- KRBERR PREAUTH
DNS SRV _kerberos-master -
- no such name
ASREQ -
- AS REP OK
DNS SRV _kerberos-master -
- no such name
TGSREQ -
- TGSREP
DNS SRV _kerberos-master -
- no such name
that makes 3 DNS lookups per TGS.
As I have excplicitly configured :
A) dns_lookups to false
B) numerical IP addresses for the KDC's
I would expect dns lookups to be completely *non-existant*.
Are my expectations correct, or is there something in the protocol that I
missed
, that would need to enforce dns lookups even if configured not to ? Or maybe
I
have misconfigured krb5.conf ? It seems that Samba would not look into this
file.
Can it be configured elsewhere ?
Same behaviour with numerical ipp addresses for password server
Why I am looking into this is because I use kerberos for AD authentication,
through winbind.
Our configuration (typical for an AD infrastructure) is to have 2 DC's, which
are KDC's as well as DNS servers.
What happens when the primary DC is unavailable is that both the primary KDC
and
the primary DNS are down.
Timeouts summing up, the result in a default RHEL5 configuration is to have
wbinto -t take 21 seconds to accomplish.
(3*5s DNS timeouts + 3*2s KDC timeouts)
For the moment, DNS Timeout can be lowered to 1s but not less.
Still, I don't understand why these DNS lookups are made at all with this
configuration.
Has anyone an explanation ?
using
krb5-libs-1.6.1-36.el5
samba-3.0.33-3.15.el5_4
on RHEL 5.4
Regards,
Andrew
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/options/samba
Interesting. Does the samba generated cached version of krb5.conf
have dns records? This is an altogether different file than
/etc/krb5.conf.
On my CentOS 5.4 box, samba caches its krb5 config here:
/var/cache/samba/smb_krb5/krb5.conf.NETBIOSDOMAINNAME
In my experience, some of these samba generated cached entries can be
altogether different than /etc/krb5.conf !
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/options/samba
[Samba] samba4 size
Hi, I've built samba 4 from the git repository, but... the resulting (stripped) binaries take 504 MB disk space! Is that what it is or did I do something wrong? theHog -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] samba4 size
On 12/15/2009 05:35 PM, theHog wrote: Hi, I've built samba 4 from the git repository, but... the resulting (stripped) binaries take 504 MB disk space! Is that what it is or did I do something wrong? theHog No, you did it right. I want to know how you did that! Mine is 1.2GB for the whole of it. ;-) - John T. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Windows 7 machine trust accounts expiring
I think I have narrowed this down even further. I have been working through getting rid of error messages in the logs, and I have updated Samba to 3.4.3. This might have fixed the issue, and I won't know for some time, but I can still see the following error appearing in the logs, which seems to line up with the core issue of machine trust accounts expiring. rpc_server/srv_netlog_nt.c:603(_netr_ServerAuthenticate3) _netr_ServerAuthenticate3: netlogon_creds_server_check failed. Rejecting auth request from client AC-2150 machine account AC-2150$ I have noticed that the new Windows 7 machines say the password has expired on the same date that is in sambaPwdLastSet. I added the X attribute in sambaAcctFlags in an attempt to stop the accounts from expiring. Below is an ldif of a Windows 7 machine trust account dn: uid=ac-2150$,ou=computers,dc=domain,dc=local objectClass: top objectClass: account objectClass: posixAccount objectClass: sambaSamAccount cn: ac-2150$ uid: ac-2150$ uidNumber: gidNumber: 515 homeDirectory: /dev/null loginShell: /bin/false description: Computer gecos: Computer sambaDomainName: DOMAIN sambaPrimaryGroupSID: S-1-5-21-3581057417-3103041693-70022037-515 sambaSID: S-1-5-21-3581057417-3103041693-70022037-3222 sambaNTPassword: DABA25E3910551C63347D399520C123D sambaAcctFlags: [WX ] sambaPwdLastSet: 1260776037 Any help would be appreciated. aF -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via c289e6e... WHATSNEW: Update changes since 3.5.0pre1. from 477edb8... s3: Allow up to 20480 entries in LookupSids, as mandated by the official IDL http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit c289e6e3f0a1faf1dcd39d1af7825335af8a89ca Author: Karolin Seeger ksee...@samba.org Date: Tue Dec 15 08:26:11 2009 +0100 WHATSNEW: Update changes since 3.5.0pre1. Karolin --- Summary of changes: WHATSNEW.txt |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 9a18f60..d165113 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -66,6 +66,7 @@ smb.conf changes ctdb timeout New 0 cups encrypt New no debug hires timestamp Changed Default yes + ldap deref New auto ldap follow referral New auto @@ -125,6 +126,10 @@ o Günther Deschner g...@samba.org * Fix several printing issues. * Fix the build on Mac OS X 10.6.2. * Fix net and rpcclient after setprinterdataex changes. +* Add full support for level 8 printer drivers. +* Add more spoolss architectures to IDL. +* Fix enumprinter key client and server. +* Fix crash in EnumPrinterDataEx. o Björn Jacke b...@sernet.de @@ -145,6 +150,7 @@ o Volker Lendecke v...@samba.org * Add rpcclient wkssvc_enumerateusers. * De-deprecate write cache size to prevent its removal without a proper alternative. +* Allow more than 1000 users in BUILTIN\Users. o Jim McDonough j...@samba.org -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-stable updated
The branch, v3-5-stable has been updated via 2b0f402... WHATSNEW: Update changes since 3.5.0pre1. via 5511fd4... s3: Allow up to 20480 entries in LookupSids, as mandated by the official IDL via ebe81ca... spoolss: fix spoolss_PrinterData size calculation. via c760b75... spoolss: trivial fix for spoolss_FormInfo2 IDL. via 581982d... s4-smbtorture: check whether a returned buffer size is a multiple of 4 in RPC-SPOOLSS. via 78c80fe... s3-selftest: enable RPC-SAMBA3-WINREG. via 3a29aab... s3-rpcclient: allow to set offered size for enumkey command. via 22f30db... s4-smbtorture: add more spoolss_EnumPrinterKey tests for local NDR test. via f33b191... spoolss: remove unused spoolss_StringArray2. via e5d0a0b... s4-smbtorture: fix and extend enum printerkey test. via 60d8b62... s3-spoolss: fix enumprinter key client and server. via aec9d64... s3: re-run make samba3-idl. via 6a5ffe8... spoolss: use spoolss_KeyNames in spoolss_EnumPrinterKey. via b4fc954... spoolss: add spoolss_KeyNames union. via 93fb4f1... s4-smbtorture: enhance spoolss_EnumPrinterKey torture test. via 371c423... s3-spoolss: use SPOOLSS_ARCHITECTURE_ALL in driver enum server code. via 47ac175... spoolss: add more spoolss architectures to IDL. via cacdb92... spoolss: fix spoolss_DriverInfo8 IDL. via 7053b13... s4-smbtorture: make level 8 the reference for PrinterDriverEnum test. via 9982340... s3-spoolss: cleanup _spoolss_EnumPrinterDrivers(). via ee88c71... s3-spoolss: remove unused architecture from fill_printer_driver_info1(). via 5b8753b... s3-spoolss: remove ridiculous amount of duplicate driver code. via b979e0b... s3-spoolss: fully support level 8 drivers. via 82fbd83... s3-spoolss: use driver level info8 everywhere in spoolss server internally. via d5efd83... s4-smbtorture: fill in COMPARE_STRING_ARRAY macro in spoolss driver test. from ec1e4fb... s3:docs: Fix 'make manpages3'. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-stable - Log - commit 2b0f402f113bd51ce8bdae6062af0533d3b44b49 Author: Karolin Seeger ksee...@samba.org Date: Tue Dec 15 08:26:11 2009 +0100 WHATSNEW: Update changes since 3.5.0pre1. Karolin (cherry picked from commit c289e6e3f0a1faf1dcd39d1af7825335af8a89ca) commit 5511fd4193f75d0a911f86fe859af9eb9df2310d Author: Volker Lendecke v...@samba.org Date: Mon Dec 14 16:48:38 2009 +0100 s3: Allow up to 20480 entries in LookupSids, as mandated by the official IDL Seen in the wild by putting 1000 users into BUILTIN\Users (cherry picked from commit 477edb8bdf3def827c398c4fc01dffd2071ea77e) commit ebe81ca6f19ec10173cdd4d867e9ca3440d47fd7 Author: Günther Deschner g...@samba.org Date: Sat Dec 12 02:52:41 2009 +0100 spoolss: fix spoolss_PrinterData size calculation. Currently we were crashing in EnumPrinterDataEx when an e.g. an empty (NULL) string for a separator file was returned. Guenther (cherry picked from commit e316624ddb8d4e178b03b315bfafd793e6c297c8) (cherry picked from commit 4520862918ba2cff025b15d84922fbb08d8abbf6) commit c760b755f637d0b91f8758c963de903133d847f5 Author: Günther Deschner g...@samba.org Date: Sat Dec 12 02:51:44 2009 +0100 spoolss: trivial fix for spoolss_FormInfo2 IDL. Guenther (cherry picked from commit 5ae61cfbc281f346fd3712a975c5796f9cfbc6c2) (cherry picked from commit 43ff4f2628882f9fa51bbe37f6cbe776f62241a3) commit 581982da3bcfb0533f28f0e667df47528250e61e Author: Günther Deschner g...@samba.org Date: Sat Dec 12 01:51:13 2009 +0100 s4-smbtorture: check whether a returned buffer size is a multiple of 4 in RPC-SPOOLSS. This gives a good indication where our IDL (and the s3 spoolss implementation) is still wrong. Guenther (cherry picked from commit 801fbd05691819ce9afadf4817bf1bf8ccc28a02) (cherry picked from commit 73da0de2eaa2dec3ef1ebeee9dccaf81201dc7ba) commit 78c80fe6633f9f8c56c634902dfd05607a0dcfb7 Author: Günther Deschner g...@samba.org Date: Thu Dec 10 20:38:32 2009 +0100 s3-selftest: enable RPC-SAMBA3-WINREG. Very strange we didn't run it before. Guenther (cherry picked from commit 31202a9dab330ed939b4ea71349c816707adff95) (cherry picked from commit 4e218472de4c5a2b79fd6c8115e8877d253c33b5) commit 3a29aab1e0db7f4f352a2204c11890a986c38dce Author: Günther Deschner g...@samba.org Date: Wed Dec 9 15:49:46 2009 +0100 s3-rpcclient: allow to set offered size for enumkey command. Guenther (cherry picked from commit c2618d2c6f8657c30cd0f68777d3f37e64172191) (cherry picked from commit ee7944ed987bd0e4dc1315ffcac09fd2fd37bfe9) commit 22f30db8d006ccb0610ce0a4473d9266bfaf1080 Author: Günther Deschner g...@samba.org
[SCM] Samba Shared Repository - annotated tag release-3-5-0pre2 created
The annotated tag, release-3-5-0pre2 has been created at 217de81d12ac95f56c480f44e0b36672b6826115 (tag) tagging 2b0f402f113bd51ce8bdae6062af0533d3b44b49 (commit) replaces release-3-5-0pre1 tagged by Karolin Seeger on Tue Dec 15 10:14:00 2009 +0100 - Log - tag release-3-5-0pre2 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.12 (GNU/Linux) iD8DBQBLJ1NjbzORW2Vot+oRAlnSAJkBAwAfelZKxAARezTkMDV7EaQglwCgtgUj LKVjEIGCwr/0q3r7hiQhOpw= =p+Io -END PGP SIGNATURE- Björn Jacke (12): correct mail address s3:build: fix shared library build on QNX s3: prefer posix_fallocate for doing strict allocate s3:build: remove redundant qnx block size definition Ñ3: remove superfluous option check s3: check if glibc has broken posix_fallocate s3: allocate only new space, not old sparse space in the posix_fallocate path s3: make sys_posix_fallocate more generic s3:doc: make dos filetimes description less contradictory s3: keep subsecond times on cross-filesystem moves and don't follow links s3: add LDAP Alias Dereferencing support s3:docs: document ldap deref Bo Yang (8): s3: Fix crash in free_file_list(). s3: Fix commit 9b5f8eb59ed7f65d4c017cd6a9dc668ebf3115b6. Revert s3: Fix crash in free_file_list(). Revert s3: Fix commit 9b5f8eb59ed7f65d4c017cd6a9dc668ebf3115b6. s3: Fix crash in winbindd;(bug#6879). s3: Give the user a chance to change password when password will expire soon. s3: Fix build on non-linux platform. s3: check for PAM_RADIO_TYPE. Christian Ambach (1): streamline some log levels for invalid servicenames Günther Deschner (65): s4-smbtorture: add torture_samr_context to carry some RPC-SAMR-X specifics. s4-smbtorture: refactor RPC-SAMR-LARGE-DC test a little more. s3-kerberos: next step to resolve Bug #6929: build with recent heimdal. s3-spoolss: pre cosmetics: reorder levels in construct_printer_info levels. s3-winbind: properly include netlogon.idl in wbint.idl. s3-passdb: move some defines out of rpc headers (they really belong to passdb). s3-rpc: Avoid including every pipe's client and server stubs everywhere in samba. s3-rpc: running minimal_includes.pl on rpc_client and rpc_server. s3-smbd: no drsuapi server stubs yet in s3. Fixes the build, sorry. s3-spoolss: use macros to fillup driver levels. s3-kerberos: Fix Bug #6929: build with recent heimdal. s3-nsstest: drastically shrink size and dependencies of nsstest binary. pidl: fix handling of output arguments in s3 client stubs. misc: mark winreg_Data little-endian except for a REG_DWORD_BIG_ENDIAN. s3-kerberos: only use krb5 headers where required. s3-spoolss: simplify _spoolss_EnumPrinterKey a little more. s3-kerberos: do not include authdata headers before including krb5 headers. s3-kerberos: add a missing reference to authdata headers. s3-kerberos: fix the build on Mac OS X 10.6.2. s4-smbtorture: more and stricter tests for printer and data keys in RPC-SPOOLSS. s3-spoolss: fix fstrings in convert_devicemode() function. drsuapi: fix build warning of NDR size calculation of drsuapi_DsReplicaObjectIdentifier3Binary. s3-spoolss: move MAXDEVICENAME to spoolss idl. spoolss: add spoolss_StringArray2. samba-spoolss: use spoolss_StringArray2 in spoolss_EnumPrinterKey. spoolss: hand-marshall the spoolss_StringArray2 struct for spoolss_EnumPrinterKey. s4-smbtorture: be very strict in checking spools_EnumPrinterKey results. s3-selftest: run LOCAL-NDR when running make selftest. s4-smbtorture: call test_EnumPrinterDrivers with architecture in RPC-SPOOLSS. s4-smbtorture: check more WERRORs in RPC-SPOOLSS. s3-spoolss: handle SEC_FLAG_MAXIMUM_ALLOWED in spoolss_OpenPrinterEx. s4-smbtorture: heavily expand printerdata tests in RPC-SPOOLSS. s3-winreg: remove trailing whitespace. s3-winreg: fill in some inline comments. s3-spoolss: a default printer should have at least a PrintDriverData key. spoolss: rework spoolss_GetPrinterDataEx and spoolss_SetPrinterDataEx. s3-spoolss: let _spoolss_GetPrinterData call into _spoolss_GetPrinterDataEx. s3-spoolss: let _spoolss_SetPrinterData call into _spoolss_SetPrinterDataEx. s3-spoolss: let _spoolss_DeletePrinterData call into _spoolss_DeletePrinterDataEx. s4-smbtorture: fix RPC-SPOOLSS after _spoolss_SetPrinterDataEx IDL change. s3: fix net and rpcclient after setprinterdataex changes. s4-smbtorture: disable some spoolss printerdata tests which s3 does not pass at the moment. s4-smbtorture: fill in COMPARE_STRING_ARRAY macro in spoolss driver test. s3-spoolss: use driver level info8 everywhere in spoolss server internally.
svn commit: samba-web r1348 - in trunk: .
Author: kseeger Date: 2009-12-15 02:44:35 -0700 (Tue, 15 Dec 2009) New Revision: 1348 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1348 Log: Announce Samba 3.5.0pre2 Karolin Modified: trunk/index.html Changeset: Modified: trunk/index.html === --- trunk/index.html2009-12-04 09:43:43 UTC (rev 1347) +++ trunk/index.html2009-12-15 09:44:35 UTC (rev 1348) @@ -24,6 +24,21 @@ h2Latest News/h2 !--#include virtual=/samba/news/headlines.html -- +h415 December 2009/h4 + +p class=headlineSamba 3.5.0pre2 Available for Download/p + +pThe a href=/samba/ftp/pre/samba-3.5.0pre2.tar.gzSamba 3.5.0pre2 +source code/a can be downloaded now. This is the second preview release of +the Samba 3.5 series. It is emnot/em intended for use on production +servers. The a href=/samba/ftp/pre/samba-3.5.0pre2.tar.ascGnuPG +signature is for the emun/emcompressed tarball/a. +Please see the a href=/samba/ftp/pre/WHATSNEW-3-5-0pre2.txtRelease Notes/a +for more information on this release. +Precompiled packages will be made available on a volunteer basis and can be +found in the a href=/samba/ftp/Binary_Packages/Binary_Packages download +area/a./p + h426 November 2009/h4 p class=headlineSamba 3.5.0pre1 Available for Download/p
[SCM] CTDB repository - branch master updated - ctdb-1.0.108-64-g6ed34d5
The branch, master has been updated
via 6ed34d5320c39d8a55f2a36ad4c1ab574e0b0796 (commit)
via bcf494b81f4277dc75f05faccf0c446bd15f6e2b (commit)
via 24767be2eb9aed29704c2a4097bab5466cb6728f (commit)
via 340be0179f55acfff77f8c3c8be958679227bde1 (commit)
from ea9e39369379939abf6a4076fa2014c10c1a9ad0 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit 6ed34d5320c39d8a55f2a36ad4c1ab574e0b0796
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Tue Dec 15 20:56:16 2009 +1100
Author: Rusty Russell ru...@rustcorp.com.au
Date: Tue Dec 15 15:53:30 2009 +1030
eventscript: hack to avoid overloading valgrind
Now we fork one child per script, when running under valgrind the
load
gets quite high. This is because valgrind does a lot of work after
exit,
and we don't wait for the children to finish; we start the next one
when
the child reports status via the pipe.
This fix is ugly, but simple.
Signed-off-by: Rusty Russell ru...@rustcorp.com.au
commit bcf494b81f4277dc75f05faccf0c446bd15f6e2b
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Tue Dec 15 19:04:52 2009 +1100
This is a dodgy patch.
I saw once where the master ctdbd logging structure was talloc freed
which caused issues.
So only free the structure if it is NOT the master structure.
This needs to be looked into in more detail.
commit 24767be2eb9aed29704c2a4097bab5466cb6728f
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Tue Dec 15 12:14:49 2009 +1100
add a new test tool that just locks and releases the same record over and
over
commit 340be0179f55acfff77f8c3c8be958679227bde1
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Tue Dec 15 11:29:16 2009 +1100
ctdb_fetch requires the number of nodes being specified.
Have it log an error and terminate if thie parameter was omitted
---
Summary of changes:
Makefile.in |7 ++-
server/ctdb_logging.c |4 +-
server/eventscript.c|3 +
tests/src/ctdb_fetch.c |5 ++
tests/src/{ctdb_traverse.c = ctdb_fetch_one.c} | 72 +++---
5 files changed, 66 insertions(+), 25 deletions(-)
copy tests/src/{ctdb_traverse.c = ctdb_fetch_one.c} (62%)
Changeset truncated at 500 lines:
diff --git a/Makefile.in b/Makefile.in
index df80e7f..0684df3 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -58,7 +58,8 @@ CTDB_SERVER_OBJ = server/ctdbd.o server/ctdb_daemon.o
server/ctdb_lockwait.o \
server/ctdb_vacuum.o server/ctdb_banning.o \
$(CTDB_CLIENT_OBJ) $(CTDB_TCP_OBJ) @INFINIBAND_WRAPPER_OBJ@
-TEST_BINS=tests/bin/ctdb_bench tests/bin/ctdb_fetch tests/bin/ctdb_store \
+TEST_BINS=tests/bin/ctdb_bench tests/bin/ctdb_fetch tests/bin/ctdb_fetch_one \
+ tests/bin/ctdb_store \
tests/bin/ctdb_randrec tests/bin/ctdb_persistent \
tests/bin/ctdb_traverse tests/bin/rb_test tests/bin/ctdb_transaction \
@INFINIBAND_BINS@
@@ -143,6 +144,10 @@ tests/bin/ctdb_fetch: $(CTDB_CLIENT_OBJ)
tests/src/ctdb_fetch.o
@echo Linking $@
@$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch.o $(CTDB_CLIENT_OBJ)
$(LIB_FLAGS)
+tests/bin/ctdb_fetch_one: $(CTDB_CLIENT_OBJ) tests/src/ctdb_fetch_one.o
+ @echo Linking $@
+ @$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_one.o $(CTDB_CLIENT_OBJ)
$(LIB_FLAGS)
+
tests/bin/ctdb_store: $(CTDB_CLIENT_OBJ) tests/src/ctdb_store.o
@echo Linking $@
@$(CC) $(CFLAGS) -o $@ tests/src/ctdb_store.o $(CTDB_CLIENT_OBJ)
$(LIB_FLAGS)
diff --git a/server/ctdb_logging.c b/server/ctdb_logging.c
index 770deb6..de25865 100644
--- a/server/ctdb_logging.c
+++ b/server/ctdb_logging.c
@@ -382,7 +382,9 @@ static void ctdb_log_handler(struct event_context *ev,
struct fd_event *fde,
if (n 0) {
log-buf_used += n;
} else if (n == 0) {
- talloc_free(log);
+ if (log != log_state) {
+ talloc_free(log);
+ }
return;
}
diff --git a/server/eventscript.c b/server/eventscript.c
index 5bec0e0..59cb6a3 100644
--- a/server/eventscript.c
+++ b/server/eventscript.c
@@ -450,6 +450,9 @@ static void ctdb_event_script_handler(struct event_context
*ev, struct fd_event
state-cb_status = 0;
}
+ /* valgrind gets overloaded if we run next script as it's still doing
+* post-execution analysis, so kill finished child here. */
+ kill(state-child, SIGKILL);
state-child = 0;
/* Aborted or finished all scripts? We're done. */
diff --git a/tests/src/ctdb_fetch.c b/tests/src/ctdb_fetch.c
index
[SCM] CTDB repository - branch master updated - ctdb-1.0.108-76-gb765e12
The branch, master has been updated
via b765e12a5fb87a6121e49b349017b6a961929346 (commit)
via 3d2d877d877146ca09a28a3a44f4840eb36fd377 (commit)
via ac06a0e042e7d024060d6e87a49bda9ccc072c52 (commit)
via c5a0aef668a63f927d6184612b13ce316eb4a0be (commit)
via 5736e17c139c9a8049e235429aeae0c6c9d0e93d (commit)
via 844aa6300ee4d87561e698001ebc15ac1e455528 (commit)
via 78ca29352aa39f4ef4e41096b92d55cb2e0d348a (commit)
via a7e3b5fac6b3f5d74473f26eb86c067b35647996 (commit)
via 4b1dbcf0853bdc4832d39a477823ae34f216da52 (commit)
via 1640da1cab7e8b545367824204c82931f3346848 (commit)
via 6af5e74a21546d723008d69d6752ebebf898c947 (commit)
via f66428f9d2013080a414404c1ba6117888352fd6 (commit)
from 6ed34d5320c39d8a55f2a36ad4c1ab574e0b0796 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit b765e12a5fb87a6121e49b349017b6a961929346
Merge: 6ed34d5320c39d8a55f2a36ad4c1ab574e0b0796
3d2d877d877146ca09a28a3a44f4840eb36fd377
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Tue Dec 15 21:00:22 2009 +1100
Merge branch 'trans3'
---
Summary of changes:
include/ctdb.h |3 +
include/ctdb_private.h | 12 +++-
lib/talloc/talloc.h |1 +
server/ctdb_control.c|7 ++
server/ctdb_ltdb_server.c|6 +-
server/ctdb_persistent.c | 151 ++
server/ctdb_recoverd.c | 58 +---
server/ctdb_server.c | 20 +++---
tests/src/ctdb_transaction.c |3 +
9 files changed, 194 insertions(+), 67 deletions(-)
Changeset truncated at 500 lines:
diff --git a/include/ctdb.h b/include/ctdb.h
index 0270925..552726a 100644
--- a/include/ctdb.h
+++ b/include/ctdb.h
@@ -127,6 +127,9 @@ struct ctdb_call_info {
/* the key used for transaction locking on persistent databases */
#define CTDB_TRANSACTION_LOCK_KEY __transaction_lock__
+/* the key used to store persistent db sequence number */
+#define CTDB_DB_SEQNUM_KEY __db_sequence_number__
+
enum control_state {CTDB_CONTROL_WAIT, CTDB_CONTROL_DONE, CTDB_CONTROL_ERROR,
CTDB_CONTROL_TIMEOUT};
struct ctdb_client_control_state {
diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index e490b21..b6c4b2f 100644
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -472,7 +472,7 @@ struct ctdb_db_context {
struct tdb_wrap *ltdb;
struct ctdb_registered_call *calls; /* list of registered calls */
uint32_t seqnum;
- struct timed_event *te;
+ struct timed_event *seqnum_update;
struct ctdb_traverse_local_handle *traverse;
bool transaction_active;
struct ctdb_vacuum_handle *vacuum_handle;
@@ -623,6 +623,8 @@ enum ctdb_controls {CTDB_CONTROL_PROCESS_EXISTS =
0,
CTDB_CONTROL_TRANS2_ACTIVE = 116,
CTDB_CONTROL_GET_LOG = 117,
CTDB_CONTROL_CLEAR_LOG = 118,
+ CTDB_CONTROL_TRANS3_COMMIT = 119,
+ CTDB_CONTROL_GET_DB_SEQNUM = 120,
};
/*
@@ -1424,6 +1426,10 @@ int32_t ctdb_control_trans2_commit(struct ctdb_context
*ctdb,
struct ctdb_req_control *c,
TDB_DATA recdata, bool *async_reply);
+int32_t ctdb_control_trans3_commit(struct ctdb_context *ctdb,
+ struct ctdb_req_control *c,
+ TDB_DATA recdata, bool *async_reply);
+
int32_t ctdb_control_transaction_start(struct ctdb_context *ctdb, uint32_t id);
int32_t ctdb_control_transaction_commit(struct ctdb_context *ctdb, uint32_t
id);
int32_t ctdb_control_transaction_cancel(struct ctdb_context *ctdb);
@@ -1530,4 +1536,8 @@ struct ctdb_log_state *ctdb_fork_with_logging(TALLOC_CTX
*mem_ctx,
int32_t ctdb_control_process_exists(struct ctdb_context *ctdb, pid_t pid);
struct ctdb_client *ctdb_find_client_by_pid(struct ctdb_context *ctdb, pid_t
pid);
+int32_t ctdb_control_get_db_seqnum(struct ctdb_context *ctdb,
+ TDB_DATA indata,
+ TDB_DATA *outdata);
+
#endif
diff --git a/lib/talloc/talloc.h b/lib/talloc/talloc.h
index 15130d0..bc50e5d 100644
--- a/lib/talloc/talloc.h
+++ b/lib/talloc/talloc.h
@@ -94,6 +94,7 @@ typedef void TALLOC_CTX;
#define talloc_array(ctx, type, count) (type *)_talloc_array(ctx,
sizeof(type), count, #type)
#define talloc_array_size(ctx, size, count) _talloc_array(ctx, size, count,
__location__)
#define talloc_array_ptrtype(ctx, ptr, count)
(_TALLOC_TYPEOF(ptr))talloc_array_size(ctx, sizeof(*(ptr)), count)
+#define talloc_array_length(ctx) (talloc_get_size(ctx)/sizeof(*ctx))
#define
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 4deaa84... Fixed a problem with duplicate values of
allowedAttributesEffective.
from ef5508b... s4: rename res/res2 to something more explicit
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4deaa84ce4a425bfba4b2612d79cc6fa1e00cca5
Author: Nadezhda Ivanova nadezhda.ivan...@postpath.com
Date: Tue Dec 15 12:02:20 2009 +0200
Fixed a problem with duplicate values of allowedAttributesEffective.
---
Summary of changes:
source4/dsdb/samdb/ldb_modules/acl.c |4 +++-
source4/dsdb/schema/schema_query.c | 11 ++-
2 files changed, 13 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/samdb/ldb_modules/acl.c
b/source4/dsdb/samdb/ldb_modules/acl.c
index 45aa294..dcd015b 100644
--- a/source4/dsdb/samdb/ldb_modules/acl.c
+++ b/source4/dsdb/samdb/ldb_modules/acl.c
@@ -431,7 +431,9 @@ static int acl_allowedAttributes(struct ldb_module *module,
return LDB_ERR_OPERATIONS_ERROR;
}
/* remove constructed attributes */
- if (attr-systemFlags DS_FLAG_ATTR_IS_CONSTRUCTED) {
+ if (attr-systemFlags DS_FLAG_ATTR_IS_CONSTRUCTED
+ || attr-systemOnly
+ || (attr-linkID != 0 attr-linkID % 2 != 0 )) {
continue;
}
ret = acl_check_access_on_attribute(module,
diff --git a/source4/dsdb/schema/schema_query.c
b/source4/dsdb/schema/schema_query.c
index 0a58f7a..f563f01 100644
--- a/source4/dsdb/schema/schema_query.c
+++ b/source4/dsdb/schema/schema_query.c
@@ -350,6 +350,14 @@ static const char
**dsdb_full_attribute_list_internal_el(TALLOC_CTX *mem_ctx,
return attr_list;
}
+static int qsort_string(const void *v1,
+ const void *v2)
+{
+ char * const *s1 = v1;
+ char * const *s2 = v2;
+ return strcasecmp(*s1, *s2);
+}
+
/* Helper function to remove duplicates from the attribute list to be returned
*/
static const char **dedup_attr_list(const char **attr_list)
{
@@ -359,13 +367,14 @@ static const char **dedup_attr_list(const char
**attr_list)
int i;
qsort(attr_list, new_len,
sizeof(*attr_list),
- (comparison_fn_t)strcasecmp);
+ (comparison_fn_t)qsort_string);
for (i=1 ; i new_len; i++) {
const char **val1 = attr_list[i-1];
const char **val2 = attr_list[i];
if (ldb_attr_cmp(*val1, *val2) == 0) {
memmove(val1, val2, (new_len - i) * sizeof(
*attr_list));
+ attr_list[new_len-1] = NULL;
new_len--;
i--;
}
--
Samba Shared Repository
[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated - 3.2.11-ctdb-68-3-g60f25aa
The branch, v3-2-ctdb has been updated
via 60f25aaa650bf998fcf4f7a987700a6b5f633260 (commit)
via 6cf1eaf8bc7408f83719eea9d4dc7672b4e7509a (commit)
from 7f294edf618d0b36374f830085ceb768f2efa67e (commit)
http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb
- Log -
commit 60f25aaa650bf998fcf4f7a987700a6b5f633260
Author: Jeremy Allison j...@samba.org
Date: Fri Jun 19 11:00:41 2009 +0200
Bug 6488: acl_group_override() call in posix acls references an
uninitialized variable. (cherry picked from commit
f92195e3a1baaddda47a5d496f9488c8445b41ad)
commit 6cf1eaf8bc7408f83719eea9d4dc7672b4e7509a
Author: Christian Ambach christian.amb...@de.ibm.com
Date: Wed Dec 2 20:06:37 2009 +0100
streamline some log levels for invalid servicenames
I don't think we need to log the fact that a user gave a wrong sharename in
Explorer with the highest log level.
The level of this was not very consistent:
service.c: DEBUG(3,(find_service() failed to find service %s\n,
service));
service.c: DEBUG(0,(%s (%s) couldn't find service %s\n,
smb2_tcon.c:DEBUG(1,(smbd_smb2_tree_connect: couldn't find
service %s\n,
This changes the last two to 3 as the first one.
Signed-off-by: Christian Ambach christian.amb...@de.ibm.com
---
Summary of changes:
source/smbd/posix_acls.c | 22 ++
source/smbd/service.c|2 +-
2 files changed, 11 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c
index 90c2caf..3e88418 100644
--- a/source/smbd/posix_acls.c
+++ b/source/smbd/posix_acls.c
@@ -2368,24 +2368,22 @@ static bool current_user_in_group(gid_t gid)
/
static bool acl_group_override(connection_struct *conn,
- gid_t prim_gid,
+ SMB_STRUCT_STAT *psbuf,
const char *fname)
{
- SMB_STRUCT_STAT sbuf;
-
if ((errno != EPERM) (errno != EACCES)) {
return false;
}
/* file primary group == user primary or supplementary group */
if (lp_acl_group_control(SNUM(conn))
- current_user_in_group(prim_gid)) {
+ current_user_in_group(psbuf-st_gid)) {
return true;
}
/* user has writeable permission */
if (lp_dos_filemode(SNUM(conn))
- can_write_to_file(conn, fname, sbuf)) {
+ can_write_to_file(conn, fname, psbuf)) {
return true;
}
@@ -2396,7 +2394,7 @@ static bool acl_group_override(connection_struct *conn,
Attempt to apply an ACL to a file or directory.
/
-static bool set_canon_ace_list(files_struct *fsp, canon_ace *the_ace, bool
default_ace, gid_t prim_gid, bool *pacl_set_support)
+static bool set_canon_ace_list(files_struct *fsp, canon_ace *the_ace, bool
default_ace, SMB_STRUCT_STAT *psbuf, bool *pacl_set_support)
{
connection_struct *conn = fsp-conn;
bool ret = False;
@@ -2575,7 +2573,7 @@ static bool set_canon_ace_list(files_struct *fsp,
canon_ace *the_ace, bool defau
*pacl_set_support = False;
}
- if (acl_group_override(conn, prim_gid, fsp-fsp_name)) {
+ if (acl_group_override(conn, psbuf, fsp-fsp_name)) {
int sret;
DEBUG(5,(set_canon_ace_list: acl group control
on and current user in file %s primary group.\n,
@@ -2606,7 +2604,7 @@ static bool set_canon_ace_list(files_struct *fsp,
canon_ace *the_ace, bool defau
*pacl_set_support = False;
}
- if (acl_group_override(conn, prim_gid, fsp-fsp_name)) {
+ if (acl_group_override(conn, psbuf, fsp-fsp_name)) {
int sret;
DEBUG(5,(set_canon_ace_list: acl group control
on and current user in file %s primary group.\n,
@@ -3562,7 +3560,7 @@ NTSTATUS set_nt_acl(files_struct *fsp, uint32
security_info_sent, SEC_DESC *psd)
if (set_acl_as_root) {
become_root();
}
- ret = set_canon_ace_list(fsp, file_ace_list, False,
sbuf.st_gid, acl_set_support);
+ ret = set_canon_ace_list(fsp, file_ace_list, False, sbuf,
acl_set_support);
if (set_acl_as_root) {
unbecome_root();
}
@@ -3579,7 +3577,7 @@ NTSTATUS
[SCM] CTDB repository - branch lock-wait created - ctdb-1.0.108-77-g47d63bc
The branch, lock-wait has been created at 47d63bc9cf3885c16eec7e7f2cdef27f8b6c4e93 (commit) - Log - commit 47d63bc9cf3885c16eec7e7f2cdef27f8b6c4e93 Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Tue Dec 15 21:28:23 2009 +1100 initial support for a lockdown protocol. We use a dummy file and byte range locks on this file to make records sticky. With the current design there is a possibility that database records for very hot records will be migrating bethween the nodes faster than the client applications can access the data. So that once a client application has requested a record and asking ctdbd to migrate the record onto the node, that this record might be migrated off the node again before the client got a chance to access the record. This can now be prevented by using a pindown mechanism. This pindown mechanism is implemented using fcntl() locks on a file shared between ctdbd and the clients on the local nodes. Records that are pinned down, can not be migrated off the node by ctdbd. Instead any such requests will be blocked until the pindown dissapears. Records can however be migrated onto the node while there is an active pin-down. Clients can set a pindown on a record even before it tries to have it being migrated onto the node with the effect that then record is fetched, and then remains pinned down on the node until the client has finished processing the record. Multiple clietns can pin down the same record, in which case the record remains on the local node until all clietns have released their pin-down. Client pindown is implemented by a read-lock on teh pindown file. Ctdbd tries write-locks for the same region on the pindown file when determining whether a migrate off node request should be allowed or if it should be postphoned until all clients have finished. clients use read-locks to pin the record down ctdbd will not allow the record to be migrated off the node until it can take out a write-lock. Since this will require two extra trips to the kernel and back for the clietns, clietns may try a cheaper non-pinlock the first few interations in the fetch-lock loop and not involve the heavy pind-down until this has failed a few times for the record, to make sure non-contended records are as fast as possible and at the same time allow for using the slightly more heavy pin-down when it gets tired of waiting. clients using pin-down can coexist and access the same data and records as clients not using pin-down. --- -- CTDB repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via f346079... s4:tls: fix the build on Solaris from 4deaa84... Fixed a problem with duplicate values of allowedAttributesEffective. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit f34607908367cce84fa9d8331c924135583359e6 Author: Brian Lu brian...@sun.com Date: Tue Dec 15 12:56:23 2009 +0100 s4:tls: fix the build on Solaris Signed-off-by: Stefan Metzmacher me...@samba.org --- Summary of changes: source4/lib/tls/config.m4 |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/lib/tls/config.m4 b/source4/lib/tls/config.m4 index 709a095..8a5b996 100644 --- a/source4/lib/tls/config.m4 +++ b/source4/lib/tls/config.m4 @@ -41,5 +41,8 @@ if test x$use_gnutls = xyes; then AC_DEFINE(ENABLE_GNUTLS,1,[Whether we have gnutls support (SSL)]) AC_CHECK_HEADERS(gcrypt.h) AC_CHECK_LIB_EXT(gcrypt, GCRYPT_LIBS, gcry_control) + # On Solaris libgcrypt.so has a bug and seems to be not linked + # to libgpg-error.so, so we need to manually add them... + AC_CHECK_LIB_EXT(gpg-error, GCRYPT_LIBS, gpg_err_code_from_errno) SMB_EXT_LIB(GCRYPT, $GCRYPT_LIBS) fi -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 7f95686... Fix release script to work with recent git versions
from f346079... s4:tls: fix the build on Solaris
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 7f956869ff7a8e481afb9db0c52a0d74d809867a
Author: Simo Sorce i...@samba.org
Date: Tue Dec 15 09:17:25 2009 -0500
Fix release script to work with recent git versions
---
Summary of changes:
lib/talloc/script/release-script.sh |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/talloc/script/release-script.sh
b/lib/talloc/script/release-script.sh
index 4804f6f..fd5c1ef 100755
--- a/lib/talloc/script/release-script.sh
+++ b/lib/talloc/script/release-script.sh
@@ -23,7 +23,7 @@ fi
git clean -f -x -d lib/talloc
git clean -f -x -d lib/replace
-curbranch=`git-branch |grep ^* | tr -d * `
+curbranch=`git branch |grep ^* | tr -d * `
version=$1
strver=`echo ${version} | tr . -`
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 5930f77... s4 torture: Convert RAW-OPEN to suite form
via d732fb4... s4 torture: Add SHARE_DELETE to create_directory_handle
from 7f95686... Fix release script to work with recent git versions
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 5930f770d279a5aee2aed805b8732aafd9288c26
Author: Zach Loafman zachary.loaf...@isilon.com
Date: Mon Dec 14 10:31:02 2009 -0800
s4 torture: Convert RAW-OPEN to suite form
commit d732fb43a6ba6932b966ff382954e52a0489efda
Author: Tim Prouty tpro...@samba.org
Date: Mon Dec 14 17:00:43 2009 -0800
s4 torture: Add SHARE_DELETE to create_directory_handle
Tests explicitly checking share modes should open the dir/file
with the share mode they want to test.
---
Summary of changes:
source4/torture/raw/open.c | 180
source4/torture/raw/raw.c |2 +-
source4/torture/util_smb.c |2 +-
3 files changed, 101 insertions(+), 83 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/raw/open.c b/source4/torture/raw/open.c
index adec6a9..8c4311b 100644
--- a/source4/torture/raw/open.c
+++ b/source4/torture/raw/open.c
@@ -157,7 +157,7 @@ static const char *rdwr_string(enum rdwr_mode m)
/*
test RAW_OPEN_OPEN
*/
-static bool test_open(struct smbcli_state *cli, struct torture_context *tctx)
+static bool test_open(struct torture_context *tctx, struct smbcli_state *cli)
{
union smb_open io;
union smb_fileinfo finfo;
@@ -166,7 +166,9 @@ static bool test_open(struct smbcli_state *cli, struct
torture_context *tctx)
int fnum = -1, fnum2;
bool ret = true;
- torture_comment(tctx, Checking RAW_OPEN_OPEN\n);
+ if (!torture_setup_dir(cli, BASEDIR)) {
+ return false;
+ }
io.openold.level = RAW_OPEN_OPEN;
io.openold.in.fname = fname;
@@ -259,7 +261,7 @@ static bool test_open(struct smbcli_state *cli, struct
torture_context *tctx)
done:
smbcli_close(cli-tree, fnum);
- smbcli_unlink(cli-tree, fname);
+ smbcli_deltree(cli-tree, BASEDIR);
return ret;
}
@@ -268,7 +270,7 @@ done:
/*
test RAW_OPEN_OPENX
*/
-static bool test_openx(struct smbcli_state *cli, struct torture_context *tctx)
+static bool test_openx(struct torture_context *tctx, struct smbcli_state *cli)
{
union smb_open io;
union smb_fileinfo finfo;
@@ -298,8 +300,9 @@ static bool test_openx(struct smbcli_state *cli, struct
torture_context *tctx)
{ OPENX_OPEN_FUNC_TRUNC | OPENX_OPEN_FUNC_CREATE, false,
NT_STATUS_OK },
};
- torture_comment(tctx, Checking RAW_OPEN_OPENX\n);
- smbcli_unlink(cli-tree, fname);
+ if (!torture_setup_dir(cli, BASEDIR)) {
+ return false;
+ }
io.openx.level = RAW_OPEN_OPENX;
io.openx.in.fname = fname;
@@ -494,8 +497,7 @@ static bool test_openx(struct smbcli_state *cli, struct
torture_context *tctx)
done:
smbcli_close(cli-tree, fnum);
- smbcli_unlink(cli-tree, fname_exe);
- smbcli_unlink(cli-tree, fname);
+ smbcli_deltree(cli-tree, BASEDIR);
return ret;
}
@@ -506,7 +508,7 @@ done:
many thanks to kukks for a sniff showing how this works with os2-w2k
*/
-static bool test_t2open(struct smbcli_state *cli, struct torture_context *tctx)
+static bool test_t2open(struct torture_context *tctx, struct smbcli_state *cli)
{
union smb_open io;
union smb_fileinfo finfo;
@@ -536,6 +538,10 @@ static bool test_t2open(struct smbcli_state *cli, struct
torture_context *tctx)
{ OPENX_OPEN_FUNC_TRUNC | OPENX_OPEN_FUNC_CREATE, false,
NT_STATUS_OK },
};
+ if (!torture_setup_dir(cli, BASEDIR)) {
+ return false;
+ }
+
fnum = create_complex_file(cli, tctx, fname1);
if (fnum == -1) {
torture_result(tctx, TORTURE_FAIL,
@@ -546,8 +552,6 @@ static bool test_t2open(struct smbcli_state *cli, struct
torture_context *tctx)
}
smbcli_close(cli-tree, fnum);
- torture_comment(tctx, Checking RAW_OPEN_T2OPEN\n);
-
io.t2open.level = RAW_OPEN_T2OPEN;
io.t2open.in.flags = OPENX_FLAGS_ADDITIONAL_INFO;
io.t2open.in.open_mode = OPENX_MODE_DENY_NONE | OPENX_MODE_ACCESS_RDWR;
@@ -669,7 +673,7 @@ static bool test_t2open(struct smbcli_state *cli, struct
torture_context *tctx)
done:
smbcli_close(cli-tree, fnum);
- smbcli_unlink(cli-tree, fname);
+ smbcli_deltree(cli-tree, BASEDIR);
return ret;
}
@@ -678,7 +682,7 @@ done:
/*
test RAW_OPEN_NTCREATEX
*/
-static bool test_ntcreatex(struct smbcli_state *cli, struct torture_context
*tctx)
+static bool test_ntcreatex(struct torture_context *tctx, struct
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via dd38f15... talloc: Fix write behind memory block
from c289e6e... WHATSNEW: Update changes since 3.5.0pre1.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit dd38f159860bc3d7a454992ce56ea3500e81aed4
Author: Kamen Mazdrashki kamen.mazdras...@postpath.com
Date: Sat Dec 5 21:44:15 2009 +0200
talloc: Fix write behind memory block
If ALWASY_REALLOC is defined and we are to 'shrink' memory block,
memcpy() will write outside memory just allocated.
Signed-off-by: Andrew Tridgell tri...@samba.org
(cherry picked from commit 8efabcc8a5dcd83deed8ef8e17826a1d347e6d83)
---
Summary of changes:
lib/talloc/talloc.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/talloc/talloc.c b/lib/talloc/talloc.c
index 7beda4b..f7b1ac3 100644
--- a/lib/talloc/talloc.c
+++ b/lib/talloc/talloc.c
@@ -1184,7 +1184,7 @@ void *_talloc_realloc(const void *context, void *ptr,
size_t size, const char *n
#if ALWAYS_REALLOC
new_ptr = malloc(size + TC_HDR_SIZE);
if (new_ptr) {
- memcpy(new_ptr, tc, tc-size + TC_HDR_SIZE);
+ memcpy(new_ptr, tc, MIN(tc-size, size) + TC_HDR_SIZE);
free(tc);
}
#else
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via b85f6f6... s4 torture: Add new RAW-SEARCH test to explore strange
max count behavior
via 8ba02d9... s4 torture: Update RAW-QFILEINFO to only test info
levels that are supported by the server
from 5930f77... s4 torture: Convert RAW-OPEN to suite form
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b85f6f63e6e957970f09acb2aab14e63d2661a22
Author: Aravind Srinivasan aravind.sriniva...@isilon.com
Date: Tue Dec 15 09:49:08 2009 -0800
s4 torture: Add new RAW-SEARCH test to explore strange max count behavior
Signed-off-by: Tim Prouty tpro...@samba.org
commit 8ba02d9ed9d1f6f330ed1f72d919bfa3869e37f5
Author: Aravind Srinivasan aravind.sriniva...@isilon.com
Date: Tue Dec 15 09:22:07 2009 -0800
s4 torture: Update RAW-QFILEINFO to only test info levels that are
supported by the server
Signed-off-by: Tim Prouty tpro...@samba.org
---
Summary of changes:
source4/torture/raw/qfileinfo.c | 33 +
source4/torture/raw/search.c| 75 +++
2 files changed, 108 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/raw/qfileinfo.c b/source4/torture/raw/qfileinfo.c
index d21d1dc..85f9f1b 100644
--- a/source4/torture/raw/qfileinfo.c
+++ b/source4/torture/raw/qfileinfo.c
@@ -265,11 +265,26 @@ static bool torture_raw_qfileinfo_internals(struct
torture_context *torture,
if (is_ipc) {
if (levels[i].expected_ipc_access_denied
NT_STATUS_EQUAL(NT_STATUS_ACCESS_DENIED, levels[i].fname_status)) {
+ } else if (!levels[i].only_handles
+ NT_STATUS_EQUAL(levels[i].fname_status,
+ NT_STATUS_NOT_SUPPORTED)) {
+ torture_warning(torture, fname level %s %s,
+ levels[i].name,
+ nt_errstr(levels[i].fname_status));
+ continue;
} else if (!levels[i].only_handles
!NT_STATUS_EQUAL(NT_STATUS_INVALID_DEVICE_REQUEST, levels[i].fname_status)) {
printf(ERROR: fname level %s failed, expected
NT_STATUS_INVALID_DEVICE_REQUEST - %s\n,
levels[i].name,
nt_errstr(levels[i].fname_status));
count++;
}
+ if (!levels[i].only_paths
+ NT_STATUS_EQUAL(levels[i].fnum_status,
+ NT_STATUS_NOT_SUPPORTED)) {
+ torture_warning(torture, fnum level %s %s,
+ levels[i].name,
+ nt_errstr(levels[i].fnum_status));
+ continue;
+ }
if (!levels[i].only_paths
!NT_STATUS_EQUAL(levels[i].expected_ipc_fnum_status, levels[i].fnum_status)) {
printf(ERROR: fnum level %s failed, expected
%s - %s\n,
levels[i].name,
nt_errstr(levels[i].expected_ipc_fnum_status),
@@ -277,6 +292,24 @@ static bool torture_raw_qfileinfo_internals(struct
torture_context *torture,
count++;
}
} else {
+ if (!levels[i].only_paths
+ NT_STATUS_EQUAL(levels[i].fnum_status,
+ NT_STATUS_NOT_SUPPORTED)) {
+ torture_warning(torture, fnum level %s %s,
+ levels[i].name,
+ nt_errstr(levels[i].fnum_status));
+ continue;
+ }
+
+ if (!levels[i].only_handles
+ NT_STATUS_EQUAL(levels[i].fname_status,
+ NT_STATUS_NOT_SUPPORTED)) {
+torture_warning(torture, fname level %s %s,
+ levels[i].name,
+ nt_errstr(levels[i].fname_status));
+ continue;
+ }
+
if (!levels[i].only_paths
!NT_STATUS_IS_OK(levels[i].fnum_status)) {
printf(ERROR: fnum level %s failed - %s\n,
levels[i].name,
nt_errstr(levels[i].fnum_status));
diff --git a/source4/torture/raw/search.c b/source4/torture/raw/search.c
index 74186e3..dec7da0 100644
--- a/source4/torture/raw/search.c
+++ b/source4/torture/raw/search.c
@@ -1376,7 +1376,81 @@ static bool
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 4330efe... Removed ldb_modify_ctrl from ldb, implemented as a
static in ldap_backend.
from b85f6f6... s4 torture: Add new RAW-SEARCH test to explore strange
max count behavior
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4330efe0f22b7318058867a554222c3c0049f644
Author: Nadezhda Ivanova nadezhda.ivan...@postpath.com
Date: Tue Dec 15 20:29:20 2009 +0200
Removed ldb_modify_ctrl from ldb, implemented as a static in ldap_backend.
---
Summary of changes:
source4/ldap_server/ldap_backend.c | 44 +++-
source4/lib/ldb/common/ldb.c | 17 +++--
source4/lib/ldb/include/ldb.h | 18 --
3 files changed, 47 insertions(+), 32 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/ldap_server/ldap_backend.c
b/source4/ldap_server/ldap_backend.c
index 5eabda9..d983a54 100644
--- a/source4/ldap_server/ldap_backend.c
+++ b/source4/ldap_server/ldap_backend.c
@@ -171,6 +171,48 @@ static int map_ldb_error(TALLOC_CTX *mem_ctx, int ldb_err,
/* result is 1:1 for now */
return ldb_err;
}
+/* create and execute a modify request */
+static int ldb_mod_req_with_controls(struct ldb_context *ldb,
+const struct ldb_message *message,
+struct ldb_control **controls)
+{
+ struct ldb_request *req;
+ int ret;
+
+ ret = ldb_msg_sanity_check(ldb, message);
+ if (ret != LDB_SUCCESS) {
+ return ret;
+ }
+
+ ret = ldb_build_mod_req(req, ldb, ldb,
+ message,
+ controls,
+ NULL,
+ ldb_op_default_callback,
+ NULL);
+
+ if (ret != LDB_SUCCESS) {
+ return ret;
+ }
+
+ ret = ldb_transaction_start(ldb);
+ if (ret != LDB_SUCCESS) {
+ return ret;
+ }
+
+ ret = ldb_request(ldb, req);
+ if (ret == LDB_SUCCESS) {
+ ret = ldb_wait(req-handle, LDB_WAIT_ALL);
+ }
+
+ if (ret == LDB_SUCCESS) {
+ return ldb_transaction_commit(ldb);
+ }
+ ldb_transaction_cancel(ldb);
+
+ talloc_free(req);
+ return ret;
+}
/*
connect to the sam database
@@ -546,7 +588,7 @@ reply:
NT_STATUS_HAVE_NO_MEMORY(modify_reply);
if (result == LDAP_SUCCESS) {
- ldb_ret = ldb_modify_ctrl(samdb, msg, call-request-controls);
+ ldb_ret = ldb_mod_req_with_controls(samdb, msg,
call-request-controls);
result = map_ldb_error(local_ctx, ldb_ret, errstr);
}
diff --git a/source4/lib/ldb/common/ldb.c b/source4/lib/ldb/common/ldb.c
index 94a5fb2..a3472a6 100644
--- a/source4/lib/ldb/common/ldb.c
+++ b/source4/lib/ldb/common/ldb.c
@@ -1388,11 +1388,10 @@ int ldb_add(struct ldb_context *ldb,
}
/*
- same as ldb_modify, but accepts controls
+ modify the specified attributes of a record
*/
-int ldb_modify_ctrl(struct ldb_context *ldb,
- const struct ldb_message *message,
- struct ldb_control **controls)
+int ldb_modify(struct ldb_context *ldb,
+ const struct ldb_message *message)
{
struct ldb_request *req;
int ret;
@@ -1404,7 +1403,7 @@ int ldb_modify_ctrl(struct ldb_context *ldb,
ret = ldb_build_mod_req(req, ldb, ldb,
message,
- controls,
+ NULL,
NULL,
ldb_op_default_callback,
NULL);
@@ -1417,14 +1416,6 @@ int ldb_modify_ctrl(struct ldb_context *ldb,
talloc_free(req);
return ret;
}
-/*
- modify the specified attributes of a record
-*/
-int ldb_modify(struct ldb_context *ldb,
- const struct ldb_message *message)
-{
- return ldb_modify_ctrl(ldb, message, NULL);
-}
/*
diff --git a/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h
index 2b80e42..cf55f0a 100644
--- a/source4/lib/ldb/include/ldb.h
+++ b/source4/lib/ldb/include/ldb.h
@@ -1231,24 +1231,6 @@ int ldb_add(struct ldb_context *ldb,
ldb_init())
\param message the message containing the changes required.
- \param controls ldap controls for the request
-
- \return result code (LDB_SUCCESS if the record was modified as
- requested, otherwise a failure code)
-*/
-int ldb_modify_ctrl(struct ldb_context *ldb,
- const struct ldb_message *message,
- struct ldb_control **controls);
-
-/**
- Modify the specified
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 20bcdf8... s3: Fix _samr_GetAliasMembership for results with 0 rids
from 4330efe... Removed ldb_modify_ctrl from ldb, implemented as a
static in ldap_backend.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 20bcdf85f16216c45ded886217fedc4516cc591c
Author: Volker Lendecke v...@samba.org
Date: Tue Dec 15 14:01:43 2009 +0100
s3: Fix _samr_GetAliasMembership for results with 0 rids
---
Summary of changes:
source3/rpc_server/srv_samr_nt.c |8
1 files changed, 8 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 2bfd6c3..6b40385 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -5361,6 +5361,14 @@ NTSTATUS _samr_GetAliasMembership(pipes_struct *p,
r-out.rids-count = num_alias_rids;
r-out.rids-ids = alias_rids;
+ if (r-out.rids-ids == NULL) {
+ /* Windows domain clients don't accept a NULL ptr here */
+ r-out.rids-ids = talloc_zero(p-mem_ctx, uint32_t);
+ }
+ if (r-out.rids-ids == NULL) {
+ return NT_STATUS_NO_MEMORY;
+ }
+
return NT_STATUS_OK;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via 526ceef... s3: Fix _samr_GetAliasMembership for results with 0 rids
from dd38f15... talloc: Fix write behind memory block
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit 526ceefc9d2df46b5b172a15d196f1f1de6ff6c7
Author: Volker Lendecke v...@samba.org
Date: Tue Dec 15 14:01:43 2009 +0100
s3: Fix _samr_GetAliasMembership for results with 0 rids
---
Summary of changes:
source3/rpc_server/srv_samr_nt.c |8
1 files changed, 8 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index f3a48a8..d50c6c3 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -5360,6 +5360,14 @@ NTSTATUS _samr_GetAliasMembership(pipes_struct *p,
r-out.rids-count = num_alias_rids;
r-out.rids-ids = alias_rids;
+ if (r-out.rids-ids == NULL) {
+ /* Windows domain clients don't accept a NULL ptr here */
+ r-out.rids-ids = talloc_zero(p-mem_ctx, uint32_t);
+ }
+ if (r-out.rids-ids == NULL) {
+ return NT_STATUS_NO_MEMORY;
+ }
+
return NT_STATUS_OK;
}
--
Samba Shared Repository
[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated - 3.2.11-ctdb-68-5-g7527cfb
The branch, v3-2-ctdb has been updated
via 7527cfbc73be52e351dbc5579d840972f7532769 (commit)
via c1e037467d044002d9e866399189deb87e056bd2 (commit)
from 60f25aaa650bf998fcf4f7a987700a6b5f633260 (commit)
http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb
- Log -
commit 7527cfbc73be52e351dbc5579d840972f7532769
Author: Stefan Metzmacher me...@samba.org
Date: Tue Dec 15 12:42:09 2009 +0100
v3-2-ctdb: Bump the ctdb vendor patch level to 69.
metze
commit c1e037467d044002d9e866399189deb87e056bd2
Author: Volker Lendecke v...@samba.org
Date: Tue Jun 16 12:23:31 2009 +0200
Fix bug 6478
This is the part of checkin cfee2025 that is relevant to this bug.
---
Summary of changes:
source/VERSION |2 +-
source/client/client.c | 40
2 files changed, 21 insertions(+), 21 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/VERSION b/source/VERSION
index e8f05af..7878d20 100644
--- a/source/VERSION
+++ b/source/VERSION
@@ -96,4 +96,4 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=
# - CVS 3.0.0rc2-VendorVersion#
SAMBA_VERSION_VENDOR_SUFFIX=ctdb
-SAMBA_VERSION_VENDOR_PATCH=68
+SAMBA_VERSION_VENDOR_PATCH=69
diff --git a/source/client/client.c b/source/client/client.c
index 9e11737..824dc32 100644
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -364,7 +364,7 @@ static int do_cd(const char *new_dir)
/* Ensure cur_dir ends in a DIRSEP */
if ((new_cd[0] != '\0') (*(new_cd+strlen(new_cd)-1) !=
CLI_DIRSEP_CHAR)) {
- new_cd = talloc_asprintf_append(new_cd, CLI_DIRSEP_STR);
+ new_cd = talloc_asprintf_append(new_cd, %s, CLI_DIRSEP_STR);
if (!new_cd) {
goto out;
}
@@ -871,7 +871,7 @@ static int cmd_dir(void)
if (*buf == CLI_DIRSEP_CHAR) {
mask = talloc_strdup(ctx, buf);
} else {
- mask = talloc_asprintf_append(mask, buf);
+ mask = talloc_asprintf_append(mask, %s, buf);
}
} else {
mask = talloc_asprintf_append(mask, *);
@@ -912,7 +912,7 @@ static int cmd_du(void)
return 1;
}
if ((mask[0] != '\0') (mask[strlen(mask)-1]!=CLI_DIRSEP_CHAR)) {
- mask = talloc_asprintf_append(mask, CLI_DIRSEP_STR);
+ mask = talloc_asprintf_append(mask, %s, CLI_DIRSEP_STR);
if (!mask) {
return 1;
}
@@ -923,7 +923,7 @@ static int cmd_du(void)
if (*buf == CLI_DIRSEP_CHAR) {
mask = talloc_strdup(ctx, buf);
} else {
- mask = talloc_asprintf_append(mask, buf);
+ mask = talloc_asprintf_append(mask, %s, buf);
}
} else {
mask = talloc_strdup(ctx, *);
@@ -1107,7 +1107,7 @@ static int cmd_get(void)
d_printf(get filename [localname]\n);
return 1;
}
- rname = talloc_asprintf_append(rname, fname);
+ rname = talloc_asprintf_append(rname, %s, fname);
if (!rname) {
return 1;
}
@@ -1266,7 +1266,7 @@ static int cmd_more(void)
unlink(lname);
return 1;
}
- rname = talloc_asprintf_append(rname, fname);
+ rname = talloc_asprintf_append(rname, %s, fname);
if (!rname) {
return 1;
}
@@ -1318,7 +1318,7 @@ static int cmd_mget(void)
mget_mask = talloc_strdup(ctx, buf);
} else {
mget_mask = talloc_asprintf_append(mget_mask,
- buf);
+ %s, buf);
}
if (!mget_mask) {
return 1;
@@ -1419,7 +1419,7 @@ static int cmd_mkdir(void)
}
return 1;
}
- mask = talloc_asprintf_append(mask, buf);
+ mask = talloc_asprintf_append(mask, %s, buf);
if (!mask) {
return 1;
}
@@ -1448,14 +1448,14 @@ static int cmd_mkdir(void)
trim_char(ddir,'.','\0');
p = strtok_r(ddir, /\\, saveptr);
while (p) {
- ddir2 = talloc_asprintf_append(ddir2, p);
+ ddir2 = talloc_asprintf_append(ddir2, %s, p);
if (!ddir2) {
return 1;
}
if (!cli_chkpath(targetcli, ddir2)) {
do_mkdir(ddir2);
[SCM] SAMBA-CTDB repository - annotated tag 3.2.11-ctdb-69 created - 3.2.11-ctdb-69
The annotated tag, 3.2.11-ctdb-69 has been created at 2dcc736337da99c0b639dd4b4ac4358792fe6232 (tag) tagging 7527cfbc73be52e351dbc5579d840972f7532769 (commit) replaces 3.2.11-ctdb-68 tagged by Michael Adam on Tue Dec 15 21:52:58 2009 +0100 - Log - Tag release 3.2.11-ctdb-69. -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (GNU/Linux) iEYEABECAAYFAksn9zoACgkQyU9JOBhPkDRVSQCfRZz5nnVDHvPe9CGZzwR+nmaG RpsAnRCyx8Rl6sh/kkGBaJfm3JAzeLdl =bWrv -END PGP SIGNATURE- Christian Ambach (2): add e2fsprogs-devel as build dependency this is needed for AD because it contains libcom/libcom_err files and headers streamline some log levels for invalid servicenames Jeremy Allison (1): Bug 6488: acl_group_override() call in posix acls references an uninitialized variable. (cherry picked from commit f92195e3a1baaddda47a5d496f9488c8445b41ad) Stefan Metzmacher (1): v3-2-ctdb: Bump the ctdb vendor patch level to 69. Volker Lendecke (1): Fix bug 6478 --- -- SAMBA-CTDB repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 4a19ada... smbtorture4: Add rpc-samba3-getaliasmembership-0
from 20bcdf8... s3: Fix _samr_GetAliasMembership for results with 0 rids
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4a19adadcc543f289f4f1c70e696153b488f79c6
Author: Volker Lendecke v...@samba.org
Date: Tue Dec 15 17:49:24 2009 +0100
smbtorture4: Add rpc-samba3-getaliasmembership-0
---
Summary of changes:
source4/torture/rpc/rpc.c |2 +
source4/torture/rpc/samba3rpc.c | 60 +++
2 files changed, 62 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c
index 141a39e..3362bad 100644
--- a/source4/torture/rpc/rpc.c
+++ b/source4/torture/rpc/rpc.c
@@ -488,6 +488,8 @@ NTSTATUS torture_rpc_init(void)
torture_suite_add_simple_test(suite, SAMBA3-SPOOLSS,
torture_samba3_rpc_spoolss);
torture_suite_add_simple_test(suite, SAMBA3-WKSSVC,
torture_samba3_rpc_wkssvc);
torture_suite_add_simple_test(suite, SAMBA3-WINREG,
torture_samba3_rpc_winreg);
+ torture_suite_add_simple_test(suite, SAMBA3-GETALIASMEMBERSHIP-0,
+ torture_samba3_getaliasmembership_0);
torture_rpc_drsuapi_tcase(suite);
torture_rpc_drsuapi_cracknames_tcase(suite);
torture_suite_add_suite(suite, torture_rpc_dssetup(suite));
diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c
index d439e1f..7cae8db 100644
--- a/source4/torture/rpc/samba3rpc.c
+++ b/source4/torture/rpc/samba3rpc.c
@@ -3541,3 +3541,63 @@ bool torture_samba3_regconfig(struct torture_context
*torture)
talloc_free(cli);
return ret;
}
+
+/*
+ * Test that even with a result of 0 rids the array is returned as a
+ * non-NULL pointer. Yes, XP does notice.
+ */
+
+bool torture_samba3_getaliasmembership_0(struct torture_context *torture)
+{
+ struct dcerpc_pipe *p;
+ NTSTATUS status;
+ bool ret;
+ struct samr_Connect2 c;
+ struct samr_OpenDomain o;
+ struct dom_sid sid;
+ struct lsa_SidPtr ptr;
+ struct lsa_SidArray sids;
+ struct samr_GetAliasMembership g;
+ struct samr_Ids rids;
+ struct policy_handle samr, domain;
+
+ status = torture_rpc_connection(torture, p, ndr_table_samr);
+ if (!NT_STATUS_IS_OK(status)) {
+ return false;
+ }
+ c.in.system_name = NULL;
+ c.in.access_mask = SAMR_ACCESS_LOOKUP_DOMAIN;
+ c.out.connect_handle = samr;
+ status = dcerpc_samr_Connect2(p, torture, c);
+ if (!NT_STATUS_IS_OK(status)) {
+ return false;
+ }
+ dom_sid_parse(S-1-5-32, sid);
+ o.in.connect_handle = samr;
+ o.in.access_mask = SAMR_DOMAIN_ACCESS_LOOKUP_ALIAS;
+ o.in.sid = sid;
+ o.out.domain_handle = domain;
+ status = dcerpc_samr_OpenDomain(p, torture, o);
+ if (!NT_STATUS_IS_OK(status)) {
+ return false;
+ }
+ dom_sid_parse(S-1-2-3-4-5, sid);
+ ptr.sid = sid;
+ sids.num_sids = 1;
+ sids.sids = ptr;
+ g.in.domain_handle = domain;
+ g.in.sids = sids;
+ g.out.rids = rids;
+ status = dcerpc_samr_GetAliasMembership(p, torture, g);
+ if (!NT_STATUS_IS_OK(status)) {
+ return false;
+ }
+ if (rids.ids == NULL) {
+ /* This is the piece to test here */
+ torture_warning(torture,
+ torture_samba3_getaliasmembership_0:
+ Server returns NULL rids array\n);
+ return false;
+ }
+ return true;
+}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 1a43d86... s4:prog_guide4.txt: remove obsolete comments via a88b288... s4: Fixed the programming guide to reflect the current tree. via b55d076... s4-kdc: Migrate to tsocket_address. via a5bdab8... tsocket: Fixed tsocket_guide.txt asciidoc syntax. via e33ae22... tsocket: Fixed documentation for tsocket_address_bsd_sockaddr(). via ab04dd3... tsocket: Fixed typo in LGPL header. via edbf2ca... tsocket: add tsocket_address_bsd_sockaddr() and tsocket_address_bsd_from_sockaddr() from 4a19ada... smbtorture4: Add rpc-samba3-getaliasmembership-0 http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 1a43d863be50be5bdcb8cde4adf30f7fd627f8ef Author: Stefan Metzmacher me...@samba.org Date: Tue Dec 15 16:52:00 2009 +0100 s4:prog_guide4.txt: remove obsolete comments metze commit a88b28850bb1cf5e1e40d49c05054ccd445ac0ed Author: Andreas Schneider a...@redhat.com Date: Tue Dec 15 16:46:03 2009 +0100 s4: Fixed the programming guide to reflect the current tree. commit b55d07615be78c582f790a498292a76a77259374 Author: Andreas Schneider a...@redhat.com Date: Tue Dec 15 12:58:40 2009 +0100 s4-kdc: Migrate to tsocket_address. commit a5bdab8b32768282270315f880f980d99ebb9a2e Author: Andreas Schneider a...@redhat.com Date: Tue Dec 15 12:58:18 2009 +0100 tsocket: Fixed tsocket_guide.txt asciidoc syntax. commit e33ae22b87597f31caefd5466bb8e8f240405972 Author: Andreas Schneider a...@redhat.com Date: Tue Dec 15 12:57:35 2009 +0100 tsocket: Fixed documentation for tsocket_address_bsd_sockaddr(). commit ab04dd3be743806bf3c9cf9db4b5326ce0476bf5 Author: Andreas Schneider a...@redhat.com Date: Tue Dec 15 12:56:44 2009 +0100 tsocket: Fixed typo in LGPL header. commit edbf2caa6f8273227229cd8f1b293e95c6a6122d Author: Stefan Metzmacher me...@samba.org Date: Wed Nov 4 19:03:41 2009 +0100 tsocket: add tsocket_address_bsd_sockaddr() and tsocket_address_bsd_from_sockaddr() metze --- Summary of changes: lib/tsocket/tsocket.c |2 +- lib/tsocket/tsocket.h | 17 ++- lib/tsocket/tsocket_bsd.c | 56 +++- lib/tsocket/tsocket_guide.txt | 317 ++-- lib/tsocket/tsocket_helpers.c |2 +- lib/tsocket/tsocket_internal.h |2 +- prog_guide4.txt| 63 +++- source4/kdc/kdc.c | 69 +++-- source4/kdc/kdc.h |6 +- source4/kdc/kpasswdd.c | 23 +++- 10 files changed, 349 insertions(+), 208 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/tsocket/tsocket.c b/lib/tsocket/tsocket.c index 55f1af3..b8dd6c8 100644 --- a/lib/tsocket/tsocket.c +++ b/lib/tsocket/tsocket.c @@ -3,7 +3,7 @@ Copyright (C) Stefan Metzmacher 2009 - ** NOTE! The following LGPL license applies to the tevent + ** NOTE! The following LGPL license applies to the tsocket ** library. This does NOT imply that all of Samba is released ** under the LGPL diff --git a/lib/tsocket/tsocket.h b/lib/tsocket/tsocket.h index ae73113..7e9cf9e 100644 --- a/lib/tsocket/tsocket.h +++ b/lib/tsocket/tsocket.h @@ -3,7 +3,7 @@ Copyright (C) Stefan Metzmacher 2009 - ** NOTE! The following LGPL license applies to the tevent + ** NOTE! The following LGPL license applies to the tsocket ** library. This does NOT imply that all of Samba is released ** under the LGPL @@ -179,6 +179,21 @@ int _tstream_unix_socketpair(TALLOC_CTX *mem_ctx1, _tstream_unix_socketpair(mem_ctx1, stream1, mem_ctx2, stream2, \ __location__) +struct sockaddr; + +int _tsocket_address_bsd_from_sockaddr(TALLOC_CTX *mem_ctx, + struct sockaddr *sa, + size_t sa_socklen, + struct tsocket_address **_addr, + const char *location); +#define tsocket_address_bsd_from_sockaddr(mem_ctx, sa, sa_socklen, _addr) \ + _tsocket_address_bsd_from_sockaddr(mem_ctx, sa, sa_socklen, _addr, \ + __location__) + +ssize_t tsocket_address_bsd_sockaddr(const struct tsocket_address *addr, +struct sockaddr *sa, +size_t sa_socklen); + int _tstream_bsd_existing_socket(TALLOC_CTX *mem_ctx, int fd, struct tstream_context **_stream, diff --git a/lib/tsocket/tsocket_bsd.c b/lib/tsocket/tsocket_bsd.c index 05f5be1..1c1e580 100644 --- a/lib/tsocket/tsocket_bsd.c +++ b/lib/tsocket/tsocket_bsd.c @@ -3,7 +3,7 @@ Copyright (C) Stefan Metzmacher 2009 - ** NOTE! The
[SCM] CTDB repository - branch master updated - ctdb-1.0.108-77-gb883d19
The branch, master has been updated
via b883d19a495a41a22db37f9c2cf6250fee529de0 (commit)
from b765e12a5fb87a6121e49b349017b6a961929346 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit b883d19a495a41a22db37f9c2cf6250fee529de0
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Wed Dec 16 09:51:17 2009 +1100
Revert cleanup: remove a tunable we no longer use in the eventscripts
any more :
This reverts commit 401f421fa003d9515df15e759b50b56e0c67d69c.
Conflicts:
include/ctdb_private.h
server/ctdb_tunables.c
---
Summary of changes:
include/ctdb_private.h |1 +
server/ctdb_tunables.c |1 +
2 files changed, 2 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index b6c4b2f..feff0bc 100644
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -104,6 +104,7 @@ struct ctdb_tunable {
uint32_t tickle_update_interval;
uint32_t script_timeout;
uint32_t script_timeout_count; /* allow dodgy scripts to hang this many
times in a row before we mark the node unhealthy */
+ uint32_t script_unhealthy_on_timeout; /* obsolete */
uint32_t recovery_grace_period;
uint32_t recovery_ban_period;
uint32_t database_hash_size;
diff --git a/server/ctdb_tunables.c b/server/ctdb_tunables.c
index 8722603..17949d1 100644
--- a/server/ctdb_tunables.c
+++ b/server/ctdb_tunables.c
@@ -39,6 +39,7 @@ static const struct {
{ TickleUpdateInterval,20, offsetof(struct ctdb_tunable,
tickle_update_interval) },
{ EventScriptTimeout, 30, offsetof(struct ctdb_tunable,
script_timeout) },
{ EventScriptTimeoutCount, 1, offsetof(struct ctdb_tunable,
script_timeout_count) },
+ { EventScriptUnhealthyOnTimeout, 0, offsetof(struct ctdb_tunable,
script_unhealthy_on_timeout) },/* OBSOLETE */
{ RecoveryGracePeriod, 120, offsetof(struct ctdb_tunable,
recovery_grace_period) },
{ RecoveryBanPeriod, 300, offsetof(struct ctdb_tunable,
recovery_ban_period) },
{ DatabaseHashSize, 1, offsetof(struct ctdb_tunable,
database_hash_size) },
--
CTDB repository
svn commit: samba-web r1349 - in trunk/support: .
Author: jra Date: 2009-12-15 16:28:55 -0700 (Tue, 15 Dec 2009) New Revision: 1349 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1349 Log: Added lines. Modified: trunk/support/costarica.html Changeset: Modified: trunk/support/costarica.html === --- trunk/support/costarica.html2009-12-15 09:44:35 UTC (rev 1348) +++ trunk/support/costarica.html2009-12-15 23:28:55 UTC (rev 1349) @@ -30,6 +30,7 @@ /small/pre !-- Added: 27 November 2009 -- +hr / presmall Abax Asesores URL: a href=http://www.abaxasesores.com;http://www.abaxasesores.com/a @@ -38,6 +39,7 @@ Fax. +506 2234.6622 Apartado Postal: 595-2070, Sabanilla, San José, Costa Rica. +hr / /small/pre !--#include virtual=footer_support.html --
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 308b50a... s4-smbtorture: run GetPrinterDriver2 tests against each
printer's driver.
from 1a43d86... s4:prog_guide4.txt: remove obsolete comments
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 308b50a7bb07a7db6d2119f9ff08f33fce922562
Author: Günther Deschner g...@samba.org
Date: Tue Dec 15 22:26:39 2009 +0100
s4-smbtorture: run GetPrinterDriver2 tests against each printer's driver.
Guenther
---
Summary of changes:
source4/torture/rpc/spoolss.c | 62 +---
1 files changed, 45 insertions(+), 17 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 772ca09..9136454 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -860,6 +860,11 @@ static bool test_EnumPrinters(struct torture_context *tctx,
return true;
}
+static bool test_GetPrinterDriver2(struct torture_context *tctx,
+ struct dcerpc_pipe *p,
+ struct policy_handle *handle,
+ const char *driver_name);
+
static bool test_GetPrinter(struct torture_context *tctx,
struct dcerpc_pipe *p,
struct policy_handle *handle)
@@ -895,6 +900,12 @@ static bool test_GetPrinter(struct torture_context *tctx,
torture_assert_werr_ok(tctx, r.out.result, GetPrinter failed);
CHECK_NEEDED_SIZE_LEVEL(spoolss_PrinterInfo, r.out.info,
r.in.level, lp_iconv_convenience(tctx-lp_ctx), needed, 4);
+
+ if ((r.in.level == 2) r.out.info-info2.drivername
strlen(r.out.info-info2.drivername)) {
+ torture_assert(tctx,
+ test_GetPrinterDriver2(tctx, p, handle,
r.out.info-info2.drivername),
+ failed to call test_GetPrinterDriver2);
+ }
}
return true;
@@ -2965,38 +2976,55 @@ static bool test_GetPrinterDriver2(struct
torture_context *tctx,
const char *driver_name)
{
struct spoolss_GetPrinterDriver2 r;
+ uint16_t levels[] = {1, 2, 3, 4, 5, 6, 8, 101 };
uint32_t needed;
uint32_t server_major_version;
uint32_t server_minor_version;
+ int i;
r.in.handle = handle;
- r.in.architecture = W32X86;
- r.in.level = 1;
- r.in.buffer = NULL;
- r.in.offered = 0;
- r.in.client_major_version = 0;
+ r.in.architecture = SPOOLSS_ARCHITECTURE_NT_X86;
+ r.in.client_major_version = 3;
r.in.client_minor_version = 0;
r.out.needed = needed;
r.out.server_major_version = server_major_version;
r.out.server_minor_version = server_minor_version;
- torture_comment(tctx, Testing GetPrinterDriver2 level %d\n,
r.in.level);
+ for (i=0;iARRAY_SIZE(levels);i++) {
+
+ r.in.buffer = NULL;
+ r.in.offered = 0;
+ r.in.level = levels[i];
+
+ torture_comment(tctx, Testing GetPrinterDriver2(%s) level
%d\n,
+ driver_name, r.in.level);
- torture_assert_ntstatus_ok(tctx, dcerpc_spoolss_GetPrinterDriver2(p,
tctx, r),
- failed to call GetPrinterDriver2);
- if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
- DATA_BLOB blob = data_blob_talloc(tctx, NULL, needed);
- data_blob_clear(blob);
- r.in.buffer = blob;
- r.in.offered = needed;
torture_assert_ntstatus_ok(tctx,
dcerpc_spoolss_GetPrinterDriver2(p, tctx, r),
failed to call GetPrinterDriver2);
- }
+ if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
+ DATA_BLOB blob = data_blob_talloc(tctx, NULL, needed);
+ data_blob_clear(blob);
+ r.in.buffer = blob;
+ r.in.offered = needed;
+ torture_assert_ntstatus_ok(tctx,
dcerpc_spoolss_GetPrinterDriver2(p, tctx, r),
+ failed to call GetPrinterDriver2);
+ }
- torture_assert_werr_ok(tctx, r.out.result,
- failed to call GetPrinterDriver2);
+ if (W_ERROR_EQUAL(r.out.result, WERR_INVALID_LEVEL)) {
+ switch (r.in.level) {
+ case 101:
+ case 8:
+ continue;
+ default:
+ break;
+ }
+ }
- CHECK_NEEDED_SIZE_LEVEL(spoolss_DriverInfo, r.out.info, r.in.level,
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via e831e3e... Ensure dos_mode can return FILE_ATTRIBUTE_NORMAL, then
filter the returned attributes by protocol level.
from 308b50a... s4-smbtorture: run GetPrinterDriver2 tests against each
printer's driver.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e831e3ee32ba3f1f492f9918d74a302731fa79a9
Author: Jeremy Allison j...@samba.org
Date: Tue Dec 15 18:03:47 2009 -0800
Ensure dos_mode can return FILE_ATTRIBUTE_NORMAL, then filter the returned
attributes by protocol level.
This makes us consistant in returning DOS attrs across all replies. Tested
on OS/2 by Günter Kukkukk.
Jeremy.
---
Summary of changes:
source3/smbd/dosmode.c | 28
source3/smbd/trans2.c | 15 +--
2 files changed, 25 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index 0f31973..aaef09b 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -21,6 +21,18 @@
#include includes.h
#include librpc/gen_ndr/ndr_xattr.h
+static uint32_t filter_mode_by_protocol(uint32_t mode)
+{
+ if (get_Protocol() = PROTOCOL_LANMAN2) {
+ DEBUG(10,(filter_mode_by_protocol:
+ filtering result 0x%x to 0x%x\n,
+ (unsigned int)mode,
+ (unsigned int)(mode 0x3f) ));
+ mode = 0x3f;
+ }
+ return mode;
+}
+
static int set_sparse_flag(const SMB_STRUCT_STAT * const sbuf)
{
#if defined (HAVE_STAT_ST_BLOCKS) defined(STAT_ST_BLOCKSIZE)
@@ -459,12 +471,12 @@ uint32 dos_mode_msdfs(connection_struct *conn,
result |= aHIDDEN;
}
- if (get_Protocol() = PROTOCOL_LANMAN2) {
- DEBUG(10,(dos_mode_msdfs : filtering result 0x%x\n,
- (unsigned int)result ));
- result = 0xff;
+ if (result == 0) {
+ result = FILE_ATTRIBUTE_NORMAL;
}
+ result = filter_mode_by_protocol(result);
+
DEBUG(8,(dos_mode_msdfs returning ));
if (result aHIDDEN) DEBUG(8, (h));
@@ -645,12 +657,12 @@ uint32 dos_mode(connection_struct *conn, struct
smb_filename *smb_fname)
result |= aHIDDEN;
}
- if (get_Protocol() = PROTOCOL_LANMAN2) {
- DEBUG(10,(dos_mode : filtering result 0x%x\n,
- (unsigned int)result ));
- result = 0xff;
+ if (result == 0) {
+ result = FILE_ATTRIBUTE_NORMAL;
}
+ result = filter_mode_by_protocol(result);
+
DEBUG(8,(dos_mode returning ));
if (result aHIDDEN) DEBUG(8, (h));
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index cd4f605..40c1af2 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -1484,7 +1484,6 @@ static bool smbd_marshall_dir_entry(TALLOC_CTX *ctx,
char *nameptr;
char *last_entry_ptr;
bool was_8_3;
- uint32_t nt_extmode; /* Used for NT connections instead of mode */
off_t off;
off_t pad = 0;
@@ -1535,8 +1534,6 @@ static bool smbd_marshall_dir_entry(TALLOC_CTX *ctx,
pad = 0;
off = 0;
- nt_extmode = mode ? mode : FILE_ATTRIBUTE_NORMAL;
-
switch (info_level) {
case SMB_FIND_INFO_STANDARD:
DEBUG(10,(smbd_marshall_dir_entry: SMB_FIND_INFO_STANDARD\n));
@@ -1684,7 +1681,7 @@ static bool smbd_marshall_dir_entry(TALLOC_CTX *ctx,
put_long_date_timespec(conn-ts_res,p,cdate_ts); p += 8;
SOFF_T(p,0,file_size); p += 8;
SOFF_T(p,0,allocation_size); p += 8;
- SIVAL(p,0,nt_extmode); p += 4;
+ SIVAL(p,0,mode); p += 4;
q = p; p += 4; /* q is placeholder for name length. */
{
unsigned int ea_size = estimate_ea_size(conn, NULL,
@@ -1750,7 +1747,7 @@ static bool smbd_marshall_dir_entry(TALLOC_CTX *ctx,
put_long_date_timespec(conn-ts_res,p,cdate_ts); p += 8;
SOFF_T(p,0,file_size); p += 8;
SOFF_T(p,0,allocation_size); p += 8;
- SIVAL(p,0,nt_extmode); p += 4;
+ SIVAL(p,0,mode); p += 4;
len = srvstr_push(base_data, flags2,
p + 4, fname, PTR_DIFF(end_data, p+4),
STR_TERMINATE_ASCII);
@@ -1786,7 +1783,7 @@ static bool smbd_marshall_dir_entry(TALLOC_CTX *ctx,
put_long_date_timespec(conn-ts_res,p,cdate_ts); p += 8;
SOFF_T(p,0,file_size); p += 8;
SOFF_T(p,0,allocation_size); p += 8;
- SIVAL(p,0,nt_extmode); p += 4;
+ SIVAL(p,0,mode); p += 4;
q = p; p +=
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via 4c733f1... Ensure dos_mode can return FILE_ATTRIBUTE_NORMAL, then
filter the returned attributes by protocol level.
from 526ceef... s3: Fix _samr_GetAliasMembership for results with 0 rids
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit 4c733f139ee93276a410f6470f4c11c4bf75a24a
Author: Jeremy Allison j...@samba.org
Date: Tue Dec 15 18:03:47 2009 -0800
Ensure dos_mode can return FILE_ATTRIBUTE_NORMAL, then filter the returned
attributes by protocol level.
This makes us consistant in returning DOS attrs across all replies. Tested
on OS/2 by Günter Kukkukk.
Jeremy.
(cherry picked from commit e831e3ee32ba3f1f492f9918d74a302731fa79a9)
---
Summary of changes:
source3/smbd/dosmode.c | 28
source3/smbd/trans2.c | 15 +--
2 files changed, 25 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index 0f31973..aaef09b 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -21,6 +21,18 @@
#include includes.h
#include librpc/gen_ndr/ndr_xattr.h
+static uint32_t filter_mode_by_protocol(uint32_t mode)
+{
+ if (get_Protocol() = PROTOCOL_LANMAN2) {
+ DEBUG(10,(filter_mode_by_protocol:
+ filtering result 0x%x to 0x%x\n,
+ (unsigned int)mode,
+ (unsigned int)(mode 0x3f) ));
+ mode = 0x3f;
+ }
+ return mode;
+}
+
static int set_sparse_flag(const SMB_STRUCT_STAT * const sbuf)
{
#if defined (HAVE_STAT_ST_BLOCKS) defined(STAT_ST_BLOCKSIZE)
@@ -459,12 +471,12 @@ uint32 dos_mode_msdfs(connection_struct *conn,
result |= aHIDDEN;
}
- if (get_Protocol() = PROTOCOL_LANMAN2) {
- DEBUG(10,(dos_mode_msdfs : filtering result 0x%x\n,
- (unsigned int)result ));
- result = 0xff;
+ if (result == 0) {
+ result = FILE_ATTRIBUTE_NORMAL;
}
+ result = filter_mode_by_protocol(result);
+
DEBUG(8,(dos_mode_msdfs returning ));
if (result aHIDDEN) DEBUG(8, (h));
@@ -645,12 +657,12 @@ uint32 dos_mode(connection_struct *conn, struct
smb_filename *smb_fname)
result |= aHIDDEN;
}
- if (get_Protocol() = PROTOCOL_LANMAN2) {
- DEBUG(10,(dos_mode : filtering result 0x%x\n,
- (unsigned int)result ));
- result = 0xff;
+ if (result == 0) {
+ result = FILE_ATTRIBUTE_NORMAL;
}
+ result = filter_mode_by_protocol(result);
+
DEBUG(8,(dos_mode returning ));
if (result aHIDDEN) DEBUG(8, (h));
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index ca2ff60..cbadab7 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -1484,7 +1484,6 @@ static bool smbd_marshall_dir_entry(TALLOC_CTX *ctx,
char *nameptr;
char *last_entry_ptr;
bool was_8_3;
- uint32_t nt_extmode; /* Used for NT connections instead of mode */
off_t off;
off_t pad = 0;
@@ -1535,8 +1534,6 @@ static bool smbd_marshall_dir_entry(TALLOC_CTX *ctx,
pad = 0;
off = 0;
- nt_extmode = mode ? mode : FILE_ATTRIBUTE_NORMAL;
-
switch (info_level) {
case SMB_FIND_INFO_STANDARD:
DEBUG(10,(smbd_marshall_dir_entry: SMB_FIND_INFO_STANDARD\n));
@@ -1684,7 +1681,7 @@ static bool smbd_marshall_dir_entry(TALLOC_CTX *ctx,
put_long_date_timespec(conn-ts_res,p,cdate_ts); p += 8;
SOFF_T(p,0,file_size); p += 8;
SOFF_T(p,0,allocation_size); p += 8;
- SIVAL(p,0,nt_extmode); p += 4;
+ SIVAL(p,0,mode); p += 4;
q = p; p += 4; /* q is placeholder for name length. */
{
unsigned int ea_size = estimate_ea_size(conn, NULL,
@@ -1750,7 +1747,7 @@ static bool smbd_marshall_dir_entry(TALLOC_CTX *ctx,
put_long_date_timespec(conn-ts_res,p,cdate_ts); p += 8;
SOFF_T(p,0,file_size); p += 8;
SOFF_T(p,0,allocation_size); p += 8;
- SIVAL(p,0,nt_extmode); p += 4;
+ SIVAL(p,0,mode); p += 4;
len = srvstr_push(base_data, flags2,
p + 4, fname, PTR_DIFF(end_data, p+4),
STR_TERMINATE_ASCII);
@@ -1786,7 +1783,7 @@ static bool smbd_marshall_dir_entry(TALLOC_CTX *ctx,
put_long_date_timespec(conn-ts_res,p,cdate_ts); p += 8;
SOFF_T(p,0,file_size); p += 8;
SOFF_T(p,0,allocation_size); p += 8;
- SIVAL(p,0,nt_extmode); p += 4;
+
Build status as of Wed Dec 16 07:00:02 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-12-15 00:00:03.0 -0700 +++ /home/build/master/cache/broken_results.txt 2009-12-16 00:00:04.0 -0700 @@ -1,4 +1,4 @@ -Build status as of Tue Dec 15 07:00:02 2009 +Build status as of Wed Dec 16 07:00:02 2009 Build counts: Tree Total Broken Panic @@ -10,13 +10,13 @@ lorikeet 0 0 0 pidl 23 23 0 ppp 0 0 0 -rsync33 13 0 +rsync33 12 0 samba-docs 0 0 0 samba-web0 0 0 samba_3_current 0 0 0 -samba_3_master 31 24 4 +samba_3_master 31 23 4 samba_3_next 31 31 2 -samba_4_0_test 33 31 0 -talloc 2 1 0 +samba_4_0_test 33 30 0 +talloc 31 11 0 tdb 2 0 0
