Re: [Samba] SAMBA implementation for DOS ?
Hi, thank you all for answers. @Ged and Neal, yes - I considered using DOSBox and/or DOSEMU. This is solution that I will keep away from. The true is that with DOSBox I dont even need to care about network configuration and there is enough memory to run required application. The thing is that my Clipper/dBase application is located on Linux server and shared with SAMBA. 8 nodes (PCs/workstations) are connected to that share. If I use DOSbox, then DOSbox node will always overwrite its changes over dBase/database. Which will erase changes done by other nodes. VirtualBox: as I have written - I have 8 nodes (PCs/workstations). Each of them needs to communicate to Linux/Samba server where application is shared. DOS must have samba client. VB wont help that way. However I do my tests with FreeDOS inside of VirtualBox. @Marc - yes, Im playing around that. So far, on the FreeDOS I have managed to get 485KB of free conventional memory. Application I need to run requires little bit above 500KB. MS Client take most of it... nightmare :( One last chance might be NFS client for DOS... But I was just hoping that there is some old/discontinued Samba project for DOS. BR, czezz Dnia 8 maja 2013 0:18 Neal Murphy lt;neal.p.mur...@alum.wpi.edugt; napisał(a): On Tuesday, May 07, 2013 05:57:13 PM G.W. Haywood wrote: gt; Hi there, gt; gt; On Tue, 7 May 2013 czezz wrote: gt; gt; I use FreeDOS with MS Client to map a network drive. However MS gt; gt; Client is a memory hog and prevents me to run all applications I gt; gt; need. Therefore I would like to ask here is there SAMBA gt; gt; implementation for DOS ? gt; gt; Have you considered using DOSBox on a Linux machine? Then you can do gt; whatever you want with drives, mapping, NAS, or whatever. I use it a gt; lot for an old application that I wrote over twenty years ago, it does gt; everything that I need. gt; gt; Alternatively you could try VirtualBox, which will let you do similar gt; things with drives but I don't know how flexible it is. To extend this concept a little, mayhap czezz could run each DOS app in a separate VM or separate DOSBox. Then he wouldn't need to worry about RAM. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] SAMBA implementation for DOS ?
On Wed, May 08, 2013 at 09:50:30AM +0200, czezz wrote: Hi, thank you all for answers. @Ged and Neal, yes - I considered using DOSBox and/or DOSEMU. This is solution that I will keep away from. The true is that with DOSBox I dont even need to care about network configuration and there is enough memory to run required application. The thing is that my Clipper/dBase application is located on Linux server and shared with SAMBA. 8 nodes (PCs/workstations) are connected to that share. If I use DOSbox, then DOSbox node will always overwrite its changes over dBase/database. Which will erase changes done by other nodes. VirtualBox: as I have written - I have 8 nodes (PCs/workstations). Each of them needs to communicate to Linux/Samba server where application is shared. DOS must have samba client. VB wont help that way. However I do my tests with FreeDOS inside of VirtualBox. @Marc - yes, Im playing around that. So far, on the FreeDOS I have managed to get 485KB of free conventional memory. Application I need to run requires little bit above 500KB. MS Client take most of it... nightmare :( One last chance might be NFS client for DOS... But I was just hoping that there is some old/discontinued Samba project for DOS. Is mars_nwe still alive? The Novell client uses less memory than the MSClient thingy. Volker -- SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen phone: +49-551-37-0, fax: +49-551-37-9 AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen http://www.sernet.de, mailto:kont...@sernet.de -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Samba4 on hosted root server
Hi list I am trying to install Samba4 on a hosted server but haven't been successful yet. Environment: Hosted Server with official .net domain. OS is Ubuntu 12.04 LTS Server 64-bit. DNS for domain is registred with provider's name servers. Installed Samba with Bind backend following the how-to on http://www.matrix44.net/cms/notes/gnulinux/samba-4-ad-domain-with-ubuntu-12-04 [1] . When I tried to join the domain I got an error message that SRV _ldap._tcp.dc.msdcs.official.domain not found. No DC can't be located. I checked if name service is working properly on the server itself: host -t SRV _ldap._tcp.dc.msdcs.official.domain _ldap._tcp.dc.msdcs.official.domain has SRV record 0 0 389 rv1325.official.domain. host -t SRV _kerberos._udp.official.domain _kerberos._udp.official.domain has SRV record 0 0 88 rv1325.official.domain. host -t SRV _ldap._tcp.official.domain _ldap._tcp.official.domain has SRV record 0 100 389 rv1325.official.domain. Everything looks fine I tried the same from another linux server with: host -t SRV _ldap._tcp.dc.msdcs.official.domain [server-ip] Also everything works fine. I've got the same replys. But whenever I try to join the domain it doesn't work. I would appreciate any help and ideas. -- Regards, Carsten Laun-De Lellis Hauptstrasse 13 D-67705 Trippstadt Phone: +49 6306 992140 Fax: +49 6306 992142 Mobile: +49 151 27530865 email: carsten.delel...@delellis.net http://www.linkedin.com/in/carstenlaundelellis [2] Links: -- [1] http://www.matrix44.net/cms/notes/gnulinux/samba-4-ad-domain-with-ubuntu-12-04 [2] http://www.linkedin.com/in/carstenlaundelellis -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] many smbd processes when sync'ing sysvol
On 08/05/2013 00:43, Michael Mol wrote: On May 7, 2013 4:56 PM, Alex Matthews qoole.sa...@lillimoth.com mailto:qoole.sa...@lillimoth.com wrote: Hi there, I have three S4 servers running as AD DCs. In order to keep the sysvol share in sync I'm using crontab to run the following command: /usr/bin/rsync -PavAX --delete root@masterPDC:/var/lib/samba/sysvol/ /var/lib/samba/sysvol/ However everytime this command is run a couple of extra smbd processes are started on the masterPDC (between 2 and 5 processes) which never exit and just sit there taking up resources. So, quite quickly I had a system with over 500 smbd processes and no free memory which very abruptly fell over and stopped serving genuine clients. Has anyone else come across this issue/know what is causing it? I have taken some level 10 logs of the smbd processes that get formed. However I don't have access to them from my current location. I will email them in tomorrow from work. Thanks, Alex -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba Are you sure those are separate processes, and not simply threads? (Apologies for brief response; sending from phone.) Hi Michael! They show up in `ps aux` as separate smbd processes. They also generate their own log files when I set the log file output names based on PIDs. Thanks, Alex -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] many smbd processes when sync'ing sysvol
On Tue, 2013-05-07 at 21:55 +0100, Alex Matthews wrote: Hi there, I have three S4 servers running as AD DCs. In order to keep the sysvol share in sync I'm using crontab to run the following command: /usr/bin/rsync -PavAX --delete root@masterPDC:/var/lib/samba/sysvol/ /var/lib/samba/sysvol/ However everytime this command is run a couple of extra smbd processes are started on the masterPDC (between 2 and 5 processes) which never exit and just sit there taking up resources. So, quite quickly I had a system with over 500 smbd processes and no free memory which very abruptly fell over and stopped serving genuine clients. Has anyone else come across this issue/know what is causing it? I have taken some level 10 logs of the smbd processes that get formed. However I don't have access to them from my current location. I will email them in tomorrow from work. My best guess is that the winbind part of samba's AD DC is making a connection, but never closing it. Andrew Bartlett -- Andrew Bartletthttp://samba.org/~abartlet/ Authentication Developer, Samba Team http://samba.org -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] ntp and samba4
On Tue, 2013-05-07 at 15:43 -0400, Michael Mol wrote: On 05/07/2013 03:25 PM, Andrew Bartlett wrote: On Mon, 2013-05-06 at 17:15 +0200, Michael De Groote wrote: Hi all Recently i noticed that upon starting the samba4 'samba' daemon, that it changes the group ownership of the socket for ntpd to *staff* $ls -l /usr/local/samba/var/lib/ntp_signd/ total 0 srwxrwxrwx 1 root *staff* 0 May 6 16:35 socket The documentation says it needs to be *ntp* (FYI: i'm running this on debian wheezy) I have just added ntp to group staff, but that seems like a workaround... I don't know why this is happening. I've examined the code, and it does not change the group ID, it only creates the directory, forcing the uid. Indeed, the same code is using for the winbind privileged pipe, which is likewise deliberately designed so that you can set the group to a specific group for use by squid et al. In this case the group is meant to be 'ntp' to allow only NTP access to the pipe. Could this be a namespace overlap? Perhaps the directory has the correct GID, but when Samba spins up the lookup for GID-name goes through it, and something samba is attached to already has a mapping for that GID. (I find it very odd to see asterisks around the group name in ls's output, too...) Samba never sets the GID explicitly, but should be gid 0 at this point, so should be creating gid 0 files. Andrew Bartlett -- Andrew Bartletthttp://samba.org/~abartlet/ Authentication Developer, Samba Team http://samba.org -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Provisioning command line args for DNS forwarder
On Tue, 2013-05-07 at 08:41 +0100, John wrote: Hello, I'm trying to script an installation and can't find the command-line argument to samba-tool domain provision to specify the DNS forwarder. I have tried samba-tool domain provision --help but I couldn't see such an option there. Does that mean there isn't one ? I also tried to use the samba-tool --option=option construct (described on 'man samba-tool') to set the dns forwarder after the provision but I can't work out how to constuct the parameter. I'd appreciate a nudge in the right direction... I noticed the same. Perhaps I dissuaded Kai from adding to our already very long list of options, but I'm now convinced we should add it. Care to prepare a git formatted patch? Kai: Any comments? Andrew Bartlett -- Andrew Bartletthttp://samba.org/~abartlet/ Authentication Developer, Samba Team http://samba.org -- 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.6.15 Available for Download
== Without freedom of choice there is no creativity. The body dies. James T. Kirk == Release Announcements = This is is the latest stable release of Samba 3.6. Major enhancements in Samba 3.6.15 include: o Fix crash bug in Winbind (bug #9854). Changes since 3.6.14: - o Andrew Bartlett abart...@samba.org * BUG 9746: Fix guest ok, force user and force group for guest users. o David Disseldorp dd...@samba.org * BUG 9830: Fix panic in nt_printer_publish_ads. o Volker Lendecke v...@samba.org * BUG 9854: Fix crash bug in Winbind. o Andreas Schneider a...@samba.org * BUG 9817: Fix 'map untrusted to domain' with NTLMv2. ## Reporting bugs Development Discussion ### Please discuss this release on the samba-technical mailing list or by joining the #samba-technical IRC channel on irc.freenode.net. If you do report problems then please try to send high quality feedback. If you don't provide vital information to help us track down the problem then you will probably be ignored. All bug reports should be filed under the Samba corresponding product in the project's Bugzilla database (https://bugzilla.samba.org/). == == Our Code, Our Bugs, Our Responsibility. == The Samba Team == Download Details The uncompressed tarballs and patch files have been signed using GnuPG (ID 6568B7EA). The source code can be downloaded from: http://download.samba.org/samba/ftp/ The release notes are available online at: http://www.samba.org/samba/ftp/history/samba-3.6.15.html Binary packages will be made available on a volunteer basis from http://download.samba.org/samba/ftp/Binary_Packages/ Our Code, Our Bugs, Our Responsibility. (https://bugzilla.samba.org/) --Enjoy The Samba Team -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Using Windows ACL on a samba3 share
Hello folks, I have some directories within a samba 3.x share which I want to give granulated security settings for various users and groups. I could use of course setfacl and POSIX ACLs to accomplish that, but some of these ACL should be also able to be set by some users. These users of course has no access to my linux host where samba3 is running, so they only can do that by right-clicking the directory/file and set the permissions through Windows explorer. Unfortunately this doesn't work in our case. My filesystem where the samba3 shares reside on is mounted with acl and xattr and I have double-checked that. Posix ACLs work fine. But as soon as the owner of a directory or file tries to add some other users with access on it, the change is not applied after clicking on the button Apply. It looks like the windows client cannot set these security settings. My share looks like that: [share1] path = /disk01/share1 admin users = @Domain Admins read only = No create mask = 0775 directory mask = 0775 nt acl support = yes vfs objects = acl_xattr invalid users = @restricted the command mount shows: [...] /dev/xvdb1 on /disk01 type ext4 (rw,acl,user_xattr) [...] What am I doing wrong, why this doesn't work? Any help appreciated. Thanks in advance, Lucas. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Succes for Günter Kukkukk [PATCH] Fix internal DNS dyn. updates, seen as: ; TSIG error with server: tsig verify failure
I just wanted to report that after using the patch from Günter Kukkukk ( 0001-Fix-internal-DNS-dyn.-update-seen-as-TSIG-error-with.patch ) for 2 weeks I haven't seen any errors in samba 4.0.5. Anyway thank you for the patch. Best regards Tim Vangehugten -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] many smbd processes when sync'ing sysvol
For reference, my smbd.conf is as follows: # Global parameters [global] workgroup = SMC realm = internal.stmaryscollege.co.uk netbios name = XEN-ARCH-AD-01 server role = active directory domain controller printcap name = /etc/printcap load printers = no dns forwarder = 192.168.0.30 #DNS handled by BIND server services = -dns log level = 1 max log size = 10240 log file = /var/log/samba/samba.log.%d debug uid = yes debug timestamp = yes allow dns updates = secure nsupdate command = /usr/bin/nsupdate -g spn update command = /usr/sbin/samba_spnupdate idmap_ldb:use rfc2307 = yes winbind nss info = rfc2307 #Small file tuning read raw = no level2 oplocks = true On 08/05/2013 10:10, Andrew Bartlett wrote: On Tue, 2013-05-07 at 21:55 +0100, Alex Matthews wrote: Hi there, I have three S4 servers running as AD DCs. In order to keep the sysvol share in sync I'm using crontab to run the following command: /usr/bin/rsync -PavAX --delete root@masterPDC:/var/lib/samba/sysvol/ /var/lib/samba/sysvol/ However everytime this command is run a couple of extra smbd processes are started on the masterPDC (between 2 and 5 processes) which never exit and just sit there taking up resources. So, quite quickly I had a system with over 500 smbd processes and no free memory which very abruptly fell over and stopped serving genuine clients. Has anyone else come across this issue/know what is causing it? I have taken some level 10 logs of the smbd processes that get formed. However I don't have access to them from my current location. I will email them in tomorrow from work. My best guess is that the winbind part of samba's AD DC is making a connection, but never closing it. Andrew Bartlett -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Building 3.6.12
All, I'm trying to build Samba 3.6.12 on Solaris 8 sparc using studio 12. Is this the correct forum to ask questions? This is my first build so any tips/tricks are appreciated. What are the prerequisites to get samba to compile so that it will join an AD domain? TIA, -Kevin -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Using Windows ACL on a samba3 share
From the Samba HOWTO: « The net command can be used to obtain the currently supported capabilities for rights and privileges using this method: root# net rpc rights list -U root%not24get SeMachineAccountPrivilege Add machines to domain SePrintOperatorPrivilege Manage printers SeAddUsersPrivilege Add users and groups to the domain SeRemoteShutdownPrivilege Force shutdown from a remote system SeDiskOperatorPrivilege Manage disk shares SeBackupPrivilege Back up files and directories SeRestorePrivilege Restore files and directories SeTakeOwnershipPrivilege Take ownership of files or other objects Machine account privilege is necessary to permit a Windows NT4 or later network client to be added to the domain. *The disk operator privilege is necessary to permit the user to manage share ACLs and file and directory ACLs for objects not owned by the user.* » http://www.samba.org/samba/docs/man/Samba-HOWTO-Collection/NetCommand.html#id2601333 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Building 3.6.12
I can patch Solaris 10 to get Samba 3.6.12 and takes about 5 mins to complete. I know moving off Solaris 8 would be the best path to take however it's not my decision to make... -Kevin -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Building 3.6.12
My first tip is a strong get off Solaris 8. It has been unsupported for a long time and you're not likely to be in a good place to get help from others either. - Original Message - From: Shaw, Kevin [mailto:kevin.s...@xerox.com] Sent: Wednesday, May 08, 2013 08:52 AM To: samba@lists.samba.org samba@lists.samba.org Subject: [Samba] Building 3.6.12 All, I'm trying to build Samba 3.6.12 on Solaris 8 sparc using studio 12. Is this the correct forum to ask questions? This is my first build so any tips/tricks are appreciated. What are the prerequisites to get samba to compile so that it will join an AD domain? TIA, -Kevin -- 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
[Samba] Is nss_winbind required?
Hi all, Is it a necessity to use the winbind nss module? I have run a few tests and having it enabled creates a massive bottleneck. It's not nss_winbind itself that is the bottleneck but something in the background (I'm guessing uid/rid-username code). If I disable winbind in nsswitch.conf what impact will it have? Will the system continue to work? eg: #nss_winbind enabled on group and passwd time samba-tool ntacl sysvolreset real3m58.240s user2m54.760s sys 0m27.030s #nss_winbind disabled time samba-tool ntacl sysvolreset real0m46.940s user0m35.057s sys 0m6.350s #nss_winbind enabled on only group time samba-tool ntacl sysvolreset real0m46.668s user0m34.790s sys 0m6.263s #nss_winbind enabled on only passwd time samba-tool ntacl sysvolreset real4m7.639s user2m56.987s sys 0m26.923s #nss_winbind enabled on group and passwd with enum groups and users disabled time samba-tool ntacl sysvolreset real4m1.464s user2m55.350s sys 0m26.660s #nss_winbind disabled and *nss-pam-ldap* enabled on passwd, shadow and group time samba-tool ntacl sysvolreset real3m57.029s user3m0.913s sys 0m30.570s Please note this last test shows that it is not the nss_winbind module that it slow it is something 'behind the scenes'. Also note that this is not just applicable to the sysvolreset (it was just a convenient method of testing). Copying a directory consisting of many small files (eg a windows roaming profile) can be excruciatingly slow! 50s+ for a 50mb folder! I am sure that it is not a network or drive limitation, copying the folder locally and via NFS happen very quickly and copying the same folder from a standalone S3 install on the same hardware is 'fast' also. Thanks, Alex -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Building 3.6.12
Had you posted about this last month? For active directory support you will need to compile OpenLDAP. The ldap functionality in Solaris is NOT openldap. I would that you will need to specify the path to the kerberos directory. Solaris 9 and Solaris 10 have kerberos installed by default. Not sure about Solaris 8 - it used to be part of the SEAM tool kit? If kerberos is not installed you will need to either download it from Sun/Oracle or compile from source. --with-ads=yes \ --with-ldap=yes \ --with-krb5=/usr Also make sure winbind and nsswitch support is enabled. . You may want to uninstall the samba 3.0.x packages to avoid confusing on which winbind/nsswitch libraries are being used. I would also make sure that your Solaris 8 server is configured to use the Windows AD PDC as the DNS master.I did not configure my systems as AD members BUT I did configure trusts with AD servers. Need to make sure the samba server can locate the AD server. Doesn't hurt to make sure all servers are using the same WINS server- although it shouldn't be relevant with AD. You may also want to setup a Solaris 10 test machine as well. Assuming you get Samba 3.6.x compile on Solaris 8, and you can't get it to join the AD domain, you will want some way to determine if the problem is with the samba config or if the problem is with the samba compile. If the identical config works on Solaris 10 but not Solaris 8, then you know you have a problem with the compile.Solaris 10 will be diagnostic tool, not the production system. On 05/08/13 08:52, Shaw, Kevin wrote: All, I'm trying to build Samba 3.6.12 on Solaris 8 sparc using studio 12. Is this the correct forum to ask questions? This is my first build so any tips/tricks are appreciated. What are the prerequisites to get samba to compile so that it will join an AD domain? TIA, -Kevin -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] SAMBA implementation for DOS ?
Memory usage is the reason (imho) that Novell was king in the dos era. The lanman client was just too huge even running on NETBEUI. Add to that a TCP/IP stack and in DOS terms you have a 200 to 300 K behemoth. I just googled linux clipper compiler. Have you tried 'Clip?' Looks like it might fill the bill and then you wouldn't be stuck with the limitations of DOS - Original Message - From: czezz cz...@o2.pl To: samba@lists.samba.org; Neal Murphy neal.p.mur...@alum.wpi.edu; sa...@jubileegroup.co.uk; Marc Muehlfeld sa...@marc-muehlfeld.de Cc: Sent: Wednesday, 8 May 2013, 0:50 Subject: Re: [Samba] SAMBA implementation for DOS ? Hi, thank you all for answers. @Ged and Neal, yes - I considered using DOSBox and/or DOSEMU. This is solution that I will keep away from. The true is that with DOSBox I dont even need to care about network configuration and there is enough memory to run required application. The thing is that my Clipper/dBase application is located on Linux server and shared with SAMBA. 8 nodes (PCs/workstations) are connected to that share. If I use DOSbox, then DOSbox node will always overwrite its changes over dBase/database. Which will erase changes done by other nodes. VirtualBox: as I have written - I have 8 nodes (PCs/workstations). Each of them needs to communicate to Linux/Samba server where application is shared. DOS must have samba client. VB wont help that way. However I do my tests with FreeDOS inside of VirtualBox. @Marc - yes, Im playing around that. So far, on the FreeDOS I have managed to get 485KB of free conventional memory. Application I need to run requires little bit above 500KB. MS Client take most of it... nightmare :( One last chance might be NFS client for DOS... But I was just hoping that there is some old/discontinued Samba project for DOS. BR, czezz Dnia 8 maja 2013 0:18 Neal Murphy lt;neal.p.mur...@alum.wpi.edugt; napisał(a): On Tuesday, May 07, 2013 05:57:13 PM G.W. Haywood wrote: gt; Hi there, gt; gt; On Tue, 7 May 2013 czezz wrote: gt; gt; I use FreeDOS with MS Client to map a network drive. However MS gt; gt; Client is a memory hog and prevents me to run all applications I gt; gt; need. Therefore I would like to ask here is there SAMBA gt; gt; implementation for DOS ? gt; gt; Have you considered using DOSBox on a Linux machine? Then you can do gt; whatever you want with drives, mapping, NAS, or whatever. I use it a gt; lot for an old application that I wrote over twenty years ago, it does gt; everything that I need. gt; gt; Alternatively you could try VirtualBox, which will let you do similar gt; things with drives but I don't know how flexible it is. To extend this concept a little, mayhap czezz could run each DOS app in a separate VM or separate DOSBox. Then he wouldn't need to worry about RAM. -- 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] Samba4 Delegation
Hello Andreas, Am 08.05.2013 20:08, schrieb Andreas Krupp: Thx a lot for the quick reply. I will try to upgrade or possibly reinstall my Samba4 Instance. At the moment the command returns me: 4.1.Opre1-GIT-5f2edd1 I guess that is not really right version or the latest release. I tried your command to reset the ACLs but that command is not part of my dbcheck. I tried and could not find your command in the list either. So I am starting to think that my problems maybe come from the entire version. I will set up a VM, reinstall centos + samba4 and see if that works better :) The '--reset-well-known-acls' option was introduced in 4.0.5 (this is the latest version). Maybe someone else on the list can say if you can switch from your git version to 4.0.5. Regards, Marc -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Using Windows ACL on a samba3 share
Hello again, I am using samba 3.5.6. I have another though maybe this problem occurs due to my OpenLDAP service? My /etc/openldap/slapd.conf is using: [...] access to dn.base= by * read access to dn.base=cn=Subschema by * read access to attrs=userPassword,userPKCS12 by self write by * auth access to attrs=shadowLastChange by self write by * read access to * by * read [...] Could that be the problem because slapd is denying any kind of access to the samba or nsswitch process??? If so, how should I modify these lines to allow it? Regards, Lucas. net groupmap list outputs all my groups and the mappings look fine. All the displayed groups are mapped correctly. So I tried also this command net usersidlist but this gives me following error: # net usersidlist [2013/05/08 23:57:30.799662, 0] utils/net_rpc.c:4591(net_usersidlist) Could not get the user/sid list # Thanks for your assistance, Lucas. Чтв 09 Май 2013 01:41:51 +0400, Miguel Medalha написал: The log file always says: [2013/05/08 21:57:21.630413, 0] smbd/posix_acls.c:1755(create_canon_ace_lists) create_canon_ace_lists: unable to map SID S-1-5-21-1062190697-4189521229-2202214947-3776 to uid or gid. Did you map the unix groups to Windows groups? For example: net groupmap add ntgroup=Domain Admins unixgroup=root type=d net groupmap add ntgroup=Domain Admins unixgroup=root type=d What is the output of the net groupmap list command? Чтв 09 Май 2013 01:41:51 +0400, Miguel Medalha написал: The log file always says: [2013/05/08 21:57:21.630413, 0] smbd/posix_acls.c:1755(create_canon_ace_lists) create_canon_ace_lists: unable to map SID S-1-5-21-1062190697-4189521229-2202214947-3776 to uid or gid. Did you map the unix groups to Windows groups? For example: net groupmap add ntgroup=Domain Admins unixgroup=root type=d net groupmap add ntgroup=Domain Admins unixgroup=root type=d What is the output of the net groupmap list command? By the way, which version of Samba are you using? (I ask this because your log contains a message also caused by a bug in an old version of Samba) -- 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.6.15 Available for Download
Am 08.05.2013 11:18, schrieb Karolin Seeger: Major enhancements in Samba 3.6.15 include: How is the 'log level' in 3.6.15 defined? From http://www.samba.org/samba/docs/man/manpages-3/smb.conf.5.html#LOGLEVEL [...] Default: log level = 0 And: debuglevel This parameter is a synonym for log level. In 3.5.x I had in some scripts following definition: debuglevel=`testparm -vs 2/dev/null | grep 'log level =' | cut -d' ' -f4` This was always the same as my own definition debug level = x in smb.conf in 3.5.x. But now: referencetest26 # testparm -vs 2/dev/null | grep 'log level' log level = 2 referencetest26 # grep 'log level' /etc/smb.conf referencetest26 # grep 'debug level' /etc/smb.conf debug level = 0 referencetest26 # grep 'debuglevel' /etc/smb.conf referencetest26 # 2 != 0 Here is my question: Where is 'log level = 2' defined? Not in my smb.conf... Can somebody shed some light on this? -- der tom -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Is nss_winbind required?
On Wed, 2013-05-08 at 15:23 +0100, Alex Matthews wrote: Hi all, Is it a necessity to use the winbind nss module? I have run a few tests and having it enabled creates a massive bottleneck. It's not nss_winbind itself that is the bottleneck but something in the background (I'm guessing uid/rid-username code). If I disable winbind in nsswitch.conf what impact will it have? Will the system continue to work? Please note this last test shows that it is not the nss_winbind module that it slow it is something 'behind the scenes'. Also note that this is not just applicable to the sysvolreset (it was just a convenient method of testing). Copying a directory consisting of many small files (eg a windows roaming profile) can be excruciatingly slow! 50s+ for a 50mb folder! I am sure that it is not a network or drive limitation, copying the folder locally and via NFS happen very quickly and copying the same folder from a standalone S3 install on the same hardware is 'fast' also. The issue is that the winbind in the Samba 4.0 AD DC is incredibly inefficient. It is required for the [homes] share to work, but we try to avoid needing it for other things. I understand this is incredibly frustrating, but what this highlights is that we really, really need to start on the project to replace it with running the winbindd code from source3. The challenge is that this is a lot of work, which will cause disruption in other parts of the system as we generalise stuff and add the plugins we need to hook into the AD DC. I'm increasingly of the view that this will need to be a priority soon, but it's still hard to get stuck into this stuff. Andrew Bartlett -- Andrew Bartletthttp://samba.org/~abartlet/ Authentication Developer, Samba Team http://samba.org -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] [PATCH] Re: fsmo _role_seize _issue
On Mon, 2013-05-06 at 10:29 +0530, mur...@nbtechnology.in wrote: Hi I have been trying to replace my win 2003 DC with samba4 ADC , but i am getting the following error when i run samba-tool fsmo seize --role=all for all the 5 roles. I found that it is listed in Samba-Bugzilla – Bug 9461 as on 28/1/2013.Is there any patch been released after that or is there any patch which is planned for release.Any workaround to overcome this [root@server1# samba-tool fsmo seize --role=schema Attempting transfer... FSMO transfer of 'schema' role successful ERROR: Failed to initiate role seize of 'schema' role: objectclass: modify message must have elements/attributes! G'Day Murali, The attached patch should fix this for you. As you might notice, the FSMO role transfer is successful, but we then error out. If I can get an ack from you that this solves your problem, and an ack from a team member on the patch, I can get this fixed in master and eventually into 4.0.6. Thanks! Andrew Bartlett -- Andrew Bartletthttp://samba.org/~abartlet/ Authentication Developer, Samba Team http://samba.org From acad20714833c22efbd4f0ae6d6bb3ea449bc314 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett abart...@samba.org Date: Thu, 9 May 2013 15:16:55 +1200 Subject: [PATCH] python-samba-tool fsmo: Do not give an error on a successful role transfer --- python/samba/netcmd/fsmo.py | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/python/samba/netcmd/fsmo.py b/python/samba/netcmd/fsmo.py index c938c91..02721f9 100644 --- a/python/samba/netcmd/fsmo.py +++ b/python/samba/netcmd/fsmo.py @@ -124,22 +124,22 @@ all=all of the above), self.message(Attempting transfer...) try: transfer_role(self.outf, role, samdb) +self.outf.write(FSMO seize was not required, as transfer of '%s' role was successful\n % role) +return except CommandError: #transfer failed, use the big axe... self.message(Transfer unsuccessful, seizing...) -m[fSMORoleOwner]= ldb.MessageElement( -serviceName, ldb.FLAG_MOD_REPLACE, -fSMORoleOwner) else: self.message(Will not attempt transfer, seizing...) -m[fSMORoleOwner]= ldb.MessageElement( -serviceName, ldb.FLAG_MOD_REPLACE, -fSMORoleOwner) + +m[fSMORoleOwner]= ldb.MessageElement( +serviceName, ldb.FLAG_MOD_REPLACE, +fSMORoleOwner) try: samdb.modify(m) except LdbError, (num, msg): raise CommandError(Failed to initiate role seize of '%s' role: %s % (role, msg)) -self.outf.write(FSMO transfer of '%s' role successful\n % role) +self.outf.write(FSMO seize of '%s' role successful\n % role) def run(self, force=None, H=None, role=None, credopts=None, sambaopts=None, versionopts=None): -- 1.7.11.7 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] log level and testparm lies
On Thu, 2013-05-09 at 03:22 +0200, Thomas Bork wrote: Am 08.05.2013 11:18, schrieb Karolin Seeger: Major enhancements in Samba 3.6.15 include: How is the 'log level' in 3.6.15 defined? But now: referencetest26 # testparm -vs 2/dev/null | grep 'log level' log level = 2 referencetest26 # grep 'log level' /etc/smb.conf referencetest26 # grep 'debug level' /etc/smb.conf debug level = 0 referencetest26 # grep 'debuglevel' /etc/smb.conf referencetest26 # 2 != 0 Here is my question: Where is 'log level = 2' defined? Not in my smb.conf... Can somebody shed some light on this? The issue is that testparm forces the log level to ensure the warnings are output. Andrew Bartlett -- Andrew Bartletthttp://samba.org/~abartlet/ Authentication Developer, Samba Team http://samba.org -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[SCM] CTDB repository - branch 1.2.39 updated - ctdb-1.2.39-8-7-g25ffee1
The branch, 1.2.39 has been updated via 25ffee12bd06df7c4a46862bb7667d41e42dde7f (commit) via 8bca8e1e63c70b959fdee5f680024249b688cc50 (commit) via d22ac9f3f79ea3368fdb49babed2c2252e0d45a5 (commit) via 3a01839e650e47663f22a731486b9297030a6524 (commit) via efb72d75201a22905e12cb3b92240054ad36068c (commit) via 60f6beca9eb5a2fb410419f555d92434f862a026 (commit) via f5a511b72689557db75353eb5bd6c1ea5724f799 (commit) from a1c04ba95aa21837b8388f91480122e3349d3e92 (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=1.2.39 - Log - commit 25ffee12bd06df7c4a46862bb7667d41e42dde7f Author: Martin Schwenke mar...@meltin.net Date: Wed May 8 13:06:12 2013 +1000 New version 1.2.39-9 Signed-off-by: Martin Schwenke mar...@meltin.net commit 8bca8e1e63c70b959fdee5f680024249b688cc50 Author: Amitay Isaacs ami...@gmail.com Date: Wed Dec 5 11:38:42 2012 +1100 scripts: Add helper script to log locking information using /proc/locks This finds any processes locking tdb databases used by CTDB and logs stack trace for each process. Includes this fix from 1.2.40 branch: scripts: Fix the variable name for sed expressions Signed-off-by: Amitay Isaacs ami...@gmail.com (cherry picked from commit 0e99ca1cdf28a7043554afb78bd439f727ab4f95) (cherry picked from commit 9fbd13ea7d3da5e297827e7763f336f484262f47) commit d22ac9f3f79ea3368fdb49babed2c2252e0d45a5 Author: Amitay Isaacs ami...@gmail.com Date: Wed Dec 5 11:37:26 2012 +1100 daemon: Run an external script if freeze locks were not obtained during recovery If the freeze child is already created in ctdb_start_freeze(), then it indicates that the child process has not yet obtained the locks. This may be because another process has locked the databases and has not yet released the locks. In this case, invoke a helper script defined by environmental variable CTDB_DEBUG_LOCKS, to log information about locks. Signed-off-by: Amitay Isaacs ami...@gmail.com (cherry picked from commit e80b2c15bf8c8fb5c3793acfebbe09d3cdd617b7) commit 3a01839e650e47663f22a731486b9297030a6524 Author: Martin Schwenke mar...@meltin.net Date: Thu May 17 10:17:51 2012 +1000 ctdbd: Backport use of external script to debug hung eventscript This is a cherry-pick from 6e68797af67bee36f2bad045f94806e7e98f27e9, combined with several recent fixes: 8507303b525d20c74e8ec4e7c4f5f275945cd3b6 scripts: debug-hung-script.sh doesn't need functions/loadconfig 501461cc3e132d4adee9e91b5d4513a26bae2846 ctdbd: Remove debug_hung_script_ctx 0581f9a84e58764d194f4e04064c2c5b393c348b ctdbd: Remove command-line option --debug-hung-script 3400b2ed34b6eb9496eb55f1aab6f89d2952060d ctdbd: Complain loudly if CTDB_DEBUG_HUNG_SCRIPT script isn't executable 9b0d56b16775aa16f33bdfdf831256e085fa3339 ctdbd: Don't use a fixed length buffer for the hung script command Signed-off-by: Martin Schwenke mar...@meltin.net Cherry-pick-from: b86270fae7fd9f8a7a718e15d8c7436a918f28c4 commit efb72d75201a22905e12cb3b92240054ad36068c Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Wed Jun 20 15:10:05 2012 +1000 When we find an ip we shouldnt host, just release it Dont call a full blown clusterwide ipreallocation, just release it locally (cherry picked from commit 9a806dec8687e2ec08a308853b61af6aed5e5d1e) Conflicts: server/ctdb_recoverd.c commit 60f6beca9eb5a2fb410419f555d92434f862a026 Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Wed Jun 20 10:08:11 2012 +1000 When we release an ip, get the interface name from the kernel instead of using the interface where ctdb thinks the ip is hosted at. The difference is that this now allows us to handle cases where we want to release an ip but ctdbd does not know which interface the ip is assigned on. (user has used 'ip addr add...' and manually assigned an ip to the wrong interface) (cherry picked from commit c6bf22ba5c01001b7febed73dd16a03bd3fd2bed) Conflicts: server/ctdb_takeover.c commit f5a511b72689557db75353eb5bd6c1ea5724f799 Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Wed Jun 20 13:32:02 2012 +1000 Add new command to find which interface is located on (cherry picked from commit f07376309e70f5ccdb7de8453caacc71b451ab48) Conflicts: common/system_common.c include/ctdb_private.h tools/ctdb.c --- Summary of changes: Makefile.in |2 + common/system_common.c | 84 +++ config/ctdb.init|7 config/ctdb.sysconfig |3 ++
[SCM] CTDB repository - annotated tag ctdb-1.2.39-9 created - ctdb-1.2.39-9
The annotated tag, ctdb-1.2.39-9 has been created at 7e832ad5a31167582acf0634ccdc1dd69f6f82fc (tag) tagging 25ffee12bd06df7c4a46862bb7667d41e42dde7f (commit) replaces ctdb-1.2.39-8 tagged by Amitay Isaacs on Wed May 8 17:52:59 2013 +1000 - Log - new version 1.2.39-9 Amitay Isaacs (2): daemon: Run an external script if freeze locks were not obtained during recovery scripts: Add helper script to log locking information using /proc/locks Martin Schwenke (2): ctdbd: Backport use of external script to debug hung eventscript New version 1.2.39-9 Ronnie Sahlberg (3): Add new command to find which interface is located on When we release an ip, get the interface name from the kernel When we find an ip we shouldnt host, just release it --- -- CTDB repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 0872d99 winbind: Fix bug 9854 -- NULL pointer dereference
from 6287391 BUG 9817: Fix 'map untrusted to domain' with NTLMv2.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 0872d998cd2bcfa274283bd7dd1d70010ca33166
Author: Volker Lendecke v...@samba.org
Date: Tue May 7 12:39:16 2013 +0200
winbind: Fix bug 9854 -- NULL pointer dereference
Signed-off-by: Volker Lendecke v...@samba.org
Reviewed-by: Michael Adam ob...@samba.org
Autobuild-User(master): Michael Adam ob...@samba.org
Autobuild-Date(master): Tue May 7 14:49:07 CEST 2013 on sn-devel-104
(cherry picked from commit 8c1283a89f746a108e8014b6fbc9a58a371950cf)
---
Summary of changes:
source3/winbindd/winbindd_cache.c |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_cache.c
b/source3/winbindd/winbindd_cache.c
index 033ea77..0a65953 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -946,7 +946,7 @@ static void wcache_save_name_to_sid(struct winbindd_domain
*domain,
if (!centry)
return;
- if (domain_name[0] == '\0') {
+ if ((domain_name == NULL) || (domain_name[0] == '\0')) {
struct winbindd_domain *mydomain =
find_domain_from_sid_noinit(sid);
if (mydomain != NULL) {
@@ -974,7 +974,7 @@ static void wcache_save_sid_to_name(struct winbindd_domain
*domain, NTSTATUS sta
if (!centry)
return;
- if (domain_name[0] == '\0') {
+ if ((domain_name == NULL) || (domain_name[0] == '\0')) {
struct winbindd_domain *mydomain =
find_domain_from_sid_noinit(sid);
if (mydomain != NULL) {
@@ -1798,7 +1798,7 @@ NTSTATUS wcache_name_to_sid(struct winbindd_domain
*domain,
return NT_STATUS_NO_MEMORY;
}
- if (domain_name[0] == '\0') {
+ if ((domain_name == NULL) || (domain_name[0] == '\0')) {
domain_name = domain-name;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via 8a3db2e WHATSNEW: Prepare release notes for Samba 3.6.15. from 0872d99 winbind: Fix bug 9854 -- NULL pointer dereference http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit 8a3db2e8ef12d259feaa2af5092ddda74c5b4def Author: Karolin Seeger ksee...@samba.org Date: Wed May 8 10:15:32 2013 +0200 WHATSNEW: Prepare release notes for Samba 3.6.15. Signed-off-by: Karolin Seeger ksee...@samba.org --- Summary of changes: WHATSNEW.txt | 20 +--- 1 files changed, 17 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 6b986c2..461ed76 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,6 +1,6 @@ == Release Notes for Samba 3.6.15 - June 10, 2013 +May 08, 2013 == @@ -8,12 +8,26 @@ This is is the latest stable release of Samba 3.6. Major enhancements in Samba 3.6.15 include: -o +o Fix crash bug in Winbind (bug #9854). + Changes since 3.6.14: - -o Jeremy Allison j...@samba.org +o Andrew Bartlett abart...@samba.org +* BUG 9746: Fix guest ok, force user and force group for guest users. + + +o David Disseldorp dd...@samba.org +* BUG 9830: Fix panic in nt_printer_publish_ads. + + +o Volker Lendecke v...@samba.org +* BUG 9854: Fix crash bug in Winbind. + + +o Andreas Schneider a...@samba.org +* BUG 9817: Fix 'map untrusted to domain' with NTLMv2. ## -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-stable updated
The branch, v3-6-stable has been updated via e0c2e3c WHATSNEW: Prepare release notes for Samba 3.6.15. via 07f930e winbind: Fix bug 9854 -- NULL pointer dereference via 6c5c055 BUG 9817: Fix 'map untrusted to domain' with NTLMv2. via 76d9020 bug 9830: fix panic in nt_printer_publish_ads via b633e71 s3:librpc: add support for PFC_FLAG_OBJECT_UUID when parsing packets (bug #9382) via 6f14d3b s3-smbd: Split make_serverinfo_from_username guest parameters into two parts from abe0fec WHATSNEW: Start release notes for Samba 3.6.15. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-stable - Log - commit e0c2e3cd1579d89b2e3f8d1bce2019e61104441e Author: Karolin Seeger ksee...@samba.org Date: Wed May 8 10:15:32 2013 +0200 WHATSNEW: Prepare release notes for Samba 3.6.15. Signed-off-by: Karolin Seeger ksee...@samba.org (cherry picked from commit 8a3db2e8ef12d259feaa2af5092ddda74c5b4def) commit 07f930e32cdc0d8a317d4b14285b2fb1f15f0c46 Author: Volker Lendecke v...@samba.org Date: Tue May 7 12:39:16 2013 +0200 winbind: Fix bug 9854 -- NULL pointer dereference Signed-off-by: Volker Lendecke v...@samba.org Reviewed-by: Michael Adam ob...@samba.org Autobuild-User(master): Michael Adam ob...@samba.org Autobuild-Date(master): Tue May 7 14:49:07 CEST 2013 on sn-devel-104 (cherry picked from commit 8c1283a89f746a108e8014b6fbc9a58a371950cf) (cherry picked from commit 0872d998cd2bcfa274283bd7dd1d70010ca33166) commit 6c5c055ab1a83c71adf26b2089e51715833b2c31 Author: Andreas Schneider a...@samba.org Date: Wed Apr 24 15:27:21 2013 +0200 BUG 9817: Fix 'map untrusted to domain' with NTLMv2. Signed-off-by: Andreas Schneider a...@samba.org Reviewed-by: Günther Deschner g...@samba.org Reviewed-by: Stefan Metzmacher me...@samba.org Autobuild-User(master): Andreas Schneider a...@cryptomilk.org Autobuild-Date(master): Wed Apr 24 17:14:48 CEST 2013 on sn-devel-104 (cherry picked from commit 62873916076d748f7c91868a6cd28d35e64d8dca) commit 76d90201a02511429bf0f658c1564ccc78f26e6d Author: David Disseldorp dd...@samba.org Date: Thu Apr 25 16:01:54 2013 +0200 bug 9830: fix panic in nt_printer_publish_ads Check for ads_find_machine_acct() errors, to ensure a NULL LDAPMessage pointer doesn't get passed to ldap_get_dn(). Signed-off-by: David Disseldorp dd...@samba.org (cherry picked from commit dd07b3c4973b169f07d227869dba8d0f4a76569a) commit b633e710743aff595a87782507429e68d94ce80e Author: Stefan Metzmacher me...@samba.org Date: Mon Nov 12 10:16:50 2012 +0100 s3:librpc: add support for PFC_FLAG_OBJECT_UUID when parsing packets (bug #9382) Now the logic matches the one in dcerpc_read_ncacn_packet_done(). Signed-off-by: Stefan Metzmacher me...@samba.org Reviewed-by: Michael Adam ob...@samba.org Reviewed-by: David Disseldorp dd...@suse.de (cherry picked from commit 65860c540faba0ca3542ee2edc0a16fa76a2bcde) commit 6f14d3be50c0f45fa8f2afc2d42f229a05a6056d Author: Andrew Bartlett abart...@samba.org Date: Thu Apr 4 09:53:34 2013 +1100 s3-smbd: Split make_serverinfo_from_username guest parameters into two parts This handles differently the case where we are the guest (from security=share) and when we are forced to be a different user with force user. We want to maintain only the is_guest flag if were forced to become any other user, we need the rest of the token to change. Andrew Bartlett Fix bug #9746 - guest ok + force user + force group doesn't work. (cherry picked from commit 24d68d799553b0806e580a47aed70a4eaac09191) --- Summary of changes: WHATSNEW.txt| 20 +--- source3/auth/auth_util.c|3 ++- source3/auth/auth_winbind.c | 10 -- source3/auth/proto.h|1 + source3/librpc/rpc/dcerpc_helpers.c |4 source3/printing/nt_printing_ads.c | 10 -- source3/smbd/service.c |4 ++-- source3/winbindd/winbindd_cache.c |6 +++--- 8 files changed, 45 insertions(+), 13 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 6b986c2..461ed76 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,6 +1,6 @@ == Release Notes for Samba 3.6.15 - June 10, 2013 +May 08, 2013 == @@ -8,12 +8,26 @@ This is is the latest stable release of Samba 3.6. Major enhancements in Samba 3.6.15 include: -o +o Fix crash bug in Winbind (bug #9854). + Changes since 3.6.14: - -o Jeremy
[SCM] Samba Shared Repository - annotated tag samba-3.6.15 created
The annotated tag, samba-3.6.15 has been created at b6b36c0528ab22763e1aa7e8f716306cc6369d92 (tag) tagging e0c2e3cd1579d89b2e3f8d1bce2019e61104441e (commit) replaces samba-3.6.14 tagged by Karolin Seeger on Wed May 8 10:17:16 2013 +0200 - Log - tag samba-3.6.15 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iD8DBQBRigoSbzORW2Vot+oRApTVAJ9qnLYrYpgJuc/jsmxc4d4NgT0ZSwCeOAir yrjaE9ASeWlqXzs+vdoDZS0= =j2Jj -END PGP SIGNATURE- Andreas Schneider (1): BUG 9817: Fix 'map untrusted to domain' with NTLMv2. Andrew Bartlett (1): s3-smbd: Split make_serverinfo_from_username guest parameters into two parts David Disseldorp (1): bug 9830: fix panic in nt_printer_publish_ads Karolin Seeger (3): VERSION: Bump version number up to 3.6.15. WHATSNEW: Start release notes for Samba 3.6.15. WHATSNEW: Prepare release notes for Samba 3.6.15. Stefan Metzmacher (1): s3:librpc: add support for PFC_FLAG_OBJECT_UUID when parsing packets (bug #9382) Volker Lendecke (1): winbind: Fix bug 9854 -- NULL pointer dereference --- -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated
The branch, v4-0-test has been updated
via 23a75ad winbind: Fix bug 9854 -- NULL pointer dereference
from ed22de6 check_parent_exists() can change errno. Ensure we preserve
it across calls.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit 23a75adf1f6eabed7c6f7cb4f523e049245eab10
Author: Volker Lendecke v...@samba.org
Date: Tue May 7 12:39:16 2013 +0200
winbind: Fix bug 9854 -- NULL pointer dereference
Signed-off-by: Volker Lendecke v...@samba.org
Reviewed-by: Michael Adam ob...@samba.org
Autobuild-User(master): Michael Adam ob...@samba.org
Autobuild-Date(master): Tue May 7 14:49:07 CEST 2013 on sn-devel-104
(cherry picked from commit 8c1283a89f746a108e8014b6fbc9a58a371950cf)
Autobuild-User(v4-0-test): Karolin Seeger ksee...@samba.org
Autobuild-Date(v4-0-test): Wed May 8 11:53:49 CEST 2013 on sn-devel-104
---
Summary of changes:
source3/winbindd/winbindd_cache.c |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_cache.c
b/source3/winbindd/winbindd_cache.c
index 8b2e6a9..f631aea 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -944,7 +944,7 @@ static void wcache_save_name_to_sid(struct winbindd_domain
*domain,
if (!centry)
return;
- if (domain_name[0] == '\0') {
+ if ((domain_name == NULL) || (domain_name[0] == '\0')) {
struct winbindd_domain *mydomain =
find_domain_from_sid_noinit(sid);
if (mydomain != NULL) {
@@ -972,7 +972,7 @@ static void wcache_save_sid_to_name(struct winbindd_domain
*domain, NTSTATUS sta
if (!centry)
return;
- if (domain_name[0] == '\0') {
+ if ((domain_name == NULL) || (domain_name[0] == '\0')) {
struct winbindd_domain *mydomain =
find_domain_from_sid_noinit(sid);
if (mydomain != NULL) {
@@ -1806,7 +1806,7 @@ NTSTATUS wcache_name_to_sid(struct winbindd_domain
*domain,
return NT_STATUS_NO_MEMORY;
}
- if (domain_name[0] == '\0') {
+ if ((domain_name == NULL) || (domain_name[0] == '\0')) {
domain_name = domain-name;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via 1303a68 WHATSNEW: Start release notes for Samba 3.6.16. via 9b46794 VERSION: Bump version up to 3.6.16. from 8a3db2e WHATSNEW: Prepare release notes for Samba 3.6.15. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit 1303a689c7530cd1b4787050dd837a5e655544bc Author: Karolin Seeger ksee...@samba.org Date: Wed May 8 13:08:00 2013 +0200 WHATSNEW: Start release notes for Samba 3.6.16. Signed-off-by: Karolin Seeger ksee...@samba.org commit 9b46794780b906e0e38e8f86a49c2ae2ee556c16 Author: Karolin Seeger ksee...@samba.org Date: Wed May 8 13:06:31 2013 +0200 VERSION: Bump version up to 3.6.16. Karolin --- Summary of changes: WHATSNEW.txt| 48 ++-- source3/VERSION |2 +- 2 files changed, 43 insertions(+), 7 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 461ed76..ed91593 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,4 +1,45 @@ == + Release Notes for Samba 3.6.16 + June 19, 2013 + == + + +This is is the latest stable release of Samba 3.6. + +Major enhancements in Samba 3.6.16 include: + +o + + +Changes since 3.6.15: +- + +o Andrew Bartlett abart...@samba.org + + +## +Reporting bugs Development Discussion +### + +Please discuss this release on the samba-technical mailing list or by +joining the #samba-technical IRC channel on irc.freenode.net. + +If you do report problems then please try to send high quality +feedback. If you don't provide vital information to help us track down +the problem then you will probably be ignored. All bug reports should +be filed under the Samba 3.6 product in the project's Bugzilla +database (https://bugzilla.samba.org/). + + +== +== Our Code, Our Bugs, Our Responsibility. +== The Samba Team +== + +Release notes for older releases follow: + + + == Release Notes for Samba 3.6.15 May 08, 2013 == @@ -44,13 +85,8 @@ be filed under the Samba 3.6 product in the project's Bugzilla database (https://bugzilla.samba.org/). -== -== Our Code, Our Bugs, Our Responsibility. -== The Samba Team -== +--- -Release notes for older releases follow: - == Release Notes for Samba 3.6.14 diff --git a/source3/VERSION b/source3/VERSION index d5d4da0..0b042fa 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -25,7 +25,7 @@ SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=6 -SAMBA_VERSION_RELEASE=15 +SAMBA_VERSION_RELEASE=16 # Bug fix releases use a letter for the patch revision # -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-stable updated
The branch, v3-6-stable has been updated via cbf1012 WHATSNEW: Start release notes for Samba 3.6.16. via 339bb01 VERSION: Bump version up to 3.6.16. from e0c2e3c WHATSNEW: Prepare release notes for Samba 3.6.15. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-stable - Log - commit cbf101271c031dffd64b85016e2ea522dc844acf Author: Karolin Seeger ksee...@samba.org Date: Wed May 8 13:08:00 2013 +0200 WHATSNEW: Start release notes for Samba 3.6.16. Signed-off-by: Karolin Seeger ksee...@samba.org (cherry picked from commit 1303a689c7530cd1b4787050dd837a5e655544bc) commit 339bb01c39424780aec759842c1f8209c1442974 Author: Karolin Seeger ksee...@samba.org Date: Wed May 8 13:06:31 2013 +0200 VERSION: Bump version up to 3.6.16. Karolin (cherry picked from commit 9b46794780b906e0e38e8f86a49c2ae2ee556c16) --- Summary of changes: WHATSNEW.txt| 48 ++-- source3/VERSION |2 +- 2 files changed, 43 insertions(+), 7 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 461ed76..ed91593 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,4 +1,45 @@ == + Release Notes for Samba 3.6.16 + June 19, 2013 + == + + +This is is the latest stable release of Samba 3.6. + +Major enhancements in Samba 3.6.16 include: + +o + + +Changes since 3.6.15: +- + +o Andrew Bartlett abart...@samba.org + + +## +Reporting bugs Development Discussion +### + +Please discuss this release on the samba-technical mailing list or by +joining the #samba-technical IRC channel on irc.freenode.net. + +If you do report problems then please try to send high quality +feedback. If you don't provide vital information to help us track down +the problem then you will probably be ignored. All bug reports should +be filed under the Samba 3.6 product in the project's Bugzilla +database (https://bugzilla.samba.org/). + + +== +== Our Code, Our Bugs, Our Responsibility. +== The Samba Team +== + +Release notes for older releases follow: + + + == Release Notes for Samba 3.6.15 May 08, 2013 == @@ -44,13 +85,8 @@ be filed under the Samba 3.6 product in the project's Bugzilla database (https://bugzilla.samba.org/). -== -== Our Code, Our Bugs, Our Responsibility. -== The Samba Team -== +--- -Release notes for older releases follow: - == Release Notes for Samba 3.6.14 diff --git a/source3/VERSION b/source3/VERSION index c3db9ad..85b7e7e 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -25,7 +25,7 @@ SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=6 -SAMBA_VERSION_RELEASE=15 +SAMBA_VERSION_RELEASE=16 # Bug fix releases use a letter for the patch revision # -- Samba Shared Repository
[SCM] CTDB repository - branch master updated - ctdb-2.1-145-gd0a3822
The branch, master has been updated via d0a3822573db296e73cc897835f783c8abc084b3 (commit) via 65e0ea6c2c0629e19349ba4b9affa221fde2b070 (commit) via 107e656bbe24f9d21fbaf886a3e9417da4effe5a (commit) via 7cf63722873a6a7baafd77aa3d8a1989b221dee9 (commit) via 1308a51f73f2e29ba4dbebb6111d9309a89732cc (commit) via 12aef10e9889760d98f58c8d916f19d069fa381a (commit) via a1addd89fd9c0390912604097acd028cc24d3483 (commit) via 1fb5352d2b6918fcc6f630db49275d25a3eebe8d (commit) via 9721aae001b3023e9c8b4af2b143c0db3442d623 (commit) via 91405282ba4abad4ad8e8c5f7ee4c83c75f38280 (commit) from 0eb351ff4c7ee096de7c5e0a59561067091fa32e (commit) http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master - Log - commit d0a3822573db296e73cc897835f783c8abc084b3 Author: Martin Schwenke mar...@meltin.net Date: Fri May 3 20:46:15 2013 +1000 recoverd: Remove unused mask argument and initial mask calculation This has been replaced by set_ipflags() and associated functionality. Signed-off-by: Martin Schwenke mar...@meltin.net commit 65e0ea6c2c0629e19349ba4b9affa221fde2b070 Author: Martin Schwenke mar...@meltin.net Date: Fri May 3 20:41:32 2013 +1000 recoverd: When calculating rebalance candidates don't consider flags This is really a check to see if a node is already hosting IPs. If so, we assume it was previously healthy so it isn't considered as a rebalance candidate. There's no need to limit this to healthy node, since this is checked elsewhere. Due to this the variable newly_healthy is renamed everywhere to rebalance_candidates. The mask argument is now completely unused. Signed-off-by: Martin Schwenke mar...@meltin.net commit 107e656bbe24f9d21fbaf886a3e9417da4effe5a Author: Martin Schwenke mar...@meltin.net Date: Fri May 3 20:13:40 2013 +1000 recoverd: Remove unused mask argument from IP allocation functions This is a no-op and is in a separate commit to make the previous commit less cumbersome. Signed-off-by: Martin Schwenke mar...@meltin.net commit 7cf63722873a6a7baafd77aa3d8a1989b221dee9 Author: Martin Schwenke mar...@meltin.net Date: Fri May 3 15:57:21 2013 +1000 tests/takeover: Add takeover tests, mostly for NoIPHostOnAllDisabled Signed-off-by: Martin Schwenke mar...@meltin.net Pair-programmed-with: Amitay Isaacs ami...@gmail.com commit 1308a51f73f2e29ba4dbebb6111d9309a89732cc Author: Martin Schwenke mar...@meltin.net Date: Fri May 3 16:59:20 2013 +1000 recoverd: Fix tunable NoIPTakeoverOnDisabled, rename to NoIPHostOnAllDisabled This really needs to be per-node. The rename is because nodes with this tunable switched on should drop IPs if they become unhealthy (or disabled in some other way). * Add new flag NODE_FLAGS_NOIPHOST, only used in recovery daemon. * Enhance set_ipflags_internal() and set_ipflags() to setup NODE_FLAGS_NOIPHOST depending on setting of NoIPHostOnAllDisabled and/or whether nodes are disabled/inactive. * Replace can_node_servce_ip() with functions can_node_host_ip() and can_node_takeover_ip(). These functions are the only ones that need to look at NODE_FLAGS_NOIPTAKEOVER and NODE_FLAGS_NOIPHOST. They can make the decision without looking at any other flags due to previous setup. * Remove explicit flag checking in IP allocation functions (including unassign_unsuitable_ips()) and just call can_node_host_ip() and can_node_takeover_ip() as appropriate. * Update test code to handle CTDB_SET_NoIPHostOnAllDisabled. Signed-off-by: Martin Schwenke mar...@meltin.net Pair-programmed-with: Amitay Isaacs ami...@gmail.com commit 12aef10e9889760d98f58c8d916f19d069fa381a Author: Martin Schwenke mar...@meltin.net Date: Fri May 3 16:56:24 2013 +1000 recoverd: Factor out new function all_nodes_are_disabled() Signed-off-by: Martin Schwenke mar...@meltin.net commit a1addd89fd9c0390912604097acd028cc24d3483 Author: Martin Schwenke mar...@meltin.net Date: Fri May 3 15:55:01 2013 +1000 tests/takeover: Allow per-node tunable settings Implemented for CTDB_SET_NoIPTakeover. Signed-off-by: Martin Schwenke mar...@meltin.net Pair-programmed-with: Amitay Isaacs ami...@gmail.com commit 1fb5352d2b6918fcc6f630db49275d25a3eebe8d Author: Martin Schwenke mar...@meltin.net Date: Fri May 3 16:21:16 2013 +1000 recoverd: Refactor code to get NoIPTakeover tunable from all nodes Signed-off-by: Martin Schwenke mar...@meltin.net Pair-programmed-with: Amitay Isaacs ami...@gmail.com commit 9721aae001b3023e9c8b4af2b143c0db3442d623 Author: Martin Schwenke mar...@meltin.net Date: Fri May 3 15:53:13 2013 +1000 tests: Unit test diff output should use filtered output
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 41f1c39 pidl:NDR/Parser: correctly set
$ndr-[relative_highest_]offset for relative_short pointers
via 5732c68 Revert Remove a bunch of unused variable
_relative_save_offset warnings.
from fa5898b Remove a bunch of unused variable _relative_save_offset
warnings.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 41f1c3969a3f381379ca665b2d992070c8e50227
Author: Stefan Metzmacher me...@samba.org
Date: Wed May 8 10:21:15 2013 +0200
pidl:NDR/Parser: correctly set $ndr-[relative_highest_]offset for
relative_short pointers
Signed-off-by: Stefan Metzmacher me...@samba.org
Reviewed-by: Günther Deschner g...@samba.org
Autobuild-User(master): Jeremy Allison j...@samba.org
Autobuild-Date(master): Wed May 8 20:49:55 CEST 2013 on sn-devel-104
commit 5732c6840350f18dd779d5a088bc825a9d1b4069
Author: Stefan Metzmacher me...@samba.org
Date: Wed May 8 10:18:54 2013 +0200
Revert Remove a bunch of unused variable _relative_save_offset warnings.
This reverts commit fa5898b6de797431d5ae9d2ce6dcddcb35a60b66.
This is the wrong fix for the warnings, the correct fix will follow.
Signed-off-by: Stefan Metzmacher me...@samba.org
Reviewed-by: Günther Deschner g...@samba.org
---
Summary of changes:
pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm |8 +++-
1 files changed, 3 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index ed86571..54b6f13 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -1157,10 +1157,8 @@ sub ParseElementPullLevel
$self-indent;
if ($l-{POINTER_TYPE} eq relative or
$l-{POINTER_TYPE} eq relative_short) {
- if ($l-{POINTER_TYPE} eq relative) {
- $self-pidl(uint32_t
_relative_save_offset;);
- $self-pidl(_relative_save_offset =
$ndr-offset;);
- }
+ $self-pidl(uint32_t _relative_save_offset;);
+ $self-pidl(_relative_save_offset =
$ndr-offset;);
$self-pidl(NDR_CHECK(ndr_pull_relative_ptr2($ndr, $var_name)););
}
}
@@ -1173,7 +1171,7 @@ sub ParseElementPullLevel
$self-ParseMemCtxPullEnd($e, $l, $ndr);
if ($l-{POINTER_TYPE} ne ref) {
- if ($l-{POINTER_TYPE} eq relative) {
+ if ($l-{POINTER_TYPE} eq relative or
$l-{POINTER_TYPE} eq relative_short) {
$self-pidl(if ($ndr-offset
$ndr-relative_highest_offset) {);
$self-indent;
$self-pidl($ndr-relative_highest_offset =
$ndr-offset;);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated
The branch, v4-0-test has been updated via cd9be74 Tests processing an oplock break within a compound SMB2 request. via 457af02 Remove the compound_related_in_progress state from the smb2 global state. via 5ab0457 The core of the fix to allow opens to go async inside a compound request. via 805b029 Move a variable into the area of code where it's used. via 0fea4e3 Ensure we don't try and cancel anything that is in a compound-related request. via 0770400 Only do the 1 second delay for sharing violations for SMB1, not SMB2. from 23a75ad winbind: Fix bug 9854 -- NULL pointer dereference http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log - commit cd9be74acbb5e09c5304516fa31cbb0b64da7d12 Author: Richard Sharpe realrichardsha...@gmail.com Date: Thu May 2 14:36:05 2013 -0700 Tests processing an oplock break within a compound SMB2 request. Signed-off-by: Richard Sharpe realrichardsha...@gmail.com Reviewed-by: Jeremy Allison j...@samba.org Autobuild-User(master): Richard Sharpe sha...@samba.org Autobuild-Date(master): Tue May 7 19:45:36 CEST 2013 on sn-devel-104 (cherry picked from commit 76bffc27a3f9ad6ac6b8ff8e21f801012835b73d) The last 6 patches address bug #9722 - Samba does not properly handle Oplock breaks in compound requests. Autobuild-User(v4-0-test): Karolin Seeger ksee...@samba.org Autobuild-Date(v4-0-test): Wed May 8 23:11:55 CEST 2013 on sn-devel-104 commit 457af02a687ff479fdcc7d870db3648466111c64 Author: Jeremy Allison j...@samba.org Date: Thu May 2 14:16:22 2013 -0700 Remove the compound_related_in_progress state from the smb2 global state. And also remove the restriction that we can't read a new request whilst we're in this state. Signed-off-by: Jeremy Allison j...@samba.org Reviewed-by: Richard Sharpe realrichardsha...@samba.org (cherry picked from commit cbff4885508e050bcb91c0faccb26941de5c1e1d) commit 5ab0457fec6fc7816fb7007e18583f1a471a28f1 Author: Jeremy Allison j...@samba.org Date: Thu May 2 13:55:53 2013 -0700 The core of the fix to allow opens to go async inside a compound request. This is only allowed for opens that cause an oplock break, otherwise it is not allowed. See [MS-SMB2].pdf note 194 on Section 3.3.5.2.7. Signed-off-by: Jeremy Allison j...@samba.org Reviewed-by: Richard Sharpe realrichardsha...@gmail.com (cherry picked from commit 10cbcfd167a4d7b1a22f9b42b684a66e424cbede) commit 805b0296ff8c87bf6b340ce199f4da2ab66c8654 Author: Jeremy Allison j...@samba.org Date: Thu May 2 13:08:16 2013 -0700 Move a variable into the area of code where it's used. Signed-off-by: Jeremy Allison j...@samba.org Reviewed-by: Richard Sharpe realrichardsha...@gmail.com (cherry picked from commit 1102e73832f78ca5decc928d6c3649d4fe68eab7) commit 0fea4e392a37b884242c26a35990ab6313b121a0 Author: Jeremy Allison j...@samba.org Date: Thu May 2 12:34:54 2013 -0700 Ensure we don't try and cancel anything that is in a compound-related request. Too hard to deal with splitting off the replies. Signed-off-by: Jeremy Allison j...@samba.org Reviewed-by: Richard Sharpe realrichardsha...@gmail.com (cherry picked from commit a026fc6b699719309a27d4646d06fe1a45b0d158) commit 07704006805108641f2391094432d52f0aa78098 Author: Jeremy Allison j...@samba.org Date: Tue May 7 12:07:16 2013 -0700 Only do the 1 second delay for sharing violations for SMB1, not SMB2. Match Windows behavior. Signed-off-by: Jeremy Allison j...@samba.org Reviewed-by: Richard Sharpe realrichardsha...@gmail.com --- Summary of changes: selftest/knownfail |1 + source3/smbd/globals.h |1 - source3/smbd/open.c |3 +- source3/smbd/smb2_server.c | 115 +++- source4/torture/smb2/compound.c | 163 +++ 5 files changed, 227 insertions(+), 56 deletions(-) Changeset truncated at 500 lines: diff --git a/selftest/knownfail b/selftest/knownfail index e3964d6..262b889 100644 --- a/selftest/knownfail +++ b/selftest/knownfail @@ -107,6 +107,7 @@ ^samba4.smb2.rename.no_share_delete_no_delete_access\(.*\)$ ^samba4.smb2.rename.msword ^samba4.smb2.compound.related3 +^samba4.smb2.compound.compound-break ^samba4.winbind.struct.*.show_sequence # Not yet working in winbind ^samba4.*base.delaywrite.*update of write time and SMBwrite truncate\(.*\)$ ^samba4.*base.delaywrite.*update of write time and SMBwrite truncate expand\(.*\)$ diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h index 16ac24b..1182ae9 100644 --- a/source3/smbd/globals.h +++ b/source3/smbd/globals.h @@ -786,7 +786,6 @@ struct
[SCM] CTDB repository - branch master updated - ctdb-2.1-147-ge143abd
The branch, master has been updated
via e143abd16ccde2e0edfe103673d31a5fb06b6aef (commit)
via 45c776958017ea7001f061842c9e0f60e4a25f23 (commit)
from d0a3822573db296e73cc897835f783c8abc084b3 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -
commit e143abd16ccde2e0edfe103673d31a5fb06b6aef
Author: Martin Schwenke mar...@meltin.net
Date: Thu May 9 12:53:48 2013 +1000
recoverd: Move IP flags into ctdb_takeover.c
These should never be seen outside the IP allocation code.
Signed-off-by: Martin Schwenke mar...@meltin.net
commit 45c776958017ea7001f061842c9e0f60e4a25f23
Author: Martin Schwenke mar...@meltin.net
Date: Thu May 9 12:51:57 2013 +1000
recoverd: Clear IP flags after IP allocation algorithm has run
If these flags are left set they will confuse other recovery daemon
code.
Factor the clearing code into new function clear_ipflags().
Signed-off-by: Martin Schwenke mar...@meltin.net
Pair-programmed-with: Amitay Isaacs ami...@gmail.com
---
Summary of changes:
include/ctdb_protocol.h |5 -
server/ctdb_takeover.c | 28 +++-
2 files changed, 23 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/include/ctdb_protocol.h b/include/ctdb_protocol.h
index 3133b4e..09ce01a 100644
--- a/include/ctdb_protocol.h
+++ b/include/ctdb_protocol.h
@@ -584,11 +584,6 @@ struct ctdb_node_map {
#define NODE_FLAGS_DISABLED
(NODE_FLAGS_UNHEALTHY|NODE_FLAGS_PERMANENTLY_DISABLED)
#define NODE_FLAGS_INACTIVE
(NODE_FLAGS_DELETED|NODE_FLAGS_DISCONNECTED|NODE_FLAGS_BANNED|NODE_FLAGS_STOPPED)
-/* These flags are ONLY valid within the recovery daemon */
-#define NODE_FLAGS_NOIPTAKEOVER0x0100 /* can not takeover
additional IPs */
-#define NODE_FLAGS_NOIPHOST0x0200 /* can not host IPs */
-
-
/*
* Node capabilities
*/
diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index 3ba7dc3..24c6298 100644
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -33,6 +33,12 @@
#define CTDB_ARP_INTERVAL 1
#define CTDB_ARP_REPEAT 3
+/* These flags are ONLY valid within IP allocation code and must be
+ * cleared to avoid confusing other recovery daemon functions
+ */
+#define NODE_FLAGS_NOIPTAKEOVER0x0100 /* can not takeover
additional IPs */
+#define NODE_FLAGS_NOIPHOST0x0200 /* can not host IPs */
+
struct ctdb_iface {
struct ctdb_iface *prev, *next;
const char *name;
@@ -2281,6 +2287,17 @@ static uint32_t *get_tunable_from_nodes(struct
ctdb_context *ctdb,
return tvals;
}
+static void clear_ipflags(struct ctdb_node_map *nodemap)
+{
+ int i;
+
+ for (i=0;inodemap-num;i++) {
+ nodemap-nodes[i].flags =
+ ~(NODE_FLAGS_NOIPTAKEOVER|NODE_FLAGS_NOIPHOST);
+ }
+}
+
+
/* Set internal flags for IP allocation:
* Clear ip flags
* Set NOIPTAKOVER ip flags from per-node NoIPTakeover tunable
@@ -2296,11 +2313,7 @@ static void set_ipflags_internal(struct ctdb_node_map
*nodemap,
{
int i;
- /* Clear IP flags */
- for (i=0;inodemap-num;i++) {
- nodemap-nodes[i].flags =
- ~(NODE_FLAGS_NOIPTAKEOVER|NODE_FLAGS_NOIPHOST);
- }
+ clear_ipflags(nodemap);
for (i=0;inodemap-num;i++) {
/* Can not take IPs on node with NoIPTakeover set */
@@ -2400,6 +2413,11 @@ int ctdb_takeover_run(struct ctdb_context *ctdb, struct
ctdb_node_map *nodemap,
/* Do the IP reassignment calculations */
ctdb_takeover_run_core(ctdb, nodemap, all_ips);
+ /* The IP flags need to be cleared because they should never
+* be seen outside the IP allocation code.
+*/
+ clear_ipflags(nodemap);
+
/* The recovery daemon does regular sanity checks of the IPs.
* However, sometimes it is overzealous and thinks changes are
* required when they're already underway. This stops the
--
CTDB repository
