[Samba] samba init script
I had to manaully downgrade my samba installation to 2.2 to see if I can solve my problems with home folder. The problem is that I cant find the init script in the sources and the one included with Gentoo ebuild does not works. Cans somebody tell me where to find a working script for the default installation (located in /usr/local/samba)? -- Roger D. Vargas Using Gentoo Linux 2008.0, Ogre 1.6.2, fglrx Powered by Celeron D 2.8 Ghz, 2Gb RAM, Radeon HD4770 Currently working on: The Ark physics system http://dsgp.blogspot.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Is there a console tool to monitorcontrollognotify the print queue information?
Le 10/08/2009 19:20, LiuYan 刘研 a écrit : Thank you Johan for your reply! I've already configured the web admin of CUPS, I even assign an 80 port to it. What I do not want to use it is because of: 1. It can't show the correct document pages if windows clients print to samba shared printer. it will always be 1 page. 2. It's not real-time enough, we need manually refresh/reload the page like polling mode. 3. It's a web GUI which need a text browser to display it, and there are other important management options on it. Before I migrate to linux print server, I use a Windows 2000 Professional to act as print server. Workmates know how to open the print/fax folder, view the print queue, and cancel a print job on the win2000 print server. So I want a similar simple management like that on a linux print server, unfortunately, web-admin of CUPS does not fit that very well :(. Johan Hendriks wrote: I setup a central Fedora 11 printer server in a big office for 80+ windows clients due to the max 10 connections limitation of windows 2000/xp. 2 physical printers are connected to the server, and I configured 3 CUPS printers(1 printer with 2 different printer drivers) in Fedora 11. Is there a console tool to 1. Monitor the print queue(s) in real-time like windows system? A history windows hold some recent printed jobs information, and a real-time window hold the current printing/queueing jobs information. The current printing/queueing job information contains the information like windows system provided such as: Document Name, Status, Owner, Pages, File Size, Submit Time, Port. 2. Control the print queue(s). Everyone who stand in front of Fedora 11 can cancel any print job. 3. Log the job informations. Log job information to database, especially the 'Pages' and 'Owner' info of a job, so that I get a total Pages/Papers consumed in a month. CUPS can't provide a correct Pages value if job comes from Samba. 4. Notify the Owner when the job is finished via windows messenger mechanism. Many workmates(especially workmates from HR department) often print documents which have hundreds of pages. Their office is 30+ meters far from the printer, they rarely watch the print queue in their windows workstation, and watching a 'hundreds of pages' print job is boring. So, if owner can be notified when print job is finished, it will be very convenient. (hmmm, it's a weird idea that job information been notified via windows messenger mechanism, but windows messenger service comes with windows 2000+ system, so client users don't need install other softwares to receive notification.) ps: (1). the printer server is an old computer (Celeron 900MHz, 128M+32M memory), so it's not good to run GUI desktop. (2). Document name contains Chinese characters, all I know is: there's an open source project named zhCon to deal the display/input of Chinese/Japanese/Korean characters in text console mode. And the encoding of zhCon may be different to the linux system (I mean, the linux system may have LANG=en_US.UTF-8, but zhCon may working with zh_CN.GBK), so the encoding can be configurable. :working: If there's no such a tool, can anybody guide me how to get these print queue information from Samba? Any hint will be appreciated! :) Can't you use the webbased frontend of CUPS Like http://your-printserver:631/admin You need to edit the cups config file to allow other machine's other then localhost to acces the web gui. Here you find some info http://www.cups.org/doc-1.1/sam.html#5_3 regards, Johan No virus found in this outgoing message. Checked by AVG - www.avg.com Version: 8.5.392 / Virus Database: 270.13.49/2293 - Release Date: 08/09/09 18:10:00 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba Hi, Under GNOME see the gnome-cups-manager package, and if you want try to accounting your jobs, maybe the pykota suite or just the pkpgcounter tool. Regards, Rodolphe -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Win98 client can't connect after Samba upgrade
Hi All, I was running Samba 2.2 as a PDC for a small office server for several years. Hardware was getting old enough I finally bit the bullet and upgraded to Samba 3.3.4 on FreeBSD 7.2 and a new box. The smbpasswd file and all that stuff was copied from the old box. Clients are Win2000 and XP Professional, and for the most part were back up and connected, practically unaware of the switch over. After a couple of weeks of thinking that was too easy I got a call that one PC wasn't working. It's an old Windows 98 pc only used occasionally. I tried recreating the machine account for it, and rejoining the domain, to no avail. Any suggestions where to start with this one? -RW -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Win98 client can't connect after Samba upgrade
smb2...@gmail.com wrote: Hi All, I was running Samba 2.2 as a PDC for a small office server for several years. Hardware was getting old enough I finally bit the bullet and upgraded to Samba 3.3.4 on FreeBSD 7.2 and a new box. The smbpasswd file and all that stuff was copied from the old box. Clients are Win2000 and XP Professional, and for the most part were back up and connected, practically unaware of the switch over. After a couple of weeks of thinking that was too easy I got a call that one PC wasn't working. It's an old Windows 98 pc only used occasionally. I tried recreating the machine account for it, and rejoining the domain, to no avail. Any suggestions where to start with this one? -RW You need to add: lanman auth = yes The default value was changed from yes to no in recent versions. HTH, Deyan -- Deyan Stoykov, dstoy...@ru.acad.bg University of Rousse, BG-7017 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Win98 client can't connect after Samba upgrade
Deyan Stoykov wrote: smb2...@gmail.com wrote: bullet and upgraded to Samba 3.3.4 on FreeBSD 7.2 and a new box. After a couple of weeks of thinking that was too easy I got a call that one PC wasn't working. It's an old Windows 98 pc only used occasionally. I tried recreating the machine account for it, and rejoining the domain, to no avail. Any suggestions where to start You need to add: lanman auth = yes The default value was changed from yes to no in recent versions. Thanks, Deyan. Added that tweak; no doubt it's part of the puzzle. I also remembered the old registry hack with old Samba versions, and found this PC had the reg flag set to use plain-text passwords; undid that one, but still no go. Any other suggestions? [other than scrap the old clunker? ;) ] -Rob W -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] File Locking, Access - Inconsistencies
Lately I'm seeing bizarre problems with the SAMBA server I'm using in production. For no rhyme or reason the connections get dropped, the same set of users who previously were able to access the shares, now get permission denied. Users (not all but some) are having trouble opening the folders, files and so on. This was not the case few days ago, it started happening lately with amazing inconsistency. Inconsistent in it works some times, it simply doesn't sometimes. I have two samba servers in the setup one on Solaris-10 and the other on Solaris-9. On Solaris 10 I'm using stock SUN Samba packages. It would be real easy, if I could isolate the problem by limiting it to one, but it occurs on both the servers. The samba versions are different on both servers. Before any can suggest, I did shutdown one server and pointed all the users to remaining one. No luck. Shut down the other server, re-pointed the users, no luck. I'm going nuts trying to isolate the problem, if only it wasn't happening with such astonishing inconsistency. Trussing the smbd shows the user access is stuck in fcntl system calls like this, and these users do have all the proper permissions for messing with these files Fcntl(10, F_SETLKW64, 0xFFBFF750) . (sleeping) Fcntl (27,F_GETLKW64,0xFFBFF840)..(sleeping) They never get out of this. Tried the usual options of oplocks = no kernel oplocks = no and even faking oplocks in the smb.conf, I can't get out of this. Anyone can suggest something I can muck with? I know earlier Solaris versions had a kernel bug with fcntl and it was patched. So, what else could be the issue here? Thanks. Ravi K. Channavajhala http://www.dciera.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] File Locking, Access - Inconsistencies
On Tue, Aug 11, 2009 at 11:49:09PM +0530, ravi channavajhala wrote: Lately I'm seeing bizarre problems with the SAMBA server I'm using in production. For no rhyme or reason the connections get dropped, the same set of users who previously were able to access the shares, now get permission denied. Users (not all but some) are having trouble opening the folders, files and so on. This was not the case few days ago, it started happening lately with amazing inconsistency. Inconsistent in it works some times, it simply doesn't sometimes. I have two samba servers in the setup one on Solaris-10 and the other on Solaris-9. On Solaris 10 I'm using stock SUN Samba packages. It would be real easy, if I could isolate the problem by limiting it to one, but it occurs on both the servers. The samba versions are different on both servers. Before any can suggest, I did shutdown one server and pointed all the users to remaining one. No luck. Shut down the other server, re-pointed the users, no luck. I'm going nuts trying to isolate the problem, if only it wasn't happening with such astonishing inconsistency. Trussing the smbd shows the user access is stuck in fcntl system calls like this, and these users do have all the proper permissions for messing with these files Fcntl(10, F_SETLKW64, 0xFFBFF750) . (sleeping) Fcntl (27,F_GETLKW64,0xFFBFF840)..(sleeping) They never get out of this. Tried the usual options of oplocks = no kernel oplocks = no and even faking oplocks in the smb.conf, I can't get out of this. Anyone can suggest something I can muck with? I know earlier Solaris versions had a kernel bug with fcntl and it was patched. So, what else could be the issue here? Thanks. What filename is the smbd stuck on the lock in ? Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Samba-LDAP Password Expiration Email Script?
Hi All, I am currently running Samba with an OpenLDAP backend. I would like to be able to have a script run that would look at the sambaPwdLastSet attribute, compare it to the current time and then if needed...email the user a reminder to change their password. I have never written any scripts that reference the LDAP directory, so I'm hoping there is something out there that I can modify or reference for my own script. Any help would be greatly apprecitated, thanks! --Bill -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Win98 client can't connect after Samba upgrade
On 2009/08/11 12:49 (GMT-0400) smb2...@gmail.com composed: Deyan Stoykov wrote: smb2...@gmail.com wrote: bullet and upgraded to Samba 3.3.4 on FreeBSD 7.2 and a new box. After a couple of weeks of thinking that was too easy I got a call that one PC wasn't working. It's an old Windows 98 pc only used occasionally. I tried recreating the machine account for it, and rejoining the domain, to no avail. Any suggestions where to start You need to add: lanman auth = yes The default value was changed from yes to no in recent versions. Thanks, Deyan. Added that tweak; no doubt it's part of the puzzle. I also remembered the old registry hack with old Samba versions, and found this PC had the reg flag set to use plain-text passwords; undid that one, but still no go. Any other suggestions? [other than scrap the old clunker? ;) ] OS/2 requires also: client lanman auth = Yes client plaintext auth = Yes Probably W9x is the same. -- How much better to get wisdom than gold, to choose understanding rather than silver. Proverbs 16:16 NKJV Team OS/2 ** Reg. Linux User #211409 Felix Miata *** http://fm.no-ip.com/ -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] CTDB+GFS2+CMAN. clean_start=0 or clean_start=1?
Yauheni Labko wrote: Thank you for the answer, Michael. As far as I understood clean_star=1 is absolutely ok for GFS/GFS2? Sorry, I am not an expert in GFS settings. (But read on...) CTDB is not going to work without Red Hat Cluster manage. CMAN starts dlm_controld and gfs_controld. ccsd handles node-to-node communication. Well GFS needs the cman processes, so CTDB needs them, too. But CTDB only uses one lock file in the cluster file system. Apart from that, the CTDB daemons communicate with each other via tcp all on their own. I think GPFS has the similar manager like CMAN. The clean_start=1 is the only setting which can provide the necessary access to the GFS/GFS2 partitions as CTDB required. Correct me if I'm wrong. Sorry again. CTDB is completely ignorant with respect to GFS or CMAN configuration options. It only needs a cluster file system that supports POSIX fcntl() byte range locks. CTDB basicall treats the file system as a black box. So CTDB does not care about the value clean_start as such. Just make sure you don't sure that you don't start ctdbd before the cman stuff is up and running and the GFS file system is mounted. Btw, i thought OCFS2 is not ready to use with CTDB due to the lacks of some features. This was primary reason why I started with GFS. OCFS2 was lacking support of POSIX fcntl byte range locks (which are required to run ctdb) until recently. But this has changed! I have not tried it myself, but I think Jim McDonough (j...@samba.org, I have added him to Cc) might be able to give you some details (versions and such). I left manual fencing for testing only. I was going to use iLO in production. OK. Hope this somewhat helps... :-) Cheers - Michael Yauheni Labko (Eugene Lobko) Junior System Administrator Chapdelaine Co. (212)208-9150 CTDB is pretty ignorant of CMAN as such. It just relies on a cluster file system, like GFS2. So you should only start ctdbd when the cluster is up and the gfs2 file system is mounted. I think you should not start ctdbd as a cluster service managed by cman, since ctdbd can be considered a cluster manager for certain services (like samba...) itself. Apart from that, ctdb should be considered pretty much independent of the red hat cluster manager. CTDB needs a file in the cluster file system, the recovery lock file. The location of this file (or a directory, in which such a file can be created) should be specified in the CTDB_RECOVERY_LOCK=... setting in /etc/sysconfig/ctdb. At a glance, your cluster.conf looks sane, but I think manual fencing can be a real problem with cman. GPFS is very well tested with ctdb. I think there are many people testing ctdb with gfs2. I have heard positive feedback of people using ctdb with GlusterFS and lustre (and recently with ocfs2). You might want to join the #ctdb irc channel on freenode. There are ususally some people around with more expertise in gfs2 than me. Cheers - Michael Yauheni Labko wrote: Hi everybody, I have tested CTDB+GFS2+CMAN under Debian. It works good but I do not understand some points. It is possible to run the CTDB defining it under services section in cluster.conf but running it on the second node shuts down the process at the first one. My CTDB configuration implies 2 active-active nodes. Does CTDB care if the node starts with clean_start=0 or clean_start=1? man fenced says this is a safe way especially during startup because it prevents a data corruption if a node was dead for some reason. From my understanding CTDB uses CMAN only as module to get access to gfs/gfs2 partitions. Or maybe it is better to look at GPFS and LustreFS? Could anybody show the working configuration of cluster.conf for CTDB+GFS2+CMAN? I used the following cluster.conf and ctd conf: ?xml version=1.0? cluster name=smb-cluster config_version=8 fence_daemon clean_start=0 post_fail_delay=0 post_join_delay=3/ cman expected_votes=1 two_node=1/ cman cluster_id=101/ clusternodes clusternode name=smb01 votes=1 nodeid=1 fence !-- Handle fencing manually -- method name=human device name=human nodename=smb01/ /method /fence /clusternode clusternode name=smb02 votes=1 nodeid=2 fence !-- Handle fencing manually -- method name=human device name=human nodename=smb02/ /method /fence /clusternode /clusternodes fencedevices !-- Define manual fencing -- fencedevice name=human agent=fence_manual/ !-- Define ilo fencing -- fencedevice name=ilo agent=fence_ilo login=admin password=foo/ /fencedevices /cluster # Options to ctdbd. This is read by /etc/init.d/ctdb CTDB_RECOVERY_LOCK=/smb-ctdb/.ctdb_locking CTDB_PUBLIC_INTERFACE=eth2
[Samba] samba with ldap PDC cannot join my windows to domain?
Hi people. I have been working with samba+ldap = PDC in my test netwwork. I had follow the good tutorial: Samba By Example, chapter 5, I had done all the test the book say and no issues. I have 2 issues: 1; I cannot see my domain at my windows browser. 2; I cannot add my windows xp pro to my domain. I have been trying to see if I could find the solution but nothing yet, there is the reason I send this email. My server is Centos 5.3 latest one all the packages are the current from centos. Ldap looks that is working, because all my test from the book pass, and the same with samba. Went I try to add one Winbox to the domain I receive this: The following error occurred attempting to join the domain MyDomain The network path as not found My smb.conf is this: [global] dos charset = 850 unix charset = ISO8859-1 display charset = ISO8859-1 workgroup = RMAI netbios name = RMAIPDC server string = Samba Server on %L os level = 33 remote announce = 192.168.50.255 interfaces = eth0,lo bind interfaces only = Yes socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 allow hosts = 192.168.50.0/24 127.0.0.1 admin users = Manager @Domain Admins passdb backend = ldapsam:ldap://127.0.0.1 enable privileges = Yes username map = /etc/samba/smbusers log level = 6 syslog = 1 log file = /var/log/samba/%m.log max log size = 100 smb ports = 139 445 name resolve order = wins bcast hosts time server = No #printcap name = CUPS show add printer wizard = No add user script = /usr/sbin/smbldap-useradd -m %u delete user script = /usr/sbin/smbldap-userdel %u add group script = /usr/sbin/smbldap-groupadd -p %g delete group script = /usr/sbin/smbldap-groupdel %g add user to group script = /usr/sbin/smbldap-groupmod -m %u %g delete user from group script = /usr/sbin/smbldap-groupmod -x %u %g set primary group script = /usr/sbin/smbldap-usermod -g %g %u add machine script = /usr/sbin/smbldap-useradd -w %u #logon script = scripts\logon.bat #logon path = \\%L\profiles\%U #logon drive = X: domain logons = Yes domain master = Yes preferred master = Yes wins support = Yes ##LDAP### ldap suffix = dc=rmai,dc=local ldap machine suffix = ou=Computers ldap user suffix = ou=People ldap group suffix = ou=Groups ldap idmap suffix = ou=Idmap ldap admin dn = cn=Manager,dc=rmai,dc=local idmap backend = ldap:ldap://127.0.0.1 idmap uid = 1-2 idmap gid = 1-2 # map acl inherit = Yes cups options = [homes] comment = RMAI Home Directories browseable = No writeable = Yes read only = No create mask = 0664 browseable = No valid users = %U [profiles] path = /home/samba/profiles read only = No store dos attributes = Yes create mask = 0600 directory mask = 0700 browseable = No writeable = Yes guest ok = No The stuff I can see at the log files is this: windows-box.log [2009/08/11 16:40:49, 5] rpc_parse/parse_prs.c:prs_uint32(710) 004c uni_max_len: 000c [2009/08/11 16:40:49, 5] rpc_parse/parse_prs.c:prs_uint32(710) 0050 offset : [2009/08/11 16:40:49, 5] rpc_parse/parse_prs.c:prs_uint32(710) 0054 uni_str_len: 000c [2009/08/11 16:40:49, 5] rpc_parse/parse_prs.c:dbg_rw_punival(942) 0058 buffer : F.A.M.-.C.H.O.R.I.Z.O... [2009/08/11 16:40:49, 6] rpc_parse/parse_prs.c:prs_debug(84) 70 smb_io_chal [2009/08/11 16:40:49, 5] rpc_parse/parse_prs.c:prs_uint8s(857) 0070 data: 03 a3 f4 30 4b c7 3c 90 [2009/08/11 16:40:49, 5] rpc_parse/parse_prs.c:prs_debug(84) 00 net_io_r_auth [2009/08/11 16:40:49, 6] rpc_parse/parse_prs.c:prs_debug(84) 00 smb_io_chal [2009/08/11 16:40:49, 5] rpc_parse/parse_prs.c:prs_uint8s(857) data: 00 00 00 00 00 00 00 00 [2009/08/11 16:40:49, 5] rpc_parse/parse_prs.c:prs_ntstatus(769) 0008 status: NT_STATUS_ACCESS_DENIED [2009/08/11 16:40:49, 5] rpc_server/srv_pipe.c:api_rpcTNP(2305) api_rpcTNP: called NETLOGON successfully [2009/08/11 16:40:49, 3] rpc_server/srv_pipe_hnd.c:free_pipe_context(529) free_pipe_context: destroying talloc pool of size 70 I will increase the debug level and give u more info. Thanks for your time!!! -- LIving the dream... -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] File Locking, Access - Inconsistencies
On Wed, Aug 12, 2009 at 9:53 AM, Jeremy Allisonj...@samba.org wrote: On Wed, Aug 12, 2009 at 08:51:51AM +0530, ravi channavajhala wrote: Hi Jeremy, Why would the file name be an issue here? It is not just one file, several files are getting affected. I followed your earlier discussion on the issue way back in 2002, can you suggest something to try. Really, I will take whatever I can get. Firstly, let's keep the list CC:ed so we keep everyone up to date. I'm asking what file name the fcntl is blocked in, as I want to know if this is a Samba tdb, or a file the server is trying to access. The Samba server should never make a blocking fcntl lock call on a user data file, but will make such calls on tdb files. So please let me know what file the fcntl syscall is blocked in. Thanks, Jeremy. Sorry I must have not used reply to all. Anyway, here is how I trussed. I had the user open a file, and then capture the system calls made with truss. The fcntl appears blocking on a user file, but I might be incorrect because I didnt really see which file the file descriptor belonged to (the very first two lines of truss show fcntl, no other information). Either way, if this is blocking on tbd file what possible recourse I can apply? Thanks for your help. -- Ravi Channavajhala -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Build status as of Tue Aug 11 06:00:01 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-08-10 00:00:06.0 -0600 +++ /home/build/master/cache/broken_results.txt 2009-08-11 00:00:18.0 -0600 @@ -1,22 +1,22 @@ -Build status as of Mon Aug 10 06:00:02 2009 +Build status as of Tue Aug 11 06:00:01 2009 Build counts: Tree Total Broken Panic build_farm 0 0 0 -ccache 14 4 0 +ccache 2 1 0 distcc 0 0 0 -ldb 34 33 0 -libreplace 33 13 0 +ldb 32 32 0 +libreplace 32 13 0 lorikeet 0 0 0 -pidl 24 3 0 -ppp 7 1 0 -rsync34 13 0 +pidl 23 3 0 +ppp 2 0 0 +rsync33 13 0 samba-docs 0 0 0 samba-web0 0 0 -samba_3_current 30 20 0 -samba_3_master 31 27 7 -samba_3_next 30 26 1 -samba_4_0_test 34 29 4 -talloc 33 32 0 -tdb 32 31 0 +samba_3_current 1 0 0 +samba_3_master 30 26 5 +samba_3_next 28 25 1 +samba_4_0_test 33 28 2 +talloc 32 32 0 +tdb 30 30 0
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-930-g40017a2
The branch, master has been updated via 40017a2143c97c622a3f237f347d2fd3f4039bcc (commit) via 4f0d93531fd41e633ff43610e86bd49f1cd4ead2 (commit) via 84a93491b8600737511fcf32370e596fbaa37b56 (commit) via 2388b9039df02abed3ece3e7ca2bee62869b1312 (commit) via a8c8432247c61944e63ec7f645e69fbbe777a53f (commit) via 5810f7f09472734f1ba9d1da5cbf43af62435fe9 (commit) via 7e4bd16c706a971a8250c949756ba7694e9d61be (commit) via a0eb906f7ef8bb9e309e975a88c1243de8683876 (commit) via 3eeb988248db7d99e4392eb4bc3d05e953944ddb (commit) via d8af037aab60ddd34c673feeccd02085db9e46e6 (commit) via 77b96cc0bf1a077fd8b9cc28f90e1bdc1f50fff1 (commit) from 7b9542ba34fd2b3144e02a5570858bc652534c4c (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 40017a2143c97c622a3f237f347d2fd3f4039bcc Author: Kai Blin k...@samba.org Date: Tue Aug 11 09:33:51 2009 +0200 i18n: Update s3 net German translation. commit 4f0d93531fd41e633ff43610e86bd49f1cd4ead2 Author: Kai Blin k...@samba.org Date: Tue Aug 11 09:01:10 2009 +0200 s3 net: i18n support for net utility functions commit 84a93491b8600737511fcf32370e596fbaa37b56 Author: Kai Blin k...@samba.org Date: Tue Aug 11 08:57:01 2009 +0200 s3 net: i18n support for net usershare commit 2388b9039df02abed3ece3e7ca2bee62869b1312 Author: Kai Blin k...@samba.org Date: Tue Aug 11 08:40:48 2009 +0200 s3 net: i18n support for net user commit a8c8432247c61944e63ec7f645e69fbbe777a53f Author: Kai Blin k...@samba.org Date: Tue Aug 11 08:38:42 2009 +0200 s3 net: i18n support for net time commit 5810f7f09472734f1ba9d1da5cbf43af62435fe9 Author: Kai Blin k...@samba.org Date: Tue Aug 11 08:35:46 2009 +0200 s3 net: i18n support for net status commit 7e4bd16c706a971a8250c949756ba7694e9d61be Author: Kai Blin k...@samba.org Date: Tue Aug 11 08:32:10 2009 +0200 s3 net: i18n support for net share commit a0eb906f7ef8bb9e309e975a88c1243de8683876 Author: Kai Blin k...@samba.org Date: Tue Aug 11 08:31:04 2009 +0200 s3 net: i18n support for net sam commit 3eeb988248db7d99e4392eb4bc3d05e953944ddb Author: Kai Blin k...@samba.org Date: Mon Aug 10 20:38:33 2009 +0200 s3 net: i18n support for net rpc shell commit d8af037aab60ddd34c673feeccd02085db9e46e6 Author: Kai Blin k...@samba.org Date: Mon Aug 10 20:23:41 2009 +0200 s3 net: i18n support for net rpc service commit 77b96cc0bf1a077fd8b9cc28f90e1bdc1f50fff1 Author: Kai Blin k...@samba.org Date: Mon Aug 10 19:54:27 2009 +0200 s3 net: i18n support for net rpc samsync --- Summary of changes: source3/locale/net/de.po| 4410 ++- source3/locale/net/genmsg |4 +- source3/utils/net_rpc_samsync.c | 50 +- source3/utils/net_rpc_service.c | 236 ++- source3/utils/net_rpc_sh_acct.c | 93 +- source3/utils/net_rpc_shell.c | 32 +- source3/utils/net_sam.c | 667 +++--- source3/utils/net_share.c |8 +- source3/utils/net_status.c | 66 +- source3/utils/net_time.c| 56 +- source3/utils/net_user.c| 30 +- source3/utils/net_usershare.c | 236 ++- source3/utils/net_util.c| 55 +- 13 files changed, 5199 insertions(+), 744 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/locale/net/de.po b/source3/locale/net/de.po index 78b1353..d99873b 100644 --- a/source3/locale/net/de.po +++ b/source3/locale/net/de.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: @pack...@\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2009-08-06 20:51+0200\n +POT-Creation-Date: 2009-08-11 09:01+0200\n PO-Revision-Date: 2009-08-06 20:45+0200\n Last-Translator: Kai Blin k...@samba.org\n MIME-Version: 1.0\n @@ -468,12 +468,12 @@ msgid msgstr #: ../../utils/net_ads.c:87 ../../utils/net_ads.c:88 ../../utils/net_ads.c:89 ../../utils/net_ads.c:90 ../../utils/net_ads.c:91 ../../utils/net_ads.c:92 ../../utils/net_ads.c:93 ../../utils/net_ads.c:94 ../../utils/net_ads.c:95 ../../utils/net_ads.c:96 -#: ../../utils/net_ads.c:97 ../../utils/net_ads.c:98 ../../utils/net_rap.c:376 +#: ../../utils/net_ads.c:97 ../../utils/net_ads.c:98 ../../utils/net_rap.c:376 ../../utils/net_rpc_sh_acct.c:203 ../../utils/net_rpc_sh_acct.c:206 msgid yes msgstr #: ../../utils/net_ads.c:87 ../../utils/net_ads.c:88 ../../utils/net_ads.c:89 ../../utils/net_ads.c:90 ../../utils/net_ads.c:91 ../../utils/net_ads.c:92 ../../utils/net_ads.c:93 ../../utils/net_ads.c:94 ../../utils/net_ads.c:95 ../../utils/net_ads.c:96 -#: ../../utils/net_ads.c:97 ../../utils/net_ads.c:98 ../../utils/net_rap.c:376 +#: ../../utils/net_ads.c:97 ../../utils/net_ads.c:98 ../../utils/net_rap.c:376 ../../utils/net_rpc_sh_acct.c:203 ../../utils/net_rpc_sh_acct.c:206 msgid no msgstr @@
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-931-ge13c14e
The branch, master has been updated
via e13c14e7e440f56069aac6c6568b56e48e7ea825 (commit)
from 40017a2143c97c622a3f237f347d2fd3f4039bcc (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e13c14e7e440f56069aac6c6568b56e48e7ea825
Author: Andrew Bartlett abart...@samba.org
Date: Tue Aug 11 18:20:39 2009 +1000
s4:torture Add test for the NTP signd server
This is used by at patch to the NTP project to supply authenticated
time as required by MS-SNTP. (ie, to keep windows clients in time sync
in the domain)
Andrew Bartlett
---
Summary of changes:
source4/ntp_signd/ntp_signd.c |7 +
source4/selftest/tests.sh |2 +
source4/torture/config.mk | 16 +++
source4/torture/ntp/ntp_signd.c | 270 +++
source4/torture/torture.c |3 +-
5 files changed, 297 insertions(+), 1 deletions(-)
create mode 100644 source4/torture/ntp/ntp_signd.c
Changeset truncated at 500 lines:
diff --git a/source4/ntp_signd/ntp_signd.c b/source4/ntp_signd/ntp_signd.c
index 4306e5a..6c6416d 100644
--- a/source4/ntp_signd/ntp_signd.c
+++ b/source4/ntp_signd/ntp_signd.c
@@ -153,6 +153,13 @@ static NTSTATUS ntp_signd_recv(void *private_data,
DATA_BLOB wrapped_input)
return signing_failure(ntp_signdconn, sign_request.packet_id);
}
+ /* We need to implement 'check signature' and 'request server
+* to sign' operations at some point */
+ if (sign_request.version != 1) {
+ talloc_free(tmp_ctx);
+ return signing_failure(ntp_signdconn, sign_request.packet_id);
+ }
+
domain_sid = samdb_domain_sid(ntp_signdconn-ntp_signd-samdb);
if (!domain_sid) {
talloc_free(tmp_ctx);
diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index 6c6a09f..5251791 100755
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -272,6 +272,8 @@ done
plantest rpc.echo on ncacn_np over smb2 dc $smb4torture
ncacn_np:\$SERVER[smb2] -U\$USERNAME%\$PASSWORD -W \$DOMAIN RPC-ECHO $*
+plantest ntp.signd dc $smb4torture ncacn_np:\$SERVER
-U\$USERNAME%\$PASSWORD -W \$DOMAIN NTP-SIGND $*
--configfile=st/dc/etc/smb.conf
+
# Tests against the NTVFS POSIX backend
NTVFSARGS=
NTVFSARGS=${NTVFSARGS} --option=torture:sharedelay=10
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 79d9bd0..b85a0f8 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -237,6 +237,22 @@ TORTURE_NET_OBJ_FILES = $(addprefix
$(torturesrcdir)/libnet/, libnet.o \
$(eval $(call
proto_header_template,$(torturesrcdir)/libnet/proto.h,$(TORTURE_NET_OBJ_FILES:.o=.c)))
#
+# Start SUBSYSTEM TORTURE_NTP
+[MODULE::TORTURE_NTP]
+SUBSYSTEM = smbtorture
+OUTPUT_TYPE = MERGED_OBJ
+INIT_FUNCTION = torture_ntp_init
+PRIVATE_DEPENDENCIES = \
+ POPT_CREDENTIALS \
+ torture_rpc
+# End SUBSYSTEM TORTURE_NTP
+#
+
+TORTURE_NTP_OBJ_FILES = $(addprefix $(torturesrcdir)/ntp/, ntp_signd.o)
+
+$(eval $(call
proto_header_template,$(torturesrcdir)/ntp/proto.h,$(TORTURE_NET_OBJ_FILES:.o=.c)))
+
+#
# Start BINARY smbtorture
[BINARY::smbtorture]
INSTALLDIR = BINDIR
diff --git a/source4/torture/ntp/ntp_signd.c b/source4/torture/ntp/ntp_signd.c
new file mode 100644
index 000..e82276a
--- /dev/null
+++ b/source4/torture/ntp/ntp_signd.c
@@ -0,0 +1,270 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ Test NTP authentication support
+
+ Copyright (C) Andrew Bartlet abart...@samba.org 2008
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see http://www.gnu.org/licenses/.
+*/
+
+#include includes.h
+#include torture/torture.h
+#include torture/smbtorture.h
+#include tevent.h
+#include lib/socket/socket.h
+#include lib/stream/packet.h
+#include auth/credentials/credentials.h
+#include torture/rpc/rpc.h
+#include torture/rpc/netlogon.h
+#include ../lib/crypto/crypto.h
+#include libcli/auth/libcli_auth.h
+#include librpc/gen_ndr/ndr_netlogon_c.h
+#include librpc/gen_ndr/ndr_netlogon.h
+#include librpc/gen_ndr/ndr_ntp_signd.h
+#include param/param.h
+
+#define TEST_MACHINE_NAME
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3644-ga49a3bd
The branch, v3-2-test has been updated via a49a3bdc1aa0c66edc00e11b470a3c3ccca79f6d (commit) from 32fdc5cef5c7aaea61228037f8c417369328e4d4 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit a49a3bdc1aa0c66edc00e11b470a3c3ccca79f6d Author: Karolin Seeger ksee...@samba.org Date: Tue Aug 11 11:21:16 2009 +0200 WHATSNEW: Update WHATSNEW. Karolin --- Summary of changes: WHATSNEW.txt |9 +++-- 1 files changed, 7 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 41ccffe..2360de9 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,10 +1,15 @@ == Release Notes for Samba 3.2.14 - August 10, 2009 + August 12, 2009 == -This is a maintenance release of the Samba 3.2 series. +This is the last maintenance release of the Samba 3.2 series. + +Please note that this is the last bugfix release of the Samba 3.2 series! +There will security releases on demand only. Please see +http://wiki.samba.org/index.php/Samba3_Release_Planning for information +on current releases. Major enhancements in 3.2.14 include: -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-13-22-gdd1e92e
The branch, v3-2-stable has been updated via dd1e92e99786b98c60e5b0ebbe1b7edaae924fb8 (commit) from a50a4d48d8174b2e02daeef508d36f08a1bbe32a (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable - Log - commit dd1e92e99786b98c60e5b0ebbe1b7edaae924fb8 Author: Karolin Seeger ksee...@samba.org Date: Tue Aug 11 11:21:16 2009 +0200 WHATSNEW: Update WHATSNEW. Karolin (cherry picked from commit a49a3bdc1aa0c66edc00e11b470a3c3ccca79f6d) --- Summary of changes: WHATSNEW.txt |9 +++-- 1 files changed, 7 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 41ccffe..2360de9 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,10 +1,15 @@ == Release Notes for Samba 3.2.14 - August 10, 2009 + August 12, 2009 == -This is a maintenance release of the Samba 3.2 series. +This is the last maintenance release of the Samba 3.2 series. + +Please note that this is the last bugfix release of the Samba 3.2 series! +There will security releases on demand only. Please see +http://wiki.samba.org/index.php/Samba3_Release_Planning for information +on current releases. Major enhancements in 3.2.14 include: -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1204-g13911af
The branch, v3-4-test has been updated
via 13911afe5b167ae9d100c40d32e9286d902652a1 (commit)
from e4a26c94271409d58138391d523305d641105a05 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit 13911afe5b167ae9d100c40d32e9286d902652a1
Author: Bo Yang boy...@samba.org
Date: Fri Aug 7 13:55:31 2009 +0800
s3: Unable to browse DFS when using kerberos in libsmbclient
Signed-off-by: Bo Yang boy...@samba.org
Fixes bug #6615.
---
Summary of changes:
source3/libsmb/libsmb_context.c | 22 ++
1 files changed, 14 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/libsmb_context.c b/source3/libsmb/libsmb_context.c
index f09e9c6..f85f2df 100644
--- a/source3/libsmb/libsmb_context.c
+++ b/source3/libsmb/libsmb_context.c
@@ -651,22 +651,28 @@ void smbc_set_credentials_with_fallback(SMBCCTX *context,
{
smbc_bool use_kerberos = false;
const char *signing_state = off;
- struct user_auth_info *auth_info = user_auth_info_init(NULL);
+ struct user_auth_info *auth_info = NULL;
- if (auth_info) {
+ if (! context) {
+
+ return;
+ }
+
+ if (! workgroup || ! *workgroup) {
+ workgroup = smbc_getWorkgroup(context);
}
- if (! context ||
- ! workgroup || ! *workgroup ||
- ! user || ! *user ||
- ! password || ! *password) {
+ if (! user) {
+ user = smbc_getUser(context);
+ }
- return;
+ if (! password) {
+ password = ;
}
auth_info = user_auth_info_init(NULL);
- if (auth_info) {
+ if (! auth_info) {
DEBUG(0, (smbc_set_credentials_with_fallback: allocation
fail\n));
return;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5339-g40da23b
The branch, v3-3-test has been updated
via 40da23b6a7dc7acfbdf76a6808b7e50c6c39093e (commit)
from 2538df1ea3229ea6d8242b5ae6fdd3d453395609 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 40da23b6a7dc7acfbdf76a6808b7e50c6c39093e
Author: Bo Yang boy...@samba.org
Date: Fri Aug 7 14:58:36 2009 +0800
s3: Unable to browse DFS when using kerberos in libsmbclient
Signed-off-by: Bo Yang boy...@samba.org
Fixes bug #6615.
---
Summary of changes:
source/libsmb/libsmb_context.c | 17 +
1 files changed, 13 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libsmb/libsmb_context.c b/source/libsmb/libsmb_context.c
index ec16311..8e0aa1e 100644
--- a/source/libsmb/libsmb_context.c
+++ b/source/libsmb/libsmb_context.c
@@ -655,14 +655,23 @@ void smbc_set_credentials_with_fallback(SMBCCTX *context,
smbc_bool use_kerberos = false;
const char *signing_state = off;
- if (!context ||
- ! workgroup || ! *workgroup ||
- ! user || ! *user ||
- ! password || ! *password) {
+ if (! context) {
return;
}
+ if (! workgroup || ! *workgroup) {
+ workgroup = smbc_getWorkgroup(context);
+ }
+
+ if (! user) {
+ user = smbc_getUser(context);
+ }
+
+ if (! password) {
+ password = ;
+ }
+
if (smbc_getOptionUseKerberos(context)) {
use_kerberos = True;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3645-g15652ee
The branch, v3-2-test has been updated
via 15652ee4259201a6d794c735d7e81631338f1050 (commit)
from a49a3bdc1aa0c66edc00e11b470a3c3ccca79f6d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 15652ee4259201a6d794c735d7e81631338f1050
Author: Michael Adam ob...@samba.org
Date: Fri May 22 11:58:00 2009 +0200
s3:winbind:idmap_ldap: fix a crash bug in idmap_ldap_unixids_to_sids (#6387)
This fixes a crash bug hit when multiple mappings were found by
the ldap search. This crash was caused by an ldap asssertion
in ldap_next_entry because was set to NULL in each iteration.
The corresponding fix was applied to the idmap_ldap_sids_to_unixids()
by Jerry in 2007 (b08b74768d9ed547f16bf7b6ba6aea5df20a).
This fixes the crash part of bug #6387.
There is a logic part, too:
The problem currently only occurs when multiple mappings are found
for one given unixid. Now winbindd does not crash any more but
it does not correctly handle this situation. It just returns the
last mapping from the ldap search results.
This needs fixing.
Michael
(cherry picked from commit e9010fa366746ec1ae948dbcf3493d446e23b14c)
Signed-off-by: Michael Adam ob...@samba.org
---
Summary of changes:
source/winbindd/idmap_ldap.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/winbindd/idmap_ldap.c b/source/winbindd/idmap_ldap.c
index 53f6310..d4bf65b 100644
--- a/source/winbindd/idmap_ldap.c
+++ b/source/winbindd/idmap_ldap.c
@@ -893,6 +893,7 @@ static NTSTATUS idmap_ldap_unixids_to_sids(struct
idmap_domain *dom,
TALLOC_CTX *memctx;
struct idmap_ldap_context *ctx;
LDAPMessage *result = NULL;
+ LDAPMessage *entry = NULL;
const char *uidNumber;
const char *gidNumber;
const char **attr_list;
@@ -988,7 +989,6 @@ again:
}
for (i = 0; i count; i++) {
- LDAPMessage *entry = NULL;
char *sidstr = NULL;
char *tmp = NULL;
enum id_type type;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3646-g6ee6e12
The branch, v3-2-test has been updated via 6ee6e122fd81ab0b208e9f69cc1bd651e328d97c (commit) from 15652ee4259201a6d794c735d7e81631338f1050 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 6ee6e122fd81ab0b208e9f69cc1bd651e328d97c Author: Karolin Seeger ksee...@samba.org Date: Tue Aug 11 12:09:17 2009 +0200 WHATSNEW: Update changes. Karolin --- Summary of changes: WHATSNEW.txt |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 2360de9..fe89c9f 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -29,6 +29,8 @@ Changes since 3.2.13 o Michael Adam ob...@samba.org +* BUG 6387: Fix Winbind crash when multiple IDmappings exist in the + LDAP directory. * Prevent creation of keys containing the '/' character. -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-13-24-g69a1c8d
The branch, v3-2-stable has been updated
via 69a1c8de7f22194d04ebd00652dace654cc8af35 (commit)
via 5750b8d6e1f8ff93276bb422e8e1ffe44dfbcf3c (commit)
from dd1e92e99786b98c60e5b0ebbe1b7edaae924fb8 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable
- Log -
commit 69a1c8de7f22194d04ebd00652dace654cc8af35
Author: Karolin Seeger ksee...@samba.org
Date: Tue Aug 11 12:09:17 2009 +0200
WHATSNEW: Update changes.
Karolin
(cherry picked from commit 6ee6e122fd81ab0b208e9f69cc1bd651e328d97c)
commit 5750b8d6e1f8ff93276bb422e8e1ffe44dfbcf3c
Author: Michael Adam ob...@samba.org
Date: Fri May 22 11:58:00 2009 +0200
s3:winbind:idmap_ldap: fix a crash bug in idmap_ldap_unixids_to_sids (#6387)
This fixes a crash bug hit when multiple mappings were found by
the ldap search. This crash was caused by an ldap asssertion
in ldap_next_entry because was set to NULL in each iteration.
The corresponding fix was applied to the idmap_ldap_sids_to_unixids()
by Jerry in 2007 (b08b74768d9ed547f16bf7b6ba6aea5df20a).
This fixes the crash part of bug #6387.
There is a logic part, too:
The problem currently only occurs when multiple mappings are found
for one given unixid. Now winbindd does not crash any more but
it does not correctly handle this situation. It just returns the
last mapping from the ldap search results.
This needs fixing.
Michael
(cherry picked from commit e9010fa366746ec1ae948dbcf3493d446e23b14c)
Signed-off-by: Michael Adam ob...@samba.org
(cherry picked from commit 15652ee4259201a6d794c735d7e81631338f1050)
---
Summary of changes:
WHATSNEW.txt |2 ++
source/winbindd/idmap_ldap.c |2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 2360de9..fe89c9f 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -29,6 +29,8 @@ Changes since 3.2.13
o Michael Adam ob...@samba.org
+* BUG 6387: Fix Winbind crash when multiple IDmappings exist in the
+ LDAP directory.
* Prevent creation of keys containing the '/' character.
diff --git a/source/winbindd/idmap_ldap.c b/source/winbindd/idmap_ldap.c
index 53f6310..d4bf65b 100644
--- a/source/winbindd/idmap_ldap.c
+++ b/source/winbindd/idmap_ldap.c
@@ -893,6 +893,7 @@ static NTSTATUS idmap_ldap_unixids_to_sids(struct
idmap_domain *dom,
TALLOC_CTX *memctx;
struct idmap_ldap_context *ctx;
LDAPMessage *result = NULL;
+ LDAPMessage *entry = NULL;
const char *uidNumber;
const char *gidNumber;
const char **attr_list;
@@ -988,7 +989,6 @@ again:
}
for (i = 0; i count; i++) {
- LDAPMessage *entry = NULL;
char *sidstr = NULL;
char *tmp = NULL;
enum id_type type;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-932-g1e1445bc
The branch, master has been updated
via 1e1445bc7672b17a1d689fa0f0732b05b6e04da5 (commit)
from e13c14e7e440f56069aac6c6568b56e48e7ea825 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1e1445bc7672b17a1d689fa0f0732b05b6e04da5
Author: Stefan Metzmacher me...@samba.org
Date: Tue Aug 11 13:50:16 2009 +0200
s3:winbindd: raise the timeout for lsa_Lookup*() calls from 10 to 35
seconds.
metze
---
Summary of changes:
source3/winbindd/winbindd_ads.c | 21 +
source3/winbindd/winbindd_rpc.c | 35 +++
2 files changed, 56 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c
index a95b31d..665dd53 100644
--- a/source3/winbindd/winbindd_ads.c
+++ b/source3/winbindd/winbindd_ads.c
@@ -1121,6 +1121,7 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain
*domain,
/* handle sids not resolved from cache by lsa_lookup_sids */
if (num_nocache 0) {
+ unsigned int orig_timeout;
status = cm_connect_lsa(domain, tmp_ctx, cli, lsa_policy);
@@ -1128,6 +1129,13 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain
*domain,
goto done;
}
+ /*
+* This call can take a long time
+* allow the server to time out.
+* 35 seconds should do it.
+*/
+ orig_timeout = rpccli_set_timeout(cli, 35000);
+
status = rpccli_lsa_lookup_sids(cli, tmp_ctx,
lsa_policy,
num_nocache,
@@ -1136,6 +1144,9 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain
*domain,
names_nocache,
name_types_nocache);
+ /* And restore our original timeout. */
+ rpccli_set_timeout(cli, orig_timeout);
+
if (!(NT_STATUS_IS_OK(status) ||
NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED) ||
NT_STATUS_EQUAL(status, NT_STATUS_NONE_MAPPED)))
@@ -1150,6 +1161,13 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain
*domain,
goto done;
}
+ /*
+* This call can take a long time
+* allow the server to time out.
+* 35 seconds should do it.
+*/
+ orig_timeout = rpccli_set_timeout(cli, 35000);
+
status = rpccli_lsa_lookup_sids(cli, tmp_ctx,
lsa_policy,
num_nocache,
@@ -1157,6 +1175,9 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain
*domain,
domains_nocache,
names_nocache,
name_types_nocache);
+
+ /* And restore our original timeout. */
+ rpccli_set_timeout(cli, orig_timeout);
}
if (NT_STATUS_IS_OK(status) ||
diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index 037fae0..3aa4231 100644
--- a/source3/winbindd/winbindd_rpc.c
+++ b/source3/winbindd/winbindd_rpc.c
@@ -281,6 +281,7 @@ static NTSTATUS msrpc_name_to_sid(struct winbindd_domain
*domain,
struct policy_handle lsa_policy;
NTSTATUS name_map_status = NT_STATUS_UNSUCCESSFUL;
char *mapped_name = NULL;
+ unsigned int orig_timeout;
if (name == NULL || *name=='\0') {
full_name = talloc_asprintf(mem_ctx, %s, domain_name);
@@ -314,9 +315,19 @@ static NTSTATUS msrpc_name_to_sid(struct winbindd_domain
*domain,
if (!NT_STATUS_IS_OK(result))
return result;
+ /*
+* This call can take a long time
+* allow the server to time out.
+* 35 seconds should do it.
+*/
+ orig_timeout = rpccli_set_timeout(cli, 35000);
+
result = rpccli_lsa_lookup_names(cli, mem_ctx, lsa_policy, 1,
(const char**) full_name, NULL, 1,
sids, types);
+ /* And restore our original timeout. */
+ rpccli_set_timeout(cli, orig_timeout);
+
if (!NT_STATUS_IS_OK(result))
return result;
@@ -346,6 +357,7 @@ static NTSTATUS msrpc_sid_to_name(struct winbindd_domain
*domain,
struct policy_handle lsa_policy;
NTSTATUS
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-934-g303c3b3
The branch, master has been updated
via 303c3b363bc7c28f8eb3c264b0c116a062d4b603 (commit)
via 76d893b76e67ec748a2a7eb7d2f0dde2c3ecc37e (commit)
from 1e1445bc7672b17a1d689fa0f0732b05b6e04da5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 303c3b363bc7c28f8eb3c264b0c116a062d4b603
Author: Stefan Metzmacher me...@samba.org
Date: Fri May 1 18:18:31 2009 +0200
selftest: configure ncalrpc dir for the client
Some torture tests will need this soon.
metze
commit 76d893b76e67ec748a2a7eb7d2f0dde2c3ecc37e
Author: Stefan Metzmacher me...@samba.org
Date: Fri May 1 18:17:55 2009 +0200
selftest: fix typo lock = lockdir
metze
---
Summary of changes:
selftest/selftest.pl |9 -
1 files changed, 8 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index e0ea91d..75afbdd 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -537,12 +537,18 @@ sub write_clientconf($$)
mkdir($prefix/client/private, 0777);
}
- if ( -d $prefix/client/lock ) {
+ if ( -d $prefix/client/lockdir ) {
unlink $prefix/client/lockdir/*;
} else {
mkdir($prefix/client/lockdir, 0777);
}
+ if ( -d $prefix_abs/client/ncalrpcdir ) {
+ unlink $prefix/client/ncalrpcdir/*;
+ } else {
+ mkdir($prefix/client/ncalrpcdir, 0777);
+ }
+
open(CF, $conffile);
print CF [global]\n;
if (defined($ENV{VALGRIND})) {
@@ -563,6 +569,7 @@ sub write_clientconf($$)
print CF
private dir = $prefix_abs/client/private
lock dir = $prefix_abs/client/lockdir
+ ncalrpc dir = $prefix_abs/client/ncalrpcdir
name resolve order = bcast
panic action = $RealBin/gdb_backtrace \%PID\% \%PROG\%
max xmit = 32K
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5340-gc70d545
The branch, v3-3-test has been updated
via c70d54508e1cb8f5edbad02a632dfd52d65fd699 (commit)
from 40da23b6a7dc7acfbdf76a6808b7e50c6c39093e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit c70d54508e1cb8f5edbad02a632dfd52d65fd699
Author: Michael Adam ob...@samba.org
Date: Fri Jun 26 14:09:10 2009 +0200
s3:passdb: fix bug #6509: use gid (not uid) cache in fetch_gid_from_cache().
With the previous code, the cache can never have been hit at all.
Michael
---
Summary of changes:
source/passdb/lookup_sid.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/passdb/lookup_sid.c b/source/passdb/lookup_sid.c
index 25dd73e..10f6cc6 100644
--- a/source/passdb/lookup_sid.c
+++ b/source/passdb/lookup_sid.c
@@ -1085,7 +1085,7 @@ static bool fetch_gid_from_cache(gid_t *pgid, const
DOM_SID *psid)
{
DATA_BLOB cache_value;
- if (!memcache_lookup(NULL, SID_UID_CACHE,
+ if (!memcache_lookup(NULL, SID_GID_CACHE,
data_blob_const(psid, ndr_size_dom_sid(psid, 0)),
cache_value)) {
return false;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3647-g12277e1
The branch, v3-2-test has been updated
via 12277e145f4dcc589e84e4a90b2497728d2317b6 (commit)
from 6ee6e122fd81ab0b208e9f69cc1bd651e328d97c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 12277e145f4dcc589e84e4a90b2497728d2317b6
Author: Michael Adam ob...@samba.org
Date: Fri Jun 26 14:09:10 2009 +0200
s3:passdb: fix bug #6509: use gid (not uid) cache in fetch_gid_from_cache().
With the previous code, the cache can never have been hit at all.
Michael
---
Summary of changes:
source/passdb/lookup_sid.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/passdb/lookup_sid.c b/source/passdb/lookup_sid.c
index 1971cae..3cd7d02 100644
--- a/source/passdb/lookup_sid.c
+++ b/source/passdb/lookup_sid.c
@@ -1085,7 +1085,7 @@ static bool fetch_gid_from_cache(gid_t *pgid, const
DOM_SID *psid)
{
DATA_BLOB cache_value;
- if (!memcache_lookup(NULL, SID_UID_CACHE,
+ if (!memcache_lookup(NULL, SID_GID_CACHE,
data_blob_const(psid, ndr_size_dom_sid(psid, 0)),
cache_value)) {
return false;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3648-g2a955d0
The branch, v3-2-test has been updated via 2a955d009e714d28017a3043d294ad37289f6718 (commit) from 12277e145f4dcc589e84e4a90b2497728d2317b6 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 2a955d009e714d28017a3043d294ad37289f6718 Author: Karolin Seeger ksee...@samba.org Date: Tue Aug 11 15:06:04 2009 +0200 WHATSNEW: Update changes since 3.2.13. Karolin --- Summary of changes: WHATSNEW.txt |1 + 1 files changed, 1 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index fe89c9f..f7ebc21 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -31,6 +31,7 @@ Changes since 3.2.13 o Michael Adam ob...@samba.org * BUG 6387: Fix Winbind crash when multiple IDmappings exist in the LDAP directory. +* BUG 6509: Use gid (not uid) cache in fetch_gid_from_cache(). * Prevent creation of keys containing the '/' character. -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-13-25-g62218f6
The branch, v3-2-stable has been updated via 62218f6a7e579f33db46da178d53cdb2db9d2b54 (commit) from 69a1c8de7f22194d04ebd00652dace654cc8af35 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable - Log - commit 62218f6a7e579f33db46da178d53cdb2db9d2b54 Author: Karolin Seeger ksee...@samba.org Date: Tue Aug 11 15:06:04 2009 +0200 WHATSNEW: Update changes since 3.2.13. Karolin (cherry picked from commit 2a955d009e714d28017a3043d294ad37289f6718) --- Summary of changes: WHATSNEW.txt |1 + 1 files changed, 1 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index fe89c9f..f7ebc21 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -31,6 +31,7 @@ Changes since 3.2.13 o Michael Adam ob...@samba.org * BUG 6387: Fix Winbind crash when multiple IDmappings exist in the LDAP directory. +* BUG 6509: Use gid (not uid) cache in fetch_gid_from_cache(). * Prevent creation of keys containing the '/' character. -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1205-g536946c
The branch, v3-4-test has been updated
via 536946c706b66d432d60c990f28ff0ed5861fa44 (commit)
from 13911afe5b167ae9d100c40d32e9286d902652a1 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit 536946c706b66d432d60c990f28ff0ed5861fa44
Author: Stefan Metzmacher me...@samba.org
Date: Tue Aug 11 11:17:14 2009 +0200
s3:winbindd: raise the timeout for lsa_Lookup*() calls from 10 to 35
seconds.
metze
(cherry picked from commit 1e1445bc7672b17a1d689fa0f0732b05b6e04da5)
Fixes bug #6627.
---
Summary of changes:
source3/winbindd/winbindd_ads.c | 21 +
source3/winbindd/winbindd_rpc.c | 37 -
2 files changed, 57 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c
index dcf5623..7828b45 100644
--- a/source3/winbindd/winbindd_ads.c
+++ b/source3/winbindd/winbindd_ads.c
@@ -1122,6 +1122,7 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain
*domain,
/* handle sids not resolved from cache by lsa_lookup_sids */
if (num_nocache 0) {
+ unsigned int orig_timeout;
status = cm_connect_lsa(domain, tmp_ctx, cli, lsa_policy);
@@ -1129,6 +1130,13 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain
*domain,
goto done;
}
+ /*
+* This call can take a long time
+* allow the server to time out.
+* 35 seconds should do it.
+*/
+ orig_timeout = rpccli_set_timeout(cli, 35000);
+
status = rpccli_lsa_lookup_sids(cli, tmp_ctx,
lsa_policy,
num_nocache,
@@ -1137,6 +1145,9 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain
*domain,
names_nocache,
name_types_nocache);
+ /* And restore our original timeout. */
+ rpccli_set_timeout(cli, orig_timeout);
+
if (!(NT_STATUS_IS_OK(status) ||
NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED) ||
NT_STATUS_EQUAL(status, NT_STATUS_NONE_MAPPED)))
@@ -1151,6 +1162,13 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain
*domain,
goto done;
}
+ /*
+* This call can take a long time
+* allow the server to time out.
+* 35 seconds should do it.
+*/
+ orig_timeout = rpccli_set_timeout(cli, 35000);
+
status = rpccli_lsa_lookup_sids(cli, tmp_ctx,
lsa_policy,
num_nocache,
@@ -1158,6 +1176,9 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain
*domain,
domains_nocache,
names_nocache,
name_types_nocache);
+
+ /* And restore our original timeout. */
+ rpccli_set_timeout(cli, orig_timeout);
}
if (NT_STATUS_IS_OK(status) ||
diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index 50ccbae..38b20d8 100644
--- a/source3/winbindd/winbindd_rpc.c
+++ b/source3/winbindd/winbindd_rpc.c
@@ -281,6 +281,7 @@ static NTSTATUS msrpc_name_to_sid(struct winbindd_domain
*domain,
struct policy_handle lsa_policy;
NTSTATUS name_map_status = NT_STATUS_UNSUCCESSFUL;
char *mapped_name = NULL;
+ unsigned int orig_timeout;
if (name == NULL || *name=='\0') {
full_name = talloc_asprintf(mem_ctx, %s, domain_name);
@@ -314,9 +315,19 @@ static NTSTATUS msrpc_name_to_sid(struct winbindd_domain
*domain,
if (!NT_STATUS_IS_OK(result))
return result;
+ /*
+* This call can take a long time
+* allow the server to time out.
+* 35 seconds should do it.
+*/
+ orig_timeout = rpccli_set_timeout(cli, 35000);
+
result = rpccli_lsa_lookup_names(cli, mem_ctx, lsa_policy, 1,
(const char**) full_name, NULL, 1,
sids, types);
-
+
+ /* And restore our original timeout. */
+ rpccli_set_timeout(cli, orig_timeout);
+
if (!NT_STATUS_IS_OK(result))
return result;
@@ -346,6 +357,7 @@ static NTSTATUS
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5341-g8d57806
The branch, v3-3-test has been updated
via 8d57806544dade748aaac9cc493deb75d4e95735 (commit)
from c70d54508e1cb8f5edbad02a632dfd52d65fd699 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 8d57806544dade748aaac9cc493deb75d4e95735
Author: Stefan Metzmacher me...@samba.org
Date: Tue Aug 11 11:17:14 2009 +0200
s3:winbindd: raise the timeout for lsa_Lookup*() calls from 10 to 35
seconds.
metze
(cherry picked from commit 1e1445bc7672b17a1d689fa0f0732b05b6e04da5)
Fixes bug #6627.
---
Summary of changes:
source/winbindd/winbindd_ads.c | 21 +
source/winbindd/winbindd_rpc.c | 37 -
2 files changed, 57 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/winbindd/winbindd_ads.c b/source/winbindd/winbindd_ads.c
index a508682..3c45f57 100644
--- a/source/winbindd/winbindd_ads.c
+++ b/source/winbindd/winbindd_ads.c
@@ -1122,6 +1122,7 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain
*domain,
/* handle sids not resolved from cache by lsa_lookup_sids */
if (num_nocache 0) {
+ unsigned int orig_timeout;
status = cm_connect_lsa(domain, tmp_ctx, cli, lsa_policy);
@@ -1129,6 +1130,13 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain
*domain,
goto done;
}
+ /*
+* This call can take a long time
+* allow the server to time out.
+* 35 seconds should do it.
+*/
+ orig_timeout = rpccli_set_timeout(cli, 35000);
+
status = rpccli_lsa_lookup_sids(cli, tmp_ctx,
lsa_policy,
num_nocache,
@@ -1137,6 +1145,9 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain
*domain,
names_nocache,
name_types_nocache);
+ /* And restore our original timeout. */
+ rpccli_set_timeout(cli, orig_timeout);
+
if (!(NT_STATUS_IS_OK(status) ||
NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED) ||
NT_STATUS_EQUAL(status, NT_STATUS_NONE_MAPPED)))
@@ -1151,6 +1162,13 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain
*domain,
goto done;
}
+ /*
+* This call can take a long time
+* allow the server to time out.
+* 35 seconds should do it.
+*/
+ orig_timeout = rpccli_set_timeout(cli, 35000);
+
status = rpccli_lsa_lookup_sids(cli, tmp_ctx,
lsa_policy,
num_nocache,
@@ -1158,6 +1176,9 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain
*domain,
domains_nocache,
names_nocache,
name_types_nocache);
+
+ /* And restore our original timeout. */
+ rpccli_set_timeout(cli, orig_timeout);
}
if (NT_STATUS_IS_OK(status) ||
diff --git a/source/winbindd/winbindd_rpc.c b/source/winbindd/winbindd_rpc.c
index 14f7c0c..5f51b5f 100644
--- a/source/winbindd/winbindd_rpc.c
+++ b/source/winbindd/winbindd_rpc.c
@@ -281,6 +281,7 @@ static NTSTATUS msrpc_name_to_sid(struct winbindd_domain
*domain,
POLICY_HND lsa_policy;
NTSTATUS name_map_status = NT_STATUS_UNSUCCESSFUL;
char *mapped_name = NULL;
+ unsigned int orig_timeout;
if (name == NULL || *name=='\0') {
full_name = talloc_asprintf(mem_ctx, %s, domain_name);
@@ -314,9 +315,19 @@ static NTSTATUS msrpc_name_to_sid(struct winbindd_domain
*domain,
if (!NT_STATUS_IS_OK(result))
return result;
+ /*
+* This call can take a long time
+* allow the server to time out.
+* 35 seconds should do it.
+*/
+ orig_timeout = rpccli_set_timeout(cli, 35000);
+
result = rpccli_lsa_lookup_names(cli, mem_ctx, lsa_policy, 1,
(const char**) full_name, NULL, 1,
sids, types);
-
+
+ /* And restore our original timeout. */
+ rpccli_set_timeout(cli, orig_timeout);
+
if (!NT_STATUS_IS_OK(result))
return result;
@@ -346,6 +357,7 @@ static NTSTATUS
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3649-g91ac57e
The branch, v3-2-test has been updated
via 91ac57e6b443732f64c92788d7a18ae568601763 (commit)
from 2a955d009e714d28017a3043d294ad37289f6718 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 91ac57e6b443732f64c92788d7a18ae568601763
Author: Stefan Metzmacher me...@samba.org
Date: Tue Aug 11 11:17:14 2009 +0200
s3:winbindd: raise the timeout for lsa_Lookup*() calls from 10 to 35
seconds.
metze
(similar to commit 1e1445bc7672b17a1d689fa0f0732b05b6e04da5)
Fixes bug #6627.
---
Summary of changes:
source/winbindd/winbindd_ads.c | 21 +
source/winbindd/winbindd_rpc.c | 37 -
2 files changed, 57 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/winbindd/winbindd_ads.c b/source/winbindd/winbindd_ads.c
index c130158..cef36c4 100644
--- a/source/winbindd/winbindd_ads.c
+++ b/source/winbindd/winbindd_ads.c
@@ -1119,6 +1119,7 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain
*domain,
/* handle sids not resolved from cache by lsa_lookup_sids */
if (num_nocache 0) {
+ unsigned int orig_timeout;
status = cm_connect_lsa(domain, tmp_ctx, cli, lsa_policy);
@@ -1126,6 +1127,13 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain
*domain,
goto done;
}
+ /*
+* This call can take a long time
+* allow the server to time out.
+* 35 seconds should do it.
+*/
+ orig_timeout = cli_set_timeout(cli-cli, 35000);
+
status = rpccli_lsa_lookup_sids(cli, tmp_ctx,
lsa_policy,
num_nocache,
@@ -1134,6 +1142,9 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain
*domain,
names_nocache,
name_types_nocache);
+ /* And restore our original timeout. */
+ cli_set_timeout(cli-cli, orig_timeout);
+
if (!(NT_STATUS_IS_OK(status) ||
NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED) ||
NT_STATUS_EQUAL(status, NT_STATUS_NONE_MAPPED)))
@@ -1148,6 +1159,13 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain
*domain,
goto done;
}
+ /*
+* This call can take a long time
+* allow the server to time out.
+* 35 seconds should do it.
+*/
+ orig_timeout = cli_set_timeout(cli-cli, 35000);
+
status = rpccli_lsa_lookup_sids(cli, tmp_ctx,
lsa_policy,
num_nocache,
@@ -1155,6 +1173,9 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain
*domain,
domains_nocache,
names_nocache,
name_types_nocache);
+
+ /* And restore our original timeout. */
+ cli_set_timeout(cli-cli, orig_timeout);
}
if (NT_STATUS_IS_OK(status) ||
diff --git a/source/winbindd/winbindd_rpc.c b/source/winbindd/winbindd_rpc.c
index f6a9c66..81154df 100644
--- a/source/winbindd/winbindd_rpc.c
+++ b/source/winbindd/winbindd_rpc.c
@@ -279,6 +279,7 @@ static NTSTATUS msrpc_name_to_sid(struct winbindd_domain
*domain,
char *full_name = NULL;
struct rpc_pipe_client *cli;
POLICY_HND lsa_policy;
+ unsigned int orig_timeout;
if (name == NULL || *name=='\0') {
full_name = talloc_asprintf(mem_ctx, %s, domain_name);
@@ -302,9 +303,19 @@ static NTSTATUS msrpc_name_to_sid(struct winbindd_domain
*domain,
if (!NT_STATUS_IS_OK(result))
return result;
+ /*
+* This call can take a long time
+* allow the server to time out.
+* 35 seconds should do it.
+*/
+ orig_timeout = cli_set_timeout(cli-cli, 35000);
+
result = rpccli_lsa_lookup_names(cli, mem_ctx, lsa_policy, 1,
(const char**) full_name, NULL, 1,
sids, types);
-
+
+ /* And restore our original timeout. */
+ cli_set_timeout(cli-cli, orig_timeout);
+
if (!NT_STATUS_IS_OK(result))
return result;
@@ -332,6 +343,7 @@ static NTSTATUS msrpc_sid_to_name(struct winbindd_domain
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3650-g9bcfbcc
The branch, v3-2-test has been updated via 9bcfbccad5d5983cfa42f31f6394f03c4678e79a (commit) from 91ac57e6b443732f64c92788d7a18ae568601763 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 9bcfbccad5d5983cfa42f31f6394f03c4678e79a Author: Karolin Seeger ksee...@samba.org Date: Tue Aug 11 15:41:21 2009 +0200 WHATSNEW: Update changes. Karolin --- Summary of changes: WHATSNEW.txt |1 + 1 files changed, 1 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index f7ebc21..f29e92c 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -72,6 +72,7 @@ o Stefan Metzmacher me...@samba.org * BUG 2346: Fix posix ACLs when setting an ACL without explicit ACE for the owner. * BUG 6526: Let parent_dirname() correctly return toplevel filenames. +* BUG 6627: Raise the timeout for lsa_Lookup*() calls from 10 to 35 seconds. * Fix a crash bug if we timeout in net rpc trustdom list. * Add '--request-timeout' option to 'net'. -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-13-28-g7aea93c
The branch, v3-2-stable has been updated
via 7aea93c3d1060f277aab87e85fb3066b4f666109 (commit)
via c34798994b8660586ff6447ba66b79a20580591c (commit)
via 2f1023ece2ed165815ac2d8bc70a29d9e9e2591e (commit)
from 62218f6a7e579f33db46da178d53cdb2db9d2b54 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable
- Log -
commit 7aea93c3d1060f277aab87e85fb3066b4f666109
Author: Michael Adam ob...@samba.org
Date: Fri Jun 26 14:09:10 2009 +0200
s3:passdb: fix bug #6509: use gid (not uid) cache in fetch_gid_from_cache().
With the previous code, the cache can never have been hit at all.
Michael
(cherry picked from commit 12277e145f4dcc589e84e4a90b2497728d2317b6)
commit c34798994b8660586ff6447ba66b79a20580591c
Author: Karolin Seeger ksee...@samba.org
Date: Tue Aug 11 15:41:21 2009 +0200
WHATSNEW: Update changes.
Karolin
(cherry picked from commit 9bcfbccad5d5983cfa42f31f6394f03c4678e79a)
commit 2f1023ece2ed165815ac2d8bc70a29d9e9e2591e
Author: Stefan Metzmacher me...@samba.org
Date: Tue Aug 11 11:17:14 2009 +0200
s3:winbindd: raise the timeout for lsa_Lookup*() calls from 10 to 35
seconds.
metze
(similar to commit 1e1445bc7672b17a1d689fa0f0732b05b6e04da5)
Fixes bug #6627.
(cherry picked from commit 91ac57e6b443732f64c92788d7a18ae568601763)
---
Summary of changes:
WHATSNEW.txt |1 +
source/passdb/lookup_sid.c |2 +-
source/winbindd/winbindd_ads.c | 21 +
source/winbindd/winbindd_rpc.c | 37 -
4 files changed, 59 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index f7ebc21..f29e92c 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -72,6 +72,7 @@ o Stefan Metzmacher me...@samba.org
* BUG 2346: Fix posix ACLs when setting an ACL without explicit ACE for the
owner.
* BUG 6526: Let parent_dirname() correctly return toplevel filenames.
+* BUG 6627: Raise the timeout for lsa_Lookup*() calls from 10 to 35
seconds.
* Fix a crash bug if we timeout in net rpc trustdom list.
* Add '--request-timeout' option to 'net'.
diff --git a/source/passdb/lookup_sid.c b/source/passdb/lookup_sid.c
index 1971cae..3cd7d02 100644
--- a/source/passdb/lookup_sid.c
+++ b/source/passdb/lookup_sid.c
@@ -1085,7 +1085,7 @@ static bool fetch_gid_from_cache(gid_t *pgid, const
DOM_SID *psid)
{
DATA_BLOB cache_value;
- if (!memcache_lookup(NULL, SID_UID_CACHE,
+ if (!memcache_lookup(NULL, SID_GID_CACHE,
data_blob_const(psid, ndr_size_dom_sid(psid, 0)),
cache_value)) {
return false;
diff --git a/source/winbindd/winbindd_ads.c b/source/winbindd/winbindd_ads.c
index c130158..cef36c4 100644
--- a/source/winbindd/winbindd_ads.c
+++ b/source/winbindd/winbindd_ads.c
@@ -1119,6 +1119,7 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain
*domain,
/* handle sids not resolved from cache by lsa_lookup_sids */
if (num_nocache 0) {
+ unsigned int orig_timeout;
status = cm_connect_lsa(domain, tmp_ctx, cli, lsa_policy);
@@ -1126,6 +1127,13 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain
*domain,
goto done;
}
+ /*
+* This call can take a long time
+* allow the server to time out.
+* 35 seconds should do it.
+*/
+ orig_timeout = cli_set_timeout(cli-cli, 35000);
+
status = rpccli_lsa_lookup_sids(cli, tmp_ctx,
lsa_policy,
num_nocache,
@@ -1134,6 +1142,9 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain
*domain,
names_nocache,
name_types_nocache);
+ /* And restore our original timeout. */
+ cli_set_timeout(cli-cli, orig_timeout);
+
if (!(NT_STATUS_IS_OK(status) ||
NT_STATUS_EQUAL(status, STATUS_SOME_UNMAPPED) ||
NT_STATUS_EQUAL(status, NT_STATUS_NONE_MAPPED)))
@@ -1148,6 +1159,13 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain
*domain,
goto done;
}
+ /*
+* This call can take a long time
+* allow the server to time out.
+* 35 seconds should do it.
+*/
+ orig_timeout = cli_set_timeout(cli-cli, 35000);
+
status =
Re: [SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-861-g457191ej
Hi Tim, On Fri, Aug 07, 2009 at 10:05:19AM -0700, Tim Prouty wrote: I don't remember exactly what we agreed upon for the process of backporting bug fixes to maintenance releases, but I think it was something like, get the patch signed off by someone else, and then Karolin will actually do the pushing. Does that sound right? yes. Please open a bug report, attach the patch(es), add review flag(s) and re-assign the bug report to me when the patches are acked. 3121249243f52dcbf8083f5ff137bd580515efa7 allowed us to correctly handle renaming directories when a client has files open underneath it, but it also introduced a bug. If a client holds open a handle to the directory, and then tries to rename it, the rename should be allowed, but in 3.4.x the client will get NT_STATUS_ACCESS_DENIED. We have already seen a few instances of SMB clients doing this in the field, and customers seeing this seemingly random NT_STATUS_ACCESS_DENIED. The attached patches fix the problem against v3-4-test and add a regression test so it's not broken by any future patches. The fix is slightly different in 3.4 than it was for master due to the smb_filename changes. Karolin, let me know if you would like me to push these myself, once I get an ack. Thanks, Karolin -- Samba http://www.samba.org SerNet http://www.sernet.de sambaXP http://www.sambaxp.org pgplRAWcKVeaK.pgp Description: PGP signature
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1206-g06ab965
The branch, v3-4-test has been updated
via 06ab965b72ba477505d297ab72156136ab981e93 (commit)
from 536946c706b66d432d60c990f28ff0ed5861fa44 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit 06ab965b72ba477505d297ab72156136ab981e93
Author: Tim Prouty tpro...@samba.org
Date: Thu Aug 6 15:53:33 2009 -0700
s3: Fix a bug in renames of directories
Recently code was added to match windows semantics of denying the
rename of a directory if there are open files underneath it. This
does partly match windows semantics, but it turns out the rename
should be allowed if the open file handle is for the directory being
renamed, or for a stream on the directory being renamed. This patch
refines the check to better follow these rename semantics.
Addresses bug #6620.
---
Summary of changes:
source3/smbd/files.c | 24 ++--
1 files changed, 18 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index a2200fc..54c4c73 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -385,13 +385,13 @@ bool file_find_subpath(files_struct *dir_fsp)
{
files_struct *fsp;
size_t dlen;
+ bool ret = false;
char *d_fullname = talloc_asprintf(talloc_tos(),
%s/%s,
dir_fsp-conn-connectpath,
dir_fsp-fsp_name);
-
if (!d_fullname) {
- return false;
+ goto out;
}
dlen = strlen(d_fullname);
@@ -409,15 +409,27 @@ bool file_find_subpath(files_struct *dir_fsp)
fsp-fsp_name);
if (strnequal(d_fullname, d1_fullname, dlen)) {
- TALLOC_FREE(d_fullname);
+ int d1_len = strlen(d1_fullname);
+
+ /*
+* If the open file is a second file handle to the
+* same name or is a stream on the original file, then
+* don't return true.
+*/
+ if (d1_len == dlen || d1_fullname[dlen] == ':') {
+ TALLOC_FREE(d1_fullname);
+ continue;
+ }
+
TALLOC_FREE(d1_fullname);
- return true;
+ ret = true;
+ goto out;
}
TALLOC_FREE(d1_fullname);
}
-
+ out:
TALLOC_FREE(d_fullname);
- return false;
+ return ret;
}
/
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1207-g80cedd9
The branch, v3-4-test has been updated
via 80cedd944c3bcee7fe44787c9730b564b2d86726 (commit)
from 06ab965b72ba477505d297ab72156136ab981e93 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit 80cedd944c3bcee7fe44787c9730b564b2d86726
Author: Tim Prouty tpro...@samba.org
Date: Thu Aug 6 11:23:23 2009 -0700
s4 torture: Extend the RAW-RENAME test to more fully test directory renames.
The existing test was only covering files opened underneath the
directory that was being renamed. It is not uncommon for windows
clients to actually hold a read-only handle to a directory open across
the rename, which it turns out doesn't return NT_STATUS_ACCESS_DENIED.
Additionally, holding a handle open to a stream on the directory is
also allowed.
---
Summary of changes:
source4/torture/raw/rename.c | 50 ++
1 files changed, 50 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/raw/rename.c b/source4/torture/raw/rename.c
index 951d91a..9748719 100644
--- a/source4/torture/raw/rename.c
+++ b/source4/torture/raw/rename.c
@@ -527,6 +527,7 @@ static bool test_dir_rename(struct torture_context *tctx,
struct smbcli_state *c
const char *dname1 = BASEDIR \\dir_for_rename;
const char *dname2 = BASEDIR \\renamed_dir;
const char *fname = BASEDIR \\dir_for_rename\\file.txt;
+ const char *sname = BASEDIR \\dir_for_rename:a stream:$DATA;
bool ret = true;
int fnum = -1;
@@ -591,6 +592,55 @@ static bool test_dir_rename(struct torture_context *tctx,
struct smbcli_state *c
status = smb_raw_rename(cli-tree, ren_io);
CHECK_STATUS(status, NT_STATUS_ACCESS_DENIED);
+ /* Close the file and try the rename. */
+ smbcli_close(cli-tree, fnum);
+
+ status = smb_raw_rename(cli-tree, ren_io);
+ CHECK_STATUS(status, NT_STATUS_OK);
+
+ /*
+* Now try just holding a second handle on the directory and holding
+* it open across a rename. This should be allowed.
+*/
+ io.ntcreatex.in.fname = dname2;
+ io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN_IF;
+
+ io.ntcreatex.in.access_mask = SEC_STD_READ_CONTROL |
+ SEC_FILE_READ_ATTRIBUTE | SEC_FILE_READ_EA | SEC_FILE_READ_DATA;
+
+ status = smb_raw_open(cli-tree, tctx, io);
+CHECK_STATUS(status, NT_STATUS_OK);
+fnum = io.ntcreatex.out.file.fnum;
+
+ ren_io.generic.level = RAW_RENAME_RENAME;
+ ren_io.rename.in.pattern1 = dname2;
+ ren_io.rename.in.pattern2 = dname1;
+ ren_io.rename.in.attrib = 0;
+
+ status = smb_raw_rename(cli-tree, ren_io);
+ CHECK_STATUS(status, NT_STATUS_OK);
+
+ /* close our handle to the directory. */
+ smbcli_close(cli-tree, fnum);
+
+ /*
+* Now try opening a stream on the directory and holding it open
+* across a rename. This should be allowed.
+*/
+ io.ntcreatex.in.fname = sname;
+
+ status = smb_raw_open(cli-tree, tctx, io);
+CHECK_STATUS(status, NT_STATUS_OK);
+fnum = io.ntcreatex.out.file.fnum;
+
+ ren_io.generic.level = RAW_RENAME_RENAME;
+ ren_io.rename.in.pattern1 = dname1;
+ ren_io.rename.in.pattern2 = dname2;
+ ren_io.rename.in.attrib = 0;
+
+ status = smb_raw_rename(cli-tree, ren_io);
+ CHECK_STATUS(status, NT_STATUS_OK);
+
done:
if (fnum != -1) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-935-gaa07baa
The branch, master has been updated
via aa07baa8515d7e692238fe2cdce95d0eaf0b1691 (commit)
from 303c3b363bc7c28f8eb3c264b0c116a062d4b603 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit aa07baa8515d7e692238fe2cdce95d0eaf0b1691
Author: Michael Adam ob...@samba.org
Date: Tue Aug 11 14:28:31 2009 +0200
s3: refomat definitions of some generic access rights for better readability
Michael
---
Summary of changes:
source3/include/smb.h | 27 +++
1 files changed, 19 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/smb.h b/source3/include/smb.h
index b53735d..fb01a92 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1225,18 +1225,29 @@ struct bitmap {
/* Mapping of generic access rights for files to specific rights. */
/* This maps to 0x1F01FF */
-#define FILE_GENERIC_ALL (STANDARD_RIGHTS_REQUIRED_ACCESS|
SYNCHRONIZE_ACCESS|FILE_ALL_ACCESS)
+#define FILE_GENERIC_ALL (STANDARD_RIGHTS_REQUIRED_ACCESS|\
+ SYNCHRONIZE_ACCESS|\
+ FILE_ALL_ACCESS)
/* This maps to 0x120089 */
-#define FILE_GENERIC_READ
(STANDARD_RIGHTS_READ_ACCESS|FILE_READ_DATA|FILE_READ_ATTRIBUTES|\
-
FILE_READ_EA|SYNCHRONIZE_ACCESS)
+#define FILE_GENERIC_READ (STANDARD_RIGHTS_READ_ACCESS|\
+ FILE_READ_DATA|\
+ FILE_READ_ATTRIBUTES|\
+ FILE_READ_EA|\
+ SYNCHRONIZE_ACCESS)
/* This maps to 0x120116 */
-#define FILE_GENERIC_WRITE
(STD_RIGHT_READ_CONTROL_ACCESS|FILE_WRITE_DATA|FILE_WRITE_ATTRIBUTES|\
-
FILE_WRITE_EA|FILE_APPEND_DATA|SYNCHRONIZE_ACCESS)
-
-#define FILE_GENERIC_EXECUTE
(STANDARD_RIGHTS_EXECUTE_ACCESS|FILE_READ_ATTRIBUTES|\
-
FILE_EXECUTE|SYNCHRONIZE_ACCESS)
+#define FILE_GENERIC_WRITE (STD_RIGHT_READ_CONTROL_ACCESS|\
+ FILE_WRITE_DATA|\
+ FILE_WRITE_ATTRIBUTES|\
+ FILE_WRITE_EA|\
+ FILE_APPEND_DATA|\
+ SYNCHRONIZE_ACCESS)
+
+#define FILE_GENERIC_EXECUTE (STANDARD_RIGHTS_EXECUTE_ACCESS|\
+ FILE_READ_ATTRIBUTES|\
+ FILE_EXECUTE|\
+ SYNCHRONIZE_ACCESS)
/* Share specific rights. */
#define SHARE_ALL_ACCESS FILE_GENERIC_ALL
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-936-ga038f1e
The branch, master has been updated via a038f1e05b8b7acb5e99257e59178e1ece4ce156 (commit) from aa07baa8515d7e692238fe2cdce95d0eaf0b1691 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit a038f1e05b8b7acb5e99257e59178e1ece4ce156 Author: Michael Adam ob...@samba.org Date: Tue Aug 11 23:35:48 2009 +0200 s3:smbcacls: forbid change of debug level from config file Michael --- Summary of changes: source3/utils/smbcacls.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c index 2e41afc..dfc2a92 100644 --- a/source3/utils/smbcacls.c +++ b/source3/utils/smbcacls.c @@ -23,6 +23,8 @@ #include includes.h +extern bool AllowDebugChange; + static int test_args; #define CREATE_ACCESS_READ READ_CONTROL_ACCESS @@ -1043,6 +1045,7 @@ static struct cli_state *connect_one(struct user_auth_info *auth_info, DEBUGLEVEL_CLASS[DBGC_ALL] = 1; dbf = x_stderr; x_setbuf( x_stderr, NULL ); + AllowDebugChange = false; setlinebuf(stdout); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-942-g7bc566a
The branch, master has been updated via 7bc566a88277ecbc0f712b7c54116163930f187d (commit) via 69fa901bca9b1e032d6784df60a0e1c14d27d830 (commit) via 4921a5853b323e9c19f192220a94cf4a7cd077ff (commit) via 6dc41bf27c6157f981b9b45b026da41e9a3df184 (commit) via f0decfe5c2395173fb632e9bfdea3edf43b1b434 (commit) via 28bcdf5266f75ef835fd3cbb353aadb782a1f27c (commit) from a038f1e05b8b7acb5e99257e59178e1ece4ce156 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 7bc566a88277ecbc0f712b7c54116163930f187d Author: Andrew Bartlett abart...@samba.org Date: Wed Aug 12 11:09:50 2009 +1000 s4:provision Allow provision-backend to not run slapd for 'make test' As the version of OpenLDAP required for Samba4 is fairly new, we don't want to make it a requirement before this python code is run in 'make test'. As such, skip over the actual starting of slapd, but check the rest runs alright (which still validates syntax and other modules). Andrew Bartlett commit 69fa901bca9b1e032d6784df60a0e1c14d27d830 Author: Andrew Bartlett abart...@samba.org Date: Mon Aug 10 22:01:28 2009 +1000 s4:selftest Don't start the slapd for the provision, only for the run The provision-backend script now starts slapd for us Andrew Bartlett commit 4921a5853b323e9c19f192220a94cf4a7cd077ff Author: Andrew Bartlett abart...@samba.org Date: Mon Aug 10 21:51:08 2009 +1000 s4:selftest Make OpenLDAP guess it's own modules from now on In the releases of OpenLDAP we require (2.4.17) it can guess this much itself, so no need for us to do it. Andrew Bartlett commit 6dc41bf27c6157f981b9b45b026da41e9a3df184 Author: Andrew Bartlett abart...@samba.org Date: Mon Aug 10 21:46:20 2009 +1000 s4:provision Make the --ol-slapd paramter take the full path to slapd commit f0decfe5c2395173fb632e9bfdea3edf43b1b434 Author: Andrew Bartlett abart...@samba.org Date: Mon Aug 10 21:43:11 2009 +1000 s4:provision Assume the OpenLDAP backend can find it's own modules commit 28bcdf5266f75ef835fd3cbb353aadb782a1f27c Author: Oliver Liebel oli...@itc.li Date: Mon Aug 10 09:45:01 2009 +1000 s4:provision Rework and further automate setup of OpenLDAP backend heres the summary of all changes/extensions: - Andrew Bartlett's patch to generate indext - Howard Chu's idea to use nosync on the DB included, but made optional - slaptest-path is not needed any more (slapd -Ttest is used instead) and is therefore removed. slapd-path is now recommended when openldap-backend is chosen. its also used for olc-conversion - slapd-detection is now always done by ldapsearch (ldb module), looking anonymous for objectClass: OpenLDAProotDSE via our ldapi_uri. - if ldapsearch was not successfull, (no slapd listening on our socket) slapd is started via special generated slapdcommand_prov (ldapi_uri only) - slapd-provision-process startup is done via pythons subprocess. - the slapd-provision-pid is stored under paths.ldapdir/slapd_provision_pid. - after provision-backend is finished: --- slapd.pid is compared with our stored slapd_provision_pid. if the are unique, slapd.pid will be read out, and the slapd provison-process will be shut down. --- proper slapd-shutdown is verified again with ldb-search - ldapi_uri - rootDSE. --- if the pids are different or one of the pid-files is missing, slapd will not be shut down, instead an error message is displayed to locate slapd manually --- extended help-messages (relevant to slapd) are always displayed, e.g. the commandline with which slapd has to be started when everythings finished (slapd-commandline is stored under paths.ldapdir/slapd_command_file.txt)) - upgraded the content of the mini-howto (howto-ol-backend-s4.txt) --- Summary of changes: howto-ol-backend-s4.txt | 177 selftest/target/Samba4.pm | 75 +-- source4/scripting/python/samba/provision.py | 226 + source4/setup/provision-backend | 17 +- source4/setup/slapd.conf | 42 + source4/setup/tests/blackbox_provision-backend.sh | 10 +- 6 files changed, 402 insertions(+), 145 deletions(-) create mode 100644 howto-ol-backend-s4.txt Changeset truncated at 500 lines: diff --git a/howto-ol-backend-s4.txt b/howto-ol-backend-s4.txt new file mode 100644 index 000..c96ce55 --- /dev/null +++ b/howto-ol-backend-s4.txt @@ -0,0 +1,177 @@ +Samba4 OpenLDAP-Backend Quick-Howto + + +oli...@itc.li - August 2009 + + +This Mini-Howto describes in a
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-946-g3b5c6bc
The branch, master has been updated
via 3b5c6bc971c4e5c32b19072f0f54258792d00439 (commit)
via c6936ab00f22c87d8ef8590578056446055d37a2 (commit)
via ad542a630eb2ee265d626b9752f0197281c51990 (commit)
via 0ae3912f328250703e921ec78eb9add98cbfcf7c (commit)
from 7bc566a88277ecbc0f712b7c54116163930f187d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 3b5c6bc971c4e5c32b19072f0f54258792d00439
Author: Andrew Tridgell tri...@samba.org
Date: Wed Aug 12 15:20:02 2009 +1000
no need to shout about getting an oplock
commit c6936ab00f22c87d8ef8590578056446055d37a2
Author: Andrew Tridgell tri...@samba.org
Date: Wed Aug 12 15:19:42 2009 +1000
raise the debug level for a common message
when a client disconnects we expect this to happen, so don't print an
error each time
commit ad542a630eb2ee265d626b9752f0197281c51990
Author: Andrew Tridgell tri...@samba.org
Date: Wed Aug 12 14:41:44 2009 +1000
Allow selection of the samba4 process model for 'make test'
To choose the process model, set the environment variable
SAMBA_PROCESS_MODEL to the desired model. This will allow us to enable
the standard process model for some machines in the build farm without
enabling it for all of them. I don't want to just enable it
universally as I am concerned with total memory using during some of
the tests.
commit 0ae3912f328250703e921ec78eb9add98cbfcf7c
Author: Andrew Tridgell tri...@samba.org
Date: Wed Aug 12 14:38:55 2009 +1000
print server log on stderr as well as to log file
I think we are missing some important messages from the server during
'make test' because we don't show the log file contents during
runs. This patch uses tee to put the log messages to stderr so we can
see any server messages associated with the test that caused them.
---
Summary of changes:
selftest/target/Samba4.pm | 18 +++---
source4/lib/tls/tls.c |2 +-
source4/ntvfs/posix/pvfs_oplock.c |2 +-
3 files changed, 17 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 0f909ce..ef55323 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -88,9 +88,12 @@ sub check_or_start($$$)
my $pid = fork();
if ($pid == 0) {
open STDIN, $env_vars-{SAMBA_TEST_FIFO};
- open STDOUT, $env_vars-{SAMBA_TEST_LOG};
+ # we want out from samba to go to the log file, but also
+ # to the users terminal when running 'make test' on the command
+ # line. This puts it on stderr on the terminal
+ open STDOUT, | tee $env_vars-{SAMBA_TEST_LOG} 12;
open STDERR, 'STDOUT';
-
+
SocketWrapper::set_default_iface($env_vars-{SOCKET_WRAPPER_DEFAULT_IFACE});
my $valgrind = ;
@@ -120,7 +123,16 @@ sub check_or_start($$$)
$optarg.= $ENV{SAMBA_OPTIONS};
}
my $samba = $self-bindir_path(samba);
- my $ret = system($valgrind $samba $optarg
$env_vars-{CONFIGURATION} -M single -i --leak-report-full);
+
+ # allow selection of the process model using
+ # the environment varibale SAMBA_PROCESS_MODEL
+ # that allows us to change the process model for
+ # individual machines in the build farm
+ my $model = single;
+ if (defined($ENV{SAMBA_PROCESS_MODEL})) {
+ $model = $ENV{SAMBA_PROCESS_MODEL};
+ }
+ my $ret = system($valgrind $samba $optarg
$env_vars-{CONFIGURATION} -M $model -i);
if ($? == -1) {
print Unable to start $samba: $ret: $!\n;
exit 1;
diff --git a/source4/lib/tls/tls.c b/source4/lib/tls/tls.c
index d4e8680..ba2e9e4 100644
--- a/source4/lib/tls/tls.c
+++ b/source4/lib/tls/tls.c
@@ -185,7 +185,7 @@ static int tls_destructor(struct tls_context *tls)
int ret;
ret = gnutls_bye(tls-session, GNUTLS_SHUT_WR);
if (ret 0) {
- DEBUG(0,(TLS gnutls_bye failed - %s\n, gnutls_strerror(ret)));
+ DEBUG(4,(TLS gnutls_bye failed - %s\n, gnutls_strerror(ret)));
}
return 0;
}
diff --git a/source4/ntvfs/posix/pvfs_oplock.c
b/source4/ntvfs/posix/pvfs_oplock.c
index e5a069a..a10188f 100644
--- a/source4/ntvfs/posix/pvfs_oplock.c
+++ b/source4/ntvfs/posix/pvfs_oplock.c
@@ -122,7 +122,7 @@ static void pvfs_oplock_break(struct pvfs_oplock *opl,
uint8_t level)
*/
*last = cur;
- DEBUG(0,(%s: sending oplock break level %d for '%s' %p\n,
+
