Re: [Samba] net getlocalsid: is this a bug?
That was not my question. Read my message again, please. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] net getlocalsid: is this a bug?
On Friday 02 January 2009 09:13:53 Miguel Medalha wrote: That was not my question. Read my message again, please. Right. The answer actually is You didn't read the help text to 'getlocalsid'. I don't know which Samba version you're running, but in the v3-3-test tree, the help text for net getlocalsid says Get the SID for the local domain. The local domain for member servers is different from the domain a member server is joined to, but for a PDC, it's the same. Technically, you're always looking at domain SIDs here, so the output of net does just the right thing. Kai -- Kai Blin WorldForge developer http://www.worldforge.org/ Wine developerhttp://wiki.winehq.org/KaiBlin Samba team member http://www.samba.org/samba/team/ -- Will code for cotton. signature.asc Description: This is a digitally signed message part. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] samba freezes the server
Hello List ! oh myi have a very severe problem here, and i absolutely need assistance... my samba version is 3.2.6-3.1-2034-SUSE-CODE11 on an opensuse 11.1 though this thing happened on an ubuntu intrepid with 3.2.4 too: the smbd freezes the whole system here.for no obvious reason i already tested everything, and everything works perfectly, untill 2 or more people want to work with it... - hardware is ok (18h stress test with bonnie, mprime, glxgears, memtester) - samba basically seems ok too (8 hours of running a script copying 500 mb to a share, deleting them again and restarting the procedure. this has been done with 400 loops on 3 clients simultanously and everything was functioning very well.) Logging in and out, reaching the shares, copying the profiles to the server...everything is normally ok. i am labouring on this for about 2 weeks nowand the problem is not really reproducable it just happens to appear once or twice a day... the whole system is frozen then and nothing can be done unless you restart the whole server machine makeing it work perfect the only relevant info i have on this is that the freeze appeared when logging out from the domain the last two times, and that i have this in my logs (loglevel 3): smbd/notify_inotify.c:watch_destructor(351) inotify_rm_watch returned Das Argument ist ungültig and smbd/error.c:error_packet_set(61) error packet at smbd/nttrans.c(532) cmd=162 (SMBntcreateX) NT_STATUS_SHARING_VIOLATION please help me... This isn't my first samba server...but i am really going nuts with this one. Any idea is very welcome... thank you very much Sascha my smb.conf (the main share being worked on being projects): [global] workgroup = domainname printing = cups printcap name = cups printcap cache time = 750 cups options = raw map to guest = Bad User logon path = \\%L\profiles\.msprofile logon home = \\%L\%U\.9xprofile logon script = user.log.bat logon drive = Q: usershare allow guests = Yes add machine script = /usr/sbin/useradd -c Machine -d /var/lib/nobody -s /bin/false %m$ domain logons = Yes domain master = Yes local master = Yes netbios name = fileserver os level = 65 preferred master = Yes security = user time server = Yes bind interfaces only = Yes log file = /var/log/samba/%m.samba-log max log size = 3 syslog = 1 syslog only = no debug level = 3 max mux = 5 socket options = SO_KEEPALIVE IPTOS_LOWDELAY TCP_NODELAY SO_SNDBUF=8192 SO_RCVBUF=8192 dead time = 0 getwd cache = yes case sensitive = no preserve case = yes dos filetimes = yes dos filetime resolution = yes [homes] comment = Home Directories valid users = %S, %D%w%S browseable = No read only = No inherit acls = Yes [profiles] comment = Network Profiles Service path = %H read only = No store dos attributes = Yes create mask = 0600 directory mask = 0700 [users] comment = All users path = /home read only = No inherit acls = Yes veto files = /aquota.user/groups/shares/ [groups] comment = All groups path = /home/groups read only = No inherit acls = Yes [printers] comment = All Printers path = /var/tmp printable = Yes create mask = 0600 browseable = No [print$] comment = Printer Drivers path = /var/lib/samba/drivers write list = @ntadmin root force group = ntadmin create mask = 0664 directory mask = 0775 [netlogon] comment = Network Logon Service path = /var/lib/samba/netlogon write list = root [projects] inherit acls = Yes path = /usr/local/pub/daten1/projects read only = No create mask = 0775 directory mask = 0775 force group = samba-users force user = root case sensitive = No guest ok = Yes [install] inherit acls = Yes path = /usr/local/pub/daten2/install/ read only = No -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] samba freezes the server
Hello List ! oh myi have a very severe problem here, and i absolutely need assistance... my samba version is 3.2.6-3.1-2034-SUSE-CODE11 on an opensuse 11.1 though this thing happened on an ubuntu intrepid with 3.2.4 too: the smbd freezes the whole system here.for no obvious reason i already tested everything, and everything works perfectly, untill 2 or more people want to work with it... - hardware is ok (18h stress test with bonnie, mprime, glxgears, memtester) - samba basically seems ok too (8 hours of running a script copying 500 mb to a share, deleting them again and restarting the procedure. this has been done with 400 loops on 3 clients simultanously and everything was functioning very well.) Logging in and out, reaching the shares, copying the profiles to the server...everything is normally ok. i am labouring on this for about 2 weeks nowand the problem is not really reproducable it just happens to appear once or twice a day... the whole system is frozen then and nothing can be done unless you restart the whole server machine makeing it work perfect the only relevant info i have on this is that the freeze appeared when logging out from the domain the last two times, and that i have this in my logs (loglevel 3): smbd/notify_inotify.c:watch_destructor(351) inotify_rm_watch returned Das Argument ist ungültig and smbd/error.c:error_packet_set(61) error packet at smbd/nttrans.c(532) cmd=162 (SMBntcreateX) NT_STATUS_SHARING_VIOLATION please help me... This isn't my first samba server...but i am really going nuts with this one. Any idea is very welcome... thank you very much Sascha my smb.conf (the main share being worked on being projects): [global] workgroup = domainname printing = cups printcap name = cups printcap cache time = 750 cups options = raw map to guest = Bad User logon path = \\%L\profiles\.msprofile logon home = \\%L\%U\.9xprofile logon script = user.log.bat logon drive = Q: usershare allow guests = Yes add machine script = /usr/sbin/useradd -c Machine -d /var/lib/nobody -s /bin/false %m$ domain logons = Yes domain master = Yes local master = Yes netbios name = fileserver os level = 65 preferred master = Yes security = user time server = Yes bind interfaces only = Yes log file = /var/log/samba/%m.samba-log max log size = 3 syslog = 1 syslog only = no debug level = 3 max mux = 5 socket options = SO_KEEPALIVE IPTOS_LOWDELAY TCP_NODELAY SO_SNDBUF=8192 SO_RCVBUF=8192 dead time = 0 getwd cache = yes case sensitive = no preserve case = yes dos filetimes = yes dos filetime resolution = yes [homes] comment = Home Directories valid users = %S, %D%w%S browseable = No read only = No inherit acls = Yes [profiles] comment = Network Profiles Service path = %H read only = No store dos attributes = Yes create mask = 0600 directory mask = 0700 [users] comment = All users path = /home read only = No inherit acls = Yes veto files = /aquota.user/groups/shares/ [groups] comment = All groups path = /home/groups read only = No inherit acls = Yes [printers] comment = All Printers path = /var/tmp printable = Yes create mask = 0600 browseable = No [print$] comment = Printer Drivers path = /var/lib/samba/drivers write list = @ntadmin root force group = ntadmin create mask = 0664 directory mask = 0775 [netlogon] comment = Network Logon Service path = /var/lib/samba/netlogon write list = root [projects] inherit acls = Yes path = /usr/local/pub/daten1/projects read only = No create mask = 0775 directory mask = 0775 force group = samba-users force user = root case sensitive = No guest ok = Yes [install] inherit acls = Yes path = /usr/local/pub/daten2/install/ read only = No -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Samba performance issue
Hi there, I've got similar problem as Fabien. The configuration is as follows: server: 2x Intel Pentium III @ 1GHz 1GB RAM Compaq SmartArray 431 RAID controller Seagate Medalist 3.2GB - system disk 2x Seagate Cheetah, 18GB, 15k RPM in RAID 0 - Samba share Intel 82540EM GbE NIC client: Compaq NC6220 laptop Intel Pentium M @ 1.73GHz 512MB RAM Fujitsu 40MB ATA Broadcom BCM5751M GbE NIC switch: Dlink DGS-1005D 5-port, unmanaged GbE switch Both computers run Gentoo Linux 2008, kernel 2.6.25-r9, server runs Samba 3.0.33, client mount.cifs 3.0.30. The underlying filesystem for Samba is Ext3 with xattr and acls. I wasn't able to break 32MB/s (250Mbps) transfer speed neither reading nor writing to the server. The disk subsystem of the server is capable of 60MB/s and generaly the hardware is not the bottleneck. Neither is the network - the bw_tcp from LMbench suite shows around 108MB/s with 1500b messages, which is what I would expect from GbE TCP/IP. I've been tinkering with very much all the knobs the linux's TCP/IP stack has, the same goes for smb.conf - to no avail. The only thing I couldn't test are Jumbo frames, because the BCM5751M doesn't support them. Unfortunately I can't post my smb.conf, as I am off today, but I can post it later. However, I have find out that having several reads (or writes) pending increases the transfer speed up to 108MB/s, which proves that the hardware is not the bottleneck: I've created a 500MB file on the server and as it fits into the buffer cache the disk subsystem's limits are eliminated. Then I opened it ten times with 'dd if=/mnt/samba/examplefile of=/dev/null ' and this way I was able to saturate the GbE network. But I would like to read and write to Samba close to the hw speed within one tcp session. I was not able to manage that and after some googling on the Internet I've found out that I'm not the only one suffering from this issue. Does Samba scale to gigabit speed within one opened tcp session? Limitition of SMB protocol? Or is it linux TCP/IP stack issue? Any suggestions? Thank you in advance Ales Blaha -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] samba freezes the server
On Fri, Jan 02, 2009 at 04:36:51PM +0100, Sascha Zucca wrote: Hello List ! oh myi have a very severe problem here, and i absolutely need assistance... my samba version is 3.2.6-3.1-2034-SUSE-CODE11 on an opensuse 11.1 though this thing happened on an ubuntu intrepid with 3.2.4 too: the smbd freezes the whole system here.for no obvious reason i already tested everything, and everything works perfectly, untill 2 or more people want to work with it... - hardware is ok (18h stress test with bonnie, mprime, glxgears, memtester) - samba basically seems ok too (8 hours of running a script copying 500 mb to a share, deleting them again and restarting the procedure. this has been done with 400 loops on 3 clients simultanously and everything was functioning very well.) Logging in and out, reaching the shares, copying the profiles to the server...everything is normally ok. i am labouring on this for about 2 weeks nowand the problem is not really reproducable it just happens to appear once or twice a day... the whole system is frozen then and nothing can be done unless you restart the whole server machine makeing it work perfect This sounds like a kernel bug to me. An smbd bug can only freeze itself, not the entire machine. Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba performance issue
On Fri, Jan 02, 2009 at 05:54:11PM +0100, Aleš Bláha wrote: Both computers run Gentoo Linux 2008, kernel 2.6.25-r9, server runs Samba 3.0.33, client mount.cifs 3.0.30. The underlying filesystem for Samba is Ext3 with xattr and acls. I wasn't able to break 32MB/s (250Mbps) transfer speed neither reading nor writing to the server. The disk subsystem of the server is capable of 60MB/s and generaly the hardware is not the bottleneck. Neither is the network - the bw_tcp from LMbench suite shows around 108MB/s with 1500b messages, which is what I would expect from GbE TCP/IP. I've been tinkering with In a test I did lately it made a huge difference if I just did raw TCP benchmarks, raw disk benchmarks or a combined one. The test I used was netcat -l -p diskfile on the receiving end and netcat server-ip diskfile on the sending end. This made my hardware which would otherwise happily saturate gigE crawl down to something like 50MB/sec. Can you try that? Volker pgpjKUD24NYHS.pgp Description: PGP signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Windows Domain Member NTFS Permissions
Help please... Using Ubuntu 8.04 LTS w/Samba 3.0.28a using LDAP backend. I can add users, groups, etc. On a member workstation (or server) running Windows (XP, 2003, 2000), I can assign users and/or groups permissions to files and folders. However, users are not granted access to the files and folders. On XP and 2003, if I use the Effective Permissions tool (right-click folder, Properites, Security tab, Advanced, Effective Permissions tab, Select the user, click Ok), the effective permissions shows Windows cannot calculate the effective permissions for TestUser3. The Samba DC is over a WAN connection. The users are behind a NAT firewall, but we can join machines to the domain and logon just fine. Any help or insight, even just a direction to look, would be very much appreciated. Thank you! -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] samba freezes the server
On Fri, Jan 02, 2009 at 04:36:51PM +0100, Sascha Zucca wrote: smbd/notify_inotify.c:watch_destructor(351) inotify_rm_watch returned Das Argument ist ungültig Try notify:inotify = false in [global]. If that helps, your kernel has a broken inotify implementation. Volker pgpfFS4vhKM9q.pgp Description: PGP signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba 3.2.5 and vscan-clamav.so
Hi I made this patch for samba-vscan-0.3.6b because it a very old module. This solves the old samba init_module to new init_samba_module and the vanished pstring in samba. For me it works fine! - Thomas === --- include/vscan-global.h.orig 2004-10-05 21:47:54.0 +0200 +++ include/vscan-global.h 2008-12-09 15:55:04.0 +0100 @@ -69,6 +69,17 @@ #endif #endif +/* Patched by T. Wild, 9.12.2008, because pstrcpy removed by samba.org */ +#define PSTRING_LEN 1024 +typedef char pstring[PSTRING_LEN]; +#define pstrcpy(d,s) safe_strcpy((d),(s),sizeof(pstring)-1) +#define pstrcat(d,s) safe_strcat((d),(s),sizeof(pstring)-1) + +/* Furthermore init_module changed to init_samba_module */ + +#define init_module(void) init_samba_module(void) + +/* end of patch by T. Wild */ #endif /* __VSCAN_GLOBAL_H */ === Am 2008-12-30 17:59, Andrzej schrieb: Hello Recently I migrated from samba 3.0.24 to samba 3.2.5 on Debian etch amd64. In old system I have working samba-vscan used with ClamAV 0.91. Now I have ClamAV 0.94.2. I compiled vscan-clamav successfully, but when I try to connect to the share, it fails and I get some strange messages in the samba logs: Error trying to resolve symbol 'init_samba_module' in /usr/samba/lib/vfs/vscan-clamav.so. Actually there is no such symbol inside compiled binary. Other compiled VFS modules have that symbol in binary. ClamAV socket is configured correctly and have proper rights. How to get working vscan-clamav with samba 3.2.5 ?? Next I compiled other antivirus VFS module - scannedonly from scannedonly-0.11_git.patch.gz. In compiled binary also I haven't found 'init_samba_module'. Any ideas? -- mfg/regards Thomas Wild - Thomas Wild www.ids-gmbh.de Thomas.Wild at ids-gmbh.de -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba performance issue
Hi Volker, Thank you for your help. I will try what you propose as soon as I get to the machines. But, to be honest, I don't think, the hardware is the bottleneck. The RAID controller and the NIC in the server sit on a different PCI bus and each one has its interrupt hooked to a different CPU. Appart from that, as I've mentioned in the previous post, I can saturate the network when copying files that are cached on the server - but only as long as there are several pending requests - with only one I get just those 30MBs or so (one tcp session vs. couple of them). I will do some more benchmarks next week, post the smb.conf and tcp/ip stack config. Regards Ales On Fri, 02 Jan 2009 20:48:53 +0100 (CET) Volker Lendecke volker.lende...@sernet.de wrote: On Fri, Jan 02, 2009 at 05:54:11PM +0100, Aleš Bláha wrote: Both computers run Gentoo Linux 2008, kernel 2.6.25-r9, server runs Samba 3.0.33, client mount.cifs 3.0.30. The underlying filesystem for Samba is Ext3 with xattr and acls. I wasn't able to break 32MB/s (250Mbps) transfer speed neither reading nor writing to the server. The disk subsystem of the server is capable of 60MB/s and generaly the hardware is not the bottleneck. Neither is the network - the bw_tcp from LMbench suite shows around 108MB/s with 1500b messages, which is what I would expect from GbE TCP/IP. I've been tinkering with In a test I did lately it made a huge difference if I just did raw TCP benchmarks, raw disk benchmarks or a combined one. The test I used was netcat -l -p diskfile on the receiving end and netcat server-ip diskfile on the sending end. This made my hardware which would otherwise happily saturate gigE crawl down to something like 50MB/sec. Can you try that? Volker -- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba performance issue
On Fri, Jan 02, 2009 at 09:57:34PM +0100, Aleš Bláha wrote: Thank you for your help. I will try what you propose as soon as I get to the machines. But, to be honest, I don't think, the hardware is the bottleneck. The RAID controller and the NIC in the server sit on a different PCI bus and each one has its interrupt hooked to a different CPU. Appart from that, as I've mentioned in the previous post, I can saturate the network when copying files that are cached on the server - but only as long as there are several pending requests - with only one I get just those 30MBs or so (one tcp session vs. couple of them). I will do some more benchmarks next week, post the smb.conf and tcp/ip stack config. One thing you might also want to check is get/put operations with latest smbclient from the git master branch. This does almost optimal streaming smb operations. Volker pgpFcGD0pFnnJ.pgp Description: PGP signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba performance issue
On Fri, 02 Jan 2009 22:01:49 +0100 (CET) Volker Lendecke volker.lende...@sernet.de wrote: On Fri, Jan 02, 2009 at 09:57:34PM +0100, Aleš Bláha wrote: Thank you for your help. I will try what you propose as soon as I get to the machines. But, to be honest, I don't think, the hardware is the bottleneck. The RAID controller and the NIC in the server sit on a different PCI bus and each one has its interrupt hooked to a different CPU. Appart from that, as I've mentioned in the previous post, I can saturate the network when copying files that are cached on the server - but only as long as there are several pending requests - with only one I get just those 30MBs or so (one tcp session vs. couple of them). I will do some more benchmarks next week, post the smb.conf and tcp/ip stack config. One thing you might also want to check is get/put operations with latest smbclient from the git master branch. This does almost optimal streaming smb operations. Volker Hello Volker, I will try that also, that is after I find out how to build it from the git source. Thanks Ales -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] net getlocalsid: is this a bug?
Right. The answer actually is You didn't read the help text to 'getlocalsid'. I don't know which Samba version you're running, but in the v3-3-test tree, the help text for net getlocalsid says Get the SID for the local domain. The local domain for member servers is different from the domain a member server is joined to, but for a PDC, it's the same. Technically, you're always looking at domain SIDs here, so the output of net does just the right thing. Thank you for your answer. In fact, I did read the man page and the online help, and they both confirm my question. I am using Samba 3.2.6 on CentOS 5.2. The man page says the following: GETLOCALSID [DOMAIN] Prints the SID of the specified domain, or if the parameter is omitted, the SID of the local server. *If the parameter is omitted* it prints the SID of the local server. If you invoke the net command without parameters, the online help states: Usage: net getlocalsid [NAME]to get the SID for local machine name In sum, it seems to me that, for the sake of consistency and to avoid confusion, the output from getlocalsid without parameter should be SID for local machine (...). According to what you say, perhaps this has already been changed for version 3.3... -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] Samba 3.2.6 upgrade - smbd panic in printing.
Can you try the following patch to 3.2.6 please ? I'm hoping this will fix the problem (it should address the backtrace supplied). Jeremy. Thank you for the quick patch Jeremy! I'll have a chance next week to try the patched code in our production environment where the glitch seems to occur in some cases. Regards, -Noel -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] Windows Domain Member NTFS Permissions
Further testing/troubleshooting indicates this may be a problem with case sensitivity. Say my user name is Test.User and my group is TestGroup1. Using smbldap-tools, I can add test.user to TestGroup1. If I assign NTFS permissions using group TestGroup1, Test.User is not granted permissions. If I use smbldap-tools to add Test.User, the permissions work. Is this a bug or am I missing a setting somewhere? -Original Message- From: samba-bounces+regisn=techheads@lists.samba.org [mailto:samba-bounces+regisn=techheads@lists.samba.org] On Behalf Of Regis Niggemann Sent: Friday, January 02, 2009 11:51 AM To: samba@lists.samba.org Subject: [Samba] Windows Domain Member NTFS Permissions Help please... Using Ubuntu 8.04 LTS w/Samba 3.0.28a using LDAP backend. I can add users, groups, etc. On a member workstation (or server) running Windows (XP, 2003, 2000), I can assign users and/or groups permissions to files and folders. However, users are not granted access to the files and folders. On XP and 2003, if I use the Effective Permissions tool (right-click folder, Properites, Security tab, Advanced, Effective Permissions tab, Select the user, click Ok), the effective permissions shows Windows cannot calculate the effective permissions for TestUser3. The Samba DC is over a WAN connection. The users are behind a NAT firewall, but we can join machines to the domain and logon just fine. Any help or insight, even just a direction to look, would be very much appreciated. Thank you! -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[SCM] Samba Shared Repository - branch master updated - 8b81e7c7c65f3923aaa7a366733000517b44756e
The branch, master has been updated
via 8b81e7c7c65f3923aaa7a366733000517b44756e (commit)
from 7458111ea4cf33b2a093e5edfb3b42ebfdc330c5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 8b81e7c7c65f3923aaa7a366733000517b44756e
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 2 09:44:53 2009 +0100
Happy New Year!
metze
---
Summary of changes:
source3/include/smb.h |2 +-
source4/smbd/server.c |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/smb.h b/source3/include/smb.h
index a8a2d98..3253773 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -27,7 +27,7 @@
#define _SMB_H
/* logged when starting the various Samba daemons */
-#define COPYRIGHT_STARTUP_MESSAGE Copyright Andrew Tridgell and the
Samba Team 1992-2008
+#define COPYRIGHT_STARTUP_MESSAGE Copyright Andrew Tridgell and the
Samba Team 1992-2009
#if defined(LARGE_SMB_OFF_T)
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index c1683a4..1eb3e42 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -266,7 +266,7 @@ static int binary_smbd_main(const char *binary_name, int
argc, const char *argv[
umask(0);
DEBUG(0,(%s version %s started.\n, binary_name,
SAMBA_VERSION_STRING));
- DEBUGADD(0,(Copyright Andrew Tridgell and the Samba Team
1992-2008\n));
+ DEBUGADD(0,(Copyright Andrew Tridgell and the Samba Team
1992-2009\n));
if (sizeof(uint16_t) 2 || sizeof(uint32_t) 4 || sizeof(uint64_t)
8) {
DEBUG(0,(ERROR: Samba is not configured correctly for the word
size on your machine\n));
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4764-ge385b41
The branch, v3-3-test has been updated via e385b4175d9accc6b78f0f506d1c1f696a1dcad1 (commit) from 8f2d5137852fd3f2a376a7fa71f1a5c8b947bd37 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit e385b4175d9accc6b78f0f506d1c1f696a1dcad1 Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 2 09:46:17 2009 +0100 Happy New Year! metze --- Summary of changes: source/include/smb.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/include/smb.h b/source/include/smb.h index 5cfdf97..cea4fe5 100644 --- a/source/include/smb.h +++ b/source/include/smb.h @@ -27,7 +27,7 @@ #define _SMB_H /* logged when starting the various Samba daemons */ -#define COPYRIGHT_STARTUP_MESSAGE Copyright Andrew Tridgell and the Samba Team 1992-2008 +#define COPYRIGHT_STARTUP_MESSAGE Copyright Andrew Tridgell and the Samba Team 1992-2009 #if defined(LARGE_SMB_OFF_T) -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3314-g347f1b6
The branch, v3-2-test has been updated via 347f1b6dcc88e04307397ea965ca8d0412b7a8c8 (commit) from 3577e583eeabb0555dc1ec1dd231ca835d90d307 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 347f1b6dcc88e04307397ea965ca8d0412b7a8c8 Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 2 09:46:17 2009 +0100 Happy New Year! metze --- Summary of changes: source/include/smb.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/include/smb.h b/source/include/smb.h index d854486..e248164 100644 --- a/source/include/smb.h +++ b/source/include/smb.h @@ -27,7 +27,7 @@ #define _SMB_H /* logged when starting the various Samba daemons */ -#define COPYRIGHT_STARTUP_MESSAGE Copyright Andrew Tridgell and the Samba Team 1992-2008 +#define COPYRIGHT_STARTUP_MESSAGE Copyright Andrew Tridgell and the Samba Team 1992-2009 #if defined(LARGE_SMB_OFF_T) -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-32-90-g041435d
The branch, v3-0-test has been updated via 041435d841b457f493c940e0281cd496b52fb7dc (commit) from a3113657b4427eddcfbb10d71e9e8ade06bbd16f (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test - Log - commit 041435d841b457f493c940e0281cd496b52fb7dc Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 2 09:46:17 2009 +0100 Happy New Year! metze --- Summary of changes: source/include/smb.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/include/smb.h b/source/include/smb.h index 0aec3ff..7484efd 100644 --- a/source/include/smb.h +++ b/source/include/smb.h @@ -28,7 +28,7 @@ #define _SMB_H /* logged when starting the various Samba daemons */ -#define COPYRIGHT_STARTUP_MESSAGE Copyright Andrew Tridgell and the Samba Team 1992-2008 +#define COPYRIGHT_STARTUP_MESSAGE Copyright Andrew Tridgell and the Samba Team 1992-2009 #if defined(LARGE_SMB_OFF_T) -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4765-g16b71af
The branch, v3-3-test has been updated via 16b71af7699836ce834a12918a8dd7ca61c2a86a (commit) from e385b4175d9accc6b78f0f506d1c1f696a1dcad1 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 16b71af7699836ce834a12918a8dd7ca61c2a86a Author: Karolin Seeger ksee...@samba.org Date: Fri Jan 2 13:48:48 2009 +0100 WHATSNEW: Update changes since 3.3.0rc2. Karolin --- Summary of changes: WHATSNEW.txt | 110 - 1 files changed, 54 insertions(+), 56 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 76cb29d..bc47900 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,12 +1,9 @@ - - Release Notes for Samba 3.3.0rc2 - December, 15 2008 - + = + Release Notes for Samba 3.3.0 + January, 05 2009 + = -This is the second release candidate of Samba 3.3.0. This is *not* -intended for production environments and is designed for testing -purposes only. Please report any defects via the Samba bug reporting -system at https://bugzilla.samba.org/. +This is the first stable release of Samba 3.3.0. Major enhancements in Samba 3.3.0 include: @@ -183,82 +180,83 @@ smb.conf changes winbind reconnect delayNew 30 -Changes since 3.3.0rc1: - +Changes since 3.3.0rc2: +--- o Jeremy Allison j...@samba.org -* BUG 1254: Fix write list in setups using security = share. -* BUG 5937: Fix filenames with * char hiding other files. -* BUG 5953: Fix segfaults in smbclient. -* Fix usrmgr opening a user object as non-root. +* BUG 5979: Fix level 2 oplocks being granted improperly. +* BUG 5980: Race condition when granting level2 oplocks can cause break + notify to be missed. +* BUG 5986: Editing a stream is broken (rename problems). +* BUG 5990: Strict allocate should be checked before ftruncate. +* Fix gcc 4.3.2 warnings. +* Fix more asprintf errors and error code paths. o Michael Adam ob...@samba.org -* BUG 3661: Add support for trusted domains to idmap_ad. -* Fix default backend handling for ad backends. -* Fix potential segfault in vfs_tsmsm. -* Fix several RHEL CTDB packaging issues. +* Fix build of pam_winbind.so on older Linux systems. +* Packaging RHEL-CTDB: Fix build of [u]mount.cifs. +* Fix uid_to_sid mapping when the idmap cache is empty. +* Remove passd check from idmap_backends_unixid_to_sid(). -o Günther Deschner g...@samba.org -* BUG 5957: Do not abort rename process on valid rename script. -* Fix various potential memleaks in samr_SetUserInfo. -* Fix access bits in netapi. +o Kai Blin k...@samba.org +* BUG 5953: Fix smbclient crashes. -o Steve French ste...@smf-t60p.smfdom -* BUG 5934: Use USER environment in mount.cifs when no user is specified. -* variable +o Gerald (Jerry) Carter je...@samba.org +* Fix allow trusted domain so it disables trusted domains. -o SATOH Fumiyasu fumi...@osstech.co.jp -* BUG 5688: LPQ process is orphaned if socket address parameter is invalid. -* Vars for signals must be volatile sig_atomic_t. +o SATOH Fumiyasu fumi...@osstech.jp +* Fix gmem-numgids and gmem-maxgids breakage on Solaris 64-bit. +* Fix SIGBUS on non-x86 CPUs in libsmbclient. +* Fix a compile-time warning. -o Henning Henkel henning.hen...@fh-furtwangen.de -* BUG 5929: Fix build of vfs_prealloc with option --with-cluster-support and - GPFS. +o Holger Hetterich hhet...@novell.com +* Add a simple tdb integrity check to tdbtool. -o Tomasz Krasuski kr0...@poczta.onet.pl -* BUG 5928: Fix 'testparm --version'. - - -o Jeff Layton jlay...@redhat.com -* Allow mounts to ipv6 capable servers in mount.cifs. +o Björn Jacke b...@sernet.de +* Correct the description of the ldap timeout parameter. o Volker Lendecke v...@samba.org -* Fix crash bug when freeing a non-malloc'ed buffer if the client sends a - non-encrypted packet with the crypto state set. -* Fix error code when smbclient puts a file over an existing directory. -* Pass the get_real_filename operation through the VFS. +* BUG 5913: Fix build error with at least GCC 4.2.2. +* BUG 5933: Fix incrementing/decrementing of num_validated_vuids. +* BUG 5953: Make cli_send_smb_direct_writeX use writev. +* BUG 5969: Optimize smbclient put command. +* Fix a spinning smbd when printing. +* Fix a memory leak
[SCM] Samba Shared Repository - branch v3-3-stable updated - release-3-3-0rc2-75-gd1c9959
The branch, v3-3-stable has been updated via d1c995943694c41286a2e154d64d35b2e83b9cb7 (commit) via 0c50c0ddf1c01ad1ea8526263d60ba5ddb1ff6fe (commit) from 2f861c731dc969415fef47b060bb783547435ce4 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-stable - Log - commit d1c995943694c41286a2e154d64d35b2e83b9cb7 Author: Karolin Seeger ksee...@samba.org Date: Fri Jan 2 13:48:48 2009 +0100 WHATSNEW: Update changes since 3.3.0rc2. Karolin (cherry picked from commit 16b71af7699836ce834a12918a8dd7ca61c2a86a) commit 0c50c0ddf1c01ad1ea8526263d60ba5ddb1ff6fe Author: Karolin Seeger ksee...@samba.org Date: Fri Jan 2 13:45:02 2009 +0100 VERSION: Raise version number. Karolin --- Summary of changes: WHATSNEW.txt | 110 +++ source/VERSION |2 +- 2 files changed, 55 insertions(+), 57 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 76cb29d..bc47900 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,12 +1,9 @@ - - Release Notes for Samba 3.3.0rc2 - December, 15 2008 - + = + Release Notes for Samba 3.3.0 + January, 05 2009 + = -This is the second release candidate of Samba 3.3.0. This is *not* -intended for production environments and is designed for testing -purposes only. Please report any defects via the Samba bug reporting -system at https://bugzilla.samba.org/. +This is the first stable release of Samba 3.3.0. Major enhancements in Samba 3.3.0 include: @@ -183,82 +180,83 @@ smb.conf changes winbind reconnect delayNew 30 -Changes since 3.3.0rc1: - +Changes since 3.3.0rc2: +--- o Jeremy Allison j...@samba.org -* BUG 1254: Fix write list in setups using security = share. -* BUG 5937: Fix filenames with * char hiding other files. -* BUG 5953: Fix segfaults in smbclient. -* Fix usrmgr opening a user object as non-root. +* BUG 5979: Fix level 2 oplocks being granted improperly. +* BUG 5980: Race condition when granting level2 oplocks can cause break + notify to be missed. +* BUG 5986: Editing a stream is broken (rename problems). +* BUG 5990: Strict allocate should be checked before ftruncate. +* Fix gcc 4.3.2 warnings. +* Fix more asprintf errors and error code paths. o Michael Adam ob...@samba.org -* BUG 3661: Add support for trusted domains to idmap_ad. -* Fix default backend handling for ad backends. -* Fix potential segfault in vfs_tsmsm. -* Fix several RHEL CTDB packaging issues. +* Fix build of pam_winbind.so on older Linux systems. +* Packaging RHEL-CTDB: Fix build of [u]mount.cifs. +* Fix uid_to_sid mapping when the idmap cache is empty. +* Remove passd check from idmap_backends_unixid_to_sid(). -o Günther Deschner g...@samba.org -* BUG 5957: Do not abort rename process on valid rename script. -* Fix various potential memleaks in samr_SetUserInfo. -* Fix access bits in netapi. +o Kai Blin k...@samba.org +* BUG 5953: Fix smbclient crashes. -o Steve French ste...@smf-t60p.smfdom -* BUG 5934: Use USER environment in mount.cifs when no user is specified. -* variable +o Gerald (Jerry) Carter je...@samba.org +* Fix allow trusted domain so it disables trusted domains. -o SATOH Fumiyasu fumi...@osstech.co.jp -* BUG 5688: LPQ process is orphaned if socket address parameter is invalid. -* Vars for signals must be volatile sig_atomic_t. +o SATOH Fumiyasu fumi...@osstech.jp +* Fix gmem-numgids and gmem-maxgids breakage on Solaris 64-bit. +* Fix SIGBUS on non-x86 CPUs in libsmbclient. +* Fix a compile-time warning. -o Henning Henkel henning.hen...@fh-furtwangen.de -* BUG 5929: Fix build of vfs_prealloc with option --with-cluster-support and - GPFS. +o Holger Hetterich hhet...@novell.com +* Add a simple tdb integrity check to tdbtool. -o Tomasz Krasuski kr0...@poczta.onet.pl -* BUG 5928: Fix 'testparm --version'. - - -o Jeff Layton jlay...@redhat.com -* Allow mounts to ipv6 capable servers in mount.cifs. +o Björn Jacke b...@sernet.de +* Correct the description of the ldap timeout parameter. o Volker Lendecke v...@samba.org -* Fix crash bug when freeing a non-malloc'ed buffer if the client sends a - non-encrypted packet with the crypto state set. -* Fix error code when smbclient puts a file over an existing directory. -* Pass the
[SCM] Samba Shared Repository - branch master updated - 71c74725bce403e36e4dc38287802c95b8d4de66
The branch, master has been updated
via 71c74725bce403e36e4dc38287802c95b8d4de66 (commit)
via 308dbca653ce1d689b75f9b781237c67df4233a8 (commit)
from 8b81e7c7c65f3923aaa7a366733000517b44756e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 71c74725bce403e36e4dc38287802c95b8d4de66
Author: Michael Adam ob...@samba.org
Date: Wed Dec 17 22:27:39 2008 +0100
packaging(RHEL): fix typo in [u]mount.cifs installation
Michael
(cherry picked from commit 835108bcf84a5f47f46d237c7a93c572348125a1)
Signed-off-by: Michael Adam ob...@samba.org
commit 308dbca653ce1d689b75f9b781237c67df4233a8
Author: Michael Adam ob...@samba.org
Date: Wed Dec 17 18:56:34 2008 +0100
packaging(RHEL): fix build of [u]mount.cifs
mount.cifs is now built by make everything.
And it needs extra objects anyways (mtab.o),
which is why the build of mount.cifs failed.
Michael
(cherry picked from commit 96c811cf222be5463a6705feae73d6215685c5f1)
Signed-off-by: Michael Adam ob...@samba.org
---
Summary of changes:
packaging/RHEL/samba.spec.tmpl | 10 ++
1 files changed, 2 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index 92030fc..f674e83 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -178,12 +178,6 @@ fi
make CFLAGS=$RPM_OPT_FLAGS -D_GNU_SOURCE %{?_smp_mflags} \
all modules pam_smbpass
-## build the cifs fs mount helper
-cd client
-gcc -o mount.cifs $RPM_OPT_FLAGS -D_GNU_SOURCE -Wall -D_GNU_SOURCE
-D_LARGEFILE64_SOURCE mount.cifs.c
-gcc -o umount.cifs $RPM_OPT_FLAGS -D_GNU_SOURCE -Wall -D_GNU_SOURCE
-D_LARGEFILE64_SOURCE umount.cifs.c
-cd ..
-
# Remove some permission bits to avoid to many dependencies
cd ..
find examples docs -type f | xargs -r chmod -x
@@ -238,8 +232,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 source/client/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
-install -m755 source/client/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
+install -m755 source/bin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
+install -m755 source/bin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
install -m755 source/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
/bin/rm $RPM_BUILD_ROOT%{_sbindir}/*mount.cifs
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4767-gcfc140d
The branch, v3-3-test has been updated
via cfc140d3924dd6be893d242ce5df22e2128f09f8 (commit)
via 9745e36c011a76669aad7a0a861ba1520ef8cec3 (commit)
from 16b71af7699836ce834a12918a8dd7ca61c2a86a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit cfc140d3924dd6be893d242ce5df22e2128f09f8
Author: Michael Adam ob...@samba.org
Date: Wed Dec 17 22:27:39 2008 +0100
packaging(RHEL): fix typo in [u]mount.cifs installation
Michael
(cherry picked from commit 835108bcf84a5f47f46d237c7a93c572348125a1)
Signed-off-by: Michael Adam ob...@samba.org
(cherry picked from commit 71c74725bce403e36e4dc38287802c95b8d4de66)
commit 9745e36c011a76669aad7a0a861ba1520ef8cec3
Author: Michael Adam ob...@samba.org
Date: Wed Dec 17 18:56:34 2008 +0100
packaging(RHEL): fix build of [u]mount.cifs
mount.cifs is now built by make everything.
And it needs extra objects anyways (mtab.o),
which is why the build of mount.cifs failed.
Michael
(cherry picked from commit 96c811cf222be5463a6705feae73d6215685c5f1)
Signed-off-by: Michael Adam ob...@samba.org
(cherry picked from commit 308dbca653ce1d689b75f9b781237c67df4233a8)
---
Summary of changes:
packaging/RHEL/samba.spec.tmpl | 10 ++
1 files changed, 2 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index 92030fc..f674e83 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -178,12 +178,6 @@ fi
make CFLAGS=$RPM_OPT_FLAGS -D_GNU_SOURCE %{?_smp_mflags} \
all modules pam_smbpass
-## build the cifs fs mount helper
-cd client
-gcc -o mount.cifs $RPM_OPT_FLAGS -D_GNU_SOURCE -Wall -D_GNU_SOURCE
-D_LARGEFILE64_SOURCE mount.cifs.c
-gcc -o umount.cifs $RPM_OPT_FLAGS -D_GNU_SOURCE -Wall -D_GNU_SOURCE
-D_LARGEFILE64_SOURCE umount.cifs.c
-cd ..
-
# Remove some permission bits to avoid to many dependencies
cd ..
find examples docs -type f | xargs -r chmod -x
@@ -238,8 +232,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 source/client/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
-install -m755 source/client/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
+install -m755 source/bin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
+install -m755 source/bin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
install -m755 source/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
/bin/rm $RPM_BUILD_ROOT%{_sbindir}/*mount.cifs
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-stable updated - release-3-3-0rc2-77-g8b4c199
The branch, v3-3-stable has been updated
via 8b4c199deffd724a4a2219ccb8ffb91524101cd9 (commit)
via 1c1e196b648ae3ef241401f859842450c5153181 (commit)
from d1c995943694c41286a2e154d64d35b2e83b9cb7 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-stable
- Log -
commit 8b4c199deffd724a4a2219ccb8ffb91524101cd9
Author: Michael Adam ob...@samba.org
Date: Wed Dec 17 22:27:39 2008 +0100
packaging(RHEL): fix typo in [u]mount.cifs installation
Michael
(cherry picked from commit 835108bcf84a5f47f46d237c7a93c572348125a1)
Signed-off-by: Michael Adam ob...@samba.org
(cherry picked from commit 71c74725bce403e36e4dc38287802c95b8d4de66)
(cherry picked from commit cfc140d3924dd6be893d242ce5df22e2128f09f8)
commit 1c1e196b648ae3ef241401f859842450c5153181
Author: Michael Adam ob...@samba.org
Date: Wed Dec 17 18:56:34 2008 +0100
packaging(RHEL): fix build of [u]mount.cifs
mount.cifs is now built by make everything.
And it needs extra objects anyways (mtab.o),
which is why the build of mount.cifs failed.
Michael
(cherry picked from commit 96c811cf222be5463a6705feae73d6215685c5f1)
Signed-off-by: Michael Adam ob...@samba.org
(cherry picked from commit 308dbca653ce1d689b75f9b781237c67df4233a8)
(cherry picked from commit 9745e36c011a76669aad7a0a861ba1520ef8cec3)
---
Summary of changes:
packaging/RHEL/samba.spec.tmpl | 10 ++
1 files changed, 2 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index 92030fc..f674e83 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -178,12 +178,6 @@ fi
make CFLAGS=$RPM_OPT_FLAGS -D_GNU_SOURCE %{?_smp_mflags} \
all modules pam_smbpass
-## build the cifs fs mount helper
-cd client
-gcc -o mount.cifs $RPM_OPT_FLAGS -D_GNU_SOURCE -Wall -D_GNU_SOURCE
-D_LARGEFILE64_SOURCE mount.cifs.c
-gcc -o umount.cifs $RPM_OPT_FLAGS -D_GNU_SOURCE -Wall -D_GNU_SOURCE
-D_LARGEFILE64_SOURCE umount.cifs.c
-cd ..
-
# Remove some permission bits to avoid to many dependencies
cd ..
find examples docs -type f | xargs -r chmod -x
@@ -238,8 +232,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 source/client/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
-install -m755 source/client/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
+install -m755 source/bin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
+install -m755 source/bin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
install -m755 source/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
/bin/rm $RPM_BUILD_ROOT%{_sbindir}/*mount.cifs
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3316-gb2ef645
The branch, v3-2-test has been updated
via b2ef64515d4a4876276d152ff2075546d2030d23 (commit)
via cd796359ec0c30a0204fe744805bfbea3550f57d (commit)
from 347f1b6dcc88e04307397ea965ca8d0412b7a8c8 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit b2ef64515d4a4876276d152ff2075546d2030d23
Author: Michael Adam ob...@samba.org
Date: Wed Dec 17 22:27:39 2008 +0100
packaging(RHEL): fix typo in [u]mount.cifs installation
Michael
(cherry picked from commit 835108bcf84a5f47f46d237c7a93c572348125a1)
Signed-off-by: Michael Adam ob...@samba.org
(cherry picked from commit 71c74725bce403e36e4dc38287802c95b8d4de66)
(cherry picked from commit cfc140d3924dd6be893d242ce5df22e2128f09f8)
(cherry picked from commit 8b4c199deffd724a4a2219ccb8ffb91524101cd9)
commit cd796359ec0c30a0204fe744805bfbea3550f57d
Author: Michael Adam ob...@samba.org
Date: Wed Dec 17 18:56:34 2008 +0100
packaging(RHEL): fix build of [u]mount.cifs
mount.cifs is now built by make everything.
And it needs extra objects anyways (mtab.o),
which is why the build of mount.cifs failed.
Michael
(cherry picked from commit 96c811cf222be5463a6705feae73d6215685c5f1)
Signed-off-by: Michael Adam ob...@samba.org
(cherry picked from commit 308dbca653ce1d689b75f9b781237c67df4233a8)
(cherry picked from commit 9745e36c011a76669aad7a0a861ba1520ef8cec3)
(cherry picked from commit 1c1e196b648ae3ef241401f859842450c5153181)
---
Summary of changes:
packaging/RHEL/samba.spec.tmpl | 10 ++
1 files changed, 2 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index 49a0109..a93b5d9 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -179,12 +179,6 @@ fi
make CFLAGS=$RPM_OPT_FLAGS -D_GNU_SOURCE %{?_smp_mflags} \
all modules pam_smbpass
-## build the cifs fs mount helper
-cd client
-gcc -o mount.cifs $RPM_OPT_FLAGS -D_GNU_SOURCE -Wall -D_GNU_SOURCE
-D_LARGEFILE64_SOURCE mount.cifs.c
-gcc -o umount.cifs $RPM_OPT_FLAGS -D_GNU_SOURCE -Wall -D_GNU_SOURCE
-D_LARGEFILE64_SOURCE umount.cifs.c
-cd ..
-
# Remove some permission bits to avoid to many dependencies
cd ..
find examples docs -type f | xargs -r chmod -x
@@ -251,8 +245,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 source/client/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
-install -m755 source/client/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
+install -m755 source/bin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
+install -m755 source/bin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
install -m755 source/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
/bin/rm $RPM_BUILD_ROOT%{_sbindir}/*mount.cifs
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3318-gb17132c
The branch, v3-2-test has been updated
via b17132c61c22962fc30747f4619d32d0be608272 (commit)
via 6dbaf86ba4119a4fe2b2aea56994c3d3ea5d8428 (commit)
from b2ef64515d4a4876276d152ff2075546d2030d23 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit b17132c61c22962fc30747f4619d32d0be608272
Author: Karolin Seeger ksee...@samba.org
Date: Fri Jan 2 14:51:23 2009 +0100
Revert packaging(RHEL): fix build of [u]mount.cifs
This reverts commit cd796359ec0c30a0204fe744805bfbea3550f57d.
Applies only for 3.3 series.
Karolin
commit 6dbaf86ba4119a4fe2b2aea56994c3d3ea5d8428
Author: Karolin Seeger ksee...@samba.org
Date: Fri Jan 2 14:50:14 2009 +0100
Revert packaging(RHEL): fix typo in [u]mount.cifs installation
This reverts commit b2ef64515d4a4876276d152ff2075546d2030d23.
This issue does apply for 3.3 series only.
Karolin
---
Summary of changes:
packaging/RHEL/samba.spec.tmpl | 10 --
1 files changed, 8 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index a93b5d9..49a0109 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -179,6 +179,12 @@ fi
make CFLAGS=$RPM_OPT_FLAGS -D_GNU_SOURCE %{?_smp_mflags} \
all modules pam_smbpass
+## build the cifs fs mount helper
+cd client
+gcc -o mount.cifs $RPM_OPT_FLAGS -D_GNU_SOURCE -Wall -D_GNU_SOURCE
-D_LARGEFILE64_SOURCE mount.cifs.c
+gcc -o umount.cifs $RPM_OPT_FLAGS -D_GNU_SOURCE -Wall -D_GNU_SOURCE
-D_LARGEFILE64_SOURCE umount.cifs.c
+cd ..
+
# Remove some permission bits to avoid to many dependencies
cd ..
find examples docs -type f | xargs -r chmod -x
@@ -245,8 +251,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 source/bin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
-install -m755 source/bin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
+install -m755 source/client/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
+install -m755 source/client/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
install -m755 source/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
/bin/rm $RPM_BUILD_ROOT%{_sbindir}/*mount.cifs
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 76d53e7648869bbdc83be1e07941467019b96321
The branch, master has been updated
via 76d53e7648869bbdc83be1e07941467019b96321 (commit)
via 13248e8917015435c8979535531484344e3f2262 (commit)
via c033ea562669a2d28da53b3dbe566cdb7d26d43e (commit)
from 71c74725bce403e36e4dc38287802c95b8d4de66 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 76d53e7648869bbdc83be1e07941467019b96321
Author: Volker Lendecke v...@samba.org
Date: Fri Jan 2 14:53:26 2009 +0100
Alternative fix for 45db33e73 and 0d443ae7931
Simo is right, we need to ask passdb first. At least this fixes a nasty to
find
NT_STATUS_ACCESS_DENIED problem in the build farm for the test run I just
did
on host opi.
Michael, can you re-check if this also fixes the error you found, leading to
the two fixes?
Thanks,
Volker
commit 13248e8917015435c8979535531484344e3f2262
Author: Volker Lendecke v...@samba.org
Date: Fri Jan 2 14:51:23 2009 +0100
Revert s:Fix uid_to_sid mapping when the idmap cache is empty.
This reverts commit 9a9b64dbdfce4414ada22d4f882c8c757b5813e1.
commit c033ea562669a2d28da53b3dbe566cdb7d26d43e
Author: Volker Lendecke v...@samba.org
Date: Fri Jan 2 14:51:06 2009 +0100
Revert s3:idmap: Remove passd check from idmap_backends_unixid_to_sid().
This reverts commit 45db33e73262d8e195a46fb96405dfb3dc43d6bc.
---
Summary of changes:
source3/winbindd/idmap.c | 11 +++
1 files changed, 11 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/idmap.c b/source3/winbindd/idmap.c
index 6be55ef..ca07f23 100644
--- a/source3/winbindd/idmap.c
+++ b/source3/winbindd/idmap.c
@@ -735,6 +735,17 @@ NTSTATUS idmap_backends_unixid_to_sid(const char *domname,
struct id_map *id)
maps[0] = id;
maps[1] = NULL;
+ /*
+* Always give passdb a chance first
+*/
+
+ dom = idmap_init_passdb_domain(NULL);
+ if ((dom != NULL)
+NT_STATUS_IS_OK(dom-methods-unixids_to_sids(dom, maps))
+id-status == ID_MAPPED) {
+ return NT_STATUS_OK;
+ }
+
dom = idmap_find_domain(domname);
if (dom == NULL) {
return NT_STATUS_NONE_MAPPED;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4770-gf2535d7
The branch, v3-3-test has been updated
via f2535d7b94cfc6bec05127576186d93531304005 (commit)
via 605f5911febc25f40c697d4fc1097584ba49021e (commit)
via 860da910633415d1a3c850ed977a6635d28a7bf2 (commit)
from cfc140d3924dd6be893d242ce5df22e2128f09f8 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit f2535d7b94cfc6bec05127576186d93531304005
Author: Volker Lendecke v...@samba.org
Date: Fri Jan 2 14:53:26 2009 +0100
Alternative fix for 45db33e73 and 0d443ae7931
Simo is right, we need to ask passdb first. At least this fixes a nasty to
find
NT_STATUS_ACCESS_DENIED problem in the build farm for the test run I just
did
on host opi.
Michael, can you re-check if this also fixes the error you found, leading to
the two fixes?
Thanks,
Volker
commit 605f5911febc25f40c697d4fc1097584ba49021e
Author: Volker Lendecke v...@samba.org
Date: Fri Jan 2 15:02:03 2009 +0100
Revert Fix uid_to_sid mapping when the idmap cache is empty.
This reverts commit d4bc1f8d79929dc1a1d06e92eaf85923a1848e6f.
commit 860da910633415d1a3c850ed977a6635d28a7bf2
Author: Volker Lendecke v...@samba.org
Date: Fri Jan 2 15:01:47 2009 +0100
Revert idmap: Remove passd check from idmap_backends_unixid_to_sid().
This reverts commit 3d22b77f1ac5e8f83d1063d87c68e60655a3ed6b.
---
Summary of changes:
source/winbindd/idmap.c | 11 +++
1 files changed, 11 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/winbindd/idmap.c b/source/winbindd/idmap.c
index 6be55ef..ca07f23 100644
--- a/source/winbindd/idmap.c
+++ b/source/winbindd/idmap.c
@@ -735,6 +735,17 @@ NTSTATUS idmap_backends_unixid_to_sid(const char *domname,
struct id_map *id)
maps[0] = id;
maps[1] = NULL;
+ /*
+* Always give passdb a chance first
+*/
+
+ dom = idmap_init_passdb_domain(NULL);
+ if ((dom != NULL)
+NT_STATUS_IS_OK(dom-methods-unixids_to_sids(dom, maps))
+id-status == ID_MAPPED) {
+ return NT_STATUS_OK;
+ }
+
dom = idmap_find_domain(domname);
if (dom == NULL) {
return NT_STATUS_NONE_MAPPED;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - ec1e831bd8791e7b2c373f1119e1d3e33b06e152
The branch, master has been updated
via ec1e831bd8791e7b2c373f1119e1d3e33b06e152 (commit)
via 96266d2f50b2f68e29c811908efecb78895e49bd (commit)
from 76d53e7648869bbdc83be1e07941467019b96321 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit ec1e831bd8791e7b2c373f1119e1d3e33b06e152
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 2 16:26:00 2009 +0100
librpc/gen_ndr: rerun make idl_full after pidl changes
metze
commit 96266d2f50b2f68e29c811908efecb78895e49bd
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 2 16:22:18 2009 +0100
pidl: add dummy element for empty unions
This hopefully fixes the build on Solaris and IRIX.
metze
---
Summary of changes:
librpc/gen_ndr/named_pipe_auth.h |1 +
pidl/lib/Parse/Pidl/Samba4/Header.pm |6 ++
2 files changed, 7 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/named_pipe_auth.h b/librpc/gen_ndr/named_pipe_auth.h
index 5f4ba9a..8f2446e 100644
--- a/librpc/gen_ndr/named_pipe_auth.h
+++ b/librpc/gen_ndr/named_pipe_auth.h
@@ -19,6 +19,7 @@ struct named_pipe_auth_req {
}/* [gensize,public] */;
union named_pipe_auth_rep_info {
+ int _dummy_element;
}/* [switch_type(uint32)] */;
struct named_pipe_auth_rep {
diff --git a/pidl/lib/Parse/Pidl/Samba4/Header.pm
b/pidl/lib/Parse/Pidl/Samba4/Header.pm
index 94e1efb..0411466 100644
--- a/pidl/lib/Parse/Pidl/Samba4/Header.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/Header.pm
@@ -183,14 +183,20 @@ sub HeaderUnion($$;$)
return if (not defined($union-{ELEMENTS}));
pidl {\n;
$tab_depth++;
+ my $needed = 0;
foreach my $e (@{$union-{ELEMENTS}}) {
if ($e-{TYPE} ne EMPTY) {
if (! defined $done{$e-{NAME}}) {
HeaderElement($e);
}
$done{$e-{NAME}} = 1;
+ $needed++;
}
}
+ if (!$needed) {
+ # sigh - some compilers don't like empty structures
+ pidl tabs().int _dummy_element;\n;
+ }
$tab_depth--;
pidl };
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - a54c558ca6e6eee1c16817bfb9d9b7dcabd578b8
The branch, master has been updated
via a54c558ca6e6eee1c16817bfb9d9b7dcabd578b8 (commit)
from ec1e831bd8791e7b2c373f1119e1d3e33b06e152 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit a54c558ca6e6eee1c16817bfb9d9b7dcabd578b8
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 2 17:52:14 2009 +0100
Revert s4 winbind: Avoid a discards const compiler warning.
This reverts commit dd8d4b6fd178df6847052dac207a4aafc0697d71.
s3call-response.extra_data.data is a pointer and no fstring!
metze
---
Summary of changes:
source4/winbind/wb_samba3_cmd.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/winbind/wb_samba3_cmd.c b/source4/winbind/wb_samba3_cmd.c
index 6cad76b..ea30505 100644
--- a/source4/winbind/wb_samba3_cmd.c
+++ b/source4/winbind/wb_samba3_cmd.c
@@ -115,8 +115,8 @@ NTSTATUS wbsrv_samba3_priv_pipe_dir(struct
wbsrv_samba3_call *s3call)
{
const char *path =
s3call-wbconn-listen_socket-service-priv_socket_path;
s3call-response.result = WINBINDD_OK;
- WBSRV_SAMBA3_SET_STRING(s3call-response.extra_data.data, path);
-
+ s3call-response.extra_data.data = path;
+
s3call-response.length += strlen(path) + 1;
return NT_STATUS_OK;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 0e95c9a1eb82a50281c94b226fbae2ac3210e5f5
The branch, master has been updated via 0e95c9a1eb82a50281c94b226fbae2ac3210e5f5 (commit) from a54c558ca6e6eee1c16817bfb9d9b7dcabd578b8 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 0e95c9a1eb82a50281c94b226fbae2ac3210e5f5 Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 2 18:10:26 2009 +0100 Revert s4 winbind: Copy SID to avoid discard const warning This reverts commit 102028ec722d942d7f91eb92e8da4f1480d140d1. state-ctx is the composite_context, which is a temporary context! metze --- Summary of changes: source4/winbind/wb_init_domain.c |3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/winbind/wb_init_domain.c b/source4/winbind/wb_init_domain.c index 637cf10..5953474 100644 --- a/source4/winbind/wb_init_domain.c +++ b/source4/winbind/wb_init_domain.c @@ -402,8 +402,7 @@ static void init_domain_recv_samr(struct composite_context *ctx) talloc_steal(state-domain-libnet_ctx-samr.pipe, state-domain-samr_binding); state-domain-libnet_ctx-samr.access_mask = SEC_FLAG_MAXIMUM_ALLOWED; state-domain-libnet_ctx-samr.name = state-domain-info-name; - state-domain-libnet_ctx-samr.sid = dom_sid_dup(state-ctx, - state-domain-info-sid); + state-domain-libnet_ctx-samr.sid = state-domain-info-sid; composite_done(state-ctx); } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 268f3e93a4dd66ce43dc53278eff01f801ba5083
The branch, master has been updated via 268f3e93a4dd66ce43dc53278eff01f801ba5083 (commit) via 2885a7ab6e2a44a76148380f47e2d0cde69d8b38 (commit) via 34cc50cb63a1a9e466d833de781e57b2f7c0b8ab (commit) via 73ef1773bebc206522b0a285573254441fc6a18a (commit) via 2176295b02cb39945d5335d93f0c5dfe054c9b9a (commit) via 784b2dc8d02c4e5c1ae31314f08874fa57416c40 (commit) via 4f04b06ac2cfceddaabcbf661f9878ff69a6f01b (commit) via d79fc2ffcd9802d927f82f014c2b13c7eb8cc873 (commit) via 227f799dee4e59479612bcb3dc96231589515051 (commit) via 49acf9799aab288b4e585295eb7c44a719973945 (commit) via b12e78e64517d423aefecc84f23499b13aedd734 (commit) via d9529a331afaf1c82b24becc1d0d245e19d518aa (commit) via 0a73e8b334d2b9f5e8032c685d78b6425a9fa5e7 (commit) via 7db63990698563fd5d32698cb7988358cf5ab247 (commit) via d33b6aeff3ff0220c16211936043934cfa3ec71b (commit) via 8bdc947993dd29d0480675464d548134c6f71ea7 (commit) via 0ffed7d992a50bff5f3bc89447418ed485dbccb0 (commit) via 25387d89427d1cc79c80d4915ecc00100712be87 (commit) via 3f8f99eaecf7a07126969594c41c00392b85cefd (commit) via 54c0f626f51c33245ae8f7778cc6ad6b48ae0f93 (commit) from 0e95c9a1eb82a50281c94b226fbae2ac3210e5f5 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 268f3e93a4dd66ce43dc53278eff01f801ba5083 Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 2 16:41:21 2009 +0100 s4:lib/events: remove unused events_internal.h external users need to use tevent_internal.h anyway metze commit 2885a7ab6e2a44a76148380f47e2d0cde69d8b38 Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 2 16:27:48 2009 +0100 s4:selftest: report tevent tests as 'tevent.python' metze commit 34cc50cb63a1a9e466d833de781e57b2f7c0b8ab Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 2 15:34:37 2009 +0100 s4:lib/events: convert to use tevent_* functions instead of compat macros metze commit 73ef1773bebc206522b0a285573254441fc6a18a Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 2 16:28:38 2009 +0100 tevent: only provide compat macros if the caller wants them metze commit 2176295b02cb39945d5335d93f0c5dfe054c9b9a Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 2 16:27:11 2009 +0100 tevent: change pytevent to tevent_* metze commit 784b2dc8d02c4e5c1ae31314f08874fa57416c40 Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 2 16:25:29 2009 +0100 tevent: use TEVENT_FD_* instead of EVENT_FD_* metze commit 4f04b06ac2cfceddaabcbf661f9878ff69a6f01b Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 2 13:39:56 2009 +0100 tevent: rename ev_debug_ops = tevent_debug_ops And related changes, but we keep compat macros metze commit d79fc2ffcd9802d927f82f014c2b13c7eb8cc873 Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 2 14:20:37 2009 +0100 tevent: rename events = tevent in tevent.pc metze commit 227f799dee4e59479612bcb3dc96231589515051 Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 2 13:26:32 2009 +0100 tevent: pass down handler_name and location to the backend layer metze commit 49acf9799aab288b4e585295eb7c44a719973945 Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 2 11:44:17 2009 +0100 tevent: make tevent_add_*() macros arround _tevent_add_*() This passes some additional debug information into the events system to make it easier to find bugs. metze commit b12e78e64517d423aefecc84f23499b13aedd734 Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 2 13:39:26 2009 +0100 tevent: use HAVE_EPOLL instead of HAVE_EVENTS_EPOLL metze commit d9529a331afaf1c82b24becc1d0d245e19d518aa Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 2 13:35:32 2009 +0100 tevent: rename event_register_backend() = tevent_register_backend() And fix the callers and there init functions. metze commit 0a73e8b334d2b9f5e8032c685d78b6425a9fa5e7 Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 2 11:30:00 2009 +0100 tevent: rename event_context_init* = tevent_context_init*() metze commit 7db63990698563fd5d32698cb7988358cf5ab247 Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 2 11:36:52 2009 +0100 tevent: rename event_[s|g]et_fd_flags = tevent_fd_[s|g]et_flags metze commit d33b6aeff3ff0220c16211936043934cfa3ec71b Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 2 11:32:29 2009 +0100 tevent: rename event_loop_* = tevent_loop_* metze commit 8bdc947993dd29d0480675464d548134c6f71ea7 Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 2 11:17:00 2009 +0100 tevent: rename event_set_default_backend() =
[SCM] Samba Shared Repository - branch master updated - 11576353f645d7d7f44a74d27545b946c6175658
The branch, master has been updated
via 11576353f645d7d7f44a74d27545b946c6175658 (commit)
via 2234173220c51c2e37818149ddf41421672904c0 (commit)
from 268f3e93a4dd66ce43dc53278eff01f801ba5083 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 11576353f645d7d7f44a74d27545b946c6175658
Merge: 2234173220c51c2e37818149ddf41421672904c0
268f3e93a4dd66ce43dc53278eff01f801ba5083
Author: Jeremy Allison j...@samba.org
Date: Fri Jan 2 11:39:04 2009 -0800
Merge branch 'master' of ssh://j...@git.samba.org/data/git/samba
commit 2234173220c51c2e37818149ddf41421672904c0
Author: Jeremy Allison j...@samba.org
Date: Fri Jan 2 11:38:24 2009 -0800
Fix warnings in make test code.
Jeremy.
---
Summary of changes:
lib/replace/test/os2_delete.c |8 ++--
source3/torture/nbio.c| 19 +++
source3/torture/torture.c | 18 ++
source3/torture/utable.c |6 +-
source4/torture/util_smb.c|5 -
5 files changed, 44 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/test/os2_delete.c b/lib/replace/test/os2_delete.c
index b45c135..44efeea 100644
--- a/lib/replace/test/os2_delete.c
+++ b/lib/replace/test/os2_delete.c
@@ -30,7 +30,9 @@ static int test_readdir_os2_delete_ret;
static void cleanup(void)
{
/* I'm a lazy bastard */
- system(rm -rf TESTDIR);
+ if (system(rm -rf TESTDIR)) {
+ FAILED(system);
+ }
mkdir(TESTDIR, 0700) == 0 || FAILED(mkdir);
}
@@ -118,7 +120,9 @@ int test_readdir_os2_delete(void)
rmdir(TESTDIR) == 0 || FAILED(rmdir);
- system(rm -rf TESTDIR);
+ if (system(rm -rf TESTDIR) == -1) {
+ FAILED(system);
+ }
return test_readdir_os2_delete_ret;
}
diff --git a/source3/torture/nbio.c b/source3/torture/nbio.c
index 81d0eb8..a010c80 100644
--- a/source3/torture/nbio.c
+++ b/source3/torture/nbio.c
@@ -111,7 +111,9 @@ static void sigsegv(int sig)
printf(segv at line %d\n, line_count);
slprintf(line, sizeof(line), /usr/X11R6/bin/xterm -e gdb /proc/%d/exe
%d,
(int)getpid(), (int)getpid());
- system(line);
+ if (system(line) == -1) {
+ printf(system() failed\n);
+ }
exit(1);
}
@@ -280,10 +282,16 @@ static void delete_fn(const char *mnt, file_info *finfo,
const char *name, void
n = SMB_STRDUP(name);
n[strlen(n)-1] = 0;
- asprintf(s, %s%s, n, finfo-name);
+ if (asprintf(s, %s%s, n, finfo-name) == -1) {
+ printf(asprintf failed\n);
+ return;
+ }
if (finfo-mode aDIR) {
char *s2;
- asprintf(s2, %s\\*, s);
+ if (asprintf(s2, %s\\*, s) == -1) {
+ printf(asprintf failed\n);
+ return;
+ }
cli_list(c, s2, aDIR, delete_fn, NULL);
nb_rmdir(s);
} else {
@@ -297,7 +305,10 @@ static void delete_fn(const char *mnt, file_info *finfo,
const char *name, void
void nb_deltree(const char *dname)
{
char *mask;
- asprintf(mask, %s\\*, dname);
+ if (asprintf(mask, %s\\*, dname) == -1) {
+ printf(asprintf failed\n);
+ return;
+ }
total_deleted = 0;
cli_list(c, mask, aDIR, delete_fn, NULL);
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 63942da..3261e78 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -1213,7 +1213,9 @@ static bool run_tcon2_test(int dummy)
printf(starting tcon2 test\n);
- asprintf(service, %s\\%s, host, share);
+ if (asprintf(service, %s\\%s, host, share) == -1) {
+ return false;
+ }
status = cli_raw_tcon(cli, service, password, ?, max_xmit,
cnum);
@@ -5280,8 +5282,13 @@ static bool run_local_rbtree(int dummy)
for (i=0; i1000; i++) {
char *key, *value;
- asprintf(key, key%ld, random());
- asprintf(value, value%ld, random());
+ if (asprintf(key, key%ld, random()) == -1) {
+ goto done;
+ }
+ if (asprintf(value, value%ld, random()) == -1) {
+ SAFE_FREE(key);
+ goto done;
+ }
if (!rbt_testval(db, key, value)) {
SAFE_FREE(key);
@@ -5290,7 +5297,10 @@ static bool run_local_rbtree(int dummy)
}
SAFE_FREE(value);
- asprintf(value, value%ld, random());
+ if (asprintf(value, value%ld, random()) == -1) {
+ SAFE_FREE(key);
+ goto
[SCM] Samba Shared Repository - branch master updated - 793f1cdbd918f2245255176572027763664d9d0b
The branch, master has been updated
via 793f1cdbd918f2245255176572027763664d9d0b (commit)
via cc9771d3daa84994ceec427127a71a3cf0a34b9a (commit)
via de58ef45ac0510bfa510fed54010f1de67e83953 (commit)
from 11576353f645d7d7f44a74d27545b946c6175658 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 793f1cdbd918f2245255176572027763664d9d0b
Author: scude...@gmail.com scude...@gmail.com
Date: Fri Jan 2 22:41:04 2009 +1100
Changed code to use proper talloc context instead of NULL to control memory
leak.
commit cc9771d3daa84994ceec427127a71a3cf0a34b9a
Author: scude...@gmail.com scude...@gmail.com
Date: Fri Jan 2 22:40:32 2009 +1100
Memory leak fixed due to accumulation of open reg keys.
commit de58ef45ac0510bfa510fed54010f1de67e83953
Author: scude...@gmail.com scude...@gmail.com
Date: Fri Jan 2 22:39:58 2009 +1100
Fixes uninitialised access as reported by valgrind.
---
Summary of changes:
source4/lib/registry/regf.c |4 ++--
source4/lib/registry/tools/common.c |2 +-
source4/lib/registry/tools/regtree.c | 13 -
3 files changed, 11 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/lib/registry/regf.c b/source4/lib/registry/regf.c
index a869ed4..4cbcb09 100644
--- a/source4/lib/registry/regf.c
+++ b/source4/lib/registry/regf.c
@@ -543,7 +543,7 @@ static WERROR regf_get_value(TALLOC_CTX *ctx, struct
hive_key *key,
if (vk-data_length 0x8000) {
vk-data_length =~0x8000;
- data-data = (uint8_t *)vk-data_offset;
+ data-data = talloc_memdup(ctx, (uint8_t *)vk-data_offset,
vk-data_length);
data-length = vk-data_length;
} else {
*data = hbin_get(regf, vk-data_offset);
@@ -2045,7 +2045,7 @@ WERROR reg_open_regf_file(TALLOC_CTX *parent_ctx, const
char *location,
struct tdr_pull *pull;
int i;
- regf = (struct regf_data *)talloc_zero(NULL, struct regf_data);
+ regf = (struct regf_data *)talloc_zero(parent_ctx, struct regf_data);
regf-iconv_convenience = iconv_convenience;
diff --git a/source4/lib/registry/tools/common.c
b/source4/lib/registry/tools/common.c
index c9f1248..d997cb0 100644
--- a/source4/lib/registry/tools/common.c
+++ b/source4/lib/registry/tools/common.c
@@ -51,7 +51,7 @@ struct registry_key *reg_common_open_file(const char *path,
struct registry_context *h = NULL;
WERROR error;
- error = reg_open_hive(NULL, path, NULL, creds, ev_ctx, lp_ctx,
hive_root);
+ error = reg_open_hive(ev_ctx, path, NULL, creds, ev_ctx, lp_ctx,
hive_root);
if(!W_ERROR_IS_OK(error)) {
fprintf(stderr, Unable to open '%s': %s \n,
diff --git a/source4/lib/registry/tools/regtree.c
b/source4/lib/registry/tools/regtree.c
index cca009a..948ed49 100644
--- a/source4/lib/registry/tools/regtree.c
+++ b/source4/lib/registry/tools/regtree.c
@@ -55,13 +55,16 @@ static void print_tree(int level, struct registry_key *p,
keyname,
NULL,
NULL));
i++) {
- SMB_ASSERT(strlen(keyname) 0);
+
+ SMB_ASSERT(strlen(keyname) 0);
if (!W_ERROR_IS_OK(reg_open_key(mem_ctx, p, keyname, subkey)))
- continue;
+ continue;
+
print_tree(level+1, subkey, (fullpath strlen(name))?
- talloc_asprintf(mem_ctx,
%s\\%s,
- name, keyname):
- keyname, fullpath, novals);
+ talloc_asprintf(mem_ctx,
%s\\%s,
+ name, keyname):
+ keyname, fullpath, novals);
+ talloc_free(subkey);
}
talloc_free(mem_ctx);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - e000045f15665f1c5209f52bf5730bac5c14256b
The branch, master has been updated
via e45f15665f1c5209f52bf5730bac5c14256b (commit)
via 3d2d0203e57bacf0cd61cfb72780a4bd9aa42707 (commit)
from 793f1cdbd918f2245255176572027763664d9d0b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e45f15665f1c5209f52bf5730bac5c14256b
Merge: 3d2d0203e57bacf0cd61cfb72780a4bd9aa42707
793f1cdbd918f2245255176572027763664d9d0b
Author: Jeremy Allison j...@samba.org
Date: Fri Jan 2 12:51:18 2009 -0800
Merge branch 'master' of ssh://j...@git.samba.org/data/git/samba
commit 3d2d0203e57bacf0cd61cfb72780a4bd9aa42707
Author: Jeremy Allison j...@samba.org
Date: Fri Jan 2 12:49:49 2009 -0800
Remove cli_cm_set_dest_ss() - removes the global dest_ss
from libsmb/clidfs.c. Keep the '-Iaddress' option in
smbclient working. The intent is to remove all globals
from libsmb/clidfs.c.
Jeremy.
---
Summary of changes:
source3/client/client.c | 13 -
source3/libsmb/clidfs.c | 20 +---
2 files changed, 13 insertions(+), 20 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/client/client.c b/source3/client/client.c
index c63921a..529f21a 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -78,6 +78,7 @@ static bool showacls = false;
bool lowercase = false;
static struct sockaddr_storage dest_ss;
+static char dest_ss_str[INET6_ADDRSTRLEN];
#define SEPARATORS \t\n\r
@@ -4043,7 +4044,8 @@ static int process_command_string(const char *cmd_in)
/* establish the connection if not already */
if (!cli) {
- cli = cli_cm_open(talloc_tos(), NULL, desthost,
+ cli = cli_cm_open(talloc_tos(), NULL,
+ have_ip ? dest_ss_str : desthost,
service, true, smb_encrypt);
if (!cli) {
return 1;
@@ -4508,7 +4510,8 @@ static int process(const char *base_directory)
int rc = 0;
cli = cli_cm_open(talloc_tos(), NULL,
- desthost, service, true, smb_encrypt);
+ have_ip ? dest_ss_str : desthost,
+ service, true, smb_encrypt);
if (!cli) {
return 1;
}
@@ -4586,7 +4589,8 @@ static int do_tar_op(const char *base_directory)
/* do we already have a connection? */
if (!cli) {
cli = cli_cm_open(talloc_tos(), NULL,
- desthost, service, true, smb_encrypt);
+ have_ip ? dest_ss_str : desthost,
+ service, true, smb_encrypt);
if (!cli)
return 1;
}
@@ -4792,8 +4796,7 @@ static int do_message_op(struct user_auth_info *auth_info)
exit(1);
}
have_ip = true;
-
- cli_cm_set_dest_ss(dest_ss);
+ print_sockaddr(dest_ss_str,
sizeof(dest_ss_str), dest_ss);
}
break;
case 'E':
diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index 4597e63..ac68700 100644
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -54,8 +54,6 @@ static void cm_set_password(const char *newpass);
static int port;
static int name_type = 0x20;
-static bool have_ip;
-static struct sockaddr_storage dest_ss;
static struct client_connection *connections;
@@ -133,8 +131,11 @@ static struct cli_state *do_connect(TALLOC_CTX *ctx,
}
sharename = servicename;
if (*sharename == '\\') {
- server = sharename+2;
- sharename = strchr_m(server,'\\');
+ sharename += 2;
+ if (server == NULL) {
+ server = sharename;
+ }
+ sharename = strchr_m(sharename,'\\');
if (!sharename) {
return NULL;
}
@@ -151,8 +152,6 @@ static struct cli_state *do_connect(TALLOC_CTX *ctx,
again:
zero_sockaddr(ss);
- if (have_ip)
- ss = dest_ss;
/* have to open a new connection */
if (!(c=cli_initialise()) || (cli_set_port(c, port) != port)) {
@@ -550,15 +549,6 @@ void cli_cm_set_fallback_after_kerberos(void)
cm_creds.fallback_after_kerberos = true;
}
-/
-/
-
-void cli_cm_set_dest_ss(struct sockaddr_storage *pss)
-{
- dest_ss = *pss;
- have_ip = true;
-}
-
/**
split a dfs path into the server,
[SCM] Samba Shared Repository - branch master updated - b4e1eb4345ab0be00e31d09cf0753597ef0af44a
The branch, master has been updated
via b4e1eb4345ab0be00e31d09cf0753597ef0af44a (commit)
via aed8c7bfcfb3c860758d39d476ca87ef9eda2b6d (commit)
from e45f15665f1c5209f52bf5730bac5c14256b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b4e1eb4345ab0be00e31d09cf0753597ef0af44a
Author: Volker Lendecke v...@samba.org
Date: Sat Dec 20 10:51:54 2008 +0100
Optimize for the common case that packet.c received exactly one full packet
commit aed8c7bfcfb3c860758d39d476ca87ef9eda2b6d
Author: Volker Lendecke v...@samba.org
Date: Sat Dec 20 10:44:29 2008 +0100
packet.h API: The callback is now responsible to talloc_free() buf
---
Summary of changes:
source3/include/packet.h |6 +++-
source3/lib/ctdbd_conn.c | 49 ++---
source3/lib/packet.c | 44 +
3 files changed, 59 insertions(+), 40 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/packet.h b/source3/include/packet.h
index 05974da..03331da 100644
--- a/source3/include/packet.h
+++ b/source3/include/packet.h
@@ -44,12 +44,14 @@ NTSTATUS packet_fd_read_sync(struct packet_context *ctx);
* Handle an incoming packet:
* Return False if none is available
* Otherwise return True and store the callback result in *status
+ * Callback must either talloc_move or talloc_free buf
*/
bool packet_handler(struct packet_context *ctx,
- bool (*full_req)(const DATA_BLOB *data,
+ bool (*full_req)(const uint8_t *buf,
+size_t available,
size_t *length,
void *private_data),
- NTSTATUS (*callback)(const DATA_BLOB *data,
+ NTSTATUS (*callback)(uint8_t *buf, size_t length,
void *private_data),
void *private_data,
NTSTATUS *status);
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 8d97606..75a5133 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -155,17 +155,17 @@ static NTSTATUS ctdbd_connect(TALLOC_CTX *mem_ctx,
* Do we have a complete ctdb packet in the queue?
*/
-static bool ctdb_req_complete(const DATA_BLOB *data,
+static bool ctdb_req_complete(const uint8_t *buf, size_t available,
size_t *length,
void *private_data)
{
uint32 msglen;
- if (data-length sizeof(msglen)) {
+ if (available sizeof(msglen)) {
return False;
}
- msglen = *((uint32 *)data-data);
+ msglen = *((uint32 *)buf);
DEBUG(10, (msglen = %d\n, msglen));
@@ -176,12 +176,12 @@ static bool ctdb_req_complete(const DATA_BLOB *data,
cluster_fatal(ctdbd protocol error\n);
}
- if (data-length = msglen) {
- *length = msglen;
- return True;
+ if (available msglen) {
+ return false;
}
- return False;
+ *length = msglen;
+ return true;
}
/*
@@ -220,16 +220,13 @@ struct req_pull_state {
* Pull a ctdb request out of the incoming packet queue
*/
-static NTSTATUS ctdb_req_pull(const DATA_BLOB *data,
+static NTSTATUS ctdb_req_pull(uint8_t *buf, size_t length,
void *private_data)
{
struct req_pull_state *state = (struct req_pull_state *)private_data;
- state-req = data_blob_talloc(state-mem_ctx, data-data,
- data-length);
- if (state-req.data == NULL) {
- return NT_STATUS_NO_MEMORY;
- }
+ state-req.data = talloc_move(state-mem_ctx, buf);
+ state-req.length = length;
return NT_STATUS_OK;
}
@@ -497,7 +494,7 @@ NTSTATUS ctdbd_messaging_connection(TALLOC_CTX *mem_ctx,
/*
* Packet handler to receive and handle a ctdb message
*/
-static NTSTATUS ctdb_handle_message(const DATA_BLOB *data,
+static NTSTATUS ctdb_handle_message(uint8_t *buf, size_t length,
void *private_data)
{
struct ctdbd_connection *conn = talloc_get_type_abort(
@@ -505,11 +502,12 @@ static NTSTATUS ctdb_handle_message(const DATA_BLOB *data,
struct ctdb_req_message *msg;
struct messaging_rec *msg_rec;
- msg = (struct ctdb_req_message *)data-data;
+ msg = (struct ctdb_req_message *)buf;
if (msg-hdr.operation != CTDB_REQ_MESSAGE) {
DEBUG(0, (Received async msg of type %u, discarding\n,
msg-hdr.operation));
+ TALLOC_FREE(buf);
return NT_STATUS_INVALID_PARAMETER;
}
@@ -519,6 +517,7 @@ static
[SCM] Samba Shared Repository - branch master updated - 980aa0d464b5e95c777539cdd7a289b5407f1912
The branch, master has been updated
via 980aa0d464b5e95c777539cdd7a289b5407f1912 (commit)
from b4e1eb4345ab0be00e31d09cf0753597ef0af44a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 980aa0d464b5e95c777539cdd7a289b5407f1912
Author: Volker Lendecke v...@samba.org
Date: Sat Dec 27 17:20:25 2008 +0100
Replace some SMB_ASSERTs with NT_STATUS_INTERNAL_ERROR
---
Summary of changes:
source3/lib/async_sock.c | 35 ---
1 files changed, 28 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/async_sock.c b/source3/lib/async_sock.c
index 225cc7b..3e9d6f7 100644
--- a/source3/lib/async_sock.c
+++ b/source3/lib/async_sock.c
@@ -236,7 +236,10 @@ static void async_send_callback(struct event_context *ev,
req-private_data, struct async_syscall_state);
struct param_send *p = state-param.param_send;
- SMB_ASSERT(state-syscall_type == ASYNC_SYSCALL_SEND);
+ if (state-syscall_type != ASYNC_SYSCALL_SEND) {
+ async_req_error(req, NT_STATUS_INTERNAL_ERROR);
+ return;
+ }
state-result.result_ssize_t = send(p-fd, p-buffer, p-length,
p-flags);
@@ -300,7 +303,10 @@ static void async_sendall_callback(struct event_context
*ev,
req-private_data, struct async_syscall_state);
struct param_sendall *p = state-param.param_sendall;
- SMB_ASSERT(state-syscall_type == ASYNC_SYSCALL_SENDALL);
+ if (state-syscall_type != ASYNC_SYSCALL_SENDALL) {
+ async_req_error(req, NT_STATUS_INTERNAL_ERROR);
+ return;
+ }
state-result.result_ssize_t = send(p-fd, (char *)p-buffer + p-sent,
p-length - p-sent, p-flags);
@@ -317,7 +323,10 @@ static void async_sendall_callback(struct event_context
*ev,
}
p-sent += state-result.result_ssize_t;
- SMB_ASSERT(p-sent = p-length);
+ if (p-sent p-length) {
+ async_req_error(req, NT_STATUS_INTERNAL_ERROR);
+ return;
+ }
if (p-sent == p-length) {
TALLOC_FREE(state-fde);
@@ -385,7 +394,10 @@ static void async_recv_callback(struct event_context *ev,
req-private_data, struct async_syscall_state);
struct param_recv *p = state-param.param_recv;
- SMB_ASSERT(state-syscall_type == ASYNC_SYSCALL_RECV);
+ if (state-syscall_type != ASYNC_SYSCALL_RECV) {
+ async_req_error(req, NT_STATUS_INTERNAL_ERROR);
+ return;
+ }
state-result.result_ssize_t = recv(p-fd, p-buffer, p-length,
p-flags);
@@ -450,7 +462,10 @@ static void async_recvall_callback(struct event_context
*ev,
req-private_data, struct async_syscall_state);
struct param_recvall *p = state-param.param_recvall;
- SMB_ASSERT(state-syscall_type == ASYNC_SYSCALL_RECVALL);
+ if (state-syscall_type != ASYNC_SYSCALL_RECVALL) {
+ async_req_error(req, NT_STATUS_INTERNAL_ERROR);
+ return;
+ }
state-result.result_ssize_t = recv(p-fd,
(char *)p-buffer + p-received,
@@ -468,7 +483,10 @@ static void async_recvall_callback(struct event_context
*ev,
}
p-received += state-result.result_ssize_t;
- SMB_ASSERT(p-received = p-length);
+ if (p-received p-length) {
+ async_req_error(req, NT_STATUS_INTERNAL_ERROR);
+ return;
+ }
if (p-received == p-length) {
TALLOC_FREE(state-fde);
@@ -535,7 +553,10 @@ static void async_connect_callback(struct event_context
*ev,
req-private_data, struct async_syscall_state);
struct param_connect *p = state-param.param_connect;
- SMB_ASSERT(state-syscall_type == ASYNC_SYSCALL_CONNECT);
+ if (state-syscall_type != ASYNC_SYSCALL_CONNECT) {
+ async_req_error(req, NT_STATUS_INTERNAL_ERROR);
+ return;
+ }
TALLOC_FREE(state-fde);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 120dc0e5aa2778a6ad2da80672b0e51ed77f2f53
The branch, master has been updated
via 120dc0e5aa2778a6ad2da80672b0e51ed77f2f53 (commit)
from 980aa0d464b5e95c777539cdd7a289b5407f1912 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 120dc0e5aa2778a6ad2da80672b0e51ed77f2f53
Author: Kai Blin k...@samba.org
Date: Fri Jan 2 22:46:08 2009 +0100
s4 winbind: Correctly silence a discard const warning
Thanks to metze for pointing out the error.
---
Summary of changes:
source4/winbind/wb_samba3_cmd.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/winbind/wb_samba3_cmd.c b/source4/winbind/wb_samba3_cmd.c
index ea30505..6af9266 100644
--- a/source4/winbind/wb_samba3_cmd.c
+++ b/source4/winbind/wb_samba3_cmd.c
@@ -115,8 +115,8 @@ NTSTATUS wbsrv_samba3_priv_pipe_dir(struct
wbsrv_samba3_call *s3call)
{
const char *path =
s3call-wbconn-listen_socket-service-priv_socket_path;
s3call-response.result = WINBINDD_OK;
- s3call-response.extra_data.data = path;
-
+ s3call-response.extra_data.data = discard_const(path);
+
s3call-response.length += strlen(path) + 1;
return NT_STATUS_OK;
}
--
Samba Shared Repository
Build status as of Sat Jan 3 00:00:01 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-01-02 00:00:49.0 + +++ /home/build/master/cache/broken_results.txt 2009-01-03 00:00:51.0 + @@ -1,23 +1,23 @@ -Build status as of Fri Jan 2 00:00:02 2009 +Build status as of Sat Jan 3 00:00:01 2009 Build counts: Tree Total Broken Panic build_farm 0 0 0 -ccache 31 7 0 +ccache 29 5 0 ctdb 0 0 0 distcc 1 0 0 -ldb 30 31 0 -libreplace 28 12 0 -lorikeet-heimdal 28 19 0 -pidl 18 2 0 +ldb 29 29 0 +libreplace 28 11 0 +lorikeet-heimdal 26 17 0 +pidl 17 2 0 ppp 12 0 0 -rsync31 12 0 +rsync29 11 0 samba-docs 0 0 0 samba-gtk5 5 0 samba_3_X_devel 27 23 1 samba_3_X_test 27 22 0 -samba_4_0_test 30 27 2 -smb-build29 7 0 -talloc 31 31 0 -tdb 29 12 0 +samba_4_0_test 28 24 1 +smb-build27 6 0 +talloc 29 29 0 +tdb 27 10 0
