[Samba] cannot access shares
i had my file server setup with suse 10.1, and i did a clean upgrade to suse 10.2 (if it matters much), now trying to setup samba again, i have run into a slight problem. on my windows machines, i can access the home directories of the users, however when i try and get into directories i setup myself (in my case 'netshare'), it says that the directory is not accessible. check permissions etc. my user list: user1, user2 both belong to group: window permission for the directory '/netshare' is set for 775 'netshare' is owned by user1 in group window here is the smb.conf file *** START smb.conf # Samba config file created using SWAT # from 127.0.0.1 (127.0.0.1) # Date: 2007/07/14 14:06:14 [global] workgroup = HOME server string = Our File Repository map to guest = Bad User printcap name = cups add machine script = /usr/sbin/useradd -c Machine -d /var/lib/nobody -s /bin/false %m$ logon path = \\%L\profiles\.msprofile logon drive = P: logon home = \\%L\%U\.9xprofile os level = 2 domain master = No usershare allow guests = Yes hosts allow = 192.168.1.0/255.255.255.0 cups options = raw include = /etc/samba/dhcp.conf [homes] comment = Home Directories valid users = %S, %D%w%S read only = No inherit acls = Yes browseable = No [profiles] comment = Network Profiles Service path = %H read only = No create mask = 0600 directory mask = 0700 store dos attributes = Yes [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 create mask = 0600 printable = Yes browseable = No [print$] comment = Printer Drivers path = /var/lib/samba/drivers write list = @ntadmin, root force group = ntadmin create mask = 0664 directory mask = 0775 [netshare] comment = store stuff here path = /netshare valid users = user1, user2 admin users = user1, user2 force group = window read only = No acl group control = Yes inherit permissions = Yes inherit acls = Yes guest ok = Yes case sensitive = No strict locking = No msdfs proxy = no *** END smb.conf so why might i be able to access the user directories, but not my self made one? i have tried adding another that points to another random directory i created to test out, and that too does not work. i should mention that /netshare is the mount point for /dev/hdb1 (just a 120GB drive that is used to store shared stuff) thanks in advance for your help. -Ryan -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Performance problem with file 2Gb
Hello, I've setup an Samba 3 server on a Debian Etch 4 The server has : - 8x 500Gb raid 5 via 3ware Raid Controller - Filesystem is Ext3 over Lvm2 (I know that be better an Xfs FS instead ... now I can't change it easily ) - Xeon dual core 2 - 2Gb of RAM - connected to a gigabit switch using 2 bonded NIC When I copy big files ( 2Gb MPEG files) from Windows clients the copy do a pause on the end ... If at the same time I open another video from another client the movie playback start to skip frame and become very very slow ... Any Ideas ? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Performance problem with file 2Gb
Hello, I've setup an Samba 3 server on a Debian Etch 4 The server has : - 8x 500Gb raid 5 via 3ware Raid Controller - Filesystem is Ext3 over Lvm2 (I know that be better an Xfs FS instead ... now I can't change it easily ) - Xeon dual core 2 - 2Gb of RAM - connected to a gigabit switch using 2 bonded NIC When I copy big files ( 2Gb MPEG files) from Windows clients the copy do a pause on the end ... If at the same time I open another video from another client the movie playback start to skip frame and become very very slow ... Any Ideas ? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] 3.0.25b-1.1.72-1411 - copy from and to the same samba share
A copy from a samba share to the same share frequently fails with error The specified network name is no longer available. The remaining copy is the same size as source but corrupted. WinXP logs an obscure NetBT Event ID 4322, which says NetBT could not process a request, because at least one OutOfResources-Exception occurred in the last hour. One can reproduce this error anytime if one chooses a big enough file and copies it a second time before the first copy is done. Samba 3.0.24 does not have this bug. When a double copy fails there is this line in full_audit log at the moment the errors pop up: Jul 16 14:52:15 p92 smbd_audit: [2007/07/16 14:52:15, 0] lib/util_sock.c:read_data(534) Jul 16 14:52:15 p92 smbd_audit: read_data: read failure for 4 bytes to client 172.24.204.176. Error = Connection reset by peer Is this a known problem ? Can I produce more diagnostics to help fix it ? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Performance problem with file 2Gb
There are some problems to transfer big file over 2Gb, It is a filesize limitation of samba. Ale - Original Message - From: Sébastien CRAMATTE [EMAIL PROTECTED] To: samba@lists.samba.org Sent: Monday, July 16, 2007 12:13 PM Subject: [Samba] Performance problem with file 2Gb Hello, I've setup an Samba 3 server on a Debian Etch 4 The server has : - 8x 500Gb raid 5 via 3ware Raid Controller - Filesystem is Ext3 over Lvm2 (I know that be better an Xfs FS instead ... now I can't change it easily ) - Xeon dual core 2 - 2Gb of RAM - connected to a gigabit switch using 2 bonded NIC When I copy big files ( 2Gb MPEG files) from Windows clients the copy do a pause on the end ... If at the same time I open another video from another client the movie playback start to skip frame and become very very slow ... Any Ideas ? -- 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
[Samba] Problems with 3.0.25b (Cryptic Error Message)
I'm in the process of trying to setup 3.0.25b on my server and am
experiencing problems.
First, anyone know what this error means and how to fix?
[2007/07/16 09:15:16, 0] smbd/service.c:make_connection(1191)
james (192.168.100.158) couldn't find service
::{2227a280-3aea-1069-a2de-08002b30309d}
[2007/07/16 09:15:20, 1] smbd/service.c:make_connection_snum(1033)
-James
---
James Kosin
International Communications Group, Inc.
230 Pickett's Line
Newport News, VA 23601 (USA)
Phone: +1 (757) 947-1030 extension 122
Fax: +1 (757) 947-1035
Making tomorrow's communications today!
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Performance problem with file 2Gb
Only if you don't compile with large files support, something we support since long. Simo. On Mon, 2007-07-16 at 15:11 +0200, Alessandro Ferrari wrote: There are some problems to transfer big file over 2Gb, It is a filesize limitation of samba. Ale - Original Message - From: Sébastien CRAMATTE [EMAIL PROTECTED] To: samba@lists.samba.org Sent: Monday, July 16, 2007 12:13 PM Subject: [Samba] Performance problem with file 2Gb Hello, I've setup an Samba 3 server on a Debian Etch 4 The server has : - 8x 500Gb raid 5 via 3ware Raid Controller - Filesystem is Ext3 over Lvm2 (I know that be better an Xfs FS instead ... now I can't change it easily ) - Xeon dual core 2 - 2Gb of RAM - connected to a gigabit switch using 2 bonded NIC When I copy big files ( 2Gb MPEG files) from Windows clients the copy do a pause on the end ... If at the same time I open another video from another client the movie playback start to skip frame and become very very slow ... Any Ideas ? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- Simo Sorce Samba Team GPL Compliance Officer email: [EMAIL PROTECTED] http://samba.org -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Performance problem with file 2Gb
Alessandro Ferrari schrieb: There are some problems to transfer big file over 2Gb, It is a filesize limitation of samba. I just transfered a 2,8 GB file with smbclient and got ~60 MB/s. Ralf -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Performance problem with file 2Gb
There are some problems to transfer big file over 2Gb, It is a filesize limitation of samba. I just transfered a 2,8 GB file with smbclient and got ~60 MB/s. Right, large files work fine; the hardware is dorked, something badly misconfigured, or extremely untuned. I see mention of IDE and that is always my first guess. But I doubt it is a Samba issue. Try the same thing with local files and see what happens. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Performance problem with file 2Gb
Adam Tauno Williams ha scritto: There are some problems to transfer big file over 2Gb, It is a filesize limitation of samba. I just transfered a 2,8 GB file with smbclient and got ~60 MB/s. Right, large files work fine; the hardware is dorked, something badly misconfigured, or extremely untuned. I see mention of IDE and that is always my first guess. But I doubt it is a Samba issue. Try the same thing with local files and see what happens. The OP did not mention IDE. I also doubt a 8x500GB under hardware raid 5 uses ide drives... But this is not the problem I think. I suggest trying to transfer the same files via ftp or scp (e.g. using WinSCP client), to assure that the server hardware / network equipment is OK, then, if the slowdown is seen _only_ using samba shares, do a search in the mailing archives. I know it's not much, but HTH nonetheless. -- Marcello Romani Responsabile IT Ottotecnica s.r.l. http://www.ottotecnica.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Performance problem with file 2Gb
There are some problems to transfer big file over 2Gb, It is a filesize limitation of samba. I just transfered a 2,8 GB file with smbclient and got ~60 MB/s. Right, large files work fine; the hardware is dorked, something badly misconfigured, or extremely untuned. I see mention of IDE and that is always my first guess. But I doubt it is a Samba issue. Try the same thing with local files and see what happens. The OP did not mention IDE. I also doubt a 8x500GB under hardware raid 5 uses ide drives... But this is not the problem I think. 8x 500Gb raid 5 via 3ware Raid Controller 3ware almost certainly means IDE (SATA is IDE), but they also make PATA RAID controller. I suggest trying to transfer the same files via ftp or scp (e.g. using WinSCP client), to assure that the server hardware / network equipment is OK, then, if the slowdown is seen _only_ using samba shares, do a search in the mailing archives. I know it's not much, but HTH nonetheless. -- Adam Tauno Williams, Network Systems Administrator Consultant - http://www.whitemiceconsulting.com Developer - http://www.opengroupware.org -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Performance problem with file 2Gb
I had this same issue when I first setup samba on our network. I too am using a 3ware RAID controller. Do you have write caching enabled on your RAID controllers? If you do not, this will slow down performance quite noticeably. I purchased the battery backup units for the cards and enabled write caching *Jason Baker */IT Coordinator/ *Glastender Inc.* 5400 North Michigan Road Saginaw, Michigan 48604 USA 800.748.0423 Phone: 989.752.4275 ext. 228 Fax: 989.752. www.glastender.com http://www.glastender.com -BEGIN GEEK CODE BLOCK- Version: 3.1 GIT$ d- s: a C++$ LU+++$ P+ L++L !E--- W+++ N o? K? w !O M !V PS PE++ Y? PGP- t 5? X+ R+ tv+ b- DI-- D++ G e+ h--- r+++ y+++ --END GEEK CODE BLOCK-- Sébastien CRAMATTE wrote: Hello, I've setup an Samba 3 server on a Debian Etch 4 The server has : - 8x 500Gb raid 5 via 3ware Raid Controller - Filesystem is Ext3 over Lvm2 (I know that be better an Xfs FS instead ... now I can't change it easily ) - Xeon dual core 2 - 2Gb of RAM - connected to a gigabit switch using 2 bonded NIC When I copy big files ( 2Gb MPEG files) from Windows clients the copy do a pause on the end ... If at the same time I open another video from another client the movie playback start to skip frame and become very very slow ... Any Ideas ? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Performance problem with file 2Gb
I've got the battery unit ... but still slow ... The very strange is that 90% is transfered well ... and on the end do a pause and finish the job ! Jason Baker escribió: I had this same issue when I first setup samba on our network. I too am using a 3ware RAID controller. Do you have write caching enabled on your RAID controllers? If you do not, this will slow down performance quite noticeably. I purchased the battery backup units for the cards and enabled write caching *Jason Baker */IT Coordinator/ *Glastender Inc.* 5400 North Michigan Road Saginaw, Michigan 48604 USA 800.748.0423 Phone: 989.752.4275 ext. 228 Fax: 989.752. www.glastender.com http://www.glastender.com -BEGIN GEEK CODE BLOCK- Version: 3.1 GIT$ d- s: a C++$ LU+++$ P+ L++L !E--- W+++ N o? K? w !O M !V PS PE++ Y? PGP- t 5? X+ R+ tv+ b- DI-- D++ G e+ h--- r+++ y+++ --END GEEK CODE BLOCK-- Sébastien CRAMATTE wrote: Hello, I've setup an Samba 3 server on a Debian Etch 4 The server has : - 8x 500Gb raid 5 via 3ware Raid Controller - Filesystem is Ext3 over Lvm2 (I know that be better an Xfs FS instead ... now I can't change it easily ) - Xeon dual core 2 - 2Gb of RAM - connected to a gigabit switch using 2 bonded NIC When I copy big files ( 2Gb MPEG files) from Windows clients the copy do a pause on the end ... If at the same time I open another video from another client the movie playback start to skip frame and become very very slow ... Any Ideas ? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Performance problem with file 2Gb
Adam Tauno Williams escribió: There are some problems to transfer big file over 2Gb, It is a filesize limitation of samba. I just transfered a 2,8 GB file with smbclient and got ~60 MB/s. Right, large files work fine; the hardware is dorked, something badly misconfigured, or extremely untuned. I see mention of IDE and that is always my first guess. But I doubt it is a Samba issue. Try the same thing with local files and see what happens. The OP did not mention IDE. I also doubt a 8x500GB under hardware raid 5 uses ide drives... But this is not the problem I think. 8x 500Gb raid 5 via 3ware Raid Controller 3ware almost certainly means IDE (SATA is IDE), but they also make PATA RAID controller. I've got a PCI Express Sata 2 controller with seagate harddrives I suggest trying to transfer the same files via ftp or scp (e.g. using WinSCP client), to assure that the server hardware / network equipment is OK, then, if the slowdown is seen _only_ using samba shares, do a search in the mailing archives. I know it's not much, but HTH nonetheless. I will try with SCP -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Performance problem with file 2Gb
simo escribió: Only if you don't compile with large files support, something we support since long. What is the option to compile with large files support ? Simo. On Mon, 2007-07-16 at 15:11 +0200, Alessandro Ferrari wrote: There are some problems to transfer big file over 2Gb, It is a filesize limitation of samba. Ale - Original Message - From: Sébastien CRAMATTE [EMAIL PROTECTED] To: samba@lists.samba.org Sent: Monday, July 16, 2007 12:13 PM Subject: [Samba] Performance problem with file 2Gb Hello, I've setup an Samba 3 server on a Debian Etch 4 The server has : - 8x 500Gb raid 5 via 3ware Raid Controller - Filesystem is Ext3 over Lvm2 (I know that be better an Xfs FS instead ... now I can't change it easily ) - Xeon dual core 2 - 2Gb of RAM - connected to a gigabit switch using 2 bonded NIC When I copy big files ( 2Gb MPEG files) from Windows clients the copy do a pause on the end ... If at the same time I open another video from another client the movie playback start to skip frame and become very very slow ... Any Ideas ? -- 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
Re: [Samba] Performance problem with file 2Gb
Sébastien CRAMATTE schrieb: I suggest trying to transfer the same files via ftp or scp (e.g. using WinSCP client), to assure that the server hardware / network equipment is OK, then, if the slowdown is seen _only_ using samba shares, do a search in the mailing archives. I know it's not much, but HTH nonetheless. I will try with SCP I would try some network benchmarks first (netpipe, netio, netperf...). scp will encrypt the data, thus you will not get the full throughput. I had problems with Intel e1000 GbE cards last year. Most of the problems showed up in the kernel log. Keep an eye on the logs. Then I would test the raid/fs with a benchmark like bonnie++ or tiobench. If both tests are ok, I would use ftp to transfer some files and see if it behaves similar to samba. Ralf -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Performance problem with file 2Gb
On Mon, Jul 16, 2007 at 09:20:25AM -0400, simo wrote: Only if you don't compile with large files support, something we support since long. Since about 1997 to be exact, when I added it when I was @ SGI :-). Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Problems with 3.0.25b (Cryptic Error Message)
James Kosin wrote:
I'm in the process of trying to setup 3.0.25b on my server and am
experiencing problems.
First, anyone know what this error means and how to fix?
[2007/07/16 09:15:16, 0] smbd/service.c:make_connection(1191)
james (192.168.100.158) couldn't find service
::{2227a280-3aea-1069-a2de-08002b30309d}
[2007/07/16 09:15:20, 1] smbd/service.c:make_connection_snum(1033)
-James
Never mind. This really isn't the error. I don't have any printers
installed; or support for them on the server so this is really irrelevant.
I'm not exactly sure the cause of the problem; but sometimes... I'm
unable to connect or login to the server.
Below is my configuration from testparm...
-James
Load smb config files from /etc/samba/smb.conf
Processing section [homes]
Processing section [printers]
Processing section [samba]
Loaded services file OK.
Server role: ROLE_STANDALONE
Press enter to see a dump of your service definitions
[global]
workgroup = INTCOMGRP
server string = Beta Development Server
interfaces = 192.168.100.20/24
log file = /var/log/samba/%m.log
max log size = 50
socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192
IPTOS_LOWDELAY
printcap name = /etc/printcap
dns proxy = No
hosts allow = 192.168.100., 127.
cups options = raw
[homes]
comment = Home Directories
read only = No
create mask = 0640
directory mask = 0750
browseable = No
vscan-clamav:config-file = /etc/samba/vscan-clamav.conf
[printers]
comment = All Printers
path = /var/spool/samba
printable = Yes
browseable = No
[samba]
comment = Common Dir
path = /home/samba
read only = No
create mask = 0660
directory mask = 0775
guest only = Yes
guest ok = Yes
vfs objects = vscan-clamav
vscan-clamav:config-file = /etc/samba/vscan-clamav.conf
--
Scanned by ClamAV - http://www.clamav.net
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Problems since upgrade from 3.0.23 to 3.0.25b
I have a working Samba PDC, I can log in and out from a windows xp workstation. I recently upgraded to 3.0.25b-33 and now, when I add a new user, I get: The system cannot log you on due to the following error: A device attached to the system is not fuctioning Please try again or consult your system administrator I have network connectivity. I was able to join this machine to the domain through windows xp. I can log on to the domain from this machine with an existing user. All file and directory permissions are correct: If I run the smbclient command I get: session setup failed: NT_STATUS_NO_LOGON_SERVERS Samba is indeed running. If I run smbclient with an existing user I get: Domain=[GLASTENDERNET] OS=[Unix] Server=[Samba 3.0.25b-SerNet-RedHat] Sharename Type Comment - --- IPC$IPC IPC Service (Glastender File Server) supervisors Disk Supervisors shadowrods Disk Shadowrods sales Disk Sales safety Disk Safety quality Disk Quality purchasing Disk Purchasing production Disk Production marketing Disk Marketing managersDisk Managers it Disk Infomation Systems human_resources Disk Human Resources engineering Disk Engineering accounting Disk Accounting shared Disk Public Share Domain=[GLASTENDERNET] OS=[Unix] Server=[Samba 3.0.25b-SerNet-RedHat] Server Comment ---- ASTERGlastender Domain Controller running 3.0.25b-Ser HENBANE Glastender File Server WorkgroupMaster ---- GLASTENDERNETASTER I found this entry in the domain controllers samba log: [2007/07/16 13:55:13, 5] rpc_server/srv_netlog_nt.c:_net_sam_logon_internal(934) _net_sam_logon: check_password returned status NT_STATUS_OK [2007/07/16 13:55:13, 1] rpc_server/srv_netlog_nt.c:_net_sam_logon_internal(1004) _net_sam_logon: user GLASTENDERNET\jrolfe has user sid S-1-5-21-3568796296-2565465778-716510536-3404 but group sid S-1-5-21-1194936901-2368177035-684874509-513. The conflicting domain portions are not supported for NETLOGON calls --CUT-- [2007/07/16 13:55:13, 5] rpc_parse/parse_prs.c:prs_ntstatus(769) 001c status : NT_STATUS_UNSUCCESSFUL [2007/07/16 13:55:13, 5] rpc_server/srv_pipe.c:api_rpcTNP(2305) api_rpcTNP: called NETLOGON successfully My smb.conf file: [global] unix charset = LOCALE workgroup = glastendernet netbios name = aster server string = Glastender Domain Controller running %v interfaces = eth1, lo bind interfaces only = yes os level = 255 preferred master = yes local master = yes domain master = yes security = user time server = yes username map = /etc/samba/smbusers wins support = yes encrypt passwords = yes pam password change = yes name resolve order = wins bcast hosts winbind nested groups = no passdb backend = ldapsam:ldap://aster.glastender.com ldap passwd sync = Yes ldap suffix = dc=glastender,dc=com ldap admin dn = cn=Manager,dc=glastender,dc=com ldap ssl = no ldap group suffix = ou=Groups ldap user suffix = ou=People ldap machine suffix = ou=People ldap idmap suffix = ou=Idmap idmap backend = ldap:ldap://aster.glastender.com idmap uid = 1-2 idmap gid = 1-2 map acl inherit = yes add user script = /etc/smbldap-tools/smbldap-useradd -m %u #delete user script = /etc/smbldap-tools/smbldap-userdel %u add machine script = /etc/smbldap-tools/smbldap-useradd -w %u add group script = /etc/smbldap-tools/smbldap-groupadd -p %g #delete group script = /etc/smbldap-tools/smbldap-groupdel %g add user to group script = /etc/smbldap-tools/smbldap-groupmod -m %u %g delete user from group script = /etc/smbldap-tools/smbldap-groupmod -x %u %g set primary group script = /etc/smbldap-tools/smbldap-usermod -g %g %u domain logons = yes log file = /var/log/samba/log.%m log level = 5 syslog = 0 max log size = 50 #smb ports = 139 445 smb ports = 139 hosts allow = 127.0.0.1 172.16.0.0/255.255.0.0 # User profiles and home directories logon drive = U: logon path = \\%L\profiles\%U logon script = %U.bat large readwrite = no read raw = no write raw = no printcap name = /etc/printcap load printers = no printing = template shell = /bin/false winbind use default domain = no #=Shares=== [homes] comment = Home Directories browseable = no read only = no write list = %U create mask = 0600 directory
Re: [Samba] Problems since upgrade from 3.0.23 to 3.0.25b
On 7/16/07, Jason Baker [EMAIL PROTECTED] wrote: I have a working Samba PDC, I can log in and out from a windows xp workstation. I recently upgraded to 3.0.25b-33 and now, when I add a new user, I get: The system cannot log you on due to the following error: A device attached to the system is not fuctioning Please try again or consult your system administrator I have network connectivity. I was able to join this machine to the domain through windows xp. I can log on to the domain from this machine with an existing user. All file and directory permissions are correct: If I run the smbclient command I get: session setup failed: NT_STATUS_NO_LOGON_SERVERS I believe that means that samba could not find the PDC via name resolution. Samba is indeed running. If I run smbclient with an existing user I get: I found this entry in the domain controllers samba log: [2007/07/16 13:55:13, 5] rpc_server/srv_netlog_nt.c:_net_sam_logon_internal(934) _net_sam_logon: check_password returned status NT_STATUS_OK [2007/07/16 13:55:13, 1] rpc_server/srv_netlog_nt.c:_net_sam_logon_internal(1004) _net_sam_logon: user GLASTENDERNET\jrolfe has user sid S-1-5-21-3568796296-2565465778-716510536-3404 but group sid S-1-5-21-1194936901-2368177035-684874509-513. The conflicting domain portions are not supported for NETLOGON calls --CUT-- This is saying that your user and group have confilcting sids because they should share the same base sid as everything else on the domain. To fix this you need to go through your ldap database and make sure that all sids have the same base. John -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] 3.0.25b-1.1.72-1411 - copy from and to the same samba share
On Mon, Jul 16, 2007 at 03:08:01PM +0200, Dragan Krnic wrote: A copy from a samba share to the same share frequently fails with error The specified network name is no longer available. The remaining copy is the same size as source but corrupted. WinXP logs an obscure NetBT Event ID 4322, which says NetBT could not process a request, because at least one OutOfResources-Exception occurred in the last hour. One can reproduce this error anytime if one chooses a big enough file and copies it a second time before the first copy is done. Samba 3.0.24 does not have this bug. When a double copy fails there is this line in full_audit log at the moment the errors pop up: Jul 16 14:52:15 p92 smbd_audit: [2007/07/16 14:52:15, 0] lib/util_sock.c:read_data(534) Jul 16 14:52:15 p92 smbd_audit: read_data: read failure for 4 bytes to client 172.24.204.176. Error = Connection reset by peer Is this a known problem ? Can I produce more diagnostics to help fix it ? Open a bug and attach an ethereal/wireshare network trace please. Jeremy. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Problems since upgrade from 3.0.23 to 3.0.25b
On 7/16/07, Jason Baker [EMAIL PROTECTED] wrote: I believe that means that samba could not find the PDC via name resolution. I have a DNS and DHCP server running and I can ping the PDC by name from the client machine. Its not about pinging the PDC by name it is about searching the DNS server or WINS server to find the name of the domain controller. Then when the name is found then looking up what its ipaddress. John -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Problems since upgrade from 3.0.23 to 3.0.25b
I believe that means that samba could not find the PDC via name resolution. I have a DNS and DHCP server running and I can ping the PDC by name from the client machine. *Jason Baker */IT Coordinator/ *Glastender Inc.* 5400 North Michigan Road Saginaw, Michigan 48604 USA 800.748.0423 Phone: 989.752.4275 ext. 228 Fax: 989.752. www.glastender.com http://www.glastender.com -BEGIN GEEK CODE BLOCK- Version: 3.1 GIT$ d- s: a C++$ LU+++$ P+ L++L !E--- W+++ N o? K? w !O M !V PS PE++ Y? PGP- t 5? X+ R+ tv+ b- DI-- D++ G e+ h--- r+++ y+++ --END GEEK CODE BLOCK-- John Drescher wrote: On 7/16/07, Jason Baker [EMAIL PROTECTED] wrote: I have a working Samba PDC, I can log in and out from a windows xp workstation. I recently upgraded to 3.0.25b-33 and now, when I add a new user, I get: The system cannot log you on due to the following error: A device attached to the system is not fuctioning Please try again or consult your system administrator I have network connectivity. I was able to join this machine to the domain through windows xp. I can log on to the domain from this machine with an existing user. All file and directory permissions are correct: If I run the smbclient command I get: session setup failed: NT_STATUS_NO_LOGON_SERVERS I believe that means that samba could not find the PDC via name resolution. Samba is indeed running. If I run smbclient with an existing user I get: I found this entry in the domain controllers samba log: [2007/07/16 13:55:13, 5] rpc_server/srv_netlog_nt.c:_net_sam_logon_internal(934) _net_sam_logon: check_password returned status NT_STATUS_OK [2007/07/16 13:55:13, 1] rpc_server/srv_netlog_nt.c:_net_sam_logon_internal(1004) _net_sam_logon: user GLASTENDERNET\jrolfe has user sid S-1-5-21-3568796296-2565465778-716510536-3404 but group sid S-1-5-21-1194936901-2368177035-684874509-513. The conflicting domain portions are not supported for NETLOGON calls --CUT-- This is saying that your user and group have confilcting sids because they should share the same base sid as everything else on the domain. To fix this you need to go through your ldap database and make sure that all sids have the same base. John -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] copy existing users quick launch problem
Hi, I've set up 2 test servers using ldap samba with roaming profiles, then redirected the documents, app data, and desktop to the samba server. Everything is poised to go online and working as it should. However, I've one little hang-up. When I use the windows wizard and copy and existing users profile. I can not open quick launch. The error goes something like this (I'm not onsite at the moment). Cannot create toolbar Everything else seems to be working. I've googled etc to no avail. Just shopping for some ideas... Thanks in advance. -- This message has been scanned for viruses and dangerous content by RCRnet, and is believed to be clean. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
svn commit: samba r23882 - in branches: SAMBA_3_2/source/locking SAMBA_3_2_0/source/locking
Author: vlendec
Date: 2007-07-16 07:40:30 + (Mon, 16 Jul 2007)
New Revision: 23882
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23882
Log:
Fix Coverity id 389 -- finally (I hope)
Modified:
branches/SAMBA_3_2/source/locking/brlock.c
branches/SAMBA_3_2_0/source/locking/brlock.c
Changeset:
Modified: branches/SAMBA_3_2/source/locking/brlock.c
===
--- branches/SAMBA_3_2/source/locking/brlock.c 2007-07-16 01:48:07 UTC (rev
23881)
+++ branches/SAMBA_3_2/source/locking/brlock.c 2007-07-16 07:40:30 UTC (rev
23882)
@@ -1641,14 +1641,18 @@
talloc_set_destructor(br_lck, byte_range_lock_destructor);
br_lck-num_locks = data.dsize / sizeof(struct lock_struct);
- br_lck-lock_data = SMB_MALLOC_ARRAY(struct lock_struct,
br_lck-num_locks);
- if ((br_lck-num_locks != 0) (br_lck-lock_data == NULL)) {
- DEBUG(0, (malloc failed\n));
- TALLOC_FREE(br_lck);
- return NULL;
+
+ if (br_lck-num_locks != 0) {
+ br_lck-lock_data = SMB_MALLOC_ARRAY(struct lock_struct,
+br_lck-num_locks);
+ if (br_lck-lock_data == NULL) {
+ DEBUG(0, (malloc failed\n));
+ TALLOC_FREE(br_lck);
+ return NULL;
+ }
+
+ memcpy(br_lck-lock_data, data.dptr, data.dsize);
}
-
- memcpy(br_lck-lock_data, data.dptr, data.dsize);
if (!fsp-lockdb_clean) {
int orig_num_locks = br_lck-num_locks;
Modified: branches/SAMBA_3_2_0/source/locking/brlock.c
===
--- branches/SAMBA_3_2_0/source/locking/brlock.c2007-07-16 01:48:07 UTC
(rev 23881)
+++ branches/SAMBA_3_2_0/source/locking/brlock.c2007-07-16 07:40:30 UTC
(rev 23882)
@@ -1641,14 +1641,18 @@
talloc_set_destructor(br_lck, byte_range_lock_destructor);
br_lck-num_locks = data.dsize / sizeof(struct lock_struct);
- br_lck-lock_data = SMB_MALLOC_ARRAY(struct lock_struct,
br_lck-num_locks);
- if ((br_lck-num_locks != 0) (br_lck-lock_data == NULL)) {
- DEBUG(0, (malloc failed\n));
- TALLOC_FREE(br_lck);
- return NULL;
+
+ if (br_lck-num_locks != 0) {
+ br_lck-lock_data = SMB_MALLOC_ARRAY(struct lock_struct,
+br_lck-num_locks);
+ if (br_lck-lock_data == NULL) {
+ DEBUG(0, (malloc failed\n));
+ TALLOC_FREE(br_lck);
+ return NULL;
+ }
+
+ memcpy(br_lck-lock_data, data.dptr, data.dsize);
}
-
- memcpy(br_lck-lock_data, data.dptr, data.dsize);
if (!fsp-lockdb_clean) {
int orig_num_locks = br_lck-num_locks;
svn commit: samba r23885 - in branches: SAMBA_3_2/source/locking SAMBA_3_2_0/source/locking
Author: vlendec Date: 2007-07-16 08:23:20 + (Mon, 16 Jul 2007) New Revision: 23885 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23885 Log: Fix make test on opi. Modified: branches/SAMBA_3_2/source/locking/brlock.c branches/SAMBA_3_2_0/source/locking/brlock.c Changeset: Modified: branches/SAMBA_3_2/source/locking/brlock.c === --- branches/SAMBA_3_2/source/locking/brlock.c 2007-07-16 07:46:29 UTC (rev 23884) +++ branches/SAMBA_3_2/source/locking/brlock.c 2007-07-16 08:23:20 UTC (rev 23885) @@ -1637,6 +1637,7 @@ } br_lck-read_only = read_only; + br_lck-lock_data = NULL; talloc_set_destructor(br_lck, byte_range_lock_destructor); Modified: branches/SAMBA_3_2_0/source/locking/brlock.c === --- branches/SAMBA_3_2_0/source/locking/brlock.c2007-07-16 07:46:29 UTC (rev 23884) +++ branches/SAMBA_3_2_0/source/locking/brlock.c2007-07-16 08:23:20 UTC (rev 23885) @@ -1637,6 +1637,7 @@ } br_lck-read_only = read_only; + br_lck-lock_data = NULL; talloc_set_destructor(br_lck, byte_range_lock_destructor);
svn commit: lorikeet r768 - in trunk/heimdal: . appl/ftp appl/ftp/ftp appl/rsh appl/telnet appl/telnet/telnetd appl/test cf doc/standardisation kdc kpasswd kuser lib/asn1 lib/com_err lib/gssapi lib/gs
Author: lha Date: 2007-07-16 08:32:41 + (Mon, 16 Jul 2007) New Revision: 768 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=768 Log: Merged with Heimdal svn revision 21578 Added: trunk/heimdal/doc/standardisation/draft-ietf-krb-wg-anon-01.txt trunk/heimdal/doc/standardisation/draft-ietf-krb-wg-anon-02.txt trunk/heimdal/doc/standardisation/draft-ietf-krb-wg-anon-03.txt trunk/heimdal/doc/standardisation/draft-ietf-krb-wg-anon-04.txt trunk/heimdal/doc/standardisation/draft-ietf-krb-wg-pkinit-alg-agility-03.txt trunk/heimdal/doc/standardisation/draft-ietf-krb-wg-preauth-framework-06.txt trunk/heimdal/lib/com_err/version-script.map trunk/heimdal/lib/krb5/krb_err.et trunk/heimdal/lib/krb5/version-script.map trunk/heimdal/tests/java/ trunk/heimdal/tests/java/KerberosInit.java trunk/heimdal/tests/java/Makefile.am trunk/heimdal/tests/java/check-kinit.in trunk/heimdal/tests/java/have-java.sh trunk/heimdal/tests/java/jaas.conf trunk/heimdal/tests/java/krb5.conf.in trunk/heimdal/tests/kdc/check-kadmin.in trunk/heimdal/tests/kdc/heimdal.acl trunk/heimdal/tests/ldap/samba.schema Modified: trunk/heimdal/ChangeLog trunk/heimdal/NEWS trunk/heimdal/appl/ftp/ChangeLog trunk/heimdal/appl/ftp/ftp/gssapi.c trunk/heimdal/appl/rsh/ChangeLog trunk/heimdal/appl/rsh/rsh.c trunk/heimdal/appl/rsh/rsh_locl.h trunk/heimdal/appl/rsh/rshd.c trunk/heimdal/appl/telnet/ChangeLog trunk/heimdal/appl/telnet/telnetd/sys_term.c trunk/heimdal/appl/test/gssapi_client.c trunk/heimdal/appl/test/nt_gss_client.c trunk/heimdal/cf/ChangeLog trunk/heimdal/cf/Makefile.am.common trunk/heimdal/configure.in trunk/heimdal/kdc/Makefile.am trunk/heimdal/kdc/default_config.c trunk/heimdal/kdc/digest.c trunk/heimdal/kdc/kerberos4.c trunk/heimdal/kdc/kerberos5.c trunk/heimdal/kpasswd/kpasswdd.c trunk/heimdal/kuser/kinit.c trunk/heimdal/lib/asn1/ChangeLog trunk/heimdal/lib/asn1/Makefile.am trunk/heimdal/lib/asn1/asn1_err.et trunk/heimdal/lib/asn1/check-der.c trunk/heimdal/lib/asn1/check-gen.c trunk/heimdal/lib/asn1/der_get.c trunk/heimdal/lib/asn1/gen.c trunk/heimdal/lib/asn1/gen_decode.c trunk/heimdal/lib/asn1/gen_encode.c trunk/heimdal/lib/asn1/gen_length.c trunk/heimdal/lib/asn1/k5.asn1 trunk/heimdal/lib/asn1/parse.y trunk/heimdal/lib/asn1/rfc2459.asn1 trunk/heimdal/lib/asn1/test.asn1 trunk/heimdal/lib/asn1/timegm.c trunk/heimdal/lib/com_err/ChangeLog trunk/heimdal/lib/com_err/Makefile.am trunk/heimdal/lib/gssapi/ChangeLog trunk/heimdal/lib/gssapi/Makefile.am trunk/heimdal/lib/gssapi/mech/gss_acquire_cred.c trunk/heimdal/lib/gssapi/mech/gss_add_cred.c trunk/heimdal/lib/gssapi/mech/gss_canonicalize_name.c trunk/heimdal/lib/gssapi/mech/gss_compare_name.c trunk/heimdal/lib/gssapi/mech/gss_duplicate_name.c trunk/heimdal/lib/gssapi/mech/gss_init_sec_context.c trunk/heimdal/lib/gssapi/mech/gss_names.c trunk/heimdal/lib/gssapi/mech/gss_oid_to_str.c trunk/heimdal/lib/gssapi/mech/name.h trunk/heimdal/lib/gssapi/spnego/accept_sec_context.c trunk/heimdal/lib/gssapi/spnego/spnego.asn1 trunk/heimdal/lib/hcrypto/ChangeLog trunk/heimdal/lib/hcrypto/Makefile.am trunk/heimdal/lib/hcrypto/hmac.c trunk/heimdal/lib/hdb/Makefile.am trunk/heimdal/lib/hdb/dbinfo.c trunk/heimdal/lib/hdb/hdb-ldap.c trunk/heimdal/lib/hx509/ChangeLog trunk/heimdal/lib/hx509/Makefile.am trunk/heimdal/lib/hx509/ca.c trunk/heimdal/lib/hx509/cert.c trunk/heimdal/lib/hx509/ks_p11.c trunk/heimdal/lib/hx509/peer.c trunk/heimdal/lib/hx509/print.c trunk/heimdal/lib/hx509/ref/pkcs11.h trunk/heimdal/lib/hx509/test_cert.in trunk/heimdal/lib/kadm5/ChangeLog trunk/heimdal/lib/kadm5/Makefile.am trunk/heimdal/lib/kadm5/context_s.c trunk/heimdal/lib/kadm5/init_c.c trunk/heimdal/lib/kafs/ChangeLog trunk/heimdal/lib/kafs/Makefile.am trunk/heimdal/lib/krb5/Makefile.am trunk/heimdal/lib/krb5/cache.c trunk/heimdal/lib/krb5/changepw.c trunk/heimdal/lib/krb5/init_creds_pw.c trunk/heimdal/lib/krb5/krb5-v4compat.h trunk/heimdal/lib/krb5/krb5.h trunk/heimdal/lib/krb5/krb5_locl.h trunk/heimdal/lib/krb5/krbhst.c trunk/heimdal/lib/krb5/pkinit.c trunk/heimdal/lib/krb5/plugin.c trunk/heimdal/lib/krb5/v4_glue.c trunk/heimdal/lib/ntlm/ChangeLog trunk/heimdal/lib/ntlm/Makefile.am trunk/heimdal/lib/otp/ChangeLog trunk/heimdal/lib/otp/Makefile.am trunk/heimdal/lib/roken/ChangeLog trunk/heimdal/lib/roken/Makefile.am trunk/heimdal/lib/sl/ChangeLog trunk/heimdal/lib/sl/Makefile.am trunk/heimdal/tests/ChangeLog trunk/heimdal/tests/Makefile.am trunk/heimdal/tests/kdc/Makefile.am trunk/heimdal/tests/kdc/krb5.conf.in trunk/heimdal/tests/ldap/check-ldap.in trunk/heimdal/tests/ldap/init.ldif trunk/heimdal/tests/ldap/slapd-init.in
svn commit: samba r23886 - in branches/SAMBA_3_2/source/libads: .
Author: metze
Date: 2007-07-16 09:48:15 + (Mon, 16 Jul 2007)
New Revision: 23886
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23886
Log:
add ads_disconnect() function
metze
Modified:
branches/SAMBA_3_2/source/libads/ads_struct.c
branches/SAMBA_3_2/source/libads/ldap.c
branches/SAMBA_3_2/source/libads/ldap_utils.c
Changeset:
Modified: branches/SAMBA_3_2/source/libads/ads_struct.c
===
--- branches/SAMBA_3_2/source/libads/ads_struct.c 2007-07-16 08:23:20 UTC
(rev 23885)
+++ branches/SAMBA_3_2/source/libads/ads_struct.c 2007-07-16 09:48:15 UTC
(rev 23886)
@@ -141,9 +141,7 @@
is_mine = (*ads)-is_mine;
#if HAVE_LDAP
- if ((*ads)-ld) {
- ldap_unbind((*ads)-ld);
- }
+ ads_disconnect(*ads);
#endif
SAFE_FREE((*ads)-server.realm);
SAFE_FREE((*ads)-server.workgroup);
Modified: branches/SAMBA_3_2/source/libads/ldap.c
===
--- branches/SAMBA_3_2/source/libads/ldap.c 2007-07-16 08:23:20 UTC (rev
23885)
+++ branches/SAMBA_3_2/source/libads/ldap.c 2007-07-16 09:48:15 UTC (rev
23886)
@@ -465,6 +465,18 @@
return ads_sasl_bind(ads);
}
+/**
+ * Disconnect the LDAP server
+ * @param ads Pointer to an existing ADS_STRUCT
+ **/
+void ads_disconnect(ADS_STRUCT *ads)
+{
+ if (ads-ld) {
+ ldap_unbind(ads-ld);
+ ads-ld = NULL;
+ }
+}
+
/*
Duplicate a struct berval into talloc'ed memory
*/
Modified: branches/SAMBA_3_2/source/libads/ldap_utils.c
===
--- branches/SAMBA_3_2/source/libads/ldap_utils.c 2007-07-16 08:23:20 UTC
(rev 23885)
+++ branches/SAMBA_3_2/source/libads/ldap_utils.c 2007-07-16 09:48:15 UTC
(rev 23886)
@@ -75,11 +75,7 @@
DEBUG(3,(Reopening ads connection to realm '%s' after error
%s\n,
ads-config.realm, ads_errstr(status)));
- if (ads-ld) {
- ldap_unbind(ads-ld);
- }
-
- ads-ld = NULL;
+ ads_disconnect(ads);
status = ads_connect(ads);
if (!ADS_ERR_OK(status)) {
svn commit: samba r23887 - in branches/SAMBA_3_2_0/source/libads: .
Author: metze
Date: 2007-07-16 09:48:46 + (Mon, 16 Jul 2007)
New Revision: 23887
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23887
Log:
merge from SAMBA_3_2:
add ads_disconnect() function
metze
Modified:
branches/SAMBA_3_2_0/source/libads/ads_struct.c
branches/SAMBA_3_2_0/source/libads/ldap.c
branches/SAMBA_3_2_0/source/libads/ldap_utils.c
Changeset:
Modified: branches/SAMBA_3_2_0/source/libads/ads_struct.c
===
--- branches/SAMBA_3_2_0/source/libads/ads_struct.c 2007-07-16 09:48:15 UTC
(rev 23886)
+++ branches/SAMBA_3_2_0/source/libads/ads_struct.c 2007-07-16 09:48:46 UTC
(rev 23887)
@@ -141,9 +141,7 @@
is_mine = (*ads)-is_mine;
#if HAVE_LDAP
- if ((*ads)-ld) {
- ldap_unbind((*ads)-ld);
- }
+ ads_disconnect(*ads);
#endif
SAFE_FREE((*ads)-server.realm);
SAFE_FREE((*ads)-server.workgroup);
Modified: branches/SAMBA_3_2_0/source/libads/ldap.c
===
--- branches/SAMBA_3_2_0/source/libads/ldap.c 2007-07-16 09:48:15 UTC (rev
23886)
+++ branches/SAMBA_3_2_0/source/libads/ldap.c 2007-07-16 09:48:46 UTC (rev
23887)
@@ -465,6 +465,18 @@
return ads_sasl_bind(ads);
}
+/**
+ * Disconnect the LDAP server
+ * @param ads Pointer to an existing ADS_STRUCT
+ **/
+void ads_disconnect(ADS_STRUCT *ads)
+{
+ if (ads-ld) {
+ ldap_unbind(ads-ld);
+ ads-ld = NULL;
+ }
+}
+
/*
Duplicate a struct berval into talloc'ed memory
*/
Modified: branches/SAMBA_3_2_0/source/libads/ldap_utils.c
===
--- branches/SAMBA_3_2_0/source/libads/ldap_utils.c 2007-07-16 09:48:15 UTC
(rev 23886)
+++ branches/SAMBA_3_2_0/source/libads/ldap_utils.c 2007-07-16 09:48:46 UTC
(rev 23887)
@@ -75,11 +75,7 @@
DEBUG(3,(Reopening ads connection to realm '%s' after error
%s\n,
ads-config.realm, ads_errstr(status)));
- if (ads-ld) {
- ldap_unbind(ads-ld);
- }
-
- ads-ld = NULL;
+ ads_disconnect(ads);
status = ads_connect(ads);
if (!ADS_ERR_OK(status)) {
svn commit: lorikeet r769 - in trunk/heimdal: . kdc lib/com_err tests/kdc
Author: lha
Date: 2007-07-16 10:30:22 + (Mon, 16 Jul 2007)
New Revision: 769
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=769
Log:
Merged with Heimdal svn revision 21583
Modified:
trunk/heimdal/ChangeLog
trunk/heimdal/heimdal-lorikeet.diff
trunk/heimdal/kdc/set_dbinfo.c
trunk/heimdal/lib/com_err/ChangeLog
trunk/heimdal/lib/com_err/Makefile.am
trunk/heimdal/tests/kdc/check-kadmin.in
Changeset:
Modified: trunk/heimdal/ChangeLog
===
--- trunk/heimdal/ChangeLog 2007-07-16 08:32:41 UTC (rev 768)
+++ trunk/heimdal/ChangeLog 2007-07-16 10:30:22 UTC (rev 769)
@@ -1,5 +1,7 @@
2007-07-16 Love H�rnquist �strand [EMAIL PROTECTED]
+ * kdc/set_dbinfo.c: Print acl file too.
+
* kdc/kerberos4.c: Error codes are just fine, remove XXX now.
* lib/krb5/krb5-v4compat.h: Drop duplicate error codes.
Modified: trunk/heimdal/heimdal-lorikeet.diff
===
--- trunk/heimdal/heimdal-lorikeet.diff 2007-07-16 08:32:41 UTC (rev 768)
+++ trunk/heimdal/heimdal-lorikeet.diff 2007-07-16 10:30:22 UTC (rev 769)
@@ -96,193 +96,3 @@
esym=__i686.get_pc_thunk fc_softc
symbols=
-Index: kdc/default_config.c
-===
kdc/default_config.c (revision 766)
-+++ kdc/default_config.c (working copy)
-@@ -39,68 +39,6 @@
- RCSID($Id: default_config.c 21296 2007-06-25 14:49:11Z lha $);
-
- krb5_error_code
--krb5_kdc_set_dbinfo(krb5_context context, struct krb5_kdc_configuration *c)
--{
--struct hdb_dbinfo *info, *d;
--krb5_error_code ret;
--int i;
--
--/* fetch the databases */
--ret = hdb_get_dbinfo(context, info);
--if (ret)
-- return ret;
--
--d = NULL;
--while ((d = hdb_dbinfo_get_next(info, d)) != NULL) {
-- void *ptr;
--
-- ptr = realloc(c-db, (c-num_db + 1) * sizeof(*c-db));
-- if (ptr == NULL) {
-- ret = ENOMEM;
-- krb5_set_error_string(context, out of memory);
-- goto out;
-- }
-- c-db = ptr;
--
-- ret = hdb_create(context, c-db[c-num_db],
-- hdb_dbinfo_get_dbname(context, d));
-- if(ret)
-- goto out;
--
-- ret = hdb_set_master_keyfile(context, c-db[c-num_db],
-- hdb_dbinfo_get_mkey_file(context, d));
-- if (ret)
-- goto out;
--
-- c-num_db++;
--
-- kdc_log(context, c, 0, label: %s,
-- hdb_dbinfo_get_label(context, d));
-- kdc_log(context, c, 0, \trealm: %s,
-- hdb_dbinfo_get_realm(context, d));
-- kdc_log(context, c, 0, \tdbname: %s,
-- hdb_dbinfo_get_dbname(context, d));
-- kdc_log(context, c, 0, \tmkey_file: %s,
-- hdb_dbinfo_get_mkey_file(context, d));
--}
--hdb_free_dbinfo(context, info);
--
--return 0;
--out:
--for (i = 0; i c-num_db; i++)
-- if (c-db[i] c-db[i]-hdb_destroy)
-- (*c-db[i]-hdb_destroy)(context, c-db[i]);
--c-num_db = 0;
--free(c-db);
--c-db = NULL;
--
--hdb_free_dbinfo(context, info);
--
--return ret;
--}
--
--
--krb5_error_code
- krb5_kdc_get_config(krb5_context context, krb5_kdc_configuration **config)
- {
- krb5_kdc_configuration *c;
-Index: kdc/set_dbinfo.c
-===
kdc/set_dbinfo.c (revision 0)
-+++ kdc/set_dbinfo.c (revision 0)
-@@ -0,0 +1,100 @@
-+/*
-+ * Copyright (c) 1997-2007 Kungliga Tekniska H�gskolan
-+ * (Royal Institute of Technology, Stockholm, Sweden).
-+ *
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *
-+ * 1. Redistributions of source code must retain the above copyright
-+ *notice, this list of conditions and the following disclaimer.
-+ *
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *notice, this list of conditions and the following disclaimer in the
-+ *documentation and/or other materials provided with the distribution.
-+ *
-+ * 3. Neither the name of the Institute nor the names of its contributors
-+ *may be used to endorse or promote products derived from this software
-+ *without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
svn commit: samba r23888 - in branches/SAMBA_3_2/source: include libads libsmb printing utils
Author: metze Date: 2007-07-16 11:08:00 + (Mon, 16 Jul 2007) New Revision: 23888 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23888 Log: move elements belonging to the current ldap connection to a substructure. metze Modified: branches/SAMBA_3_2/source/include/ads.h branches/SAMBA_3_2/source/libads/ldap.c branches/SAMBA_3_2/source/libads/ldap_printer.c branches/SAMBA_3_2/source/libads/ldap_utils.c branches/SAMBA_3_2/source/libads/sasl.c branches/SAMBA_3_2/source/libsmb/namequery_dc.c branches/SAMBA_3_2/source/printing/nt_printing.c branches/SAMBA_3_2/source/utils/net_ads.c Changeset: Sorry, the patch is too large (623 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23888
svn commit: samba r23889 - in branches/SAMBA_3_2_0/source: include libads libsmb printing utils
Author: metze Date: 2007-07-16 11:09:48 + (Mon, 16 Jul 2007) New Revision: 23889 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23889 Log: merge from SAMBA_3_2: move elements belonging to the current ldap connection to a substructure. metze Modified: branches/SAMBA_3_2_0/source/include/ads.h branches/SAMBA_3_2_0/source/libads/ldap.c branches/SAMBA_3_2_0/source/libads/ldap_printer.c branches/SAMBA_3_2_0/source/libads/ldap_utils.c branches/SAMBA_3_2_0/source/libads/sasl.c branches/SAMBA_3_2_0/source/libsmb/namequery_dc.c branches/SAMBA_3_2_0/source/printing/nt_printing.c branches/SAMBA_3_2_0/source/utils/net_ads.c Changeset: Sorry, the patch is too large (623 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23889
svn commit: samba r23890 - in branches/SAMBA_4_0/source: librpc librpc/rpc selftest winbind
Author: abartlet Date: 2007-07-16 11:27:29 + (Mon, 16 Jul 2007) New Revision: 23890 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23890 Log: Allow wbinfo -a to work against Samba4's winbind. Add a test for wbinfo -a to test_member.sh Reimplement the server-side 'pam_auth' and 'pam_auth_crap' calls to use the same SamLogon code as auth_winbind uses. In my previous code, we did not bind to the LSA and SAMR pipes, before attempting operations. We now do this (how we passed any tests before is beyond me). This required some rework, particularly to make it easier to setup secondary connections. The new rpc_secondary_auth_connection() function also performs the bind. The dcerpc_connect.c file was getting to big, so things have been merged into dcerpc_secondary.c. Andrew Bartlett Added: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_secondary.c Modified: branches/SAMBA_4_0/source/librpc/config.mk branches/SAMBA_4_0/source/librpc/rpc/dcerpc_connect.c branches/SAMBA_4_0/source/selftest/test_member.sh branches/SAMBA_4_0/source/winbind/wb_connect_sam.c branches/SAMBA_4_0/source/winbind/wb_dom_info.c branches/SAMBA_4_0/source/winbind/wb_init_domain.c branches/SAMBA_4_0/source/winbind/wb_pam_auth.c Changeset: Sorry, the patch is too large (929 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23890
svn commit: samba r23891 - in branches/SAMBA_3_2/source/profile: .
Author: metze Date: 2007-07-16 14:19:59 + (Mon, 16 Jul 2007) New Revision: 23891 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23891 Log: fix compiler warning metze Modified: branches/SAMBA_3_2/source/profile/profile.c Changeset: Modified: branches/SAMBA_3_2/source/profile/profile.c === --- branches/SAMBA_3_2/source/profile/profile.c 2007-07-16 11:27:29 UTC (rev 23890) +++ branches/SAMBA_3_2/source/profile/profile.c 2007-07-16 14:19:59 UTC (rev 23891) @@ -89,6 +89,8 @@ #endif /* WITH_PROFILE */ } +#ifdef WITH_PROFILE + / receive a set profile level message / @@ -134,7 +136,6 @@ /*** open the profiling shared memory area **/ -#ifdef WITH_PROFILE #ifdef HAVE_CLOCK_GETTIME
svn commit: samba r23892 - in branches/SAMBA_3_2_0/source/profile: .
Author: metze Date: 2007-07-16 14:20:19 + (Mon, 16 Jul 2007) New Revision: 23892 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23892 Log: fix compiler warning metze Modified: branches/SAMBA_3_2_0/source/profile/profile.c Changeset: Modified: branches/SAMBA_3_2_0/source/profile/profile.c === --- branches/SAMBA_3_2_0/source/profile/profile.c 2007-07-16 14:19:59 UTC (rev 23891) +++ branches/SAMBA_3_2_0/source/profile/profile.c 2007-07-16 14:20:19 UTC (rev 23892) @@ -89,6 +89,8 @@ #endif /* WITH_PROFILE */ } +#ifdef WITH_PROFILE + / receive a set profile level message / @@ -134,7 +136,6 @@ /*** open the profiling shared memory area **/ -#ifdef WITH_PROFILE #ifdef HAVE_CLOCK_GETTIME
svn commit: samba r23893 - in branches/SAMBA_3_2/source: . include libads libsmb
Author: metze
Date: 2007-07-16 14:35:33 + (Mon, 16 Jul 2007)
New Revision: 23893
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23893
Log:
add dummy callbacks for LDAP SASL wrapping,
they're not used yet...
metze
Added:
branches/SAMBA_3_2/source/libads/sasl_wrapping.c
Modified:
branches/SAMBA_3_2/source/Makefile.in
branches/SAMBA_3_2/source/configure.in
branches/SAMBA_3_2/source/include/ads.h
branches/SAMBA_3_2/source/libsmb/namequery_dc.c
Changeset:
Modified: branches/SAMBA_3_2/source/Makefile.in
===
--- branches/SAMBA_3_2/source/Makefile.in 2007-07-16 14:20:19 UTC (rev
23892)
+++ branches/SAMBA_3_2/source/Makefile.in 2007-07-16 14:35:33 UTC (rev
23893)
@@ -317,7 +317,8 @@
libgpo/gpo_fetch.o libgpo/gpo_filesync.o libgpo/gpo_sec.o
LIBGPO_OBJ = $(LIBGPO_OBJ0)
-LIBADS_OBJ = libads/ldap.o libads/ldap_printer.o libads/sasl.o \
+LIBADS_OBJ = libads/ldap.o libads/ldap_printer.o \
+libads/sasl.o libads/sasl_wrapping.o \
libads/krb5_setpw.o libads/ldap_user.o \
libads/ads_struct.o libads/kerberos_keytab.o \
libads/disp_sec.o libads/ads_utils.o libads/ldap_utils.o \
Modified: branches/SAMBA_3_2/source/configure.in
===
--- branches/SAMBA_3_2/source/configure.in 2007-07-16 14:20:19 UTC (rev
23892)
+++ branches/SAMBA_3_2/source/configure.in 2007-07-16 14:35:33 UTC (rev
23893)
@@ -3478,6 +3478,14 @@
AC_CHECK_LIB_EXT(lber, LDAP_LIBS, ber_scanf)
+ # If ber_sockbuf_add_io() is available we can add
+ # SASL wrapping hooks
+ AC_CHECK_FUNC_EXT(ber_sockbuf_add_io,$LDAP_LIBS)
+ if test x$ac_cv_func_ext_ber_sockbuf_add_io = xyes; then
+ AC_DEFINE(HAVE_ADS_SASL_WRAPPING, 1, [Support for SASL wrapping])
+ fi
+
+
# now see if we can find the ldap libs in standard paths
AC_CHECK_LIB_EXT(ldap, LDAP_LIBS, ldap_init)
Modified: branches/SAMBA_3_2/source/include/ads.h
===
--- branches/SAMBA_3_2/source/include/ads.h 2007-07-16 14:20:19 UTC (rev
23892)
+++ branches/SAMBA_3_2/source/include/ads.h 2007-07-16 14:35:33 UTC (rev
23893)
@@ -54,16 +54,18 @@
} config;
/* info about the current LDAP connection */
+#ifdef HAVE_ADS
struct {
-#ifdef HAVE_LDAP
LDAP *ld;
-#else
- void *ld; /* the active ldap structure */
-#endif
struct in_addr ip; /* the ip of the active connection, if any */
time_t last_attempt; /* last attempt to reconnect */
int port;
+
+#ifdef HAVE_ADS_SASL_WRAPPING
+ Sockbuf_IO_Desc *sbiod; /* lowlevel state for LDAP wrapping */
+#endif /* HAVE_ADS_SASL_WRAPPING */
} ldap;
+#endif /* HAVE_ADS */
} ADS_STRUCT;
/* used to remember the names of the posix attributes in AD */
Added: branches/SAMBA_3_2/source/libads/sasl_wrapping.c
===
--- branches/SAMBA_3_2/source/libads/sasl_wrapping.c2007-07-16 14:20:19 UTC
(rev 23892)
+++ branches/SAMBA_3_2/source/libads/sasl_wrapping.c2007-07-16 14:35:33 UTC
(rev 23893)
@@ -0,0 +1,109 @@
+/*
+ Unix SMB/CIFS implementation.
+ ads sasl wrapping code
+ Copyright (C) Stefan Metzmacher 2007
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see http://www.gnu.org/licenses/.
+*/
+
+#include includes.h
+
+#ifdef HAVE_ADS_SASL_WRAPPING
+
+static int ads_saslwrap_setup(Sockbuf_IO_Desc *sbiod, void *arg)
+{
+ ADS_STRUCT *ads = (ADS_STRUCT *)arg;
+
+ ads-ldap.sbiod = sbiod;
+
+ sbiod-sbiod_pvt = ads;
+
+ return 0;
+}
+
+static int ads_saslwrap_remove(Sockbuf_IO_Desc *sbiod)
+{
+ return 0;
+}
+
+static ber_slen_t ads_saslwrap_read(Sockbuf_IO_Desc *sbiod, void *buf,
ber_len_t len)
+{
+ return LBER_SBIOD_READ_NEXT(sbiod, buf, len);
+}
+
+static ber_slen_t ads_saslwrap_write(Sockbuf_IO_Desc *sbiod, void *buf,
ber_len_t len)
+{
+ return LBER_SBIOD_WRITE_NEXT(sbiod, buf, len);
+}
+
+
+static int ads_saslwrap_ctrl(Sockbuf_IO_Desc *sbiod, int opt, void *arg)
+{
+ return LBER_SBIOD_CTRL_NEXT(sbiod, opt, arg);
svn commit: samba r23894 - in branches/SAMBA_3_2_0/source: . include libsmb
Author: metze
Date: 2007-07-16 14:38:05 + (Mon, 16 Jul 2007)
New Revision: 23894
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23894
Log:
merge from SAMBA_3_2:
add dummy callbacks for LDAP SASL wrapping,
they're not used yet...
metze
Modified:
branches/SAMBA_3_2_0/source/Makefile.in
branches/SAMBA_3_2_0/source/configure.in
branches/SAMBA_3_2_0/source/include/ads.h
branches/SAMBA_3_2_0/source/libsmb/namequery_dc.c
Changeset:
Modified: branches/SAMBA_3_2_0/source/Makefile.in
===
--- branches/SAMBA_3_2_0/source/Makefile.in 2007-07-16 14:35:33 UTC (rev
23893)
+++ branches/SAMBA_3_2_0/source/Makefile.in 2007-07-16 14:38:05 UTC (rev
23894)
@@ -309,7 +309,8 @@
libgpo/gpo_fetch.o libgpo/gpo_filesync.o libgpo/gpo_sec.o
LIBGPO_OBJ = $(LIBGPO_OBJ0)
-LIBADS_OBJ = libads/ldap.o libads/ldap_printer.o libads/sasl.o \
+LIBADS_OBJ = libads/ldap.o libads/ldap_printer.o \
+libads/sasl.o libads/sasl_wrapping.o \
libads/krb5_setpw.o libads/ldap_user.o \
libads/ads_struct.o libads/kerberos_keytab.o \
libads/disp_sec.o libads/ads_utils.o libads/ldap_utils.o \
Modified: branches/SAMBA_3_2_0/source/configure.in
===
--- branches/SAMBA_3_2_0/source/configure.in2007-07-16 14:35:33 UTC (rev
23893)
+++ branches/SAMBA_3_2_0/source/configure.in2007-07-16 14:38:05 UTC (rev
23894)
@@ -3352,6 +3352,14 @@
AC_CHECK_LIB_EXT(lber, LDAP_LIBS, ber_scanf)
+ # If ber_sockbuf_add_io() is available we can add
+ # SASL wrapping hooks
+ AC_CHECK_FUNC_EXT(ber_sockbuf_add_io,$LDAP_LIBS)
+ if test x$ac_cv_func_ext_ber_sockbuf_add_io = xyes; then
+ AC_DEFINE(HAVE_ADS_SASL_WRAPPING, 1, [Support for SASL wrapping])
+ fi
+
+
# now see if we can find the ldap libs in standard paths
AC_CHECK_LIB_EXT(ldap, LDAP_LIBS, ldap_init)
Modified: branches/SAMBA_3_2_0/source/include/ads.h
===
--- branches/SAMBA_3_2_0/source/include/ads.h 2007-07-16 14:35:33 UTC (rev
23893)
+++ branches/SAMBA_3_2_0/source/include/ads.h 2007-07-16 14:38:05 UTC (rev
23894)
@@ -54,16 +54,18 @@
} config;
/* info about the current LDAP connection */
+#ifdef HAVE_ADS
struct {
-#ifdef HAVE_LDAP
LDAP *ld;
-#else
- void *ld; /* the active ldap structure */
-#endif
struct in_addr ip; /* the ip of the active connection, if any */
time_t last_attempt; /* last attempt to reconnect */
int port;
+
+#ifdef HAVE_ADS_SASL_WRAPPING
+ Sockbuf_IO_Desc *sbiod; /* lowlevel state for LDAP wrapping */
+#endif /* HAVE_ADS_SASL_WRAPPING */
} ldap;
+#endif /* HAVE_ADS */
} ADS_STRUCT;
/* used to remember the names of the posix attributes in AD */
Modified: branches/SAMBA_3_2_0/source/libsmb/namequery_dc.c
===
--- branches/SAMBA_3_2_0/source/libsmb/namequery_dc.c 2007-07-16 14:35:33 UTC
(rev 23893)
+++ branches/SAMBA_3_2_0/source/libsmb/namequery_dc.c 2007-07-16 14:38:05 UTC
(rev 23894)
@@ -123,7 +123,11 @@
fstrcpy(srv_name, ads-config.ldap_server_name);
strupper_m(srv_name);
+#ifdef HAVE_ADS
*dc_ip = ads-ldap.ip;
+#else
+ ZERO_STRUCT(*dc_ip);
+#endif
ads_destroy(ads);
DEBUG(4,(ads_dc_name: using server='%s' IP=%s\n,
svn commit: samba r23895 - in branches/SAMBA_4_0/source/heimdal/lib/asn1: .
Author: metze
Date: 2007-07-16 15:03:03 + (Mon, 16 Jul 2007)
New Revision: 23895
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23895
Log:
reapply rev 23493:
regenerate lex.c files with flex 2.5.33
this makes sure we include config.h as first header
hopefully fixes the build on SerNet-aix
abartlet: please don't revert that again with your next
heimdal merge...:-)
metze
Modified:
branches/SAMBA_4_0/source/heimdal/lib/asn1/lex.c
Changeset:
Modified: branches/SAMBA_4_0/source/heimdal/lib/asn1/lex.c
===
--- branches/SAMBA_4_0/source/heimdal/lib/asn1/lex.c2007-07-16 14:38:05 UTC
(rev 23894)
+++ branches/SAMBA_4_0/source/heimdal/lib/asn1/lex.c2007-07-16 15:03:03 UTC
(rev 23895)
@@ -1,5 +1,6 @@
+#include config.h
-#line 3 lex.c
+#line 3 lex.yy.c
#define YY_INT_ALIGNED short int
@@ -342,9 +343,6 @@
typedef int yy_state_type;
extern int yylineno;
-
-int yylineno = 1;
-
extern char *yytext;
#define yytext_ptr yytext
@@ -826,7 +824,7 @@
* SUCH DAMAGE.
*/
-/* $Id: lex.l 18738 2006-10-21 11:57:22Z lha $ */
+/* $Id: lex.l,v 1.31 2006/10/21 11:57:22 lha Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -851,7 +849,7 @@
static void unterminated(const char *, unsigned);
/* This is for broken old lexes (solaris 10 and hpux) */
-#line 855 lex.c
+#line 852 lex.yy.c
#define INITIAL 0
@@ -1006,7 +1004,7 @@
#line 68 lex.l
-#line 1010 lex.c
+#line 1007 lex.yy.c
if ( !(yy_init) )
{
@@ -1675,7 +1673,7 @@
#line 274 lex.l
ECHO;
YY_BREAK
-#line 1679 lex.c
+#line 1676 lex.yy.c
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -2485,15 +2483,6 @@
/* Accessor methods (get/set functions) to struct members. */
-/** Get the current line number.
- *
- */
-int yyget_lineno (void)
-{
-
-return yylineno;
-}
-
/** Get the input stream.
*
*/
@@ -2527,16 +2516,6 @@
return yytext;
}
-/** Set the current line number.
- * @param line_number
- *
- */
-void yyset_lineno (int line_number )
-{
-
-yylineno = line_number;
-}
-
/** Set the input stream. This does not discard the current
* input buffer.
* @param in_str A readable stream.
svn commit: samba r23896 - in branches/SAMBA_3_2/source/include: .
Author: metze
Date: 2007-07-16 15:31:01 + (Mon, 16 Jul 2007)
New Revision: 23896
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23896
Log:
hopefully fix the build on most systems
metze
Modified:
branches/SAMBA_3_2/source/include/ads.h
Changeset:
Modified: branches/SAMBA_3_2/source/include/ads.h
===
--- branches/SAMBA_3_2/source/include/ads.h 2007-07-16 15:03:03 UTC (rev
23895)
+++ branches/SAMBA_3_2/source/include/ads.h 2007-07-16 15:31:01 UTC (rev
23896)
@@ -54,7 +54,7 @@
} config;
/* info about the current LDAP connection */
-#ifdef HAVE_ADS
+#ifdef HAVE_LDAP
struct {
LDAP *ld;
struct in_addr ip; /* the ip of the active connection, if any */
svn commit: samba r23897 - in branches/SAMBA_3_2_0/source/include: .
Author: metze
Date: 2007-07-16 15:31:45 + (Mon, 16 Jul 2007)
New Revision: 23897
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23897
Log:
hopefully fix the build
metze
Modified:
branches/SAMBA_3_2_0/source/include/ads.h
Changeset:
Modified: branches/SAMBA_3_2_0/source/include/ads.h
===
--- branches/SAMBA_3_2_0/source/include/ads.h 2007-07-16 15:31:01 UTC (rev
23896)
+++ branches/SAMBA_3_2_0/source/include/ads.h 2007-07-16 15:31:45 UTC (rev
23897)
@@ -54,7 +54,7 @@
} config;
/* info about the current LDAP connection */
-#ifdef HAVE_ADS
+#ifdef HAVE_LDAP
struct {
LDAP *ld;
struct in_addr ip; /* the ip of the active connection, if any */
svn commit: samba r23898 - in branches/SAMBA_3_2/source: . include libads
Author: metze
Date: 2007-07-16 16:08:24 + (Mon, 16 Jul 2007)
New Revision: 23898
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23898
Log:
rename HAVE_ADS_SASL_WRAPPING - HAVE_LDAP_SASL_WRAPPING
metze
Modified:
branches/SAMBA_3_2/source/configure.in
branches/SAMBA_3_2/source/include/ads.h
branches/SAMBA_3_2/source/libads/sasl_wrapping.c
Changeset:
Modified: branches/SAMBA_3_2/source/configure.in
===
--- branches/SAMBA_3_2/source/configure.in 2007-07-16 15:31:45 UTC (rev
23897)
+++ branches/SAMBA_3_2/source/configure.in 2007-07-16 16:08:24 UTC (rev
23898)
@@ -3482,7 +3482,7 @@
# SASL wrapping hooks
AC_CHECK_FUNC_EXT(ber_sockbuf_add_io,$LDAP_LIBS)
if test x$ac_cv_func_ext_ber_sockbuf_add_io = xyes; then
- AC_DEFINE(HAVE_ADS_SASL_WRAPPING, 1, [Support for SASL wrapping])
+ AC_DEFINE(HAVE_LDAP_SASL_WRAPPING, 1, [Support for SASL wrapping])
fi
Modified: branches/SAMBA_3_2/source/include/ads.h
===
--- branches/SAMBA_3_2/source/include/ads.h 2007-07-16 15:31:45 UTC (rev
23897)
+++ branches/SAMBA_3_2/source/include/ads.h 2007-07-16 16:08:24 UTC (rev
23898)
@@ -61,11 +61,11 @@
time_t last_attempt; /* last attempt to reconnect */
int port;
-#ifdef HAVE_ADS_SASL_WRAPPING
+#ifdef HAVE_LDAP_SASL_WRAPPING
Sockbuf_IO_Desc *sbiod; /* lowlevel state for LDAP wrapping */
-#endif /* HAVE_ADS_SASL_WRAPPING */
+#endif /* HAVE_LDAP_SASL_WRAPPING */
} ldap;
-#endif /* HAVE_ADS */
+#endif /* HAVE_LDAP */
} ADS_STRUCT;
/* used to remember the names of the posix attributes in AD */
Modified: branches/SAMBA_3_2/source/libads/sasl_wrapping.c
===
--- branches/SAMBA_3_2/source/libads/sasl_wrapping.c2007-07-16 15:31:45 UTC
(rev 23897)
+++ branches/SAMBA_3_2/source/libads/sasl_wrapping.c2007-07-16 16:08:24 UTC
(rev 23898)
@@ -19,7 +19,7 @@
#include includes.h
-#ifdef HAVE_ADS_SASL_WRAPPING
+#ifdef HAVE_LDAP_SASL_WRAPPING
static int ads_saslwrap_setup(Sockbuf_IO_Desc *sbiod, void *arg)
{
@@ -106,4 +106,4 @@
return ADS_SUCCESS;
}
-#endif /* HAVE_ADS_SASL_WRAPPING */
+#endif /* HAVE_LDAP_SASL_WRAPPING */
svn commit: samba r23899 - in branches/SAMBA_3_2_0/source: . include libads
Author: metze
Date: 2007-07-16 16:08:50 + (Mon, 16 Jul 2007)
New Revision: 23899
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23899
Log:
merge from SAMBA_3_2:
rename HAVE_ADS_SASL_WRAPPING - HAVE_LDAP_SASL_WRAPPING
+ adding missing file libads/sasl_wrapping.c
metze
Added:
branches/SAMBA_3_2_0/source/libads/sasl_wrapping.c
Modified:
branches/SAMBA_3_2_0/source/configure.in
branches/SAMBA_3_2_0/source/include/ads.h
Changeset:
Modified: branches/SAMBA_3_2_0/source/configure.in
===
--- branches/SAMBA_3_2_0/source/configure.in2007-07-16 16:08:24 UTC (rev
23898)
+++ branches/SAMBA_3_2_0/source/configure.in2007-07-16 16:08:50 UTC (rev
23899)
@@ -3356,7 +3356,7 @@
# SASL wrapping hooks
AC_CHECK_FUNC_EXT(ber_sockbuf_add_io,$LDAP_LIBS)
if test x$ac_cv_func_ext_ber_sockbuf_add_io = xyes; then
- AC_DEFINE(HAVE_ADS_SASL_WRAPPING, 1, [Support for SASL wrapping])
+ AC_DEFINE(HAVE_LDAP_SASL_WRAPPING, 1, [Support for SASL wrapping])
fi
Modified: branches/SAMBA_3_2_0/source/include/ads.h
===
--- branches/SAMBA_3_2_0/source/include/ads.h 2007-07-16 16:08:24 UTC (rev
23898)
+++ branches/SAMBA_3_2_0/source/include/ads.h 2007-07-16 16:08:50 UTC (rev
23899)
@@ -61,11 +61,11 @@
time_t last_attempt; /* last attempt to reconnect */
int port;
-#ifdef HAVE_ADS_SASL_WRAPPING
+#ifdef HAVE_LDAP_SASL_WRAPPING
Sockbuf_IO_Desc *sbiod; /* lowlevel state for LDAP wrapping */
-#endif /* HAVE_ADS_SASL_WRAPPING */
+#endif /* HAVE_LDAP_SASL_WRAPPING */
} ldap;
-#endif /* HAVE_ADS */
+#endif /* HAVE_LDAP */
} ADS_STRUCT;
/* used to remember the names of the posix attributes in AD */
Added: branches/SAMBA_3_2_0/source/libads/sasl_wrapping.c
===
--- branches/SAMBA_3_2_0/source/libads/sasl_wrapping.c 2007-07-16 16:08:24 UTC
(rev 23898)
+++ branches/SAMBA_3_2_0/source/libads/sasl_wrapping.c 2007-07-16 16:08:50 UTC
(rev 23899)
@@ -0,0 +1,109 @@
+/*
+ Unix SMB/CIFS implementation.
+ ads sasl wrapping code
+ Copyright (C) Stefan Metzmacher 2007
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see http://www.gnu.org/licenses/.
+*/
+
+#include includes.h
+
+#ifdef HAVE_LDAP_SASL_WRAPPING
+
+static int ads_saslwrap_setup(Sockbuf_IO_Desc *sbiod, void *arg)
+{
+ ADS_STRUCT *ads = (ADS_STRUCT *)arg;
+
+ ads-ldap.sbiod = sbiod;
+
+ sbiod-sbiod_pvt = ads;
+
+ return 0;
+}
+
+static int ads_saslwrap_remove(Sockbuf_IO_Desc *sbiod)
+{
+ return 0;
+}
+
+static ber_slen_t ads_saslwrap_read(Sockbuf_IO_Desc *sbiod, void *buf,
ber_len_t len)
+{
+ return LBER_SBIOD_READ_NEXT(sbiod, buf, len);
+}
+
+static ber_slen_t ads_saslwrap_write(Sockbuf_IO_Desc *sbiod, void *buf,
ber_len_t len)
+{
+ return LBER_SBIOD_WRITE_NEXT(sbiod, buf, len);
+}
+
+
+static int ads_saslwrap_ctrl(Sockbuf_IO_Desc *sbiod, int opt, void *arg)
+{
+ return LBER_SBIOD_CTRL_NEXT(sbiod, opt, arg);
+}
+
+static int ads_saslwrap_close(Sockbuf_IO_Desc *sbiod)
+{
+ return 0;
+}
+
+static const Sockbuf_IO ads_saslwrap_sockbuf_io = {
+ ads_saslwrap_setup, /* sbi_setup */
+ ads_saslwrap_remove,/* sbi_remove */
+ ads_saslwrap_ctrl, /* sbi_ctrl */
+ ads_saslwrap_read, /* sbi_read */
+ ads_saslwrap_write, /* sbi_write */
+ ads_saslwrap_close /* sbi_close */
+};
+
+ADS_STATUS ads_setup_sasl_wrapping(ADS_STRUCT *ads)
+{
+ ADS_STATUS status;
+ Sockbuf *sb;
+ Sockbuf_IO *io = discard_const_p(Sockbuf_IO, ads_saslwrap_sockbuf_io);
+ int rc;
+
+ rc = ldap_get_option(ads-ldap.ld, LDAP_OPT_SOCKBUF, sb);
+ status = ADS_ERROR_LDAP(rc);
+ if (!ADS_ERR_OK(status)) {
+ return status;
+ }
+
+ /* debugging for the layer above SASL */
+ rc = ber_sockbuf_add_io(sb, io, LBER_SBIOD_LEVEL_TRANSPORT,
+ (void *)ads_sasl_wrapping_above );
+ status = ADS_ERROR_LDAP(rc);
+ if (!ADS_ERR_OK(status)) {
+ return status;
+ }
+
+ /* setup the real wrapping callbacks */
+ rc = ber_sockbuf_add_io(sb, io,
svn commit: samba r23900 - in branches/SAMBA_3_2/source: .
Author: metze Date: 2007-07-16 16:22:05 + (Mon, 16 Jul 2007) New Revision: 23900 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23900 Log: LDAP_OPT_SOCKBUF doesn't exists on all platforms metze Modified: branches/SAMBA_3_2/source/configure.in Changeset: Modified: branches/SAMBA_3_2/source/configure.in === --- branches/SAMBA_3_2/source/configure.in 2007-07-16 16:08:50 UTC (rev 23899) +++ branches/SAMBA_3_2/source/configure.in 2007-07-16 16:22:05 UTC (rev 23900) @@ -3481,7 +3481,15 @@ # If ber_sockbuf_add_io() is available we can add # SASL wrapping hooks AC_CHECK_FUNC_EXT(ber_sockbuf_add_io,$LDAP_LIBS) - if test x$ac_cv_func_ext_ber_sockbuf_add_io = xyes; then + + AC_CACHE_CHECK([for LDAP_OPT_SOCKBUF],samba_cv_HAVE_LDAP_OPT_SOCKBUF,[ +AC_TRY_COMPILE([#include ldap.h], + [int val = LDAP_OPT_SOCKBUF;], + samba_cv_HAVE_LDAP_OPT_SOCKBUF=yes, + samba_cv_HAVE_LDAP_OPT_SOCKBUF=no)]) + + if test x$ac_cv_func_ext_ber_sockbuf_add_io = xyes -a \ + x$samba_cv_HAVE_LDAP_OPT_SOCKBUF = xyes; then AC_DEFINE(HAVE_LDAP_SASL_WRAPPING, 1, [Support for SASL wrapping]) fi
svn commit: samba r23901 - in branches/SAMBA_3_2_0/source: .
Author: metze Date: 2007-07-16 16:22:36 + (Mon, 16 Jul 2007) New Revision: 23901 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23901 Log: merge from SAMBA_3_2: LDAP_OPT_SOCKBUF doesn't exists on all platforms metze Modified: branches/SAMBA_3_2_0/source/configure.in Changeset: Modified: branches/SAMBA_3_2_0/source/configure.in === --- branches/SAMBA_3_2_0/source/configure.in2007-07-16 16:22:05 UTC (rev 23900) +++ branches/SAMBA_3_2_0/source/configure.in2007-07-16 16:22:36 UTC (rev 23901) @@ -3355,7 +3355,15 @@ # If ber_sockbuf_add_io() is available we can add # SASL wrapping hooks AC_CHECK_FUNC_EXT(ber_sockbuf_add_io,$LDAP_LIBS) - if test x$ac_cv_func_ext_ber_sockbuf_add_io = xyes; then + + AC_CACHE_CHECK([for LDAP_OPT_SOCKBUF],samba_cv_HAVE_LDAP_OPT_SOCKBUF,[ +AC_TRY_COMPILE([#include ldap.h], + [int val = LDAP_OPT_SOCKBUF;], + samba_cv_HAVE_LDAP_OPT_SOCKBUF=yes, + samba_cv_HAVE_LDAP_OPT_SOCKBUF=no)]) + + if test x$ac_cv_func_ext_ber_sockbuf_add_io = xyes -a \ + x$samba_cv_HAVE_LDAP_OPT_SOCKBUF = xyes; then AC_DEFINE(HAVE_LDAP_SASL_WRAPPING, 1, [Support for SASL wrapping]) fi
svn commit: lorikeet r770 - in trunk/heimdal: . include lib/hx509 lib/roken
Author: lha
Date: 2007-07-16 17:10:00 + (Mon, 16 Jul 2007)
New Revision: 770
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=770
Log:
Merged with Heimdal svn revision 21591
Modified:
trunk/heimdal/ChangeLog
trunk/heimdal/configure.in
trunk/heimdal/include/Makefile.am
trunk/heimdal/lib/hx509/ChangeLog
trunk/heimdal/lib/hx509/Makefile.am
trunk/heimdal/lib/roken/ChangeLog
trunk/heimdal/lib/roken/socket_wrapper.c
trunk/heimdal/lib/roken/socket_wrapper.h
Changeset:
Modified: trunk/heimdal/ChangeLog
===
--- trunk/heimdal/ChangeLog 2007-07-16 10:30:22 UTC (rev 769)
+++ trunk/heimdal/ChangeLog 2007-07-16 17:10:00 UTC (rev 770)
@@ -1,5 +1,7 @@
2007-07-16 Love H�rnquist �strand [EMAIL PROTECTED]
+ * include/Makefile.am: Add krb_err.h.
+
* kdc/set_dbinfo.c: Print acl file too.
* kdc/kerberos4.c: Error codes are just fine, remove XXX now.
Modified: trunk/heimdal/configure.in
===
--- trunk/heimdal/configure.in 2007-07-16 10:30:22 UTC (rev 769)
+++ trunk/heimdal/configure.in 2007-07-16 17:10:00 UTC (rev 770)
@@ -1,8 +1,8 @@
dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 21544 $)
+AC_REVISION($Revision: 21586 $)
AC_PREREQ([2.59])
test -z $CFLAGS CFLAGS=-g
-AC_INIT([Lorikeet-Heimdal, modified for
Samba4],[0.9pre-samba],[samba-technical.org])
+AC_INIT([Lorikeet-Heimdal, modified for
Samba4],[0.9rc3-samba],[samba-technical.org])
AC_CONFIG_SRCDIR([kuser/kinit.c])
AC_CONFIG_HEADERS(include/config.h)
Modified: trunk/heimdal/include/Makefile.am
===
--- trunk/heimdal/include/Makefile.am 2007-07-16 10:30:22 UTC (rev 769)
+++ trunk/heimdal/include/Makefile.am 2007-07-16 17:10:00 UTC (rev 770)
@@ -1,4 +1,4 @@
-# $Id: Makefile.am 21023 2007-06-09 02:54:41Z lha $
+# $Id: Makefile.am 21590 2007-07-16 17:05:42Z lha $
include $(top_srcdir)/Makefile.am.common
@@ -64,6 +64,7 @@
heimntlm.h \
heimntlm-protos.h \
kafs.h \
+ krb_err.h \
krb5-protos.h \
krb5-private.h \
krb5-types.h\
Modified: trunk/heimdal/lib/hx509/ChangeLog
===
--- trunk/heimdal/lib/hx509/ChangeLog 2007-07-16 10:30:22 UTC (rev 769)
+++ trunk/heimdal/lib/hx509/ChangeLog 2007-07-16 17:10:00 UTC (rev 770)
@@ -1,3 +1,7 @@
+2007-07-16 Love H�rnquist �strand [EMAIL PROTECTED]
+
+ * Makefile.am: Add version-script.map to EXTRA_DIST
+
2007-07-12 Love H�rnquist �strand [EMAIL PROTECTED]
* Makefile.am: Add depenency on asn1_compile for asn1 built files.
Modified: trunk/heimdal/lib/hx509/Makefile.am
===
--- trunk/heimdal/lib/hx509/Makefile.am 2007-07-16 10:30:22 UTC (rev 769)
+++ trunk/heimdal/lib/hx509/Makefile.am 2007-07-16 17:10:00 UTC (rev 770)
@@ -1,4 +1,4 @@
-# $Id: Makefile.am 21501 2007-07-12 11:42:19Z lha $
+# $Id: Makefile.am 21584 2007-07-16 14:59:15Z lha $
include $(top_srcdir)/Makefile.am.common
@@ -249,6 +249,7 @@
mv test_query.tmp test_query
EXTRA_DIST = \
+ version-script.map \
crmf.asn1 \
data/bleichenbacher-bad.pem \
hx509_err.et \
Modified: trunk/heimdal/lib/roken/ChangeLog
===
--- trunk/heimdal/lib/roken/ChangeLog 2007-07-16 10:30:22 UTC (rev 769)
+++ trunk/heimdal/lib/roken/ChangeLog 2007-07-16 17:10:00 UTC (rev 770)
@@ -1,3 +1,9 @@
+2007-07-16 Love H�rnquist �strand [EMAIL PROTECTED]
+
+ * socket_wrapper.c: Add dup(dummy stub) and dup2(real).
+
+ * socket_wrapper.h: Add dup(dummy stub) and dup2(real).
+
2007-07-10 Love H�rnquist �strand [EMAIL PROTECTED]
* Makefile.am: New library version.
Modified: trunk/heimdal/lib/roken/socket_wrapper.c
===
--- trunk/heimdal/lib/roken/socket_wrapper.c2007-07-16 10:30:22 UTC (rev
769)
+++ trunk/heimdal/lib/roken/socket_wrapper.c2007-07-16 17:10:00 UTC (rev
770)
@@ -149,6 +149,8 @@
#define real_send send
#define real_socket socket
#define real_close close
+#define real_dup dup
+#define real_dup2 dup2
#endif
#ifdef HAVE_GETTIMEOFDAY_TZ
@@ -1834,3 +1836,64 @@
return ret;
}
+
+_PUBLIC_ int swrap_dup(int oldd)
+{
+ struct socket_info *si;
+
+ si = find_socket_info(oldd);
+ if (si == NULL)
+ return real_dup(oldd);
+
+ abort(); /* write code here */
+}
+
+
+_PUBLIC_ int swrap_dup2(int oldd, int newd)
+{
+ struct socket_info *si_newd, *si_oldd;
+ int fd;
+
+ if (newd == oldd)
+ return newd;
+
+
svn commit: lorikeet r771 - in trunk/heimdal/lib/roken: .
Author: lha
Date: 2007-07-16 17:46:59 + (Mon, 16 Jul 2007)
New Revision: 771
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=771
Log:
Merged with Heimdal svn revision 21593
Modified:
trunk/heimdal/lib/roken/ChangeLog
trunk/heimdal/lib/roken/socket_wrapper.c
Changeset:
Modified: trunk/heimdal/lib/roken/ChangeLog
===
--- trunk/heimdal/lib/roken/ChangeLog 2007-07-16 17:10:00 UTC (rev 770)
+++ trunk/heimdal/lib/roken/ChangeLog 2007-07-16 17:46:59 UTC (rev 771)
@@ -1,5 +1,7 @@
2007-07-16 Love H�rnquist �strand [EMAIL PROTECTED]
+ * socket_wrapper.c: Implement swrap_dup too.
+
* socket_wrapper.c: Add dup(dummy stub) and dup2(real).
* socket_wrapper.h: Add dup(dummy stub) and dup2(real).
Modified: trunk/heimdal/lib/roken/socket_wrapper.c
===
--- trunk/heimdal/lib/roken/socket_wrapper.c2007-07-16 17:10:00 UTC (rev
770)
+++ trunk/heimdal/lib/roken/socket_wrapper.c2007-07-16 17:46:59 UTC (rev
771)
@@ -1837,15 +1837,53 @@
return ret;
}
+static int
+dup_internal(const struct socket_info *si_oldd, int fd)
+{
+ struct socket_info *si_newd;
+
+ si_newd = (struct socket_info *)calloc(1, sizeof(struct socket_info));
+
+ si_newd-fd = fd;
+
+ si_newd-family = si_oldd-family;
+ si_newd-type = si_oldd-type;
+ si_newd-protocol = si_oldd-protocol;
+ si_newd-bound = si_oldd-bound;
+ si_newd-bcast = si_oldd-bcast;
+ if (si_oldd-path)
+ si_newd-path = strdup(si_oldd-path);
+ if (si_oldd-tmp_path)
+ si_newd-tmp_path = strdup(si_oldd-tmp_path);
+ si_newd-myname =
+ sockaddr_dup(si_oldd-myname, si_oldd-myname_len);
+ si_newd-myname_len = si_oldd-myname_len;
+ si_newd-peername =
+ sockaddr_dup(si_oldd-peername, si_oldd-peername_len);
+ si_newd-peername_len = si_oldd-peername_len;
+
+ si_newd-io = si_oldd-io;
+
+ SWRAP_DLIST_ADD(sockets, si_newd);
+
+ return fd;
+}
+
+
_PUBLIC_ int swrap_dup(int oldd)
{
struct socket_info *si;
+ int fd;
si = find_socket_info(oldd);
if (si == NULL)
return real_dup(oldd);
- abort(); /* write code here */
+ fd = real_dup(si-fd);
+ if (fd 0)
+ return fd;
+
+ return dup_internal(si, fd);
}
@@ -1870,30 +1908,6 @@
/* close new socket first */
if (si_newd)
swrap_close(newd);
-
- si_newd = (struct socket_info *)calloc(1, sizeof(struct socket_info));
- si_newd-fd = fd;
-
- si_newd-family = si_oldd-family;
- si_newd-type = si_oldd-type;
- si_newd-protocol = si_oldd-protocol;
- si_newd-bound = si_oldd-bound;
- si_newd-bcast = si_oldd-bcast;
- if (si_oldd-path)
- si_newd-path = strdup(si_oldd-path);
- if (si_oldd-tmp_path)
- si_newd-tmp_path = strdup(si_oldd-tmp_path);
- si_newd-myname =
- sockaddr_dup(si_oldd-myname, si_oldd-myname_len);
- si_newd-myname_len = si_oldd-myname_len;
- si_newd-peername =
- sockaddr_dup(si_oldd-peername, si_oldd-peername_len);
- si_newd-peername_len = si_oldd-peername_len;
-
- si_newd-io = si_oldd-io;
-
- SWRAP_DLIST_ADD(sockets, si_newd);
-
- return fd;
+ return dup_internal(si_oldd, fd);
}
svn commit: samba r23902 - in branches: SAMBA_3_2/source/smbd SAMBA_3_2_0/source/smbd
Author: jra
Date: 2007-07-16 18:17:19 + (Mon, 16 Jul 2007)
New Revision: 23902
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23902
Log:
Fix uninitialized read in devicetype noticed by Volker.
Jeremy
Modified:
branches/SAMBA_3_2/source/smbd/reply.c
branches/SAMBA_3_2_0/source/smbd/reply.c
Changeset:
Modified: branches/SAMBA_3_2/source/smbd/reply.c
===
--- branches/SAMBA_3_2/source/smbd/reply.c 2007-07-16 16:22:36 UTC (rev
23901)
+++ branches/SAMBA_3_2/source/smbd/reply.c 2007-07-16 18:17:19 UTC (rev
23902)
@@ -529,7 +529,7 @@
}
p += srvstr_pull_talloc(ctx, inbuf, SVAL(inbuf, smb_flg2),
client_devicetype, p,
-6, STR_ASCII);
+MIN(6,smb_bufrem(inbuf, p)), STR_ASCII);
if (client_devicetype == NULL) {
TALLOC_FREE(ctx);
Modified: branches/SAMBA_3_2_0/source/smbd/reply.c
===
--- branches/SAMBA_3_2_0/source/smbd/reply.c2007-07-16 16:22:36 UTC (rev
23901)
+++ branches/SAMBA_3_2_0/source/smbd/reply.c2007-07-16 18:17:19 UTC (rev
23902)
@@ -528,7 +528,7 @@
}
p += srvstr_pull_talloc(ctx, inbuf, SVAL(inbuf, smb_flg2),
client_devicetype, p,
-6, STR_ASCII);
+MIN(6,smb_bufrem(inbuf, p)), STR_ASCII);
if (client_devicetype == NULL) {
TALLOC_FREE(ctx);
svn commit: samba r23903 - in branches: SAMBA_3_2/source/smbd SAMBA_3_2_0/source/smbd
Author: vlendec Date: 2007-07-16 19:36:46 + (Mon, 16 Jul 2007) New Revision: 23903 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23903 Log: Fix a potential reason for the segfault Steve found Modified: branches/SAMBA_3_2/source/smbd/nttrans.c branches/SAMBA_3_2_0/source/smbd/nttrans.c Changeset: Modified: branches/SAMBA_3_2/source/smbd/nttrans.c === --- branches/SAMBA_3_2/source/smbd/nttrans.c2007-07-16 18:17:19 UTC (rev 23902) +++ branches/SAMBA_3_2/source/smbd/nttrans.c2007-07-16 19:36:46 UTC (rev 23903) @@ -305,6 +305,7 @@ return NULL; } + result-conn = conn; result-case_sensitive = conn-case_sensitive; result-case_preserve = conn-case_preserve; result-short_case_preserve = conn-short_case_preserve; Modified: branches/SAMBA_3_2_0/source/smbd/nttrans.c === --- branches/SAMBA_3_2_0/source/smbd/nttrans.c 2007-07-16 18:17:19 UTC (rev 23902) +++ branches/SAMBA_3_2_0/source/smbd/nttrans.c 2007-07-16 19:36:46 UTC (rev 23903) @@ -299,6 +299,7 @@ return NULL; } + result-conn = conn; result-case_sensitive = conn-case_sensitive; result-case_preserve = conn-case_preserve; result-short_case_preserve = conn-short_case_preserve;
svn commit: samba r23904 - in branches: SAMBA_3_2/source/smbd SAMBA_3_2_0/source/smbd
Author: vlendec Date: 2007-07-16 21:17:26 + (Mon, 16 Jul 2007) New Revision: 23904 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23904 Log: Remove an unused variable reference Modified: branches/SAMBA_3_2/source/smbd/reply.c branches/SAMBA_3_2_0/source/smbd/reply.c Changeset: Modified: branches/SAMBA_3_2/source/smbd/reply.c === --- branches/SAMBA_3_2/source/smbd/reply.c 2007-07-16 19:36:46 UTC (rev 23903) +++ branches/SAMBA_3_2/source/smbd/reply.c 2007-07-16 21:17:26 UTC (rev 23904) @@ -27,7 +27,6 @@ /* look in server.c for some explanation of these variables */ extern enum protocol_types Protocol; -extern int max_send; extern int max_recv; unsigned int smb_echo_count = 0; extern uint32 global_client_caps; Modified: branches/SAMBA_3_2_0/source/smbd/reply.c === --- branches/SAMBA_3_2_0/source/smbd/reply.c2007-07-16 19:36:46 UTC (rev 23903) +++ branches/SAMBA_3_2_0/source/smbd/reply.c2007-07-16 21:17:26 UTC (rev 23904) @@ -27,7 +27,6 @@ /* look in server.c for some explanation of these variables */ extern enum protocol_types Protocol; -extern int max_send; extern int max_recv; unsigned int smb_echo_count = 0; extern uint32 global_client_caps;
svn commit: samba r23905 - in branches/SAMBA_4_0/source: .
Author: abartlet
Date: 2007-07-16 23:38:29 + (Mon, 16 Jul 2007)
New Revision: 23905
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23905
Log:
SATOH Fumiyasu [EMAIL PROTECTED] points out that we want , not ; here...
(We don't want to make a distclean of the main user tree, just because
they don't have the parent directory checked out).
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/autogen.sh
Changeset:
Modified: branches/SAMBA_4_0/source/autogen.sh
===
--- branches/SAMBA_4_0/source/autogen.sh2007-07-16 21:17:26 UTC (rev
23904)
+++ branches/SAMBA_4_0/source/autogen.sh2007-07-16 23:38:29 UTC (rev
23905)
@@ -65,7 +65,7 @@
if test x${AUTOGEN_SKIP_SWAT} != xyes; then
echo $0: building Web Application Framework (SWAT)
- (cd ../webapps/swat; make distclean build || exit 1)
+ (cd ../webapps/swat make distclean build || exit 1)
fi
echo Now run ./configure and then make.
Build status as of Tue Jul 17 00:00:02 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-07-16 00:01:31.0 + +++ /home/build/master/cache/broken_results.txt 2007-07-17 00:02:13.0 + @@ -1,4 +1,4 @@ -Build status as of Mon Jul 16 00:00:02 2007 +Build status as of Tue Jul 17 00:00:02 2007 Build counts: Tree Total Broken Panic @@ -9,16 +9,16 @@ distcc 2 0 0 ldb 35 4 0 libreplace 34 10 0 -lorikeet-heimdal 31 14 0 +lorikeet-heimdal 31 20 0 pidl 19 4 0 ppp 15 10 0 python 0 0 0 rsync36 13 0 samba-docs 0 0 0 samba-gtk4 4 0 -samba4 33 21 6 -samba_3_236 20 0 +samba4 33 28 5 +samba_3_236 21 0 smb-build33 33 0 talloc 36 1 0 -tdb 34 3 0 +tdb 35 3 0
svn commit: samba r23906 - in branches: SAMBA_3_0_25/source/smbd SAMBA_3_2/source/smbd SAMBA_3_2_0/source/smbd
Author: jra
Date: 2007-07-17 00:09:56 + (Tue, 17 Jul 2007)
New Revision: 23906
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23906
Log:
Fix POSIX unlink bug found by Steve. If we
used lstat during the open (which we always
do for POSIX) then use lstat for the unlink.
Jeremy.
Modified:
branches/SAMBA_3_0_25/source/smbd/close.c
branches/SAMBA_3_2/source/smbd/close.c
branches/SAMBA_3_2_0/source/smbd/close.c
Changeset:
Modified: branches/SAMBA_3_0_25/source/smbd/close.c
===
--- branches/SAMBA_3_0_25/source/smbd/close.c 2007-07-16 23:38:29 UTC (rev
23905)
+++ branches/SAMBA_3_0_25/source/smbd/close.c 2007-07-17 00:09:56 UTC (rev
23906)
@@ -153,6 +153,7 @@
struct share_mode_lock *lck;
SMB_STRUCT_STAT sbuf;
NTSTATUS status = NT_STATUS_OK;
+ int ret;
/*
* Lock the share entries, and determine if we should delete
@@ -245,8 +246,14 @@
/* We can only delete the file if the name we have is still valid and
hasn't been renamed. */
-
- if(SMB_VFS_STAT(conn,fsp-fsp_name,sbuf) != 0) {
+
+ if (fsp-posix_open) {
+ ret = SMB_VFS_LSTAT(conn,fsp-fsp_name,sbuf);
+ } else {
+ ret = SMB_VFS_STAT(conn,fsp-fsp_name,sbuf);
+ }
+
+ if (ret != 0) {
DEBUG(5,(close_remove_share_mode: file %s. Delete on close
was set and stat failed with error %s\n,
fsp-fsp_name, strerror(errno) ));
Modified: branches/SAMBA_3_2/source/smbd/close.c
===
--- branches/SAMBA_3_2/source/smbd/close.c 2007-07-16 23:38:29 UTC (rev
23905)
+++ branches/SAMBA_3_2/source/smbd/close.c 2007-07-17 00:09:56 UTC (rev
23906)
@@ -154,6 +154,7 @@
struct share_mode_lock *lck;
SMB_STRUCT_STAT sbuf;
NTSTATUS status = NT_STATUS_OK;
+ int ret;
struct file_id id;
/*
@@ -247,8 +248,14 @@
/* We can only delete the file if the name we have is still valid and
hasn't been renamed. */
-
- if(SMB_VFS_STAT(conn,fsp-fsp_name,sbuf) != 0) {
+
+ if (fsp-posix_open) {
+ ret = SMB_VFS_LSTAT(conn,fsp-fsp_name,sbuf);
+ } else {
+ ret = SMB_VFS_STAT(conn,fsp-fsp_name,sbuf);
+ }
+
+ if (ret != 0) {
DEBUG(5,(close_remove_share_mode: file %s. Delete on close
was set and stat failed with error %s\n,
fsp-fsp_name, strerror(errno) ));
Modified: branches/SAMBA_3_2_0/source/smbd/close.c
===
--- branches/SAMBA_3_2_0/source/smbd/close.c2007-07-16 23:38:29 UTC (rev
23905)
+++ branches/SAMBA_3_2_0/source/smbd/close.c2007-07-17 00:09:56 UTC (rev
23906)
@@ -154,6 +154,7 @@
struct share_mode_lock *lck;
SMB_STRUCT_STAT sbuf;
NTSTATUS status = NT_STATUS_OK;
+ int ret;
struct file_id id;
/*
@@ -247,8 +248,14 @@
/* We can only delete the file if the name we have is still valid and
hasn't been renamed. */
-
- if(SMB_VFS_STAT(conn,fsp-fsp_name,sbuf) != 0) {
+
+ if (fsp-posix_open) {
+ ret = SMB_VFS_LSTAT(conn,fsp-fsp_name,sbuf);
+ } else {
+ ret = SMB_VFS_STAT(conn,fsp-fsp_name,sbuf);
+ }
+
+ if (ret != 0) {
DEBUG(5,(close_remove_share_mode: file %s. Delete on close
was set and stat failed with error %s\n,
fsp-fsp_name, strerror(errno) ));
svn commit: samba r23907 - in branches/SAMBA_4_0/source/scripting/libjs: .
Author: abartlet
Date: 2007-07-17 00:10:53 + (Tue, 17 Jul 2007)
New Revision: 23907
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23907
Log:
Fix bug 4790 reported by [EMAIL PROTECTED]:
Before the provisioning enters to the function provision_default_paths (in
scripting/libjs/provision.js), the variable subobj.DNSDOMAIN isn't properly set
(for example for the filename of the DNS zonefile).
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/scripting/libjs/provision.js
Changeset:
Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js
===
--- branches/SAMBA_4_0/source/scripting/libjs/provision.js 2007-07-17
00:09:56 UTC (rev 23906)
+++ branches/SAMBA_4_0/source/scripting/libjs/provision.js 2007-07-17
00:10:53 UTC (rev 23907)
@@ -370,6 +370,8 @@
function provision_default_paths(subobj)
{
+ /* subobj.DNSDOMAIN isn't available at this point */
+ var dnsdomain = strlower(subobj.REALM);
var lp = loadparm_init();
var paths = new Object();
paths.smbconf = lp.get(config file);
@@ -383,12 +385,12 @@
paths.samdb = lp.get(sam database);
paths.secrets = lp.get(secrets database);
paths.keytab = secrets.keytab;
- paths.dns = lp.get(private dir) + / + subobj.DNSDOMAIN + .zone;
+ paths.dns = lp.get(private dir) + / + dnsdomain + .zone;
paths.winsdb = wins.ldb;
paths.ldapdir = lp.get(private dir) + /ldap;
- paths.ldap_basedn_ldif = paths.ldapdir + / + subobj.DNSDOMAIN +
.ldif;
- paths.ldap_config_basedn_ldif = paths.ldapdir + / + subobj.DNSDOMAIN
+ -config.ldif;
- paths.ldap_schema_basedn_ldif = paths.ldapdir + / + subobj.DNSDOMAIN
+ -schema.ldif;
+ paths.ldap_basedn_ldif = paths.ldapdir + / + dnsdomain + .ldif;
+ paths.ldap_config_basedn_ldif = paths.ldapdir + / + dnsdomain +
-config.ldif;
+ paths.ldap_schema_basedn_ldif = paths.ldapdir + / + dnsdomain +
-schema.ldif;
paths.sysvol = lp.get(sysvol, path);
@@ -399,7 +401,7 @@
paths.netlogon = lp.get(netlogon, path);
if (paths.netlogon == undefined) {
- paths.netlogon = paths.sysvol + / + subobj.DNSDOMAIN +
/scripts;
+ paths.netlogon = paths.sysvol + / + dnsdomain + /scripts;
}
return paths;
svn commit: samba r23908 - in branches: SAMBA_3_0_25/source/locking SAMBA_3_2/source/locking SAMBA_3_2_0/source/locking
Author: jra
Date: 2007-07-17 00:50:48 + (Tue, 17 Jul 2007)
New Revision: 23908
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23908
Log:
Fix bug with interaction of optimization with
POSIX locking. We can't do lock counts with POSIX,
so stop counting if we get a POSIX lock request.
Jeremy.
Modified:
branches/SAMBA_3_0_25/source/locking/locking.c
branches/SAMBA_3_2/source/locking/locking.c
branches/SAMBA_3_2_0/source/locking/locking.c
Changeset:
Modified: branches/SAMBA_3_0_25/source/locking/locking.c
===
--- branches/SAMBA_3_0_25/source/locking/locking.c 2007-07-17 00:10:53 UTC
(rev 23907)
+++ branches/SAMBA_3_0_25/source/locking/locking.c 2007-07-17 00:50:48 UTC
(rev 23908)
@@ -41,6 +41,8 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_LOCKING
+#define NO_LOCKING_COUNT (-1)
+
/* the locking database handle */
static TDB_CONTEXT *tdb;
@@ -224,11 +226,19 @@
blocking_lock,
plock_pid);
- /* blocking ie. pending, locks also count here,
-* as this is an efficiency counter to avoid checking
-* the lock db. on close. JRA. */
+ if (lock_flav == WINDOWS_LOCK
+ fsp-current_lock_count != NO_LOCKING_COUNT) {
+ /* blocking ie. pending, locks also count here,
+* as this is an efficiency counter to avoid checking
+* the lock db. on close. JRA. */
- fsp-current_lock_count++;
+ fsp-current_lock_count++;
+ } else {
+ /* Notice that this has had a POSIX lock request.
+* We can't count locks after this so forget them.
+*/
+ fsp-current_lock_count = NO_LOCKING_COUNT;
+ }
return br_lck;
}
@@ -276,8 +286,11 @@
return NT_STATUS_RANGE_NOT_LOCKED;
}
- SMB_ASSERT(fsp-current_lock_count 0);
- fsp-current_lock_count--;
+ if (lock_flav == WINDOWS_LOCK
+ fsp-current_lock_count != NO_LOCKING_COUNT) {
+ SMB_ASSERT(fsp-current_lock_count 0);
+ fsp-current_lock_count--;
+ }
return NT_STATUS_OK;
}
@@ -326,8 +339,11 @@
return NT_STATUS_DOS(ERRDOS, ERRcancelviolation);
}
- SMB_ASSERT(fsp-current_lock_count 0);
- fsp-current_lock_count--;
+ if (lock_flav == WINDOWS_LOCK
+ fsp-current_lock_count != NO_LOCKING_COUNT) {
+ SMB_ASSERT(fsp-current_lock_count 0);
+ fsp-current_lock_count--;
+ }
return NT_STATUS_OK;
}
Modified: branches/SAMBA_3_2/source/locking/locking.c
===
--- branches/SAMBA_3_2/source/locking/locking.c 2007-07-17 00:10:53 UTC (rev
23907)
+++ branches/SAMBA_3_2/source/locking/locking.c 2007-07-17 00:50:48 UTC (rev
23908)
@@ -40,6 +40,8 @@
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_LOCKING
+#define NO_LOCKING_COUNT (-1)
+
/* the locking database handle */
static struct db_context *lock_db;
@@ -225,11 +227,19 @@
blocking_lock,
plock_pid);
- /* blocking ie. pending, locks also count here,
-* as this is an efficiency counter to avoid checking
-* the lock db. on close. JRA. */
+ if (lock_flav == WINDOWS_LOCK
+ fsp-current_lock_count != NO_LOCKING_COUNT) {
+ /* blocking ie. pending, locks also count here,
+* as this is an efficiency counter to avoid checking
+* the lock db. on close. JRA. */
- fsp-current_lock_count++;
+ fsp-current_lock_count++;
+ } else {
+ /* Notice that this has had a POSIX lock request.
+* We can't count locks after this so forget them.
+*/
+ fsp-current_lock_count = NO_LOCKING_COUNT;
+ }
return br_lck;
}
@@ -279,8 +289,11 @@
return NT_STATUS_RANGE_NOT_LOCKED;
}
- SMB_ASSERT(fsp-current_lock_count 0);
- fsp-current_lock_count--;
+ if (lock_flav == WINDOWS_LOCK
+ fsp-current_lock_count != NO_LOCKING_COUNT) {
+ SMB_ASSERT(fsp-current_lock_count 0);
+ fsp-current_lock_count--;
+ }
return NT_STATUS_OK;
}
@@ -329,8 +342,11 @@
return NT_STATUS_DOS(ERRDOS, ERRcancelviolation);
}
- SMB_ASSERT(fsp-current_lock_count 0);
- fsp-current_lock_count--;
+ if (lock_flav == WINDOWS_LOCK
+ fsp-current_lock_count != NO_LOCKING_COUNT) {
+ SMB_ASSERT(fsp-current_lock_count 0);
+ fsp-current_lock_count--;
+ }
return NT_STATUS_OK;
}
Modified: branches/SAMBA_3_2_0/source/locking/locking.c
svn commit: samba r23909 - in branches: SAMBA_3_2/source/smbd SAMBA_3_2_0/source/smbd
Author: jra
Date: 2007-07-17 02:06:38 + (Tue, 17 Jul 2007)
New Revision: 23909
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23909
Log:
Get closer to passing the cthon tests for delete open file.
It matters how the target is open.
Jeremy.
Modified:
branches/SAMBA_3_2/source/smbd/reply.c
branches/SAMBA_3_2_0/source/smbd/reply.c
Changeset:
Modified: branches/SAMBA_3_2/source/smbd/reply.c
===
--- branches/SAMBA_3_2/source/smbd/reply.c 2007-07-17 00:50:48 UTC (rev
23908)
+++ branches/SAMBA_3_2/source/smbd/reply.c 2007-07-17 02:06:38 UTC (rev
23909)
@@ -4447,9 +4447,12 @@
return NT_STATUS_OBJECT_NAME_COLLISION;
}
- if (dst_exists file_find_di_first(file_id_sbuf(sbuf1)) != NULL) {
- DEBUG(3, (rename_internals_fsp: Target file open\n));
- return NT_STATUS_ACCESS_DENIED;
+ if (dst_exists) {
+ files_struct *dst_fsp =
file_find_di_first(file_id_sbuf(sbuf1));
+ if (dst_fsp !(dst_fsp-share_access FILE_SHARE_DELETE)) {
+ DEBUG(3, (rename_internals_fsp: Target file open\n));
+ return NT_STATUS_ACCESS_DENIED;
+ }
}
/* Ensure we have a valid stat struct for the source. */
Modified: branches/SAMBA_3_2_0/source/smbd/reply.c
===
--- branches/SAMBA_3_2_0/source/smbd/reply.c2007-07-17 00:50:48 UTC (rev
23908)
+++ branches/SAMBA_3_2_0/source/smbd/reply.c2007-07-17 02:06:38 UTC (rev
23909)
@@ -4445,9 +4445,12 @@
return NT_STATUS_OBJECT_NAME_COLLISION;
}
- if (dst_exists file_find_di_first(file_id_sbuf(sbuf1)) != NULL) {
- DEBUG(3, (rename_internals_fsp: Target file open\n));
- return NT_STATUS_ACCESS_DENIED;
+ if (dst_exists) {
+ files_struct *dst_fsp =
file_find_di_first(file_id_sbuf(sbuf1));
+ if (dst_fsp !(dst_fsp-share_access FILE_SHARE_DELETE)) {
+ DEBUG(3, (rename_internals_fsp: Target file open\n));
+ return NT_STATUS_ACCESS_DENIED;
+ }
}
/* Ensure we have a valid stat struct for the source. */
svn commit: samba r23910 - in branches: SAMBA_3_2/source/smbd SAMBA_3_2_0/source/smbd
Author: jra
Date: 2007-07-17 02:17:23 + (Tue, 17 Jul 2007)
New Revision: 23910
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23910
Log:
We used to deny renames on the
source open for non-delete open.
Turns out this is not the case.
VL please test but this matches
Windows behaviour. (I'll add a
torture test tomorrow).
Jeremy.
Modified:
branches/SAMBA_3_2/source/smbd/reply.c
branches/SAMBA_3_2_0/source/smbd/reply.c
Changeset:
Modified: branches/SAMBA_3_2/source/smbd/reply.c
===
--- branches/SAMBA_3_2/source/smbd/reply.c 2007-07-17 02:06:38 UTC (rev
23909)
+++ branches/SAMBA_3_2/source/smbd/reply.c 2007-07-17 02:17:23 UTC (rev
23910)
@@ -1863,6 +1863,12 @@
return NT_STATUS_NO_SUCH_FILE;
}
+#if 0
+ /* We used to deny renames on the
+* source open for non-delete open.
+* Turns out this is not the case.
+* VL please test but this matches
+* Windows behaviour. JRA. */
if (S_ISDIR(pst-st_mode)) {
return NT_STATUS_OK;
}
@@ -1872,6 +1878,9 @@
}
return NT_STATUS_ACCESS_DENIED;
+#else
+ return NT_STATUS_OK;
+#endif
}
/***
Modified: branches/SAMBA_3_2_0/source/smbd/reply.c
===
--- branches/SAMBA_3_2_0/source/smbd/reply.c2007-07-17 02:06:38 UTC (rev
23909)
+++ branches/SAMBA_3_2_0/source/smbd/reply.c2007-07-17 02:17:23 UTC (rev
23910)
@@ -1862,6 +1862,12 @@
return NT_STATUS_NO_SUCH_FILE;
}
+#if 0
+ /* We used to deny renames on the
+* source open for non-delete open.
+* Turns out this is not the case.
+* VL please test but this matches
+* Windows behaviour. JRA. */
if (S_ISDIR(pst-st_mode)) {
return NT_STATUS_OK;
}
@@ -1871,6 +1877,9 @@
}
return NT_STATUS_ACCESS_DENIED;
+#else
+ return NT_STATUS_OK;
+#endif
}
/***
svn commit: samba r23911 - in branches: SAMBA_3_2/source/smbd SAMBA_3_2_0/source/smbd
Author: jra
Date: 2007-07-17 04:47:36 + (Tue, 17 Jul 2007)
New Revision: 23911
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23911
Log:
Revert r23910 to try and fix the build farm. I
need to look at this more closely tomorrow.
Stevef's cthon tests definately show we're not
matching Windows behaviour (as his tests pass
against Windows but not SAMBA_3_2) but this isn't
the fix.
Jeremy.
Modified:
branches/SAMBA_3_2/source/smbd/reply.c
branches/SAMBA_3_2_0/source/smbd/reply.c
Changeset:
Modified: branches/SAMBA_3_2/source/smbd/reply.c
===
--- branches/SAMBA_3_2/source/smbd/reply.c 2007-07-17 02:17:23 UTC (rev
23910)
+++ branches/SAMBA_3_2/source/smbd/reply.c 2007-07-17 04:47:36 UTC (rev
23911)
@@ -1863,12 +1863,6 @@
return NT_STATUS_NO_SUCH_FILE;
}
-#if 0
- /* We used to deny renames on the
-* source open for non-delete open.
-* Turns out this is not the case.
-* VL please test but this matches
-* Windows behaviour. JRA. */
if (S_ISDIR(pst-st_mode)) {
return NT_STATUS_OK;
}
@@ -1878,9 +1872,6 @@
}
return NT_STATUS_ACCESS_DENIED;
-#else
- return NT_STATUS_OK;
-#endif
}
/***
Modified: branches/SAMBA_3_2_0/source/smbd/reply.c
===
--- branches/SAMBA_3_2_0/source/smbd/reply.c2007-07-17 02:17:23 UTC (rev
23910)
+++ branches/SAMBA_3_2_0/source/smbd/reply.c2007-07-17 04:47:36 UTC (rev
23911)
@@ -1862,12 +1862,6 @@
return NT_STATUS_NO_SUCH_FILE;
}
-#if 0
- /* We used to deny renames on the
-* source open for non-delete open.
-* Turns out this is not the case.
-* VL please test but this matches
-* Windows behaviour. JRA. */
if (S_ISDIR(pst-st_mode)) {
return NT_STATUS_OK;
}
@@ -1877,9 +1871,6 @@
}
return NT_STATUS_ACCESS_DENIED;
-#else
- return NT_STATUS_OK;
-#endif
}
/***
svn commit: lorikeet r772 - in trunk/heimdal/tests/java: .
Author: lha
Date: 2007-07-17 05:20:21 + (Tue, 17 Jul 2007)
New Revision: 772
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=772
Log:
merge 21599, java have no socket wrapper, disable test
Modified:
trunk/heimdal/tests/java/check-kinit.in
Changeset:
Modified: trunk/heimdal/tests/java/check-kinit.in
===
--- trunk/heimdal/tests/java/check-kinit.in 2007-07-16 17:46:59 UTC (rev
771)
+++ trunk/heimdal/tests/java/check-kinit.in 2007-07-17 05:20:21 UTC (rev
772)
@@ -38,9 +38,10 @@
objdir=@objdir@
port=@port@
-# If there is no useful db support compile in, disable test
+# Disable test if: no data, no java, or socket wrapper
../db/have-db || exit 77
sh ${srcdir}/have-java.sh || exit 77
+[ X$SOCKET_WRAPPER_DIR != X ] exit 77
R=TEST.H5L.SE
svn commit: lorikeet r773 - in trunk/heimdal/tests/java: .
Author: lha
Date: 2007-07-17 05:25:05 + (Tue, 17 Jul 2007)
New Revision: 773
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=lorikeetrev=773
Log:
merge 21600, make failing javac non-fatal
Modified:
trunk/heimdal/tests/java/check-kinit.in
Changeset:
Modified: trunk/heimdal/tests/java/check-kinit.in
===
--- trunk/heimdal/tests/java/check-kinit.in 2007-07-17 05:20:21 UTC (rev
772)
+++ trunk/heimdal/tests/java/check-kinit.in 2007-07-17 05:25:05 UTC (rev
773)
@@ -57,7 +57,8 @@
rm -f mkey.file*
echo Compile
-javac -d ${objdir} ${srcdir}/KerberosInit.java || exit 1
+javac -d ${objdir} ${srcdir}/KerberosInit.java || \
+{ echo Failed to compile java program: $? ; exit 77; }
echo Creating database
${kadmin} \
svn commit: samba r23912 - in branches/SAMBA_4_0/source/lib/cmdline: .
Author: abartlet
Date: 2007-07-17 05:40:36 + (Tue, 17 Jul 2007)
New Revision: 23912
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23912
Log:
We always accept / as a seperator, and it is far less confusing
compared with a shell-escape (\).
Fixes bug #4765
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/lib/cmdline/popt_credentials.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/cmdline/popt_credentials.c
===
--- branches/SAMBA_4_0/source/lib/cmdline/popt_credentials.c2007-07-17
04:47:36 UTC (rev 23911)
+++ branches/SAMBA_4_0/source/lib/cmdline/popt_credentials.c2007-07-17
05:40:36 UTC (rev 23912)
@@ -131,7 +131,7 @@
struct poptOption popt_common_credentials[] = {
{ NULL, 0, POPT_ARG_CALLBACK|POPT_CBFLAG_PRE|POPT_CBFLAG_POST, (void
*)popt_common_credentials_callback },
- { user, 'U', POPT_ARG_STRING, NULL, 'U', Set the network username,
[DOMAIN\\]USERNAME[%PASSWORD] },
+ { user, 'U', POPT_ARG_STRING, NULL, 'U', Set the network username,
[DOMAIN/]USERNAME[%PASSWORD] },
{ no-pass, 'N', POPT_ARG_NONE, dont_ask, True, Don't ask for a
password },
{ password, 0, POPT_ARG_STRING, NULL, OPT_PASSWORD, Password },
{ authentication-file, 'A', POPT_ARG_STRING, NULL, 'A', Get the
credentials from a file, FILE },
svn commit: samba r23913 - in branches: SAMBA_3_2/source/smbd SAMBA_3_2_0/source/smbd
Author: jra
Date: 2007-07-17 05:55:10 + (Tue, 17 Jul 2007)
New Revision: 23913
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23913
Log:
Revert back to Volker's original logic to fix the
RAW-SFILEINFO-RENAME until I can figure out what
is different from the way CIFSFS drives this in
the cthon tests and the way smbtorture drives it.
Jeremy.
Modified:
branches/SAMBA_3_2/source/smbd/reply.c
branches/SAMBA_3_2_0/source/smbd/reply.c
Changeset:
Modified: branches/SAMBA_3_2/source/smbd/reply.c
===
--- branches/SAMBA_3_2/source/smbd/reply.c 2007-07-17 05:40:36 UTC (rev
23912)
+++ branches/SAMBA_3_2/source/smbd/reply.c 2007-07-17 05:55:10 UTC (rev
23913)
@@ -4449,7 +4449,7 @@
if (dst_exists) {
files_struct *dst_fsp =
file_find_di_first(file_id_sbuf(sbuf1));
- if (dst_fsp !(dst_fsp-share_access FILE_SHARE_DELETE)) {
+ if (dst_fsp) {
DEBUG(3, (rename_internals_fsp: Target file open\n));
return NT_STATUS_ACCESS_DENIED;
}
Modified: branches/SAMBA_3_2_0/source/smbd/reply.c
===
--- branches/SAMBA_3_2_0/source/smbd/reply.c2007-07-17 05:40:36 UTC (rev
23912)
+++ branches/SAMBA_3_2_0/source/smbd/reply.c2007-07-17 05:55:10 UTC (rev
23913)
@@ -4447,7 +4447,7 @@
if (dst_exists) {
files_struct *dst_fsp =
file_find_di_first(file_id_sbuf(sbuf1));
- if (dst_fsp !(dst_fsp-share_access FILE_SHARE_DELETE)) {
+ if (dst_fsp) {
DEBUG(3, (rename_internals_fsp: Target file open\n));
return NT_STATUS_ACCESS_DENIED;
}
