Re: [Samba] New PDC
Look at, net RPC VAMPIRE Export users, aliases and groups from remote server to local server. You need to run this against the PDC, from a Samba machine joined as a BDC. and net getlocalsid and net setlocalsid On Mon, 30 Aug 2010 15:11:02 -0700, Gregory A. Cain g...@gregorycain.net wrote: Hi - I'm setting up a new Samba PDC here in a 30-person architectural office. The current PDC is running on an older computer and hasn't been updated in a while. The new PDC will be Samba 3.4.0 running on Ubuntu 9.10. We don't use roaming profiles. My question is this - is there a way to seamlessly migrate the desktops to the new PDC from the old one without having to move or copy all their profile data? In other words, to have the desktops see the new PDC as the old PDC? Any information anyone can provide (the more detail the better - I don't do this stuff every day) - would be very, very much appreciated. Thanks in advance. Greg -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Domain not available even minutes after workstation startup
Did you check the event logs in Windows- they may provide some additional info. This error sounded familiar- most of my users are in a Samba domain, but I have one group that uses Windows 2003 active directory domain. A few years back they had some weird issues that ended up being (possibly) related to the gigabit network connection.It had been hard to trace and had only been affecting newer machines. I think the following link was relevant. http://support.microsoft.com/kb/326152/ On 08/30/2010 11:29 PM, Abe Lau wrote: Yes, the PDC is also acting as the WINS server. The XP workstation is using WINS, set via DHCP (option netbios-name-servers ip address of the PDC;) On Mon, Aug 30, 2010 at 10:43 PM, Gaiseric Vandal gaiseric.van...@gmail.com mailto:gaiseric.van...@gmail.com wrote: Is the PDC also a WINS server? Are the XP workstations using WINS? On 08/29/2010 09:01 PM, Abe Lau wrote: Hi all, I have recently experienced an intermittent problem of getting the error message of Domain not available at initial logon of some XP workstations connected to a Samba PDC. The domain does not seems to be available after some time after initial bootup of the XP workstation, from a minute or two, to more than 10 minutes sometimes. Is there anyway to speed up this process? Thanks! I have set HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogoncachedlogonscount to 0 to workaround the problem of having the logon frozen (and folders not being redirected) during initial logon when the network is not ready. Abe -- 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] New PDC
The basic concept here is making sure that the SID and RID's are the same on the new Samba PDC as on the old PDC. After you migrate that information using net setlocalsid and net setdomainsid it is possible to go into the passdb backend (in our case LDAP) and manually modify the users to match their old NT id (I believe they call the last 4 digits the RID). You can find the users' ID's in the Windows registry in the key for their respective profile. This will allow you to join the new domain without any of the profiles being re-created. I know this works because I've just done the same thing. However, I could not get net rpc vampire to work on our old domain controllers. Chris On 08/31/2010 04:47 AM, Daniel Müller wrote: Look at, net RPC VAMPIRE Export users, aliases and groups from remote server to local server. You need to run this against the PDC, from a Samba machine joined as a BDC. and net getlocalsid and net setlocalsid On Mon, 30 Aug 2010 15:11:02 -0700, Gregory A. Cain g...@gregorycain.net wrote: Hi - I'm setting up a new Samba PDC here in a 30-person architectural office. The current PDC is running on an older computer and hasn't been updated in a while. The new PDC will be Samba 3.4.0 running on Ubuntu 9.10. We don't use roaming profiles. My question is this - is there a way to seamlessly migrate the desktops to the new PDC from the old one without having to move or copy all their profile data? In other words, to have the desktops see the new PDC as the old PDC? Any information anyone can provide (the more detail the better - I don't do this stuff every day) - would be very, very much appreciated. Thanks in advance. Greg -- Christopher Springer IS/IT Systems Administrator BRC Rubber Plastics, Inc Office: 260-693-2171 x389 Cell: 260-750-2929 csprin...@brcrp.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] failed to set machine spn: Operations error
On Mon, Aug 30, 2010 at 7:21 PM, rajat swarup raj...@gmail.com wrote: I have samba, winbind, kerberos installed on an ubuntu server. I have a windows server 2003 based domain. when i try to execute the following command: net ads join -U user I get the following error: Failed to join domain: failed to set machine spn: Operations error Kerberos authentication works fine and I can get the kerberos ticket just fine. This setup was working fine earlier. I was able to authenticate to the windows server This started happening when I upgraded the samba version using aptitude. Also I get the following error when I restart the samba daemon (/etc/init.d/samba4 start) Unknown enumerated value 'ads' for 'security' Any ideas? -- Rajat Swarup www.rajatswarup.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] New PDC
Thank you all for this great information. The server is working perfectly now. Greg On 8/30/2010 3:11 PM, Gregory A. Cain wrote: Hi - I'm setting up a new Samba PDC here in a 30-person architectural office. The current PDC is running on an older computer and hasn't been updated in a while. The new PDC will be Samba 3.4.0 running on Ubuntu 9.10. We don't use roaming profiles. My question is this - is there a way to seamlessly migrate the desktops to the new PDC from the old one without having to move or copy all their profile data? In other words, to have the desktops see the new PDC as the old PDC? Any information anyone can provide (the more detail the better - I don't do this stuff every day) - would be very, very much appreciated. Thanks in advance. Greg -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Examples for smbldap
What is a good reference samba pdc with smbldap? Originally used Samba-3 by Example but do not know if that is still current. My current samba domain controllers that were set up about 5 years ago are still broken after doing a lot of fixes. Looks like there have been some changes since I first set up and like to compare what I have to reference. In case it's matters running debian lenny samba 3.2.5-4 smbldap 0.9.4-1 slapd 2.4.11-1 John -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] trouble with chown and samba
I cannot change owner and group of a directory or a file on a samba server. I tried with a win client and smbclient. Both the server and the smbclient are stock Ubuntu lucid amd64 servers smbd -V Version 3.4.7 Here are the relevant config: #--- smbconf #-- [global] server string = %h server (Samba, Ubuntu) map to guest = Bad User obey pam restrictions = Yes pam password change = Yes passwd program = /usr/bin/passwd %u passwd chat = *Enter\snew\s*\spassword:* %n\n *Retype\snew\s*\spassword:* %n\n *password\supdated\ssuccessfully* . unix password sync = Yes syslog = 0 log file = /var/log/samba/log.%m max log size = 1000 dns proxy = No usershare allow guests = Yes panic action = /usr/share/samba/panic-action %d acl check permissions = No force create mode = 0660 force directory mode = 0770 [common] path = /srv/samba/common read only = No #--- /etc/passwd #-- usercommon1:x:1004:1004:,,,:/srv/samba/common:/bin/bash common:x:2033:2034:,,,:/srv/samba/common/:/bin/bash #--- /var/lib/samba/passdb.tdb #-- common:2033::58D0B7426D3D476339F7411C6EEBBC3B:[U ]:LCT-4C7C09ED: usercommon1:1004::7D7300E0DEF9143D4AC33EF8FAF9EF86:[U ]:LCT-4C3B20E0: #--- ll -d /srv/samba/common/ and test/ #-- drwxr-xr-x 12 usercommon1 usercommon1 4096 2010-08-31 21:54 /srv/samba/common/ drwxrwxrwx 2 common common 4096 2010-08-31 21:54 /srv/samba/common/test/ #--- Now, doing #-- nico...@i27:~$ smbclient -U usercommon1 server\\common passwd smb: \ stat test File: \test Size: 0 Blocks: 0 directory Inode: 7471243 Links: 2 Access: (0777/drwxrwxrwx) Uid: 2033 Gid: 2034 Access: 2010-08-31 22:16:37 +0200 Modify: 2010-08-31 21:54:34 +0200 Change: 2010-08-31 22:16:17 +0200 smb: \ chown 1004 1004 test NT_STATUS_ACCESS_DENIED chown file \test uid=1004, gid=1004 What did I miss? N. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] permissions question
I have a samba share that has the following permissions: create mask = 0775 force create mode = 0664 directory create mask = 0775 force directory mode = 0764 1.) Does this means DOS/windows files will be created as rwxrwxr-x per create mask or rw-rw-r-- per force create mode? 2.) Do I need both create mask force create mode or is one overkill? 3.) Is directory create mask an unknown option? 4.) Does force directory mode mean all dos/windows directories created will be drwxrw-r--? 5.) I have a basic .txt file I created on my windows desktop by right-clickingnewtext document. I copy that file over to the share in question it gets the following permission: -rwxr--r-- where is it getting that permission from as I'm expecting it to have 0775 or 0664 permisions neither is coming over. Please help! Thanks in advance! -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] permissions question
On 08/31/2010 10:54 PM, Han Solo wrote: I have a samba share that has the following permissions: create mask = 0775 force create mode = 0664 directory create mask = 0775 force directory mode = 0764 1.) Does this means DOS/windows files will be created as rwxrwxr-x per create mask or rw-rw-r-- per force create mode? a mask is a removal of bit in the permission, so you get that a bit wrong :-) say you have permissions of 777 which in binary is 111-111-111 and a mask of 022 which is 000-010-010 you have to do the following to get the final permissions: 111-111-111 - 000-010-010 = 111-101-101 which is 755 N. 2.) Do I need both create mask force create mode or is one overkill? 3.) Is directory create mask an unknown option? 4.) Does force directory mode mean all dos/windows directories created will be drwxrw-r--? 5.) I have a basic .txt file I created on my windows desktop by right-clickingnewtext document. I copy that file over to the share in question it gets the following permission: -rwxr--r-- where is it getting that permission from as I'm expecting it to have 0775 or 0664 permisions neither is coming over. Please help! Thanks in advance! -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] create_canon_ace_lists: unable to map SID
I did search and found other folks with this issue but I didn't see a solution to my specific issue: I am running Samba 3.4.7 on ubuntu 10.04 LTS server configured to authenticate to active directory via Kerberos and LDAP for use with clients from OS X and Windows (no linux clients) On the advice of my local active directory team Winbind has been uninstalled and everything works nicely except except for not being able to set ACLs from the windows properties security tab. When I add a new user it shows fine in the security tab until I press apply at which point the newly added user disappears and the on the samba server the log shows: smbd/posix_acls.c:1711(create_canon_ace_lists) create_canon_ace_lists: unable to map SID S-1-5-21-503695880-695175589-3595387526-10512 to uid or gid. I can set and get ACLs from linux command line on the samba share files OK using setfacl and getfacl and those settings can be seen OK in the windows properties security tab and I have all the recommended ACL settings in smb.conf. getent passwd and getentgroup return the AD groups and users correctly. I read a mention of something similar here: http://help.lockergnome.com/linux/Samba-Samba-LDAP-error-windows-xp-ACL--ftopict509241.html but it is not clear to me from my searches or reading the documents on http://www.samba.org/samba/docs/man/Samba-HOWTO-Collection/http://www.samba.org/samba/docs/man/Samba-HOWTO-Collection/AccessControls.html#id2613465 if I must have winbind enabled to allow setting ACLs from windows. Is winbind required for setting ACLs from windows? Here's my smb.conf for reference: [global] unix extensions = no disable spoolss = Yes name resolve order = hosts workgroup = AD realm = AD.MYDOMAIN server string = %h server (Samba, Ubuntu) dns proxy = no log file = /var/log/samba/log.%m max log size = 1000 syslog = 0 log level = 0 logon home = logon path = panic action = /usr/share/samba/panic-action %d security = ads encrypt passwords = true passdb backend = tdbsam obey pam restrictions = yes unix password sync = yes pam password change = no map to guest = bad user usershare allow guests = no [asgs] comment = ASGS path = /shares/asgs browsable = Yes valid users = @ad\ASGSFileUsers write list = @ad\ASGSFileUsers create mask = 2660 force create mode = 0660 directory mask = 2770 force directory mode = 0770 and here's nsswitch.conf passwd: files ldap group: files ldap shadow: files ldap hosts: files dns networks: files protocols: db files services: db files ethers: db files rpc:db files netgroup: nis and my pam.d/samba @include common-auth @include common-account @include common-session auth required pam_unix.so nullok_secure auth sufficient pam_krb5.so minimum_uid=1000 use_first_pass account sufficient pam_ldap.so use_first_pass session sufficient pam_ldap.so Thanks for your insight. Grant -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Domain not available even minutes after workstation startup
Thanks Gaiseric for the note. I checked the XP Event Log, and the only error is: Automatic certificate enrollment for local system failed to contact the active directory (0x8007054b). The specified domain either does not exist or could not be contacted. Enrollment will not be performed. For more information, see Help and Support Center at http://go.microsoft.com/fwlink/events.asp. The only suspicious entry in samba log: (I remember this could safely be ignored) [2010/09/01 09:10:17, 1] smbd/session.c:111(session_claim) Re-using invalid record The PDC was changed to connect via two bonded gigabit connection (balance-alb) in a mixed 1000/100 network few months ago. Contrary to the MS support link, we have problem with both 100Mbps and 1000Mbps connections intermittently. Is any way to get XP to split out detailed log when it says domain is not available? Is setting Winlogoncachedlogonscount the good way to avoid logon problem when network is not ready during initial bootup? According to MS, if the domain server is not available and logon data is not cached, domain is not available will occur. http://technet.microsoft.com/en-us/library/cc957390.aspx Any further insight? Abe On Tue, Aug 31, 2010 at 10:00 PM, Gaiseric Vandal gaiseric.van...@gmail.com wrote: Did you check the event logs in Windows- they may provide some additional info. This error sounded familiar- most of my users are in a Samba domain, but I have one group that uses Windows 2003 active directory domain. A few years back they had some weird issues that ended up being (possibly) related to the gigabit network connection.It had been hard to trace and had only been affecting newer machines. I think the following link was relevant. http://support.microsoft.com/kb/326152/ On 08/30/2010 11:29 PM, Abe Lau wrote: Yes, the PDC is also acting as the WINS server. The XP workstation is using WINS, set via DHCP (option netbios-name-servers ip address of the PDC;) On Mon, Aug 30, 2010 at 10:43 PM, Gaiseric Vandal gaiseric.van...@gmail.com mailto:gaiseric.van...@gmail.com wrote: Is the PDC also a WINS server? Are the XP workstations using WINS? On 08/29/2010 09:01 PM, Abe Lau wrote: Hi all, I have recently experienced an intermittent problem of getting the error message of Domain not available at initial logon of some XP workstations connected to a Samba PDC. The domain does not seems to be available after some time after initial bootup of the XP workstation, from a minute or two, to more than 10 minutes sometimes. Is there anyway to speed up this process? Thanks! I have set HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogoncachedlogonscount to 0 to workaround the problem of having the logon frozen (and folders not being redirected) during initial logon when the network is not ready. Abe -- 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 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Domain not available even minutes after workstation startup
Did you try disabling the media sensing feature? I need to look at some of my Active Directory XP clients and see if they are still getting the error. I don’t think it prevented people logging on, and I am not using roaming profiles, so even if I still have this issue on occasion it might not be obvious. I think I had run into it when trying to deploy software through group policies.This was a few years ago but I think I had got it resolved. You could try putting one of the problem XP machines on a 10 Mbit only link. Or maybe see if you can configure the NIC settings be be 10 Mbit OR 100 Mbit but not autosensing. From: abe...@gmail.com [mailto:abe...@gmail.com] On Behalf Of Abe Lau Sent: Tuesday, August 31, 2010 8:22 PM To: gaiseric.van...@gmail.com Cc: samba@lists.samba.org Subject: Re: [Samba] Domain not available even minutes after workstation startup Thanks Gaiseric for the note. I checked the XP Event Log, and the only error is: Automatic certificate enrollment for local system failed to contact the active directory (0x8007054b). The specified domain either does not exist or could not be contacted. Enrollment will not be performed. For more information, see Help and Support Center at http://go.microsoft.com/fwlink/events.asp. The only suspicious entry in samba log: (I remember this could safely be ignored) [2010/09/01 09:10:17, 1] smbd/session.c:111(session_claim) Re-using invalid record The PDC was changed to connect via two bonded gigabit connection (balance-alb) in a mixed 1000/100 network few months ago. Contrary to the MS support link, we have problem with both 100Mbps and 1000Mbps connections intermittently. Is any way to get XP to split out detailed log when it says domain is not available? Is setting Winlogoncachedlogonscount the good way to avoid logon problem when network is not ready during initial bootup? According to MS, if the domain server is not available and logon data is not cached, domain is not available will occur. http://technet.microsoft.com/en-us/library/cc957390.aspx Any further insight? Abe On Tue, Aug 31, 2010 at 10:00 PM, Gaiseric Vandal gaiseric.van...@gmail.com wrote: Did you check the event logs in Windows- they may provide some additional info. This error sounded familiar- most of my users are in a Samba domain, but I have one group that uses Windows 2003 active directory domain. A few years back they had some weird issues that ended up being (possibly) related to the gigabit network connection.It had been hard to trace and had only been affecting newer machines. I think the following link was relevant. http://support.microsoft.com/kb/326152/ On 08/30/2010 11:29 PM, Abe Lau wrote: Yes, the PDC is also acting as the WINS server. The XP workstation is using WINS, set via DHCP (option netbios-name-servers ip address of the PDC;) On Mon, Aug 30, 2010 at 10:43 PM, Gaiseric Vandal gaiseric.van...@gmail.com mailto:gaiseric.van...@gmail.com wrote: Is the PDC also a WINS server? Are the XP workstations using WINS? On 08/29/2010 09:01 PM, Abe Lau wrote: Hi all, I have recently experienced an intermittent problem of getting the error message of Domain not available at initial logon of some XP workstations connected to a Samba PDC. The domain does not seems to be available after some time after initial bootup of the XP workstation, from a minute or two, to more than 10 minutes sometimes. Is there anyway to speed up this process? Thanks! I have set HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogoncachedlogonscount to 0 to workaround the problem of having the logon frozen (and folders not being redirected) during initial logon when the network is not ready. Abe -- 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 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Domain not available even minutes after workstation startup
No, I have never try anything with media sensing. I could give it a try and see if it helps. Thanks for checking that for me Gaiseric. I am not using roaming profile here also, just folder redirection for the desktop, My Documents, Application Data and a few... I may try to re-enable Winlogoncachedlogonscount so that user could still logon. But then, it will get back to the problem as the login may get totally stuck when XP is trying to contact the PDC for the login script at netlogon, and redirected folders. Abe On Wed, Sep 1, 2010 at 12:50 PM, Gaiseric Vandal gaiseric.van...@gmail.comwrote: Did you try disabling the media sensing feature? I need to look at some of my Active Directory XP clients and see if they are still getting the error. I don’t think it prevented people logging on, and I am not using roaming profiles, so even if I still have this issue on occasion it might not be obvious. I think I had run into it when trying to deploy software through group policies.This was a few years ago but I think I had got it resolved. You could try putting one of the problem XP machines on a 10 Mbit only link. Or maybe see if you can configure the NIC settings be be 10 Mbit OR 100 Mbit but not autosensing. *From:* abe...@gmail.com [mailto:abe...@gmail.com] *On Behalf Of *Abe Lau *Sent:* Tuesday, August 31, 2010 8:22 PM *To:* gaiseric.van...@gmail.com *Cc:* samba@lists.samba.org *Subject:* Re: [Samba] Domain not available even minutes after workstation startup Thanks Gaiseric for the note. I checked the XP Event Log, and the only error is: Automatic certificate enrollment for local system failed to contact the active directory (0x8007054b). The specified domain either does not exist or could not be contacted. Enrollment will not be performed. For more information, see Help and Support Center at http://go.microsoft.com/fwlink/events.asp. The only suspicious entry in samba log: (I remember this could safely be ignored) [2010/09/01 09:10:17, 1] smbd/session.c:111(session_claim) Re-using invalid record The PDC was changed to connect via two bonded gigabit connection (balance-alb) in a mixed 1000/100 network few months ago. Contrary to the MS support link, we have problem with both 100Mbps and 1000Mbps connections intermittently. Is any way to get XP to split out detailed log when it says domain is not available? Is setting Winlogoncachedlogonscount the good way to avoid logon problem when network is not ready during initial bootup? According to MS, if the domain server is not available and logon data is not cached, domain is not available will occur. http://technet.microsoft.com/en-us/library/cc957390.aspx Any further insight? Abe On Tue, Aug 31, 2010 at 10:00 PM, Gaiseric Vandal gaiseric.van...@gmail.com wrote: Did you check the event logs in Windows- they may provide some additional info. This error sounded familiar- most of my users are in a Samba domain, but I have one group that uses Windows 2003 active directory domain. A few years back they had some weird issues that ended up being (possibly) related to the gigabit network connection.It had been hard to trace and had only been affecting newer machines. I think the following link was relevant. http://support.microsoft.com/kb/326152/ On 08/30/2010 11:29 PM, Abe Lau wrote: Yes, the PDC is also acting as the WINS server. The XP workstation is using WINS, set via DHCP (option netbios-name-servers ip address of the PDC;) On Mon, Aug 30, 2010 at 10:43 PM, Gaiseric Vandal gaiseric.van...@gmail.com mailto:gaiseric.van...@gmail.com wrote: Is the PDC also a WINS server? Are the XP workstations using WINS? On 08/29/2010 09:01 PM, Abe Lau wrote: Hi all, I have recently experienced an intermittent problem of getting the error message of Domain not available at initial logon of some XP workstations connected to a Samba PDC. The domain does not seems to be available after some time after initial bootup of the XP workstation, from a minute or two, to more than 10 minutes sometimes. Is there anyway to speed up this process? Thanks! I have set HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogoncachedlogonscount to 0 to workaround the problem of having the logon frozen (and folders not being redirected) during initial logon when the network is not ready. Abe -- 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 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] failed to set machine spn: Operations error
On Tue, Aug 31, 2010 at 12:15 PM, rajat swarup raj...@gmail.com wrote: On Mon, Aug 30, 2010 at 7:21 PM, rajat swarup raj...@gmail.com wrote: I have samba, winbind, kerberos installed on an ubuntu server. I have a windows server 2003 based domain. when i try to execute the following command: net ads join -U user I get the following error: Failed to join domain: failed to set machine spn: Operations error Kerberos authentication works fine and I can get the kerberos ticket just fine. This setup was working fine earlier. I was able to authenticate to the windows server This started happening when I upgraded the samba version using aptitude. Also I get the following error when I restart the samba daemon (/etc/init.d/samba4 start) Unknown enumerated value 'ads' for 'security' [Wed Sep 1 01:25:51 2010 EDT, 0 smbd/server.c:285:binary_smbd_main()] samba version 4.0.0alpha9-GIT-9733816 started. Copyright Andrew Tridgell and the Samba Team 1992-2009 [Wed Sep 1 01:25:51 2010 EDT, 0 smbd/server.c:366:binary_smbd_main()] samba: using 'standard' process model [Wed Sep 1 01:25:51 2010 EDT, 0 smbd/service_task.c:36:task_server_terminate()] task_server_terminate: [ldap_server: no LDAP server required in standalone configuration] [Wed Sep 1 01:25:51 2010 EDT, 0 smbd/service_task.c:36:task_server_terminate()] [Wed Sep 1 01:25:51 2010 EDT, 0 smbd/service_task.c:36:task_server_terminate()] task_server_terminate: [cldap_server: no CLDAP server required in standalone configuration] task_server_terminate: [kdc: no KDC required in standalone configuration] [Wed Sep 1 01:25:51 2010 EDT, 0 smbd/service_task.c:36:task_server_terminate()] task_server_terminate: [dreplsrv: no DSDB replication required in standalone configuration] [Wed Sep 1 01:25:51 2010 EDT, 0 smbd/service_task.c:36:task_server_terminate()] task_server_terminate: [NT_STATUS_CANT_ACCESS_DOMAIN_INFO] [Wed Sep 1 01:25:51 2010 EDT, 0 smbd/service_task.c:36:task_server_terminate()] task_server_terminate: [kccsrv: no KCC required in standalone configuration] [Wed Sep 1 01:26:38 2010 EDT, 0 ../lib/util/fault.c:162:fault_report()] =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= [Wed Sep 1 01:26:38 2010 EDT, 0 ../lib/util/fault.c:163:fault_report()] INTERNAL ERROR: Signal 11 in pid 11858 (4.0.0alpha9-GIT-9733816)[Wed Sep 1 01:26:38 2010 EDT, 0 ../lib/util/fault.c:164:fault_report()] Please read the file BUGS.txt in the distribution [Wed Sep 1 01:26:38 2010 EDT, 0 ../lib/util/fault.c:165:fault_report()] =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= [Wed Sep 1 01:26:38 2010 EDT, 0 ../lib/util/fault.c:143:smb_panic()] PANIC: internal error [Wed Sep 1 01:26:38 2010 EDT, 0 ../lib/util/fault.c:62:call_backtrace()] BACKTRACE: 29 stack frames: #0 /usr/sbin/samba(call_backtrace+0x1f) [0xd3ba03] #1 /usr/sbin/samba(smb_panic+0x2bd) [0xd3bdae] #2 /usr/sbin/samba() [0xd3bf50] #3 /usr/sbin/samba(fault_setup+0) [0xd3bf7f] #4 /lib/libpthread.so.0(+0xf8f0) [0x7f59116be8f0] #5 /usr/sbin/samba() [0xd4a4c4] #6 /usr/sbin/samba(convert_string_talloc_convenience+0x7b) [0xd4ace3] #7 /usr/sbin/samba(ndr_pull_string+0x10e9) [0xd262c5] #8 /usr/sbin/samba() [0xac765c] #9 /usr/sbin/samba() [0xac7b44] #10 /usr/sbin/samba(ndr_pull_dgram_smb_packet+0x2c1) [0xac820f] #11 /usr/sbin/samba() [0xac859b] #12 /usr/sbin/samba() [0xac8964] #13 /usr/sbin/samba() [0xac8e94] #14 /usr/sbin/samba(ndr_pull_nbt_dgram_packet+0x16c) [0xac9470] #15 /usr/sbin/samba(ndr_pull_struct_blob+0x5b) [0xd2eb25] #16 /usr/sbin/samba() [0x83d83d] #17 /usr/sbin/samba() [0x83dcec] #18 /usr/lib/libtevent.so.0(+0x577e) [0x7f590fa3677e] #19 /usr/lib/libtevent.so.0(_tevent_loop_once+0x90) [0x7f590fa339f0] #20 /usr/lib/libtevent.so.0(+0x2a5b) [0x7f590fa33a5b] #21 /usr/sbin/samba() [0xd31b5b] #22 /usr/sbin/samba(task_server_startup+0x89) [0x4c9054] #23 /usr/sbin/samba() [0x4c6c6a] #24 /usr/sbin/samba(server_service_startup+0x134) [0x4c6dbe] #25 /usr/sbin/samba() [0x4c614f] #26 /usr/sbin/samba(main+0x24) [0x4c6222] #27 /lib/libc.so.6(__libc_start_main+0xfd) [0x7f590f6ccc4d] #28 /usr/sbin/samba() [0x4c5219] [Wed Sep 1 01:28:22 2010 EDT, 0 smbd/server.c:117:sig_term()] [Wed Sep 1 01:28:22 2010 EDT, 0 smbd/server.c:117:sig_term()] Exiting pid 11856 on SIGTERM Exiting pid 11865 on SIGTERM [Wed Sep 1 01:28:22 2010 EDT, 0 smbd/server.c:112:sig_term()] SIGTERM: killing children [Wed Sep 1 01:28:22 2010 EDT, 0 smbd/server.c:117:sig_term()] Exiting pid 11854 on SIGTERM [Wed Sep 1 01:28:22 2010 EDT, 0 smbd/server.c:117:sig_term()] [Wed Sep 1 01:28:22 2010 EDT, 0 smbd/server.c:117:sig_term()] Exiting pid 11857 on SIGTERM Exiting pid 11859 on SIGTERM [Wed Sep 1 01:28:23 2010 EDT, 0 smbd/server.c:285:binary_smbd_main()] samba version 4.0.0alpha9-GIT-9733816 started. Copyright Andrew Tridgell and the Samba Team 1992-2009 [Wed Sep 1 01:28:23 2010 EDT, 0 smbd/server.c:366:binary_smbd_main()] samba: using 'standard' process model [Wed Sep 1 01:28:23 2010
Build status as of Tue Aug 31 06:00:02 2010
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2010-08-30 00:00:02.0 -0600 +++ /home/build/master/cache/broken_results.txt 2010-08-31 00:00:15.0 -0600 @@ -1,4 +1,4 @@ -Build status as of Mon Aug 30 06:00:01 2010 +Build status as of Tue Aug 31 06:00:02 2010 Build counts: Tree Total Broken Panic @@ -16,7 +16,7 @@ samba_3_current 32 32 4 samba_3_master 32 31 1 samba_3_next 32 32 5 -samba_4_0_waf 36 34 1 +samba_4_0_waf 36 33 0 talloc 32 8 0 tdb 30 8 0
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via c2e2be5 packaging: cifsutils are no longer part of Samba
from eee63b7 s3-auth Rename NT_USER_TOKEN privileges - privilege_mask
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit c2e2be51a64dab19b001bddb39341a035ba6a2a1
Author: Volker Lendecke v...@samba.org
Date: Mon Aug 30 09:55:44 2010 -0600
packaging: cifsutils are no longer part of Samba
---
Summary of changes:
packaging/RHEL-CTDB/samba.spec.tmpl | 11 ---
1 files changed, 0 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl
b/packaging/RHEL-CTDB/samba.spec.tmpl
index fd5380f..6199dff 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -360,12 +360,8 @@ install -m644 setup/samba.pamd
$RPM_BUILD_ROOT%{_sysconfdir}/pam.d/samba
install -m755 setup/smbprint $RPM_BUILD_ROOT%{_bindir}
install -m644 setup/smbusers $RPM_BUILD_ROOT%{_sysconfdir}/samba/smbusers
install -m644 setup/smb.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
-install -m755 source3/bin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
-install -m755 source3/bin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
install -m755 source3/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
-/bin/rm $RPM_BUILD_ROOT%{_sbindir}/*mount.cifs
-
ln -s ../..%{initdir}/smb $RPM_BUILD_ROOT%{_sbindir}/samba
ln -s ../..%{initdir}/winbind $RPM_BUILD_ROOT%{_sbindir}/winbind
@@ -538,10 +534,6 @@ exit 0
%files client
%defattr(-,root,root)
-/sbin/mount.cifs
-/sbin/umount.cifs
-
-%{_sbindir}/cifs.upcall
%{_bindir}/rpcclient
%{_bindir}/smbcacls
@@ -555,9 +547,6 @@ exit 0
%{_bindir}/smbtree
%{_bindir}/sharesec
-%{_mandir}/man8/mount.cifs.8.*
-%{_mandir}/man8/umount.cifs.8.*
-%{_mandir}/man8/cifs.upcall.8*
%{_mandir}/man8/smbspool.8*
%{_mandir}/man1/smbget.1*
%{_mandir}/man5/smbgetrc.5*
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via d163b02 packaging: cifsutils are no longer part of Samba
from 20088f3 vfs_smb_traffic_analyzer: fix off by a second bug
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit d163b0266f16567046b936227d0e079802e061ef
Author: Volker Lendecke v...@samba.org
Date: Mon Aug 30 09:55:44 2010 -0600
packaging: cifsutils are no longer part of Samba
---
Summary of changes:
packaging/RHEL-CTDB/samba.spec.tmpl | 11 ---
1 files changed, 0 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl
b/packaging/RHEL-CTDB/samba.spec.tmpl
index fd5380f..6199dff 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -360,12 +360,8 @@ install -m644 setup/samba.pamd
$RPM_BUILD_ROOT%{_sysconfdir}/pam.d/samba
install -m755 setup/smbprint $RPM_BUILD_ROOT%{_bindir}
install -m644 setup/smbusers $RPM_BUILD_ROOT%{_sysconfdir}/samba/smbusers
install -m644 setup/smb.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
-install -m755 source3/bin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
-install -m755 source3/bin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
install -m755 source3/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
-/bin/rm $RPM_BUILD_ROOT%{_sbindir}/*mount.cifs
-
ln -s ../..%{initdir}/smb $RPM_BUILD_ROOT%{_sbindir}/samba
ln -s ../..%{initdir}/winbind $RPM_BUILD_ROOT%{_sbindir}/winbind
@@ -538,10 +534,6 @@ exit 0
%files client
%defattr(-,root,root)
-/sbin/mount.cifs
-/sbin/umount.cifs
-
-%{_sbindir}/cifs.upcall
%{_bindir}/rpcclient
%{_bindir}/smbcacls
@@ -555,9 +547,6 @@ exit 0
%{_bindir}/smbtree
%{_bindir}/sharesec
-%{_mandir}/man8/mount.cifs.8.*
-%{_mandir}/man8/umount.cifs.8.*
-%{_mandir}/man8/cifs.upcall.8*
%{_mandir}/man8/smbspool.8*
%{_mandir}/man1/smbget.1*
%{_mandir}/man5/smbgetrc.5*
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 8c6ca6e s3: we have clock_gettime everywhere, remove ifdefs via 8589f46 s3: use clock_gettime() in timespec_current() via 3df1037 libreplace: add clock_gettime replacement function for systems that don't have it via 9f87bc4 libreplace/waf: look for clock_gettime via 4e104f1 libreplace: move detection of clock_gettime to libreplace via e866224 libreplace: move gettimeofday TZ arg check here from c2e2be5 packaging: cifsutils are no longer part of Samba http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 8c6ca6e25a4d33e4f9ae2ef13a3872cd533ba6f6 Author: Björn Jacke b...@sernet.de Date: Tue Aug 24 11:14:19 2010 +0200 s3: we have clock_gettime everywhere, remove ifdefs commit 8589f46b86b8acd0439e1325818cc69f9050240d Author: Björn Jacke b...@sernet.de Date: Mon Aug 30 16:51:56 2010 +0200 s3: use clock_gettime() in timespec_current() commit 3df1037a74181ef314e2115ade836546a572ee48 Author: Björn Jacke b...@sernet.de Date: Thu Aug 19 19:07:04 2010 +0200 libreplace: add clock_gettime replacement function for systems that don't have it commit 9f87bc4588c2ac669f6e808158dca7ec8517a461 Author: Björn Jacke b...@sernet.de Date: Fri Aug 27 00:13:07 2010 +0200 libreplace/waf: look for clock_gettime commit 4e104f185e1aa12c0923e82d3991a658eb2b9474 Author: Björn Jacke b...@sernet.de Date: Thu Aug 19 18:39:45 2010 +0200 libreplace: move detection of clock_gettime to libreplace commit e8662248c8bf7dfc830ce34f301f30f59e600cd8 Author: Björn Jacke b...@sernet.de Date: Mon Aug 30 14:35:49 2010 +0200 libreplace: move gettimeofday TZ arg check here --- Summary of changes: lib/replace/README |1 + lib/replace/libreplace.m4| 43 ++ lib/replace/replace.c| 21 lib/replace/replace.h|4 +++ lib/replace/system/config.m4 | 10 + lib/replace/system/time.h|6 + lib/replace/wscript |1 + lib/util/time.m4 |9 source3/configure.in | 20 +- source3/include/smbprofile.h | 13 source3/lib/time.c |5 +--- source3/m4/aclocal.m4| 31 -- source3/profile/profile.c|7 -- source4/configure.ac |1 - 14 files changed, 89 insertions(+), 83 deletions(-) delete mode 100644 lib/util/time.m4 Changeset truncated at 500 lines: diff --git a/lib/replace/README b/lib/replace/README index b2d2e4f..bf4e67f 100644 --- a/lib/replace/README +++ b/lib/replace/README @@ -33,6 +33,7 @@ opendir readdir telldir seekdir +clock_gettime closedir dlopen dlclose diff --git a/lib/replace/libreplace.m4 b/lib/replace/libreplace.m4 index 2303641..0d716e0 100644 --- a/lib/replace/libreplace.m4 +++ b/lib/replace/libreplace.m4 @@ -115,6 +115,12 @@ AC_CHECK_FUNCS(fdatasync,,[ [libreplace_cv_HAVE_FDATASYNC_IN_LIBRT=yes AC_DEFINE(HAVE_FDATASYNC, 1, Define to 1 if there is support for fdatasync)]) ]) +AC_CHECK_FUNCS(clock_gettime,libreplace_cv_have_clock_gettime=yes,[ + AC_CHECK_LIB(rt, clock_gettime, + [libreplace_cv_HAVE_CLOCK_GETTIME_IN_LIBRT=yes + libreplace_cv_have_clock_gettime=yes + AC_DEFINE(HAVE_CLOCK_GETTIME, 1, Define to 1 if there is support for clock_gettime)]) +]) AC_CHECK_FUNCS(get_current_dir_name) AC_HAVE_DECL(setresuid, [#include unistd.h]) AC_HAVE_DECL(setresgid, [#include unistd.h]) @@ -288,6 +294,12 @@ m4_include(timegm.m4) m4_include(repdir.m4) m4_include(crypt.m4) +if test x$libreplace_cv_have_clock_gettime = xyes ; then + SMB_CHECK_CLOCK_ID(CLOCK_MONOTONIC) + SMB_CHECK_CLOCK_ID(CLOCK_PROCESS_CPUTIME_ID) + SMB_CHECK_CLOCK_ID(CLOCK_REALTIME) +fi + AC_CHECK_FUNCS([printf memset memcpy],,[AC_MSG_ERROR([Required function not found])]) echo LIBREPLACE_BROKEN_CHECKS: END @@ -316,4 +328,35 @@ m4_include(libreplace_ld.m4) m4_include(libreplace_network.m4) m4_include(libreplace_macros.m4) + +dnl SMB_CHECK_CLOCK_ID(clockid) +dnl Test whether the specified clock_gettime clock ID is available. If it +dnl is, we define HAVE_clockid +AC_DEFUN([SMB_CHECK_CLOCK_ID], +[ +AC_MSG_CHECKING(for $1) +AC_TRY_LINK([ +#if TIME_WITH_SYS_TIME +# include sys/time.h +# include time.h +#else +# if HAVE_SYS_TIME_H +# include sys/time.h +# else +# include time.h +# endif +#endif +], +[ +clockid_t clk = $1; +], +[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_$1, 1, + [Whether the clock_gettime clock ID $1 is available]) +], +[ + AC_MSG_RESULT(no) +]) +]) m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[m4_include(autoconf-2.60.m4)]) diff --git
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 4c8531b s4/torture: use monotonic clock for time deltas in denytest
via 6000260 s4/ldb: use monotonic clock for time deltas in ldbtest
via 8aa0b70 s3: use monotonic time in timeout of sys_select_intr()
via 73ad77f lib/util: add nsec_time_diff to calulate diffs from
timespecs
via 0ca6a73 s3: use monotonic clock for time deltas in namequery
functions
via 5728b0f s3: use monotonic clock for time deltas in smbtar
via fc67675 s3: use monotonic clock for time deltas in smbclient
via 6e9747c s3: add TspecDiff macro
via 4b09919 s4:process_thread: use monotonic time for time deltas
via c091b33 lib/util: add function to query the monotonic clock with
the required fallback to the realtime clock
via 63b1f2e libreplace: make a define for a best effort monotonic clock
from 8c6ca6e s3: we have clock_gettime everywhere, remove ifdefs
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4c8531b642c579e69c27a8920c1aacbee04260c9
Author: Björn Jacke b...@sernet.de
Date: Mon Aug 30 18:58:20 2010 +0200
s4/torture: use monotonic clock for time deltas in denytest
commit 60002600b86808551df0fb9b907869590b670450
Author: Björn Jacke b...@sernet.de
Date: Mon Aug 30 18:54:42 2010 +0200
s4/ldb: use monotonic clock for time deltas in ldbtest
commit 8aa0b709d4924262c73c96d54bc0a28fa8b8aff0
Author: Björn Jacke b...@sernet.de
Date: Mon Aug 30 18:02:19 2010 +0200
s3: use monotonic time in timeout of sys_select_intr()
commit 73ad77f20a136b74a4ae381c8b97acf248d3c8fe
Author: Björn Jacke b...@sernet.de
Date: Mon Aug 30 17:56:37 2010 +0200
lib/util: add nsec_time_diff to calulate diffs from timespecs
commit 0ca6a73d011abd20d8a9256f6dfe3517bd1a27ef
Author: Björn Jacke b...@sernet.de
Date: Mon Aug 30 15:46:22 2010 +0200
s3: use monotonic clock for time deltas in namequery functions
commit 5728b0fb5f59f856d2f20a5237dc31a1ca0c4afe
Author: Björn Jacke b...@sernet.de
Date: Mon Aug 30 15:44:54 2010 +0200
s3: use monotonic clock for time deltas in smbtar
commit fc6767502896dfcd74767deae4775b3177369598
Author: Björn Jacke b...@sernet.de
Date: Mon Aug 30 12:15:54 2010 +0200
s3: use monotonic clock for time deltas in smbclient
commit 6e9747c1ce4806c0b81400f2627579e0bbf95207
Author: Björn Jacke b...@sernet.de
Date: Mon Aug 30 15:30:16 2010 +0200
s3: add TspecDiff macro
commit 4b09919f70b171bc6e053bc3014ffc0e36bc1ff1
Author: Björn Jacke b...@sernet.de
Date: Wed Aug 25 12:23:50 2010 +0200
s4:process_thread: use monotonic time for time deltas
commit c091b3344badac6241b85c6cf2f7dacb0f06047c
Author: Björn Jacke b...@sernet.de
Date: Mon Aug 30 12:10:29 2010 +0200
lib/util: add function to query the monotonic clock with the required
fallback to the realtime clock
commit 63b1f2ee813b430e1f4bec3abb28a6266f8a82c8
Author: Björn Jacke b...@sernet.de
Date: Thu Aug 26 12:22:02 2010 +0200
libreplace: make a define for a best effort monotonic clock
---
Summary of changes:
lib/replace/system/time.h|7 +++
lib/util/time.c | 19 +++
lib/util/time.h | 10 ++
source3/client/client.c | 28 +---
source3/client/clitar.c | 14 +++---
source3/include/smb_macros.h |9 +
source3/lib/select.c | 21 +++--
source3/libsmb/namequery.c | 24
source4/lib/ldb/tools/ldbtest.c |8
source4/smbd/process_thread.c| 19 ++-
source4/torture/basic/denytest.c | 30 +++---
11 files changed, 117 insertions(+), 72 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/system/time.h b/lib/replace/system/time.h
index ff26531..3605d26 100644
--- a/lib/replace/system/time.h
+++ b/lib/replace/system/time.h
@@ -67,9 +67,16 @@ int rep_utimes(const char *filename, const struct timeval
tv[2]);
#endif
#ifndef HAVE_CLOCK_GETTIME
+/* CLOCK_REALTIME is required by POSIX */
#define CLOCK_REALTIME 0
typedef int clockid_t;
int rep_clock_gettime(clockid_t clk_id, struct timespec *tp);
#endif
+/* make sure we have a best effort CUSTOM_CLOCK_MONOTONIC we can rely on */
+#ifndef CLOCK_MONOTONIC
+#define CUSTOM_CLOCK_MONOTONIC CLOCK_REALTIME
+#else
+#define CUSTOM_CLOCK_MONOTONIC CLOCK_MONOTONIC
+#endif
#endif
diff --git a/lib/util/time.c b/lib/util/time.c
index 571219b..5ecf93c 100644
--- a/lib/util/time.c
+++ b/lib/util/time.c
@@ -55,6 +55,16 @@ _PUBLIC_ void GetTimeOfDay(struct timeval *tval)
#endif
}
+/**
+a wrapper to preferably get the monotonic time
+**/
+_PUBLIC_ void clock_gettime_mono(struct timespec *tp)
+{
+ if
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 7eff519 packaging: build fixes
from 4c8531b s4/torture: use monotonic clock for time deltas in denytest
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 7eff519703f15d123c9b256a674b1c6ad8c84446
Author: Volker Lendecke v...@samba.org
Date: Tue Aug 31 03:29:55 2010 -0600
packaging: build fixes
---
Summary of changes:
packaging/RHEL-CTDB/samba.spec.tmpl | 18 +-
1 files changed, 9 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl
b/packaging/RHEL-CTDB/samba.spec.tmpl
index 6199dff..00f85af 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -15,7 +15,7 @@ URL: http://www.samba.org/
Source: samba-%{version}.tar.bz2
# Don't depend on Net::LDAP
-Source997: docs.tar.bz2
+Source997: docs-3.6.tar.bz2
Source998: filter-requires-samba.sh
Source999: setup.tar.bz2
@@ -471,6 +471,8 @@ exit 0
%{_libarchdir}/samba/vfs/aio_fork.so
%{_libarchdir}/samba/vfs/audit.so
%{_libarchdir}/samba/vfs/cap.so
+%{_libarchdir}/samba/vfs/catia.so
+%{_libarchdir}/samba/vfs/crossrename.so
%{_libarchdir}/samba/vfs/default_quota.so
%{_libarchdir}/samba/vfs/dirsort.so
%{_libarchdir}/samba/vfs/expand_msdfs.so
@@ -479,11 +481,13 @@ exit 0
%{_libarchdir}/samba/vfs/fileid.so
%{_libarchdir}/samba/vfs/full_audit.so
%{_libarchdir}/samba/vfs/gpfs.so
+%{_libarchdir}/samba/vfs/linux_xfs_sgid.so
%{_libarchdir}/samba/vfs/netatalk.so
%{_libarchdir}/samba/vfs/preopen.so
%{_libarchdir}/samba/vfs/readahead.so
%{_libarchdir}/samba/vfs/readonly.so
%{_libarchdir}/samba/vfs/recycle.so
+%{_libarchdir}/samba/vfs/scannedonly.so
%{_libarchdir}/samba/vfs/shadow_copy.so
%{_libarchdir}/samba/vfs/shadow_copy2.so
%{_libarchdir}/samba/vfs/smb_traffic_analyzer.so
@@ -546,6 +550,7 @@ exit 0
%{_bindir}/smbtar
%{_bindir}/smbtree
%{_bindir}/sharesec
+%{_bindir}/smbta-util
%{_mandir}/man8/smbspool.8*
%{_mandir}/man1/smbget.1*
@@ -575,6 +580,7 @@ exit 0
%attr(755,root,root) /%{_libarch}/security/pam_winbind.so
%attr(755,root,root) /%{_libarch}/security/pam_smbpass.so
/usr/share/locale/*/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/*/LC_MESSAGES/net.mo
%{_libarchdir}/samba/charset/CP437.so
%{_libarchdir}/samba/charset/CP850.so
@@ -601,7 +607,7 @@ exit 0
%{_libarchdir}/libnetapi.so
%{_libarchdir}/libnetapi.so.0
%{_libarchdir}/libtalloc.so
-%{_libarchdir}/libtalloc.so.1
+%{_libarchdir}/libtalloc.so.2
%{_libarchdir}/libtdb.so
%{_libarchdir}/libtdb.so.1
%{_libarchdir}/libwbclient.so
@@ -616,12 +622,6 @@ exit 0
%{_bindir}/smbpasswd
%{_bindir}/profiles
%{_bindir}/net
-%{_bindir}/ldbadd
-%{_bindir}/ldbdel
-%{_bindir}/ldbedit
-%{_bindir}/ldbmodify
-%{_bindir}/ldbsearch
-%{_bindir}/ldbrename
%{_bindir}/wbinfo
%{_bindir}/ntlm_auth
%{_bindir}/pdbedit
@@ -655,7 +655,7 @@ exit 0
%attr(755,root,root) /lib/libnss_winbind.so
%attr(755,root,root) /lib/libnss_winbind.so.2
%attr(755,root,root) /usr/lib/libtalloc.so
-%attr(755,root,root) /usr/lib/libtalloc.so.1
+%attr(755,root,root) /usr/lib/libtalloc.so.2
%attr(755,root,root) /usr/lib/libtdb.so
%attr(755,root,root) /usr/lib/libtdb.so.1
%attr(755,root,root) /usr/lib/libwbclient.so
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via fe6f72a packaging: build fixes
from d163b02 packaging: cifsutils are no longer part of Samba
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit fe6f72af2b74dfb41c067a08ed5647a65f609a7a
Author: Volker Lendecke v...@samba.org
Date: Tue Aug 31 03:29:55 2010 -0600
packaging: build fixes
---
Summary of changes:
packaging/RHEL-CTDB/samba.spec.tmpl | 18 +-
1 files changed, 9 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl
b/packaging/RHEL-CTDB/samba.spec.tmpl
index 6199dff..00f85af 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -15,7 +15,7 @@ URL: http://www.samba.org/
Source: samba-%{version}.tar.bz2
# Don't depend on Net::LDAP
-Source997: docs.tar.bz2
+Source997: docs-3.6.tar.bz2
Source998: filter-requires-samba.sh
Source999: setup.tar.bz2
@@ -471,6 +471,8 @@ exit 0
%{_libarchdir}/samba/vfs/aio_fork.so
%{_libarchdir}/samba/vfs/audit.so
%{_libarchdir}/samba/vfs/cap.so
+%{_libarchdir}/samba/vfs/catia.so
+%{_libarchdir}/samba/vfs/crossrename.so
%{_libarchdir}/samba/vfs/default_quota.so
%{_libarchdir}/samba/vfs/dirsort.so
%{_libarchdir}/samba/vfs/expand_msdfs.so
@@ -479,11 +481,13 @@ exit 0
%{_libarchdir}/samba/vfs/fileid.so
%{_libarchdir}/samba/vfs/full_audit.so
%{_libarchdir}/samba/vfs/gpfs.so
+%{_libarchdir}/samba/vfs/linux_xfs_sgid.so
%{_libarchdir}/samba/vfs/netatalk.so
%{_libarchdir}/samba/vfs/preopen.so
%{_libarchdir}/samba/vfs/readahead.so
%{_libarchdir}/samba/vfs/readonly.so
%{_libarchdir}/samba/vfs/recycle.so
+%{_libarchdir}/samba/vfs/scannedonly.so
%{_libarchdir}/samba/vfs/shadow_copy.so
%{_libarchdir}/samba/vfs/shadow_copy2.so
%{_libarchdir}/samba/vfs/smb_traffic_analyzer.so
@@ -546,6 +550,7 @@ exit 0
%{_bindir}/smbtar
%{_bindir}/smbtree
%{_bindir}/sharesec
+%{_bindir}/smbta-util
%{_mandir}/man8/smbspool.8*
%{_mandir}/man1/smbget.1*
@@ -575,6 +580,7 @@ exit 0
%attr(755,root,root) /%{_libarch}/security/pam_winbind.so
%attr(755,root,root) /%{_libarch}/security/pam_smbpass.so
/usr/share/locale/*/LC_MESSAGES/pam_winbind.mo
+/usr/share/locale/*/LC_MESSAGES/net.mo
%{_libarchdir}/samba/charset/CP437.so
%{_libarchdir}/samba/charset/CP850.so
@@ -601,7 +607,7 @@ exit 0
%{_libarchdir}/libnetapi.so
%{_libarchdir}/libnetapi.so.0
%{_libarchdir}/libtalloc.so
-%{_libarchdir}/libtalloc.so.1
+%{_libarchdir}/libtalloc.so.2
%{_libarchdir}/libtdb.so
%{_libarchdir}/libtdb.so.1
%{_libarchdir}/libwbclient.so
@@ -616,12 +622,6 @@ exit 0
%{_bindir}/smbpasswd
%{_bindir}/profiles
%{_bindir}/net
-%{_bindir}/ldbadd
-%{_bindir}/ldbdel
-%{_bindir}/ldbedit
-%{_bindir}/ldbmodify
-%{_bindir}/ldbsearch
-%{_bindir}/ldbrename
%{_bindir}/wbinfo
%{_bindir}/ntlm_auth
%{_bindir}/pdbedit
@@ -655,7 +655,7 @@ exit 0
%attr(755,root,root) /lib/libnss_winbind.so
%attr(755,root,root) /lib/libnss_winbind.so.2
%attr(755,root,root) /usr/lib/libtalloc.so
-%attr(755,root,root) /usr/lib/libtalloc.so.1
+%attr(755,root,root) /usr/lib/libtalloc.so.2
%attr(755,root,root) /usr/lib/libtdb.so
%attr(755,root,root) /usr/lib/libtdb.so.1
%attr(755,root,root) /usr/lib/libwbclient.so
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 7c88ccd replace/waf: add rt to deps at this place
via f222387 s4: use GetTimeOfDay macro instead of gettimeofday
from 7eff519 packaging: build fixes
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 7c88ccde30b824e14183f7fd07f0c307c7ff693d
Author: Björn Jacke b...@sernet.de
Date: Tue Aug 31 11:31:19 2010 +0200
replace/waf: add rt to deps at this place
commit f222387533645689b8529235d5e6c77418064f9e
Author: Björn Jacke b...@sernet.de
Date: Tue Aug 31 11:30:17 2010 +0200
s4: use GetTimeOfDay macro instead of gettimeofday
---
Summary of changes:
lib/replace/wscript |2 +-
source4/torture/libnet/userman.c |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 8c1c57f..35e376a 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -364,7 +364,7 @@ def build(bld):
# libraries are loaded, but this
doesn't appear to work
# at the moment:
#
hide_symbols=bld.BUILTIN_LIBRARY('replace'),
- deps='crypt dl nsl socket')
+ deps='crypt dl nsl socket rt')
TEST_SOURCES = '''test/testsuite.c test/main.c test/strptime.c
test/os2_delete.c test/getifaddrs.c'''
diff --git a/source4/torture/libnet/userman.c b/source4/torture/libnet/userman.c
index 13fc98d..ad4fa92 100644
--- a/source4/torture/libnet/userman.c
+++ b/source4/torture/libnet/userman.c
@@ -115,7 +115,7 @@ static bool test_usermod(struct torture_context *tctx,
struct dcerpc_pipe *p,
testfld = (random() % USER_FIELD_LAST) + 1;
- gettimeofday(now, NULL);
+ GetTimeOfDay(now);
switch (testfld) {
case acct_name:
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 6598298 s4/heimdal_build: use GetTimeOfDay macro instead of
gettimeofday
via b4ae2ef s3: use monotonic clock for time deltas in smbget
via 2025422 tdb/waf: the deps for rt are provided by libreplace
from 7c88ccd replace/waf: add rt to deps at this place
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 659829851703797b47d398d3c71ad971b2c5dab7
Author: Björn Jacke b...@sernet.de
Date: Tue Aug 31 13:11:13 2010 +0200
s4/heimdal_build: use GetTimeOfDay macro instead of gettimeofday
commit b4ae2efa963649c46fa4a3e3ad054c691f38af5b
Author: Björn Jacke b...@sernet.de
Date: Tue Aug 31 13:10:45 2010 +0200
s3: use monotonic clock for time deltas in smbget
commit 20254221d2c935ebcf2c4ea4372b1634bd09b1f0
Author: Björn Jacke b...@sernet.de
Date: Tue Aug 31 13:06:39 2010 +0200
tdb/waf: the deps for rt are provided by libreplace
---
Summary of changes:
lib/tdb/wscript |2 +-
source3/utils/smbget.c|7 +--
source4/heimdal_build/roken.h |1 +
3 files changed, 7 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index 2fdd67f..3dfb5ab 100644
--- a/lib/tdb/wscript
+++ b/lib/tdb/wscript
@@ -63,7 +63,7 @@ def build(bld):
if not bld.CONFIG_SET('USING_SYSTEM_TDB'):
bld.SAMBA_LIBRARY('tdb',
COMMON_SRC,
- deps='replace rt',
+ deps='replace',
includes='include',
abi_file='ABI/tdb-%s.sigs' % VERSION,
abi_match='tdb_*',
diff --git a/source3/utils/smbget.c b/source3/utils/smbget.c
index 62ecb34..85bbd24 100644
--- a/source3/utils/smbget.c
+++ b/source3/utils/smbget.c
@@ -276,7 +276,7 @@ static int smb_download_file(const char *base, const char
*name, int recursive,
int resume, int toplevel, char *outfile)
{
int remotehandle, localhandle;
- time_t start_time = time(NULL);
+ struct timespec start_time, now;
const char *newpath;
char path[SMB_MAXPATHLEN];
char checkbuf[2][RESUME_CHECK_SIZE];
@@ -284,6 +284,7 @@ static int smb_download_file(const char *base, const char
*name, int recursive,
off_t offset_download = 0, offset_check = 0, curpos = 0, start_offset =
0;
struct stat localstat, remotestat;
+ clock_gettime_mono(start_time);
snprintf(path, SMB_MAXPATHLEN-1, %s%s%s, base, (*base *name
name[0] != '/' base[strlen(base)-1] != '/')?/:, name);
remotehandle = smbc_open(path, O_RDONLY, 0755);
@@ -466,7 +467,9 @@ static int smb_download_file(const char *base, const char
*name, int recursive,
if(dots)fputc('.', stderr);
else if(!quiet) {
- print_progress(newpath, start_time, time(NULL),
start_offset, curpos, remotestat.st_size);
+ clock_gettime_mono(now);
+ print_progress(newpath, start_time.tv_sec, now.tv_sec,
+ start_offset, curpos,
remotestat.st_size);
}
}
diff --git a/source4/heimdal_build/roken.h b/source4/heimdal_build/roken.h
index 50da1da..e44810d 100644
--- a/source4/heimdal_build/roken.h
+++ b/source4/heimdal_build/roken.h
@@ -118,6 +118,7 @@
#ifndef HAVE_GETTIMEOFDAY
#define HAVE_GETTIMEOFDAY
#endif
+#define gettimeofday(a,b) GetTimeOfDay(a)
#ifndef HAVE_SETEGID
#define HAVE_SETEGID
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 079baa7 s3: use fine grained time in netprot response
from 6598298 s4/heimdal_build: use GetTimeOfDay macro instead of
gettimeofday
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 079baa76884a90740051f8dd0408eea4404adce8
Author: Björn Jacke b...@sernet.de
Date: Wed May 12 10:50:17 2010 +0200
s3: use fine grained time in netprot response
---
Summary of changes:
source3/smbd/negprot.c |7 ---
1 files changed, 4 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index 2908c26..463e1c8 100644
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -267,7 +267,7 @@ static void reply_nt1(struct smb_request *req, uint16
choice)
int secword=0;
char *p, *q;
bool negotiate_spnego = False;
- time_t t = time(NULL);
+ struct timespec ts;
ssize_t ret;
struct smbd_server_connection *sconn = req-sconn;
@@ -359,8 +359,9 @@ static void reply_nt1(struct smb_request *req, uint16
choice)
SIVAL(req-outbuf,smb_vwv5+1,0x1); /* raw size. full 64k */
SIVAL(req-outbuf,smb_vwv7+1,sys_getpid()); /* session key */
SIVAL(req-outbuf,smb_vwv9+1,capabilities); /* capabilities */
- put_long_date((char *)req-outbuf+smb_vwv11+1,t);
- SSVALS(req-outbuf,smb_vwv15+1,set_server_zone_offset(t)/60);
+ clock_gettime(CLOCK_REALTIME,ts);
+ put_long_date_timespec(TIMESTAMP_SET_NT_OR_BETTER,(char
*)req-outbuf+smb_vwv11+1,ts);
+ SSVALS(req-outbuf,smb_vwv15+1,set_server_zone_offset(ts.tv_sec)/60);
p = q = smb_buf(req-outbuf);
if (!negotiate_spnego) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 5648c3f s3: messaging_ctdbd_connection() was only called with
procid_self()
via 808ceac s3: messaging_ctdbd_init potentially modifies my_vnn
via 301bf22 s3: Make ctdbd_init_connection static
from 079baa7 s3: use fine grained time in netprot response
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 5648c3f67eeebee0a17cf9e7b64fb2cbfe2e2e68
Author: Volker Lendecke v...@samba.org
Date: Tue Aug 31 16:52:56 2010 +0200
s3: messaging_ctdbd_connection() was only called with procid_self()
Eventually we'll get this right...
commit 808ceac9f54bb3988fc2bb6b0d86eaded07283e1
Author: Volker Lendecke v...@samba.org
Date: Tue Aug 31 16:51:28 2010 +0200
s3: messaging_ctdbd_init potentially modifies my_vnn
If we call messaging_ctdbd_connection() we end up with the wrong vnn in our
messaging context.
This is a bit of a hack, get_my_vnn() needs to go eventually along with
procid_self()
commit 301bf22eab92999bc4b0f2d733830618b8b9d428
Author: Volker Lendecke v...@samba.org
Date: Tue Aug 31 16:11:10 2010 +0200
s3: Make ctdbd_init_connection static
---
Summary of changes:
source3/include/ctdbd_conn.h |2 --
source3/include/messages.h |2 +-
source3/lib/ctdbd_conn.c |4 ++--
source3/lib/dbwrap_ctdb.c| 13 ++---
source3/lib/g_lock.c | 11 +++
source3/lib/messages.c |1 +
source3/lib/messages_ctdbd.c |4 ++--
source3/lib/util.c |2 +-
source3/smbd/process.c |2 +-
source3/smbd/server.c|3 +--
10 files changed, 18 insertions(+), 26 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/ctdbd_conn.h b/source3/include/ctdbd_conn.h
index c5ba572..80cf717 100644
--- a/source3/include/ctdbd_conn.h
+++ b/source3/include/ctdbd_conn.h
@@ -22,8 +22,6 @@
struct ctdbd_connection;
-NTSTATUS ctdbd_init_connection(TALLOC_CTX *mem_ctx,
- struct ctdbd_connection **pconn);
NTSTATUS ctdbd_messaging_connection(TALLOC_CTX *mem_ctx,
struct ctdbd_connection **pconn);
diff --git a/source3/include/messages.h b/source3/include/messages.h
index a64469e..bf5e5de 100644
--- a/source3/include/messages.h
+++ b/source3/include/messages.h
@@ -116,7 +116,7 @@ bool messaging_tdb_parent_init(void);
NTSTATUS messaging_ctdbd_init(struct messaging_context *msg_ctx,
TALLOC_CTX *mem_ctx,
struct messaging_backend **presult);
-struct ctdbd_connection *messaging_ctdbd_connection(struct server_id id);
+struct ctdbd_connection *messaging_ctdbd_connection(void);
bool message_send_all(struct messaging_context *msg_ctx,
int msg_type,
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 8dba3b2..afc13f2 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -433,8 +433,8 @@ static NTSTATUS ctdb_read_req(struct ctdbd_connection
*conn, uint32 reqid,
* Get us a ctdbd connection
*/
-NTSTATUS ctdbd_init_connection(TALLOC_CTX *mem_ctx,
- struct ctdbd_connection **pconn)
+static NTSTATUS ctdbd_init_connection(TALLOC_CTX *mem_ctx,
+ struct ctdbd_connection **pconn)
{
struct ctdbd_connection *conn;
NTSTATUS status;
diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap_ctdb.c
index ceaadd2..67425dc 100644
--- a/source3/lib/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap_ctdb.c
@@ -794,7 +794,7 @@ static int db_ctdb_transaction_commit(struct db_context *db)
again:
/* tell ctdbd to commit to the other nodes */
- rets = ctdbd_control_local(messaging_ctdbd_connection(procid_self()),
+ rets = ctdbd_control_local(messaging_ctdbd_connection(),
CTDB_CONTROL_TRANS3_COMMIT,
h-ctx-db_id, 0,
db_ctdb_marshall_finish(h-m_write),
@@ -1005,9 +1005,8 @@ again:
((struct ctdb_ltdb_header *)ctdb_data.dptr)-dmaster
: -1,
get_my_vnn()));
- status = ctdbd_migrate(
- messaging_ctdbd_connection(procid_self()), ctx-db_id,
- key);
+ status = ctdbd_migrate(messaging_ctdbd_connection(), ctx-db_id,
+ key);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(5, (ctdb_migrate failed: %s\n,
nt_errstr(status)));
@@ -1112,8 +,8 @@ static int db_ctdb_fetch(struct db_context *db,
TALLOC_CTX *mem_ctx,
SAFE_FREE(ctdb_data.dptr);
/* we weren't able to get it locally - ask ctdb to
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 958fb53 s3: messaging_ctdbd_connection() was only called with
procid_self()
via 91b3df1 s3: messaging_ctdbd_init potentially modifies my_vnn
via 48fa585 s3: Make ctdbd_init_connection static
from fe6f72a packaging: build fixes
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 958fb53833673527dc36cd52511386ae9debb542
Author: Volker Lendecke v...@samba.org
Date: Tue Aug 31 16:52:56 2010 +0200
s3: messaging_ctdbd_connection() was only called with procid_self()
Eventually we'll get this right...
commit 91b3df111827ef5f2ef89f02318a0fbfacd1a3fa
Author: Volker Lendecke v...@samba.org
Date: Tue Aug 31 16:51:28 2010 +0200
s3: messaging_ctdbd_init potentially modifies my_vnn
If we call messaging_ctdbd_connection() we end up with the wrong vnn in our
messaging context.
This is a bit of a hack, get_my_vnn() needs to go eventually along with
procid_self()
commit 48fa585249f160cdc2bd7b69d3cb914f7982cfb1
Author: Volker Lendecke v...@samba.org
Date: Tue Aug 31 16:11:10 2010 +0200
s3: Make ctdbd_init_connection static
---
Summary of changes:
source3/include/ctdbd_conn.h |2 --
source3/include/messages.h |2 +-
source3/lib/ctdbd_conn.c |4 ++--
source3/lib/dbwrap_ctdb.c| 13 ++---
source3/lib/g_lock.c |8 +++-
source3/lib/messages.c |1 +
source3/lib/messages_ctdbd.c |4 ++--
source3/lib/util.c |2 +-
source3/smbd/process.c |2 +-
source3/smbd/server.c|3 +--
10 files changed, 18 insertions(+), 23 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/ctdbd_conn.h b/source3/include/ctdbd_conn.h
index c5ba572..80cf717 100644
--- a/source3/include/ctdbd_conn.h
+++ b/source3/include/ctdbd_conn.h
@@ -22,8 +22,6 @@
struct ctdbd_connection;
-NTSTATUS ctdbd_init_connection(TALLOC_CTX *mem_ctx,
- struct ctdbd_connection **pconn);
NTSTATUS ctdbd_messaging_connection(TALLOC_CTX *mem_ctx,
struct ctdbd_connection **pconn);
diff --git a/source3/include/messages.h b/source3/include/messages.h
index a64469e..bf5e5de 100644
--- a/source3/include/messages.h
+++ b/source3/include/messages.h
@@ -116,7 +116,7 @@ bool messaging_tdb_parent_init(void);
NTSTATUS messaging_ctdbd_init(struct messaging_context *msg_ctx,
TALLOC_CTX *mem_ctx,
struct messaging_backend **presult);
-struct ctdbd_connection *messaging_ctdbd_connection(struct server_id id);
+struct ctdbd_connection *messaging_ctdbd_connection(void);
bool message_send_all(struct messaging_context *msg_ctx,
int msg_type,
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 8dba3b2..afc13f2 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -433,8 +433,8 @@ static NTSTATUS ctdb_read_req(struct ctdbd_connection
*conn, uint32 reqid,
* Get us a ctdbd connection
*/
-NTSTATUS ctdbd_init_connection(TALLOC_CTX *mem_ctx,
- struct ctdbd_connection **pconn)
+static NTSTATUS ctdbd_init_connection(TALLOC_CTX *mem_ctx,
+ struct ctdbd_connection **pconn)
{
struct ctdbd_connection *conn;
NTSTATUS status;
diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap_ctdb.c
index ceaadd2..67425dc 100644
--- a/source3/lib/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap_ctdb.c
@@ -794,7 +794,7 @@ static int db_ctdb_transaction_commit(struct db_context *db)
again:
/* tell ctdbd to commit to the other nodes */
- rets = ctdbd_control_local(messaging_ctdbd_connection(procid_self()),
+ rets = ctdbd_control_local(messaging_ctdbd_connection(),
CTDB_CONTROL_TRANS3_COMMIT,
h-ctx-db_id, 0,
db_ctdb_marshall_finish(h-m_write),
@@ -1005,9 +1005,8 @@ again:
((struct ctdb_ltdb_header *)ctdb_data.dptr)-dmaster
: -1,
get_my_vnn()));
- status = ctdbd_migrate(
- messaging_ctdbd_connection(procid_self()), ctx-db_id,
- key);
+ status = ctdbd_migrate(messaging_ctdbd_connection(), ctx-db_id,
+ key);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(5, (ctdb_migrate failed: %s\n,
nt_errstr(status)));
@@ -1112,8 +,8 @@ static int db_ctdb_fetch(struct db_context *db,
TALLOC_CTX *mem_ctx,
SAFE_FREE(ctdb_data.dptr);
/* we weren't able to get it locally - ask ctdb to fetch it for us */
-
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via a20e94b Revert s4/heimdal_build: use GetTimeOfDay macro instead of gettimeofday from 5648c3f s3: messaging_ctdbd_connection() was only called with procid_self() http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit a20e94bb0ebf4f1bd19dca527f48696a62a97ab1 Author: Björn Jacke b...@sernet.de Date: Tue Aug 31 23:03:55 2010 +0200 Revert s4/heimdal_build: use GetTimeOfDay macro instead of gettimeofday This reverts commit 659829851703797b47d398d3c71ad971b2c5dab7 which later on needs some tweeks to not break some builds --- Summary of changes: source4/heimdal_build/roken.h |1 - 1 files changed, 0 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/heimdal_build/roken.h b/source4/heimdal_build/roken.h index e44810d..50da1da 100644 --- a/source4/heimdal_build/roken.h +++ b/source4/heimdal_build/roken.h @@ -118,7 +118,6 @@ #ifndef HAVE_GETTIMEOFDAY #define HAVE_GETTIMEOFDAY #endif -#define gettimeofday(a,b) GetTimeOfDay(a) #ifndef HAVE_SETEGID #define HAVE_SETEGID -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via e5c7ec6 winreg: add winreg_RestoreKeyFlags to IDL.
via 95f9542 s3-auth: remove global include of krb5pac.h.
via 16c2d91 s3-printing: add debug to get_correct_cversion().
via bf3912b s3-libads: avoid crashing in ads_keytab_list().
via d5436c6 s3-auth: remove unused variable in check_sam_security().
via d8c9756 s3-kerberos: use more krb5 compat macros in
get_mem_keytab_from_secrets().
via 765bee9 s3-kerberos: use smb_get_enctype_from_kt_entry() in
get_mem_keytab_from_secrets().
via e26a936 s3-kerberos: use get_kerberos_allowed_etypes in
fill_keytab_from_password().
via 9986d25 s3-kerberos: use krb5 compat macros in
fill_keytab_from_password().
via 3d78279 s3-kerberos: fix flush_keytab() compile with heimdal.
from a20e94b Revert s4/heimdal_build: use GetTimeOfDay macro instead of
gettimeofday
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e5c7ec66982e6d2705c7a103aff5502f441404bb
Author: Günther Deschner g...@samba.org
Date: Tue Aug 31 16:58:23 2010 +0200
winreg: add winreg_RestoreKeyFlags to IDL.
Guenther
commit 95f9542e055d027adeb596a2c67fe48add77033c
Author: Günther Deschner g...@samba.org
Date: Tue Aug 31 23:09:39 2010 +0200
s3-auth: remove global include of krb5pac.h.
Guenther
commit 16c2d9182d0c0ff55eba4d8bce2931b579b00339
Author: Günther Deschner g...@samba.org
Date: Tue Aug 31 16:58:54 2010 +0200
s3-printing: add debug to get_correct_cversion().
Guenther
commit bf3912be46b2cac71a1ff89f548b9e3528872c6c
Author: Günther Deschner g...@samba.org
Date: Tue Aug 31 14:27:56 2010 +0200
s3-libads: avoid crashing in ads_keytab_list().
Heimdal's krb5_kt_start_seq_get() will leave a non 0 fd in the
krb5_kt_cursor
struct when it cannot find a given keytab.
Guenther
commit d5436c650c806bb04424205b1d5c9c699b051d7d
Author: Günther Deschner g...@samba.org
Date: Tue Aug 31 17:25:18 2010 +0200
s3-auth: remove unused variable in check_sam_security().
Guenther
commit d8c9756d539f9a869bd09fb67b3adcbd2a6a0fc0
Author: Günther Deschner g...@samba.org
Date: Tue Aug 31 22:28:00 2010 +0200
s3-kerberos: use more krb5 compat macros in get_mem_keytab_from_secrets().
Guenther
commit 765bee9d7a2ea990db37e7811fe449af3c61e7a0
Author: Günther Deschner g...@samba.org
Date: Tue Aug 31 22:27:32 2010 +0200
s3-kerberos: use smb_get_enctype_from_kt_entry() in
get_mem_keytab_from_secrets().
Guenther
commit e26a9363335fa0c6e72f46531395bf0f9d950e83
Author: Günther Deschner g...@samba.org
Date: Tue Aug 31 11:04:40 2010 +0200
s3-kerberos: use get_kerberos_allowed_etypes in fill_keytab_from_password().
Guenther
commit 9986d25ed195ee77bd73c96f057c527b4c3a8f03
Author: Günther Deschner g...@samba.org
Date: Tue Aug 31 11:00:03 2010 +0200
s3-kerberos: use krb5 compat macros in fill_keytab_from_password().
Guenther
commit 3d78279fd437a5ef5b4ed7ff88c1f605cd0999d9
Author: Günther Deschner g...@samba.org
Date: Tue Aug 31 11:01:23 2010 +0200
s3-kerberos: fix flush_keytab() compile with heimdal.
krb5_kt_cursor is not a pointer in heimdal but a struct.
Guenther
---
Summary of changes:
auth/common_auth.h |2 -
librpc/idl/winreg.idl| 10 ++-
source3/auth/check_samsec.c |2 +-
source3/auth/user_info.c |1 +
source3/auth/user_krb5.c |1 +
source3/include/proto.h |2 +-
source3/libads/kerberos_keytab.c |1 +
source3/librpc/rpc/dcerpc_krb5.c | 51 +++--
source3/printing/nt_printing.c |1 +
9 files changed, 41 insertions(+), 30 deletions(-)
Changeset truncated at 500 lines:
diff --git a/auth/common_auth.h b/auth/common_auth.h
index 4ae5df9..c64b46c 100644
--- a/auth/common_auth.h
+++ b/auth/common_auth.h
@@ -17,8 +17,6 @@
along with this program. If not, see http://www.gnu.org/licenses/.
*/
-#include librpc/gen_ndr/krb5pac.h
-
#define USER_INFO_CASE_INSENSITIVE_USERNAME 0x01 /* username may be in any
case */
#define USER_INFO_CASE_INSENSITIVE_PASSWORD 0x02 /* password may be in any
case */
#define USER_INFO_DONT_CHECK_UNIX_ACCOUNT 0x04 /* don't check unix account
status */
diff --git a/librpc/idl/winreg.idl b/librpc/idl/winreg.idl
index 48fddb7..c5da328 100644
--- a/librpc/idl/winreg.idl
+++ b/librpc/idl/winreg.idl
@@ -281,10 +281,18 @@ import lsa.idl, security.idl, misc.idl;
/**/
/* Function: 0x13 */
+
+ typedef [public,bitmap32bit] bitmap {
+ REG_WHOLE_HIVE_VOLATILE = 0x0001,
+ REG_REFRESH_HIVE= 0x0002,
+
[SCM] CTDB repository - branch master updated - ctdb-1.0.114-299-g1a41cd7
The branch, master has been updated via 1a41cd7332703629001201eea8ae9b94f1341c9d (commit) from 14c4d99513b4bdb94f60c3e9c4823e04b0833e60 (commit) http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master - Log - commit 1a41cd7332703629001201eea8ae9b94f1341c9d Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Wed Sep 1 13:28:25 2010 +1000 dont print a lot of log information about shutting down vsftpd --- Summary of changes: config/events.d/40.vsftpd |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/config/events.d/40.vsftpd b/config/events.d/40.vsftpd index 7ca7ba8..72190db 100755 --- a/config/events.d/40.vsftpd +++ b/config/events.d/40.vsftpd @@ -6,7 +6,7 @@ service_name=vsftpd # make sure the service is stopped first service_start=service $service_name stop /dev/null 21 ; service $service_name start -service_stop=service $service_name stop +service_stop=service $service_name stop /dev/null 21 service_reconfigure=service $service_name restart service_fail_limit=2 service_tcp_ports=21 -- CTDB repository
[SCM] CTDB repository - branch 1.2 updated - ctdb-1.0.114-318-g4a9cccc
The branch, 1.2 has been updated
via 4a9b8a57e7cc256b167b2d51d3797e23951e (commit)
via 8451ddb021122e02190d39d530fc5ec750f43186 (commit)
from 3b75f59c1f2b349ac12d6210553afeb82415752b (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=1.2
- Log -
commit 4a9b8a57e7cc256b167b2d51d3797e23951e
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Wed Sep 1 15:48:55 2010 +1000
make sure all statd state directories exist before we try to reference them
or else tar and friends will throw an error in the log
commit 8451ddb021122e02190d39d530fc5ec750f43186
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Wed Sep 1 13:28:25 2010 +1000
dont print a lot of log information about shutting down vsftpd
---
Summary of changes:
config/events.d/40.vsftpd |2 +-
config/statd-callout |5 +
2 files changed, 6 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/events.d/40.vsftpd b/config/events.d/40.vsftpd
index 7ca7ba8..72190db 100755
--- a/config/events.d/40.vsftpd
+++ b/config/events.d/40.vsftpd
@@ -6,7 +6,7 @@
service_name=vsftpd
# make sure the service is stopped first
service_start=service $service_name stop /dev/null 21 ; service
$service_name start
-service_stop=service $service_name stop
+service_stop=service $service_name stop /dev/null 21
service_reconfigure=service $service_name restart
service_fail_limit=2
service_tcp_ports=21
diff --git a/config/statd-callout b/config/statd-callout
index 461cd81..9808cb9 100755
--- a/config/statd-callout
+++ b/config/statd-callout
@@ -45,6 +45,7 @@ case $1 in
continue
}
IP=`echo $LINE | cut -f2 -d:`
+ mkdir -p $CTDB_BASE/state/statd/ip/$IP
/bin/rm -f $CTDB_BASE/state/statd/ip/$IP/$2
done
;;
@@ -58,6 +59,8 @@ case $1 in
}
IP=`echo $LINE | cut -f2 -d:`
+ mkdir -p $CTDB_BASE/state/statd/ip/$IP
+
rm -f $CTDB_BASE/state/statd/ip/$IP.tar
tar cfP $CTDB_BASE/state/statd/ip/$IP.tar
$CTDB_BASE/state/statd/ip/$IP
@@ -90,6 +93,8 @@ case $1 in
}
IP=`echo $LINE | cut -f2 -d:`
+ mkdir -p $CTDB_BASE/state/statd/ip/$IP
+
rm -f $CTDB_BASE/state/statd/ip/$IP.rec
ctdb pfetch ctdb.tdb statd-state:$IP
$CTDB_BASE/state/statd/ip/$IP.rec 2/dev/null
[ $? = 0 ] || {
--
CTDB repository
[SCM] CTDB repository - branch master updated - ctdb-1.0.114-300-g96cbd2c
The branch, master has been updated
via 96cbd2c0aa9a4641a42b3c33374675fa732ed1e5 (commit)
from 1a41cd7332703629001201eea8ae9b94f1341c9d (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit 96cbd2c0aa9a4641a42b3c33374675fa732ed1e5
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date: Wed Sep 1 15:48:55 2010 +1000
make sure all statd state directories exist before we try to reference them
or else tar and friends will throw an error in the log
---
Summary of changes:
config/statd-callout |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/statd-callout b/config/statd-callout
index 461cd81..9808cb9 100755
--- a/config/statd-callout
+++ b/config/statd-callout
@@ -45,6 +45,7 @@ case $1 in
continue
}
IP=`echo $LINE | cut -f2 -d:`
+ mkdir -p $CTDB_BASE/state/statd/ip/$IP
/bin/rm -f $CTDB_BASE/state/statd/ip/$IP/$2
done
;;
@@ -58,6 +59,8 @@ case $1 in
}
IP=`echo $LINE | cut -f2 -d:`
+ mkdir -p $CTDB_BASE/state/statd/ip/$IP
+
rm -f $CTDB_BASE/state/statd/ip/$IP.tar
tar cfP $CTDB_BASE/state/statd/ip/$IP.tar
$CTDB_BASE/state/statd/ip/$IP
@@ -90,6 +93,8 @@ case $1 in
}
IP=`echo $LINE | cut -f2 -d:`
+ mkdir -p $CTDB_BASE/state/statd/ip/$IP
+
rm -f $CTDB_BASE/state/statd/ip/$IP.rec
ctdb pfetch ctdb.tdb statd-state:$IP
$CTDB_BASE/state/statd/ip/$IP.rec 2/dev/null
[ $? = 0 ] || {
--
CTDB repository
