Re: [Samba] pstools / psexec equivalent for Samba / Linux?
Kichigai Mentat schrieb: On May 29, 2005, at 13.50, Tomasz Chmielewski wrote: I was wondering if there is a pstools / psexec (tools by Sysinternals) equivalent, which could be run on Linux machine to execute a process on a remote Windows machine? Wrong mailing list for this one, buddy. Samba is just a file sharing system. However, you might want to look into VNC. It's a cross- platform system that basically turns the client machine into a remote control for the server. There are Linux, Mac, and Windows servers and clients, all will work with each other. I thought someone on the list could know it, as it certainly could help a *NIX / samba admin to control Windows machines. Anyway, VNC is not a solution, it needs installing a service on a Windows machine and is scrictly GUI; same goes for SSH - it won't work unless you install it on a Windows machine and start it as a service. psexec, on the other way, does not need anything installed on remote Windows machine, what you need, is credentials. It would be very handy to be able to execute simple tasks like that (similar to ssh on unices) straight from a Samba server. -- Tomek -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Naresh - Request
Hello, This is regarding to smb service we usually use for win-linux connectivity Now I have client application at Windows machine and server application at linux machine I have used socket for the connection... Smb : start connection using socket API-getHoseByAddress gives connecting to IP Smb : stop connection using socket API-getHoseByAddress gives can not resolve IP any other service we can use for same connectivity instead of smb thanks regardsNaresh __ Do you Yahoo!? Yahoo! Small Business - Try our new Resources site http://smallbusiness.yahoo.com/resources/ -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Long Delays Displaying Small Folders in Windows Explorer (samba-3.0.10-1 FC2)
Hi, I'm trying to replace a windows fileserver server with a Fedora Core 2 samba server in our Windows 2000 ADS domain. A performance problem occurs when accessing certain samba shares from Windows Explorer on either an Windows XP or a W2K client machine. It can take up to a minute for explorer to list files in a share folder containing only a few files! It eventually does, but but reports as non responding for a long period beforehand. I've gone about as far as I can in attempting to resolve this issue myserlf and would appreciate any suggestions from the samba list! Server Hardware: HP Proliant ML 350 Xeon 1G mem NetXtreme BCM5705_2 Gigabit Ethernet Server Software All FC2 packages updates applied as of early May 2005 including: smp kernel 2.6.10-1.771 samba 3.0.10 Network Hardware Linksys and 3com Switches (circa 2004) Client hardware: Windows 2000 SP4 and Windows XP Pro machines In setting up the samba server, I followed the approach outlined in Samba-3 By Example chapter 9.3.3 Active Directory Domain with samba Domain Member Server. I also applied recommended tuning steps. The setup all seemed to go impressively smoothly. I suspect the problem is related to networking. Analysis in ethereal shows a huge amount of traffic during the non responsive period. It looks like every file is read in it's entirity in 512 byte increments? Also, a lot of checksum messages come up. Two highly abreviated text extracts from the ethereal logs are attached (which are repeatable): The first shows the (61 entries) activity involved in displaying share //nghfs/downloads - which occurs quickly. The second shows a sample of the excessive activity (57000 log entries!) involved in displaying a sub folder share //nghfs/downloads/Mozilla - which takes quite a few seconds although only contains 5 files and 2 folders. The smb.conf file is also attached. Any help is most welcome, Stewart. #Global parameters [global] unix charset = LOCALE workgroup = NGHEALTH realm = NGHEALTH.ORG server string = NGHFS Samba security = ADS username map = /etc/samba/smbusers log level = 3 syslog = 1 log file = /var/log/samba/%m max log size = 50 printcap name = CUPS ldap ssl = no idmap uid = 1-2 idmap gid = 1-2 template primary group = Domain Users template shell = /bin/bash winbind separator = + printing = cups socket options = IPTOS_LOWDELAY TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 dead time = 10 getwd cache = yes oplocks = no level2 oplocks = no #[homes] # comment = Home Directories # valid users = %S # read only = No # browseable = No [printers] comment = SMB Print Spool path = /var/spool/samba guest ok = Yes printable = Yes browseable = No [print$] comment = Printer Drivers path = /var/lib/samba/drivers admin users = root NGHEALTH+Administrator @NGHEALTH+Domain Admins write list = root [ghost] comment = Ghost Image Store path = /mnt/images/images admin users = root NGHEALTH+Administrator @NGHEALTH+Domain Admins valid users = @NGHEALTH+Domain Admins browseable = Yes writable = Yes oplocks = false level2 oplocks = false [software] comment = Licensed Software [Restricted] path = /home/software admin users = root NGHEALTH+Administrator @NGHEALTH+Domain Admins valid users = @NGHEALTH+Domain Admins available = Yes browseable = Yes writable = Yes create mask = 775 inherit permissions = yes oplocks = false level2 oplocks = false [downloads] comment = Downloads Directory [Public] path = /home/downloads admin users = root NGHEALTH+Administrator @NGHEALTH+Web Admins valid users = @NGHEALTH+Domain Users available = Yes browseable = Yes writable = Yes create mask = 775 inherit permissions = yes oplocks = false level2 oplocks = false [users] comment = Offline users store path = /home/users admin users = root NGHEALTH+Administrator @NGHEALTH+Web Admins valid users = @NGHEALTH+Domain Users available = Yes browseable = Yes writable = No oplocks = false level2 oplocks = false Open //NGHFS/downloads mapped drive share in Windows Exporer No. TimeSourceDestination Protocol Info 55 157.836971 192.168.4.210 192.168.4.230 SMB Trans2 Request, QUERY_PATH_INFO, Query File Basic Info, Path: \Desktop.ini No. TimeSourceDestination Protocol Info 56
[Samba] Re: Two Sambas, but the new version is not activ
Andreas Bauer wrote: Hello! I have an old Samba Version(3.0.7..) in /etc/samba/ and an new one (3.0.14a) compiled in /usr/local/samba/ If I start only the Dämon from the new one, the testparm -V shows always the old versionnumber(3.0.7..). I think, only the old one is activ. How did you start the daemon? You'll have two smbd executables if you have two versions installed in different locations. Which one is executed depends on how you started it (full path) and whichever comes first in your PATH. Should I delete the old directory with th smb file, or how can I solve this problem, because I need the new one Samba, because I compiled it wth the -ldapsam option, which I need for smbpasswd -w and the LDAP Admin? Your samba installation is not in /etc/samba only. Thats configuration data. Use the packet manager to uninstall the old one (it shouldn't be a problem to have multiple versions installed in different locations though). greetings Paul -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Mac OSX breaking POSIX rights with SMB/CIFS
[UPDATE] i'm no able to specify our problem i little bit more: the problem only occurs with MS Office Word for Mac OSX (version X and 2004; recent patches) 1) create a new document (word doc) in a share (e.g. points to /data/share) with MacOSX 2) access a share, which is located *above* share (e.g. points to /data) with MacOSX 3) modify the document and save = at this moment, the document gets weird group ownerships (no matter if you work with force group or sgid bit on directories) we could see the following group ownerships on different server systems: NT 4.0 - group is set to group from superior share (e.g. /data); inheritance of other groups is not honored samba v3 - group is set to something totally different; neither the group of /data nor /data/share nor the given group in force group - parameters win2k3 server - group is set to group from superior share (e.g. /data); inheritance of other groups is not honored we think this is a bug we could not see anything in a trace on the coresponding samba process nor in an ethereal dump - of course i'm willing to provide you with our dumps it would be nice, if you would assist us and try to reproduce this behaviour! man thanks in advance Michael Gasch wrote: hi list, we recently saw the following weird behaviour on samba v3.0.13 with MacOSX panther and tiger as clients --setup-- [share1] path = /data valid users = @admins force user = administrator inherit permissions = yes force create mode = 770 force directory mode = 2770 [share2] path = /data/folder valid users = @noadmins force user = administrator inherit permissions = yes force create mode = 770 force directory mode = 2770 where: /dataadministrator.adminsrwxrwsr-x /data/folderadministrator.noadminsrwxrws--- members of @admins are also members of @noadmins --setup-- if you connect from MaxOSX (smb/cifs) to share2 and create a file the file looks like /data/folder/new.txtadministrator.noadminsrwxrwx--- if you connect now from MaxOSX (smb/cifs) to share1 and create a file in /data/folder the file looks like /data/folder/new2.txtadministrator.*admins*rwxrwx--- even if you modify new.txt and save it it gets this group change (noadmins-admins) - so nobody from noadmins is able to modify those files anymore :( we were able to reproduce this on a windows NT fileserver in the same setup (of course with equivalent NTFS/share rights) if you follow this procedure with a windows client everything looks like it should: all files/dirs in /data/folder/ get rwxrwx--- (or rwxrws--- for dirs) and administrator.noadmins as the owners can you help us? could you please try to reproduce this? we have to use minimum acls because we use netatalk also which doesn't understand ext. acls! thx in advance -- Michael Gasch Max Planck Institute for Evolutionary Anthropology Department of Human Evolution Deutscher Platz 6 D-04103 Leipzig Germany Phone: 49 (0)341 - 3550 137 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Remote Desktop Users as ADM-template?
Hi Thomasz, I'm 100% sure with win2k (and Remote Desktop installed from a msi package), but with XP I will check it tomorrow when I'm back to work. thanks, that's great, I'm curious about what comes out. ;-) Florian -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Remote Desktop Users as ADM-template?
Tomasz Chmielewski schrieb: I have some questions regarding that. :-) - Is it possible to deploy this setting via ADM template as NT4-policy? - Would it be possible to deploy this setting with a real 2003 server as GPO? - Is there any workaround, or am I left with adding each and any user on every workstation? Thanks in advance Florian yes this should be possible use adms from http://www.gruppenrichtlinien.de/ or use reg2adm to create your own is it described in English anywhere, too? They have english adms too, for further descriptions google around , there is another program ( payware ) , which name i forgot, which has a prof gui to manage all adms possible for alle win versions 98 to xp , the gui is in english too and its free to use for non commercial. Try google to adm Best Regards -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] pstools / psexec equivalent for Samba / Linux?
Tomasz Chmielewski schrieb: I was wondering if there is a pstools / psexec (tools by Sysinternals) equivalent, which could be run on Linux machine to execute a process on a remote Windows machine? there is rexec. http://www.codeproject.com/system/remoteexec.asp it could run in windows as service a get commands from the linux rexec command , my tests with this wher made a long time ago so im not 100 % sure if the lInux client and the service did worked. But i used this service to build a software deployment service which works very nice Best Regards -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Remote Desktop Users as ADM-template?
Florian Effenberger schrieb: Hi Thomasz, I'm 100% sure with win2k (and Remote Desktop installed from a msi package), but with XP I will check it tomorrow when I'm back to work. thanks, that's great, I'm curious about what comes out. ;-) yeah, with a clean XP install mstsc (Terminal Server Client) works for a normal user, too. -- Tomek -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Remote Desktop Users as ADM-template?
Hi Thomasz, yeah, with a clean XP install mstsc (Terminal Server Client) works for a normal user, too. thanks for looking up! Is your machine in a Samba NT4-style domain, or is it standalone? Florian -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Remote Desktop Users as ADM-template?
Florian Effenberger schrieb: Hi Thomasz, yeah, with a clean XP install mstsc (Terminal Server Client) works for a normal user, too. thanks for looking up! Is your machine in a Samba NT4-style domain, or is it standalone? actually, it's an AD-client :) -- Tomek -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Joining Sun NAS to samba domain
Hi I have successfully joined my Sun NAS device to my Samba PDC (version 2.2.10, security=user, encrypt passwords=yes) However, when I try to map a drive to \\nas\home it wont accept my (correct) password and the NAS log says : NetrSamlogon[BIOSS\janet]: SAMBA_ACCESS_DENIED (Samba PDC) Have I missed something ? Do I have to set up a trust account or is it to do with encrypted passwords ? -- Janet * Janet Dickson| http://www.bioss.sari.ac.uk/~janet Biomathematics Statistics Scotland | email: janet at bioss.sari.ac.uk The King's Buildings, Mayfield Rd| Telephone: +44 (0) 131 650 4888 Edinburgh EH9 3JZ, Scotland, UK. | Fax: +44 (0) 131 650 4901 * -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] modification time
Hi! I have the same problem with syncing files using xcopy on the windows clients. How could I solve this? How would I make the script run every time a backup is made? Best regards, Marius A. Koestler -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Samba/Winbind accessing AD every 5 minutes ??
Hi, I have been searching for a reason why my ActiveDirectory event log is spammed with: Pre-authentication failed: User Name:linux$ User ID: KK\linux$ Service Name: krbtgt/KK.LOCAL Pre-Authentication Type: 0x0 Failure Code: 0x19 Client Address: 1.2.3.4 Unfortunately, no one had an idea. So now I will try to limit the access from Samba to a minimum. So why do Samba access the ActiveDirectory exactly every 5 minutes with the machine accound (machinename$ as above) even though there is no user activity ? My winbind cache is set to 15 minute, so it is not cache refresh. What else could it be and can I change this access time ? Thanks, Bjarne Maschoreck -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Outlook Express Mailstore on Samba share
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi list, last Thursday I upgraded a samba installation from 2.2.12 to 3.0.14a. Everything went fine with the debian packages. But... All roaming profiles are registry hacked to place the OE mailstore onto the home drive and this worked fine for the last two years. Now after the upgrade all of my users complain about corrupt dbx files. Can anyone tell me what might be the problem in this configuration (without pointing out that OE is faulty, etc.). I suspect a change in the locking as turning on fake oplocks lessens the problem a bit (yes I know that this sounds strange!). Cheers Nicki - -- Linksystem Muenchen GmbH [EMAIL PROTECTED] Schloerstrasse 10 http://www.link-m.de 80634 Muenchen Tel. 089 / 890 518-0 We make the Net work. Fax 089 / 890 518-77 PGP-Key: https://www.link-m.de/pgp/n.messerschmidt.asc -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.1 (GNU/Linux) Comment: Get keys at: https://www.link-m.de/pgp iD8DBQFCmuwy6zWc+bXuIEMRAoreAKCgPumgv+fqtIFgnXeZ8qqUhBfaAQCeOYAd rUrjV0xEdnu6Fg6ct0rVemU= =Fte+ -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Remote Desktop Users as ADM-template?
Hi Thomasz, actually, it's an AD-client :) hm, maybe that makes the difference, although I doubt. :) Would you mind checking the contents of Start\Settings\Control Panel\System\Remote\Remote Users for me? Whats listed in there? Thanks Florian -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: Two Sambas, but the new version is not activ
Paul kölle schrieb: How did you start the daemon? You'll have two smbd executables if you I take the daemon of the new one, samba 3.0.14a...: /usr/local/samba/bin/smbd start /usr/local/samba/bin/nmbd start If I start testparm, he is testing always the samba 3.0.7.. version, not the started new one? If I start testparm -V in the directory of the samba 3.0.14a, it comes samba version 3.0.7...? Use the packet manager to uninstall the old one (it shouldn't be a problem to have multiple versions installed in different locations though). Another problem: In Yast of suse9.2 there is only the old version(3.0.7..), not the new one? If I want to delete the old one, I get warning error dependencies messages( inconsistences in your system, if you will delete)? So, delete or not? And another problem: If I want to create an ldapdmin account: /usr/local/samba/bin/smbpasswd -w password I get an errormessage: permission denied The samba 3.0.14a was comiled with the --with-ldapsam option. Best regards Andreas -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Remote Desktop Users as ADM-template?
Florian Effenberger schrieb: Hi Thomasz, actually, it's an AD-client :) hm, maybe that makes the difference, although I doubt. :) I will know today later or tomorrow perhaps, as I will roll out a new Samba domain with XP clients. Would you mind checking the contents of Start\Settings\Control Panel\System\Remote\Remote Users for me? Whats listed in there? so the first one was checked, the one below not. I tried it in different configurations, and I could always use a Terminal Server Client (as a domain admin, as a domain user and as a workstation user). -- Tomek -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Fonts on shares (thai)
On what lever does my samba server has to support thai fonts for the thei filenames on the shares to work? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] performance on small files transfers
Hi John, Thanks for your suggestion. I modified my smb.conf accroding to those pdf docs, but the samba speed is still poor. I try to build a proftpd server from source code and transfer these small files through ftp and the speed hit 2.5Mbyte/s. But when I copy large files through smbfs,the speed is normal.So I wonder if it's all rely on the configuration of samba.Is there any specific principles on performance tuning about small files transfers? Any suggestion would be appreciated. On Fri, May 27, 2005 at 11:56:42AM -0600, John H Terpstra wrote: On Friday 27 May 2005 11:41, kxsq wrote: Hi all, I'm confused of small files (no bigger than 50k ) transfers speed through samba,which is very slow on my machine. Bellow is a real case, -- SuSE professional 9.2, kernel 2.6.11,Samba 3.0.14a,reiserfs -- Dual AMD Opteron,4G mem,Giga byte LAN -- 2 raid 5 make up of 16 SATA hard disks -- set readhead to 1024 I tested raids speed using bonnie++ and get 450 Mbytes/s at 16GB files measure.So I believe the raid is not the bottleneck.I wrote a script to get 200,000 small files no more than 50K,totally size 8G.When I wrote these small files to SAMBA server and get a speed about 1.5 Mbyte/s. And the speed hit 8 Mbytes/s when these small files copied from one raid to another locally. There must be misconfigured somewhere,but I don't where. Can anybody give me some tips? Please refer to chapter 32 of the book, The Official Samba-3 HOWTO and Reference Guide (aka. Samba-HOWTO-Collection). You can obtain a PDF of this book from: http://www.samba.org/samba/docs/Samba-HOWTO-Collection.pdf - John T. -- John H Terpstra Samba-Team Member Phone: +1 (650) 580-8668 Author: The Official Samba-3 HOWTO Reference Guide, ISBN: 0131453556 Samba-3 by Example, ISBN: 0131472216 Hardening Linux, ISBN: 0072254971 Other books in production. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- Kxsq Yang (tony) Pogo Linux (Shanghai) -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Fonts on shares (thai)
Krisztian Andre wrote: On what lever does my samba server has to support thai fonts for the thei filenames on the shares to work? By default Samba 3 uses UTF-8 filenames on disk and talks Unicode to the network. Basicly Thai filenames should just work, but they might look a bit weird when viewed from the unix side. -- Wolfgang Ratzka Phone: +49 6421 2823531 FAX: +49 6421 2826994 Uni Marburg, HRZ, Hans-Meerwein-Str., D-35032 Marburg, Germany http://www.uni-marburg.de/hrz/mitarbeiter/ratzka.html -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Fonts on shares (thai)
On what lever does my samba server has to support thai fonts for the thei filenames on the shares to work? By default Samba 3 uses UTF-8 filenames on disk and talks Unicode to the network. Basicly Thai filenames should just work, but they might look a bit weird when viewed from the unix side. Interesting. If I try to create a file with thai filename on the share I get underscore characters instead of thai characters. The server is debian unstable by the way (samba-3.0.14a). -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Is this a new tls problem?
Please CC to me since Im not in the list anymore! I have red miles of text about tls problems in the samba list. This time I cant find any helpful hint. I had a fully functional test environment with samba-3.0.10 (tls enabled) openldap-2.1.x After upgrading to newer version suddenly samba stopped authenticate against openldap with tls enabled. My configuration is just like the one on idealx.org I can make users I can connect to with self made account. My smb.conf have the ldap ssl = start tls setting but it seams like samba at some point suddenly stopped having support for the tls option. I can successfully do a: ldapsearch x ZZ My ldap account for samba is cn=samba,ou=DSA,dc=dbb,dc=su,dc=se Ive added the password to secret.tdb I can successfully do a: ldapsearch x ZZ h localhost D cn=samba,ou=DSA,dc=dbb,dc=su,dc=se W As soon as I start use samba I get the tls problem. When I start samba I get the following error in my syslog: May 30 14:21:21 frodo slapd[6242]: connection_read(12): unable to get TLS client DN, error=49 id=234 May 30 14:21:21 frodo smbd[11539]: [2005/05/30 14:21:21, 0] lib/smbldap.c:smbldap_open_connection(677) May 30 14:21:21 frodo smbd[11539]: Failed to issue the StartTLS instruction: Connect error May 30 14:21:21 frodo smbd[11539]: [2005/05/30 14:21:21, 1] lib/smbldap.c:another_ldap_try(1011) May 30 14:21:21 frodo smbd[11539]: Connection to LDAP server failed for the 1 try! Testparm doesnt show any errors. I dont know how samba connect to the ldap server but I assume it uses ldap.conf and here it is: HOST frodo.dbb.su.se ##host= 127.0.0.1 BASE dc=dbb,dc=su,dc=se rootbinddn cn=nssldap,ou=DSA,dc=dbb,dc=su,dc=se nss_base_passwd ou=Users,dc=dbb,dc=su,dc=se?one nss_base_passwd ou=Computers,dc=dbb,dc=su,dc=se?one nss_base_shadow ou=Users,dc=dbb,dc=su,dc=se?one nss_base_group ou=Groups,dc=dbb,dc=su,dc=se?one ##ssl no pam_password md5 tls_checkpeer yes TLS_CACERT /etc/ldap/ca.pem ##tls_cacertfile /etc/ldap/ca.pem have never worked for some reoson TLS_REQCERT demand ssl start_tls tls_cert /etc/nssldapcets/nssldap.pem tls_key /etc/nssldapcets/nssldap.key This also works: ldapsearch x ZZ h localhost D cn=nssldap,ou=DSA,dc=dbb,dc=su,dc=se W I have nssldap password in ldap.secret # - The End Im totally lost. Any idée is appreciated. Thanks Peter Peter Nyberg Institutionen för Biokemi och Biofysik (DBB) Sv.Arrhenius vägen 12 106 91 Stockholm Tel: 08-16 24 69-- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Obtaining log level 10 for just specified user(s) (MS Word Excel File Locking issue - still)
Is it possible to make samba produce a log at level 10 for only a specified user(s), I am trying (still) to figure out why Samba processes climb to 100% CPU and the user loses connection with MS Word Excel files being locked. Have been dealing with this issue for quite some time now, but had to put it on the back burner for a while because we had little time to deal with it. Apprently only an issue with a few users still, yet unable to isolate anything different from them to the user next to them, aside from filenames, which are apparently random or not the cause anyhow. Gave up on trying to fix it a while back, but having more and more problems daily, with 2-3 processes every hour or so climbing to 100% cpu utilization and the user being locked out; a simple kill -9 to the process id in question, and a new one spawns and the end users good to go... Annoying, but at least a work-around we've been able to get by with. I'd like to get some debugging logs, but as these servers are being used in production, I need to force log level 10 only for specified users (aka ones having the problem). Is it possible to do this? Log files hit like 5 megs in a matter of a minute or two; can't accept that for every user on the system - and it's a huge hit on I/O we don't need to take either :( Any suggestions? -- Nathan Vidican [EMAIL PROTECTED] Windsor Match Plate Tool Ltd. http://www.wmptl.com/ -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Obtaining log level 10 for just specified user(s) (MS Word Excel File Locking issue - still)
I can't address the Word problem, but have you looked at Excel itself as the culprit for the Excel problem? For instance, is the user able to get anything done on his/her Excel spreadsheet before this problem occurs? There is a .xlb file (I don't remember its exact name; I'll have to look it up when I go in to work tomorrow) that occasionally gets corrupted. Deleting this file makes Excel work OK, again, and the file is regenerated the next time the user opens Excel (and is changed/updated/whatever MS feels like doing with this sort of file) every time the user opens Excel. Eric Hines At 05/30/05 08:40, you wrote: Is it possible to make samba produce a log at level 10 for only a specified user(s), I am trying (still) to figure out why Samba processes climb to 100% CPU and the user loses connection with MS Word Excel files being locked. Have been dealing with this issue for quite some time now, but had to put it on the back burner for a while because we had little time to deal with it. Apprently only an issue with a few users still, yet unable to isolate anything different from them to the user next to them, aside from filenames, which are apparently random or not the cause anyhow. Gave up on trying to fix it a while back, but having more and more problems daily, with 2-3 processes every hour or so climbing to 100% cpu utilization and the user being locked out; a simple kill -9 to the process id in question, and a new one spawns and the end users good to go... Annoying, but at least a work-around we've been able to get by with. I'd like to get some debugging logs, but as these servers are being used in production, I need to force log level 10 only for specified users (aka ones having the problem). Is it possible to do this? Log files hit like 5 megs in a matter of a minute or two; can't accept that for every user on the system - and it's a huge hit on I/O we don't need to take either :( Any suggestions? -- Nathan Vidican [EMAIL PROTECTED] Windsor Match Plate Tool Ltd. http://www.wmptl.com/ -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba Government programs provide enough to keep you alive, but they don't offer any hope of living your dreams. --Grim -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Hi Fellow Samba users,
Hi Fellow Samba users, I have two unix oracle servers one with an early release of Samba, the other a later release. below is the outcome.Can you tell me where I am going wrong. fujitsu solaris 8 samba ver 1.9.18p2 c:\net view \\fujitsu Shared resources at \\fujitsu Samba 1.9.18p2 Share name Type Used as Comment --- fims01 Disk The command completed successfully. ctaxcppd solaris 9 samba version 2.2.12 c:\net view ctaxcppd System error 5 has occurred. Access denied. var/log.nmbd contains [2005/05/30 10:28:13, 0] nmbd/nmbd_incomingrequests.c:(183) process_name_refresh_request: unicast name registration request received for n ame CI03379300 from IP 190.1.90.36 on subnet UNICAST_SUBNET. [2005/05/30 10:28:13, 0] nmbd/nmbd_incomingrequests.c:(184) Error - should be sent to WINS server The smb.conf files are workgroup=WORKGROUP null passwords = yes encrypt passwords = yes [fims01] path=/appl/fims/request_in guest=no read only=no Thanks for looking at my dilemma. Andy Bird. [EMAIL PROTECTED] ** This email and any files transmitted with it are confidential and intended solely for the use of the individual or entity to whom they are addressed and should not be disclosed to any other party. If you have received this email in error please notify your system manager and the sender of this message. This email message has been swept for the presence of computer viruses but no guarantee is given that this e-mail message and any attachments are free from viruses. Fife Council Tel: +44 (0) 1592 414141 ** -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Outlook Express Mailstore on Samba share
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Nicki Messerschmidt, Linksystem Muenchen GmbH wrote: All roaming profiles are registry hacked to place the OE mailstore onto Mmh, AFAIK the store folder can be set in the preferences of OE and you don't need to hack the registry... the upgrade all of my users complain about corrupt dbx files. Can anyone Does only OE complain about corrupt files? Did you try to read the files by using a tool like Mailnavigator (http://www.mailnavigator.com/read_outlook_express_dbx_files.html)? Just to check if the files are readable or not. Greetings, Holger -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.5 (MingW32) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFCmx3DO0QDuZMdP0sRAogwAKCNvvZBpNAyG8Oqt5Krf94U0EHxYgCcCmCv 88h4sx4IpkrIkJ1EPbM0GX8= =vTE2 -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] strange uid -- rid mapping situation
Dear Sirs, I observe some strange situation, which I've no idea what to do. 1) users are stored in LDAP 2) files belong to me: design# ls -l ~ilia/PUTTY.RND -rwx-- 1 ilia wheel 600 May 27 09:42 /home/ilia/PUTTY.RND design# 3) Windows workstation report that file as BUILTIN\Administrators, i.e. it owner is not me (PARAMON\ilia), but some builtin SID. samba seems to understand about rid--uid mapping, my uid is 1032, and I see correct entry in log.smb: [2005/05/30 19:58:54, 10] passdb/pdb_compat.c:pdb_set_user_sid_from_rid(73) pdb_set_user_sid_from_rid: setting user sid S-1-5-21-3676698982-1919171150-2606898868-3064 from rid 3064 but files and directories (i.e. any file and any directory) on samba is reported as they belong to BUILTIN\Administrators. I enabled debugging (log level =50), but there's no clue what to do. Cheers, Ilia Chipitsine -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Outlook Express Mailstore on Samba share
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Holger Wesser said the following: Nicki Messerschmidt, Linksystem Muenchen GmbH wrote: All roaming profiles are registry hacked to place the OE mailstore onto Mmh, AFAIK the store folder can be set in the preferences of OE and you don't need to hack the registry... To put the mailstore onto a network folder you have to registry hack. Otherwise it won't allow you to do that! the upgrade all of my users complain about corrupt dbx files. Can anyone Does only OE complain about corrupt files? Did you try to read the files by using a tool like Mailnavigator (http://www.mailnavigator.com/read_outlook_express_dbx_files.html)? Just to check if the files are readable or not. Nope, not yet. But I will. thanks for the suggestion. Cheers Nicki - -- Linksystem Muenchen GmbH [EMAIL PROTECTED] Schloerstrasse 10 http://www.link-m.de 80634 Muenchen Tel. 089 / 890 518-0 We make the Net work. Fax 089 / 890 518-77 PGP Keys: https://www.link-m.de/pgp/ -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.0 (MingW32) Comment: Get keys at: https://www.link-m.de/pgp iD8DBQFCmyVG6zWc+bXuIEMRAh8dAJ41vMiJ/MsrmH7n6hk45iEpv618GgCfZ+ZV L/5xyMBwSUHm8v0b3L/xjdA= =1gky -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Problem with Vampire.....
Regards, I have a problem when the Vampire uses, gives me the following mistake it is not possible to connect with the server for this domain is native Windows 2000 That I do to solve it? CENTROBECO C.A. Av Ppal de Boleita Norte Edf. Centrobeco Caracas-Venezuela Telf: 58-212-2388811 Fax: 58-212-2386505 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Smbclient browse shares Windows 2003?
Hello, Using the CIFS client I'm able to successfully mount shares on Windows 2003, however for a script I'm using, I need to be able to browse to determine what shares are on various Windows 2003 servers using SMBCLIENT -L. I assume this has to do with the SMB signing that is required be default on W2K3. Is there any way to get around this besides altering group policy/registry settings on the Windows 2003 server? Any other tool to browse the shares? Thanks, Max -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] smbclient hangs
Hello, I'm having problems with using smbclient on a win2k share. The server runs samba 3.0.14a on Solaris 9. I want to tar the whole directory of a share. Into a file on the server What I found out so far is, that it works until a maximum file count of 35. It is not size dependant but if the file count in that share exceeds more than 35 the smbclient hangs for ever and with the time is consuming up all the available memory. Until the server hangs as well due to a lack of memory space. Any ideas would be greatly appreciated. Wolfgang Here is an output with debugging: volvo:root,511smbclient '//vw/721-04' passw0rd -d 4 -U test -W WORKGROUP -Tc xxx.tar lp_load: refreshing parameters Initialising global parameters params.c:pm_process() - Processing configuration file /usr/local/samba/lib/smb.conf Processing section [global] doing parameter workgroup = DOMAIN doing parameter netbios name = volvo handle_netbios_name: set global_myname to: VOLVO doing parameter server string = Samba %v Testdep. doing parameter map to guest = Bad User doing parameter guest account = nobody doing parameter log file = /usr/local/samba/var/log.%m doing parameter debug level = 2 doing parameter max log size = 500 doing parameter name resolve order = wins hosts bcast doing parameter deadtime = 5 doing parameter printcap name = /etc/printers.conf doing parameter os level = 30 doing parameter local master = No doing parameter wins server = 10.222.224.22 doing parameter config file = /usr/local/samba/lib/smb.conf.%m doing parameter message command = csh -c 'cat %s /dev/console;rm %s' doing parameter invalid users = root daemon bin sys adm lp uucp nuucp listen noaccess nobody4 doing parameter directory mask = 0775 doing parameter create mask = 0775 doing parameter sync always = Yes doing parameter hide dot files = yes doing parameter username map = /usr/local/samba/lib/usermap.txt doing parameter security = domain doing parameter encrypt passwords = yes doing parameter password server = domain-contr doing parameter printing = sysv doing parameter print command = lp -c -d%p -s %s ; rm %s doing parameter printer admin = woma pm_process() returned Yes added interface ip=10.222.164.20 bcast=10.222.164.255 nmask=255.255.255.0 Client started (version 3.0.14a). resolve_wins: Attempting wins lookup for name vw0x20 wins_srv_is_dead: 10.222.224.22 is alive wins_srv_is_dead: 10.222.224.22 is alive resolve_wins: using WINS server 10.222.224.22 and tag '*' nmb packet from 10.222.224.22(137) header: id=25018 opcode=Query(0) response=Yes header: flags: bcast=No rec_avail=Yes rec_des=Yes trunc=No auth=Yes header: rcode=3 qdcount=0 ancount=0 nscount=0 arcount=0 Negative name query response, rcode 0x03: The name requested does not exist. resolve_hosts: Attempting host lookup for name vw0x20 Connecting to 192.168.230.42 at port 445 error connecting to 192.168.230.42:445 (Connection refused) Connecting to 192.168.230.42 at port 139 session request ok Serverzone is -7200 Domain=[WORKGROUP] OS=[Windows NT 4.0] Server=[NT LAN Manager 4.0] session setup ok tconx ok dos_clean_name [] received 37 entries (eos=0) received 36 entries (eos=0) received 36 entries (eos=0) received 36 entries (eos=0) received 36 entries (eos=0) received 36 entries (eos=0) received 36 entries (eos=0) hangs for ever --- Cntrl C --- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] read-only folders and files
On Sunday 29 May 2005 22:28, Ilia Chipitsine wrote: Dear Sirs, How does samba handle read only attribute ? I can map archive and hidden files using smb.conf, but there's nothing on mapping read-only files. files/folders are created 770 (user and group writeable), but Windows shows those files as read-only. UNIX file permissions control read/write capabilities. - John T. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Obtaining log level 10 for just specified user(s) (MS Word Excel File Locking issue - still)
On Monday 30 May 2005 07:40, Nathan Vidican wrote: Is it possible to make samba produce a log at level 10 for only a specified user(s), I am trying (still) to figure out why Samba processes climb to 100% CPU and the user loses connection with MS Word Excel files being locked. In your smb.conf file [global] section put: include = /etc/samba/%u.conf In the file /etc/samba/'username'.conf put: [global] log level = 10 Done! - John T. Have been dealing with this issue for quite some time now, but had to put it on the back burner for a while because we had little time to deal with it. Apprently only an issue with a few users still, yet unable to isolate anything different from them to the user next to them, aside from filenames, which are apparently random or not the cause anyhow. Gave up on trying to fix it a while back, but having more and more problems daily, with 2-3 processes every hour or so climbing to 100% cpu utilization and the user being locked out; a simple kill -9 to the process id in question, and a new one spawns and the end users good to go... Annoying, but at least a work-around we've been able to get by with. I'd like to get some debugging logs, but as these servers are being used in production, I need to force log level 10 only for specified users (aka ones having the problem). Is it possible to do this? Log files hit like 5 megs in a matter of a minute or two; can't accept that for every user on the system - and it's a huge hit on I/O we don't need to take either :( Any suggestions? -- Nathan Vidican [EMAIL PROTECTED] Windsor Match Plate Tool Ltd. http://www.wmptl.com/ -- John H Terpstra Samba-Team Member Phone: +1 (650) 580-8668 Author: The Official Samba-3 HOWTO Reference Guide, ISBN: 0131453556 Samba-3 by Example, ISBN: 0131472216 Hardening Linux, ISBN: 0072254971 Other books in production. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Cannot get workgroup name
Hi there!! I 'm changing the distribution from Suse8 to Fedora Core3. I have installed a new PDC server with : fedora core3, openldap, samba, and smbtools (that was included in samba) All sw above mentioned were installed with fedora core3. Now, I have my server working but.. I can't add a new machine (wXP) to this domain server. All my configuration are ok (samba+smbtools+openldap), 'cause all clients (old clients) can login to this new domain server, and they can see all maps (userFile.bat) in their machines. But, when I try to add a new machine to this domain server, It can't be done. I reviewed this file: /var/log/samba/nmbd.log and it says as follows: [2005/05/30 11:53:05, 0] nmbd/nmbd_logonnames.c:become_logon_server_success(124) become_logon_server_success: Samba is now a logon server for workgroup XXNT on subnet 10.1.255.33 [2005/05/30 11:53:21, 0] nmbd/nmbd_logonnames.c:become_logon_server_success(124) become_logon_server_success: Samba is now a logon server for workgroup XXNT on subnet UNICAST_SUBNET [2005/05/30 11:53:23, 0] nmbd/nmbd_become_lmb.c:become_local_master_stage2(396) * Samba name server XXSERVER is now a local master browser for workgroup XXNT on subnet 10.1.255.33 * [2005/05/30 11:53:23, 0] nmbd/nmbd_become_dmb.c:become_domain_master_stage2(113) * Samba server XXSERVER is now a domain master browser for workgroup XXNT on subnet UNICAST_SUBNET * [2005/05/30 11:53:24, 0] nmbd/nmbd_become_dmb.c:become_domain_master_browser_bcast(282) become_domain_master_browser_bcast: Attempting to become domain master browser on workgroup XXNT on subnet 10.1.255.33 [2005/05/30 11:53:24, 0] nmbd/nmbd_become_dmb.c:become_domain_master_browser_bcast(295) become_domain_master_browser_bcast: querying subnet 10.1.255.33 for domain master browser on workgroup XXNT [2005/05/30 11:53:34, 0] nmbd/nmbd_become_dmb.c:become_domain_master_stage2(113) * Samba server XXSERVER is now a domain master browser for workgroup XXNT on subnet 10.1.255.33 * [2005/05/30 11:53:44, 0] nmbd/nmbd_browsesync.c:get_domain_master_name_node_status_fail(488) get_domain_master_name_node_status_fail: Doing a node status request to the domain master browser at IP 192.168.0.19 failed. Cannot get workgroup name. [2005/05/30 12:08:45, 0] nmbd/nmbd_browsesync.c:get_domain_master_name_node_status_fail(488) get_domain_master_name_node_status_fail: Doing a node status request to the domain master browser at IP 192.168.0.19 failed. Cannot get workgroup name. So, in a first time, I put 192.168.0.19 and 10.1.0.19 ip to my server, and then I ran samba and then I had to change this IP to 10.1.255.33. So, I understand that this UNICAT_SUBNET has registred the first IPs (192.168.0.19) and it's looking for it. I don't know why this UNICAST is lookng that IP and isn't it working with my actual IP 10.1.255.33 And in this file: /var/cache/samba/wins.dat shows.: [EMAIL PROTECTED] samba]# less wins.dat VERSION 1 0 XXNT#00 1117724724 255.255.255.255 e4R XXNT#1b 1117724724 10.1.255.33 192.168.0.19 64R XXNT#1c 1117724724 10.1.255.33 10.1.0.19 e4R XXNT#1e 1117724724 255.255.255.255 e4R XXSERVER#00 1117724724 10.1.255.33 192.168.0.19 10.1.0.19 66R XXSERVER#03 1117724724 10.1.255.33 192.168.0.19 10.1.0.19 66R XXSERVER#20 1117724724 10.1.255.33 192.168.0.19 10.1.0.19 66R shows all IP's history, since I installed my server If I reset this file will get the answer?, but I tried erasing and restarting the service...and nothig, always reload the same information shown above. The IP tha i want to work is 10.1.255.33 not other I hope I was clear. Please, I can't find any help in internet.. (google), the only solution, I think, is to reinstall everything without changing IP I will appreciate if you can give some support ... Thanks a lot Emilio Herrera Lima -Perú [EMAIL PROTECTED] -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] pwd-must-change-time=0 not working on windows 98!!
Hi people, i was using this with the pdbedit to force the users to change they password at next logon. The thing is that it works perfectly on windows xp, windows 2k, and windows 2k3, but in windows 98 it just don't work. Any ideas? The windows 98 tells me that the account is disable and if i try on windows 2k3 it ask me to change the password like it should do also on windows 98. Tnxs in advance. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] pwd-must-change-time=0 not working on windows 98!!
On Monday 30 May 2005 12:19, Guido Lorenzutti wrote: Hi people, i was using this with the pdbedit to force the users to change they password at next logon. The thing is that it works perfectly on windows xp, windows 2k, and windows 2k3, but in windows 98 it just don't work. Any ideas? The windows 98 tells me that the account is disable and if i try on windows 2k3 it ask me to change the password like it should do also on windows 98. Windows 98 is behaving normally. It does not participate in NT4 and later domain security. It can only use the network logon service. - John T. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] order virgin more and innocent little their pussies
'Ello, 'ello, 'ello, what have we got here? soon Young pre teen so used beauty and young and One is very crazy when in love. So Beautiful... linteled So young... So innocent... SEE THEM IN A DIRTY countersigning PORN http://www.geocities.com/stephanie_432mosley_754/ You cannot love a thing without wanting to fight for it. Unique high by quality content We want to be first not first if, not first but but first!Every man sees in his relatives, and especially in his cousins, a series of grotesque caricatures of himself.Read in order to live. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Remote Desktop Users as ADM-template?
Hi Thomasz, I will know today later or tomorrow perhaps, as I will roll out a new Samba domain with XP clients. that would be great! Maybe we can compare our settings then. I read via Google Groups that XP non-admin users normally *cannot* logon via RDP. You have to add them to the list I mentioned, possibly adding them into the (local!) Remote Users Groups would be working, too. However, no clue on how to achieve that with a policy. Maybe you made some settings in the templates that make RDP possible for non-admins, maybe it's a setting in the AD. Would you mind checking the contents of Start\Settings\Control Panel\System\Remote\Remote Users for me? Whats listed in there? so the first one was checked, the one below not. What do you mean by first and last one? Thanks Florian -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Remote Desktop Users as ADM-template?
Florian Effenberger schrieb: Hi Thomasz, I will know today later or tomorrow perhaps, as I will roll out a new Samba domain with XP clients. that would be great! Maybe we can compare our settings then. I read via Google Groups that XP non-admin users normally *cannot* logon via RDP. You have to add them to the list I mentioned, possibly adding them into the (local!) Remote Users Groups would be working, too. However, no clue on how to achieve that with a policy. Maybe you made some settings in the templates that make RDP possible for non-admins, maybe it's a setting in the AD. hmm, I'm beginning to doubt if we're talking about the same :) I'm talking about using mstsc.exe (MS Terminal Server Client) to log in remotely to another machine (for example, you're a user on XP and you log in remotely to a machine running Terminal Server - that is, *from* XP I just installed to win 2003). What you're talking about is the other way round: you want to log in *to * XP you just installed, which is running as a Terminal Server? Am I right? Would you mind checking the contents of Start\Settings\Control Panel\System\Remote\Remote Users for me? Whats listed in there? so the first one was checked, the one below not. What do you mean by first and last one? I meant the checkboxes. Either way, you will probably get better answers on a windows-specific mailing list; Samba doesn't have much to do with Terminal Sessions I think. -- Tomek -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Cannot get workgroup name
Hi there!! I 'm changing the distribution from Suse8 to Fedora Core3. I have installed a new PDC server with : fedora core3, openldap, samba, and smbtools (that was included in samba) All sw above mentioned were installed with fedora core3. Now, I have my server working but.. I can't add a new machine (wXP) to this domain server. All my configuration are ok (samba+smbtools+openldap), 'cause all clients (old clients) can login to this new domain server, and they can see all maps (userFile.bat) in their machines. But, when I try to add a new machine to this domain server, It can't be done. I reviewed this file: /var/log/samba/nmbd.log and it says as follows: [2005/05/30 11:53:05, 0] nmbd/nmbd_logonnames.c:become_logon_server_success(124) become_logon_server_success: Samba is now a logon server for workgroup XXNT on subnet 10.1.255.33 [2005/05/30 11:53:21, 0] nmbd/nmbd_logonnames.c:become_logon_server_success(124) become_logon_server_success: Samba is now a logon server for workgroup XXNT on subnet UNICAST_SUBNET [2005/05/30 11:53:23, 0] nmbd/nmbd_become_lmb.c:become_local_master_stage2(396) * Samba name server XXSERVER is now a local master browser for workgroup XXNT on subnet 10.1.255.33 * [2005/05/30 11:53:23, 0] nmbd/nmbd_become_dmb.c:become_domain_master_stage2(113) * Samba server XXSERVER is now a domain master browser for workgroup XXNT on subnet UNICAST_SUBNET * [2005/05/30 11:53:24, 0] nmbd/nmbd_become_dmb.c:become_domain_master_browser_bcast(282) become_domain_master_browser_bcast: Attempting to become domain master browser on workgroup XXNT on subnet 10.1.255.33 [2005/05/30 11:53:24, 0] nmbd/nmbd_become_dmb.c:become_domain_master_browser_bcast(295) become_domain_master_browser_bcast: querying subnet 10.1.255.33 for domain master browser on workgroup XXNT [2005/05/30 11:53:34, 0] nmbd/nmbd_become_dmb.c:become_domain_master_stage2(113) * Samba server XXSERVER is now a domain master browser for workgroup XXNT on subnet 10.1.255.33 * [2005/05/30 11:53:44, 0] nmbd/nmbd_browsesync.c:get_domain_master_name_node_status_fail(488) get_domain_master_name_node_status_fail: Doing a node status request to the domain master browser at IP 192.168.0.19 failed. Cannot get workgroup name. [2005/05/30 12:08:45, 0] nmbd/nmbd_browsesync.c:get_domain_master_name_node_status_fail(488) get_domain_master_name_node_status_fail: Doing a node status request to the domain master browser at IP 192.168.0.19 failed. Cannot get workgroup name. So, in a first time, I put 192.168.0.19 and 10.1.0.19 ip to my server, and then I ran samba and then I had to change this IP to 10.1.255.33. So, I understand that this UNICAT_SUBNET has registred the first IPs (192.168.0.19) and it's looking for it. I don't know why this UNICAST is lookng that IP and isn't it working with my actual IP 10.1.255.33 And in this file: /var/cache/samba/wins.dat shows.: [EMAIL PROTECTED] samba]# less wins.dat VERSION 1 0 XXNT#00 1117724724 255.255.255.255 e4R XXNT#1b 1117724724 10.1.255.33 192.168.0.19 64R XXNT#1c 1117724724 10.1.255.33 10.1.0.19 e4R XXNT#1e 1117724724 255.255.255.255 e4R XXSERVER#00 1117724724 10.1.255.33 192.168.0.19 10.1.0.19 66R XXSERVER#03 1117724724 10.1.255.33 192.168.0.19 10.1.0.19 66R XXSERVER#20 1117724724 10.1.255.33 192.168.0.19 10.1.0.19 66R shows all IP's history, since I installed my server If I reset this file will I get the answer?, but I tried erasing and restarting the service...and nothig, always reload the same information shown above. The IP tha i want to work is 10.1.255.33 not other I hope I was clear. Please, I can't find any help in internet.. (google), the only solution, I think, is to reinstall everything without changing IP I will appreciate if you can give some support ... Thanks a lot Emilio Herrera Lima -Perú [EMAIL PROTECTED] -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Cannot get workgroup name
Are you using ROOT user to add the client to the domain? --mark - Original Message - From: EMILIO ANTONIO HERRERA TRUJILLO [EMAIL PROTECTED] To: samba@lists.samba.org Sent: Monday, May 30, 2005 12:29 PM Subject: [Samba] Cannot get workgroup name Hi there!! I 'm changing the distribution from Suse8 to Fedora Core3. I have installed a new PDC server with : fedora core3, openldap, samba, and smbtools (that was included in samba) All sw above mentioned were installed with fedora core3. Now, I have my server working but.. I can't add a new machine (wXP) to this domain server. All my configuration are ok (samba+smbtools+openldap), 'cause all clients (old clients) can login to this new domain server, and they can see all maps (userFile.bat) in their machines. But, when I try to add a new machine to this domain server, It can't be done. I reviewed this file: /var/log/samba/nmbd.log and it says as follows: [2005/05/30 11:53:05, 0] nmbd/nmbd_logonnames.c:become_logon_server_success(124) become_logon_server_success: Samba is now a logon server for workgroup XXNT on subnet 10.1.255.33 [2005/05/30 11:53:21, 0] nmbd/nmbd_logonnames.c:become_logon_server_success(124) become_logon_server_success: Samba is now a logon server for workgroup XXNT on subnet UNICAST_SUBNET [2005/05/30 11:53:23, 0] nmbd/nmbd_become_lmb.c:become_local_master_stage2(396) * Samba name server XXSERVER is now a local master browser for workgroup XXNT on subnet 10.1.255.33 * [2005/05/30 11:53:23, 0] nmbd/nmbd_become_dmb.c:become_domain_master_stage2(113) * Samba server XXSERVER is now a domain master browser for workgroup XXNT on subnet UNICAST_SUBNET * [2005/05/30 11:53:24, 0] nmbd/nmbd_become_dmb.c:become_domain_master_browser_bcast(282) become_domain_master_browser_bcast: Attempting to become domain master browser on workgroup XXNT on subnet 10.1.255.33 [2005/05/30 11:53:24, 0] nmbd/nmbd_become_dmb.c:become_domain_master_browser_bcast(295) become_domain_master_browser_bcast: querying subnet 10.1.255.33 for domain master browser on workgroup XXNT [2005/05/30 11:53:34, 0] nmbd/nmbd_become_dmb.c:become_domain_master_stage2(113) * Samba server XXSERVER is now a domain master browser for workgroup XXNT on subnet 10.1.255.33 * [2005/05/30 11:53:44, 0] nmbd/nmbd_browsesync.c:get_domain_master_name_node_status_fail(488) get_domain_master_name_node_status_fail: Doing a node status request to the domain master browser at IP 192.168.0.19 failed. Cannot get workgroup name. [2005/05/30 12:08:45, 0] nmbd/nmbd_browsesync.c:get_domain_master_name_node_status_fail(488) get_domain_master_name_node_status_fail: Doing a node status request to the domain master browser at IP 192.168.0.19 failed. Cannot get workgroup name. So, in a first time, I put 192.168.0.19 and 10.1.0.19 ip to my server, and then I ran samba and then I had to change this IP to 10.1.255.33. So, I understand that this UNICAT_SUBNET has registred the first IPs (192.168.0.19) and it's looking for it. I don't know why this UNICAST is lookng that IP and isn't it working with my actual IP 10.1.255.33 And in this file: /var/cache/samba/wins.dat shows.: [EMAIL PROTECTED] samba]# less wins.dat VERSION 1 0 XXNT#00 1117724724 255.255.255.255 e4R XXNT#1b 1117724724 10.1.255.33 192.168.0.19 64R XXNT#1c 1117724724 10.1.255.33 10.1.0.19 e4R XXNT#1e 1117724724 255.255.255.255 e4R XXSERVER#00 1117724724 10.1.255.33 192.168.0.19 10.1.0.19 66R XXSERVER#03 1117724724 10.1.255.33 192.168.0.19 10.1.0.19 66R XXSERVER#20 1117724724 10.1.255.33 192.168.0.19 10.1.0.19 66R shows all IP's history, since I installed my server If I reset this file will I get the answer?, but I tried erasing and restarting the service...and nothig, always reload the same information shown above. The IP tha i want to work is 10.1.255.33 not other I hope I was clear. Please, I can't find any help in internet.. (google), the only solution, I think, is to reinstall everything without changing IP I will appreciate if you can give some support ... Thanks a lot Emilio Herrera Lima -Perú [EMAIL PROTECTED] -- 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] pwd-must-change-time=0 not working on windows 98!! (solved!)
I found that the problem was some poledit parameters in the windows 98... not samba :) Sorry! Tnxs. John H Terpstra wrote: On Monday 30 May 2005 12:19, Guido Lorenzutti wrote: Hi people, i was using this with the pdbedit to force the users to change they password at next logon. The thing is that it works perfectly on windows xp, windows 2k, and windows 2k3, but in windows 98 it just don't work. Any ideas? The windows 98 tells me that the account is disable and if i try on windows 2k3 it ask me to change the password like it should do also on windows 98. Windows 98 is behaving normally. It does not participate in NT4 and later domain security. It can only use the network logon service. - John T. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] failed to add domain dn= sambaDomainName=hostname
Hello, On a computer, a sparc64 with Debian, with hostname tw89 and domain name KUDDE thinks `smbpasswd` that the domain name is TW89 | tw89:~ | # grep workgroup /etc/samba/smb.conf | # Change this to the workgroup/NT-domain name your Samba server will part of |workgroup = KUDDE | tw89:~ | # ldapsearch -LLxW -H ldaps://tw89 -D cn=admin,ou=people,dc=gst,dc=stappers,dc=nl \ | -b dc=gst,dc=stappers,dc=nl '((objectClass=*)(sambaDomainName=*))' sambaDomainName | version: 1 | | dn: sambaDomainName=KUDDE,dc=gst,dc=stappers,dc=nl | sambaDomainName: KUDDE | | tw89:~ | # smbpasswd -a challange | failed to add domain dn= sambaDomainName=TW89,dc=gst,dc=stappers,dc=nl with: Insufficient access | no write access to parent | Adding domain info for TW89 failed with NT_STATUS_UNSUCCESSFUL | New SMB password: | Retype new SMB password: | Failed to initialise SAM_ACCOUNT for user challange. Does this user exist in the UNIX password database ? | Failed to modify password entry for user challange | tw89:~ | # On a working computer ( debian-edu, i386 ) there is | tjener:~ | # smbpasswd -D 4 -a mymom | Searching for:[((objectClass=sambaDomain)(sambaDomainName=SKOLELINUX))] | smbldap_open_connection: connection opened | ldap_connect_system: succesful connection to the LDAP server | The LDAP server is succesful connected | New SMB password: ^C | Interupted by signal. | tjener:~ | # The failing computer gives: | tw89:~ | # smbpasswd -D 4 -a mymom | Searching for:[((objectClass=sambaDomain)(sambaDomainName=TW89))] | smbldap_open_connection: connection opened | ldap_connect_system: succesful connection to the LDAP server | ldap_connect_system: LDAP server does support paged results | The LDAP server is succesfully connected | Got no domain info entries for domain | Adding new domain | failed to add domain dn= sambaDomainName=TW89,dc=gst,dc=stappers,dc=nl | with: Insufficient access | no write access to parent | Adding domain info for TW89 failed with NT_STATUS_UNSUCCESSFUL | pdb_init_ldapsam: WARNING: Could not get domain info, nor add one to the | domain | pdb_init_ldapsam: Continuing on regardless, will be unable to allocate | new users/groups, and will risk BDCs having inconsistant SIDs | New SMB password: ^C | Interupted by signal. | tw89:~ | # Why does it use it's hostname and the workgroup? Cheers Geert Stappers -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Problem with default keyboard layout
Hi, after upgrading from Samba 2.2.8 to Samba 3.0.13 the keyboard layout changed from german to english under Windows XP for every user. Also the german letters ü,ö,ä didn't show up in the way they should do. Last time I did this upgrade with the same samba.conf I didin't get this problem. Who can help me solving this problem ? I'm using Samba 3.0.13 as a PDC under SuSE Linux 9.3. Bye, Carsten e-mail: [EMAIL PROTECTED] www: www.sgcr.net mobil: +49-173-2137083 fax: +49-6403-96187 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] pstools / psexec equivalent for Samba / Linux?
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Tomasz Chmielewski wrote: psexec, on the other way, does not need anything installed on remote Windows machine, what you need, is credentials. I looked at this. Andrew B. Looked at it as well. What is lacking currently to finish off the missing pieces is the capability create and remove a remote service. The start, stop, and control service client tools are implemented in Samba 3.0.15pre2. Anyone interesting is spending time on this ? Our plates are pretty full right now. It's not that big of a job. We just need to implement the parsing routines for the svcctl calls and add a couple of client wrapper functions. cheers, jerry = Alleviating the pain of Windows(tm) --- http://www.samba.org GnuPG Key- http://www.plainjoe.org/gpg_public.asc I never saved anything for the swim back. Ethan Hawk in Gattaca -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.5 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFCm7y4IR7qMdg1EfYRAsOJAJ9LwDxD2PtTnvwcptf1MXiUTflflgCeOQkE Jxj2te3W2ULuaW0IW2b8AY0= =CGZk -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba as a PDC with LDAP and Kerberos
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Ti Leggett wrote: So, here's my new question (I'm full of em): Are LDAP actions done as the Samab ldap admin dn or the user doing the action? It appears the latter is the case. All LDAP actions from smbd are done as the ldap admin dn, but the add machine script should be called under root if the user has the SeMachineAccountPrivilege. cheers, jerry = Alleviating the pain of Windows(tm) --- http://www.samba.org GnuPG Key- http://www.plainjoe.org/gpg_public.asc I never saved anything for the swim back. Ethan Hawk in Gattaca -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.5 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFCm8ZvIR7qMdg1EfYRAi/zAJ9h6Bzhz5algsAA6hB4O+vyl+sP3gCgu4hP wxOm2UkvC6BXHCpwwtmcxNk= =AFm2 -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] read-only folders and files
On Sunday 29 May 2005 22:28, Ilia Chipitsine wrote: Dear Sirs, How does samba handle read only attribute ? I can map archive and hidden files using smb.conf, but there's nothing on mapping read-only files. files/folders are created 770 (user and group writeable), but Windows shows those files as read-only. UNIX file permissions control read/write capabilities. I've moved further in discovering what's wrong. Samba somehow reports wrong ownership for those files and folders, despite files belong to me, it reports they are owned by BUILTIN\Administrators, so they appear as read-only due to that reason. I'm investigating now what did I do wrong. - John T. -- 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] [Fwd: samba versions above 3.0.11 doesn't respect 'dos charset' option.]
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 - Original Message Subject: samba versions above 3.0.11 doesn't respect 'dos charset' option. Date: Mon, 30 May 2005 00:01:41 +0200 From: Martin Ottmr [EMAIL PROTECTED] To: [EMAIL PROTECTED] I tried to compile samba (gentoo user) 3.0.12 and 3.0.14a and when I'm browsing on my brother's PC with windows XP, I keep getting bricks instead of Czech symbols with strokes and hooks. This part of smb.conf worked me fine on samba 3.0.11: # dos charset = ISO8859-2 ~dos charset = 852 ~display charset = iso-8859-2 ~unix charset = ISO8859-2 For now, I'm back on 3.0.11, but I thing, it has some well known security issues... I hope, You will fix it as soon as possible... I'm sorry for my bad English and if I sent this to wrong address! :-) Keep on good work! :0) (Almost) pleased samba user ;-) -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.0 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFCm9PhIR7qMdg1EfYRAv93AKCi4L6l4vpoRuqeTMiTd3GuMk6xFwCfTCpE 1uEmF/6B7QxU3lByq5nEeUU= =7W28 -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Illegal multibyte character ...
Dear Sirs, I'm running samba in utf-8/utf-8 mode (unix charset/display charset), clients are: Windows XP/RUS, files and directories are created by clients directly, so samba says: [2005/05/30 20:12:01, 3] smbd/open.c:open_file(178) Error opening file profile/\x87 \x81\x8212 (Is a directory) (local_flags=1) (flags=1) [2005/05/30 20:12:01, 3] lib/charcnv.c:convert_string_allocate(585) convert_string_allocate: Conversion error: Illegal multibyte sequence() it is strange because files are created by samba itself. Cheers, Ilia Chipitsine -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Remote Desktop Users as ADM-template?
Hi Thomasz, hmm, I'm beginning to doubt if we're talking about the same :) maybe you are right. ;-) I am *not* using a Windows Terminal Server (Windows 2000 Server, Windows Server 2003), but rather enable the Remote Desktop functionality on my XP machine, so users can connect via RDP to the XP machine as server. There must be a template somewhere in order to allow non-admin users connect *to* my XP machine. :-) Thanks, and sorry for the confusion, Florian -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] smbtar can't backup DVD device
Hello, I'm running Samba v3.0.14a on FreeBSD 5.4 and having a problem trying to backup a CDROM in a DVD drive using smbtar. Network layout is simple... 192.168.3.1 FBSD w/samba v3.0.14a 192.168.3.5 Windows XP Professional I have two shares on the WINXP machine: C:\temp shared as temp D: shared as CDROM Command is: smbtar -s PC1 -x CDROM -t /tmp/test PC1 is the WINXP machine. The smbtar command hangs when attempting to copy files from the DVD device, but works just fine if I use temp and copy files from the temp folder. If I mount the DVD device onto the FBSD machine using mount_smbfs, I can access the CDROM just fine and copy the files from the device. However, I'm curious if this is expected behaviour with smbtar(), if it's a bug with smbtar(), or if I'm just doing something wrong. Any info appreciated. Jon -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
disk size reporting error - re-ocurrence?
Bradford J. Hamilton wrote: COLLOT Jean-Yves wrote: snip I think that the latest version will fix your problem. Keep me updated. JY Compiled, linked and installed without issue - problem solved! Great job - thanks for helping! Hello, Well, you asked to be kept informed...:-) I recently upgraded my VMS system from V7.3-1 to V7.3-2. The reporting error re-occurred (total size 20.0 MB, free space 512 bytes). I attempted to fix the problem by re-compiling/re-linking SAMBA, but I'm still seeing the same problem. Is there anything obvious that I've overlooked? TIA PLEASE READ THIS IMPORTANT ETIQUETTE MESSAGE BEFORE POSTING: http://www.catb.org/~esr/faqs/smart-questions.html
svn commit: samba r7085 - in branches/SAMBA_4_0/source/lib/ejs: .
Author: tridge
Date: 2005-05-30 06:06:27 + (Mon, 30 May 2005)
New Revision: 7085
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7085
Log:
fixed a bug in ejs with setting up the arguments[] array
Modified:
branches/SAMBA_4_0/source/lib/ejs/ejsParser.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/ejs/ejsParser.c
===
--- branches/SAMBA_4_0/source/lib/ejs/ejsParser.c 2005-05-30 00:19:58 UTC
(rev 7084)
+++ branches/SAMBA_4_0/source/lib/ejs/ejsParser.c 2005-05-30 06:06:27 UTC
(rev 7085)
@@ -2069,6 +2069,8 @@
*/
for (i = 0; i formalArgs-used; i++) {
mprCreateProperty(ep-local, argNames[i], argValues[i]);
+ }
+ for (i = 0; i actualArgs-used; i++) {
mprItoa(i, buf, sizeof(buf));
mprCreateProperty(arguments, buf, argValues[i]);
}
svn commit: samba r7086 - in branches/SAMBA_4_0/source/web_server/esp: .
Author: tridge
Date: 2005-05-30 06:07:23 + (Mon, 30 May 2005)
New Revision: 7086
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7086
Log:
make include() recognise the .esp extension and include the file as
an esp script instead of as a ejs script
Modified:
branches/SAMBA_4_0/source/web_server/esp/espProcs.c
Changeset:
Modified: branches/SAMBA_4_0/source/web_server/esp/espProcs.c
===
--- branches/SAMBA_4_0/source/web_server/esp/espProcs.c 2005-05-30 06:06:27 UTC
(rev 7085)
+++ branches/SAMBA_4_0/source/web_server/esp/espProcs.c 2005-05-30 06:07:23 UTC
(rev 7086)
@@ -71,12 +71,14 @@
{
const Esp *esp;
charpath[MPR_MAX_FNAME], dir[MPR_MAX_FNAME];
- char*emsg, *buf;
+ char*emsg=NULL, *buf;
int size, i;
esp = ep-esp;
mprAssert(argv);
for (i = 0; i argc; i++) {
+ const char *extension;
+
if (argv[i][0] != '/') {
mprGetDirName(dir, sizeof(dir), ep-docPath);
mprSprintf(path, sizeof(path), %s/%s, dir, argv[i]);
@@ -90,10 +92,20 @@
}
buf[size] = '\0';
- if (ejsEvalScript(espGetScriptHandle(ep), buf, 0, emsg) 0) {
- espError(ep, Cant evaluate script);
- mprFree(buf);
- return -1;
+ extension = strrchr(argv[i], '.');
+ /* this makes handling include files in esp scripts much more
convenient */
+ if (extension strcasecmp(extension, .esp) == 0) {
+ if (espProcessRequest(ep, path, buf, emsg) != 0) {
+ espError(ep, Cant evaluate script - %s,
emsg?emsg:);
+ mprFree(buf);
+ return -1;
+ }
+ } else {
+ if (ejsEvalScript(espGetScriptHandle(ep), buf, 0,
emsg) 0) {
+ espError(ep, Cant evaluate script - %s,
emsg?emsg:);
+ mprFree(buf);
+ return -1;
+ }
}
mprFree(buf);
}
svn commit: samba r7087 - in branches/SAMBA_4_0/source/web_server: .
Author: tridge
Date: 2005-05-30 06:08:54 + (Mon, 30 May 2005)
New Revision: 7087
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7087
Log:
always run the /scripting/preauth.esp page before processing any
request. If this page produces any output then that output is sent to
the browser and the request is not processed
This allows us to ensure that all pages are authenticated
Modified:
branches/SAMBA_4_0/source/web_server/http.c
Changeset:
Modified: branches/SAMBA_4_0/source/web_server/http.c
===
--- branches/SAMBA_4_0/source/web_server/http.c 2005-05-30 06:07:23 UTC (rev
7086)
+++ branches/SAMBA_4_0/source/web_server/http.c 2005-05-30 06:08:54 UTC (rev
7087)
@@ -32,6 +32,7 @@
#include dlinklist.h
#define SWAT_SESSION_KEY _swat_session_
+#define HTTP_PREAUTH_URI /scripting/preauth.esp
/* state of the esp subsystem for a specific request */
struct esp_state {
@@ -121,7 +122,7 @@
if (url[0] != '/') return NULL;
for (i=0;url[i];i++) {
- if ((!isalnum(url[i]) !strchr(./, url[i])) ||
+ if ((!isalnum(url[i]) !strchr(./_, url[i])) ||
(url[i] == '.' strchr(/., url[i+1]))) {
return NULL;
}
@@ -164,6 +165,7 @@
return 0;
failed:
+ DEBUG(0,(Failed to read file %s - %s\n, path, strerror(errno)));
if (fd != -1) close(fd);
talloc_free(*buf);
*buf = NULL;
@@ -385,6 +387,7 @@
/* looks ok */
web-output.fd = open(path, O_RDONLY);
if (web-output.fd == -1) {
+ DEBUG(0,(Failed to read file %s - %s\n, path,
strerror(errno)));
http_error_unix(web, path);
return;
}
@@ -394,9 +397,6 @@
goto invalid;
}
- http_output_headers(web);
- EVENT_FD_WRITEABLE(web-conn-event.fde);
- web-output.output_pending = True;
return;
invalid:
@@ -481,16 +481,13 @@
/*
process a esp request
*/
-static void esp_request(struct esp_state *esp)
+static void esp_request(struct esp_state *esp, const char *url)
{
struct websrv_context *web = esp-web;
- const char *url = web-input.url;
size_t size;
int res;
char *emsg = NULL, *buf;
- http_setup_arrays(esp);
-
if (http_readFile(web, buf, size, url) != 0) {
http_error_unix(web, url);
return;
@@ -507,12 +504,43 @@
http_writeBlock(web, emsg, strlen(emsg));
}
talloc_free(buf);
- http_output_headers(web);
- EVENT_FD_WRITEABLE(web-conn-event.fde);
- web-output.output_pending = True;
}
+/*
+ perform pre-authentication on every page is /scripting/preauth.esp
+ exists. If this script generates any non-whitepace output at all,
+ then we don't run the requested URL.
+
+ note that the preauth is run even for static pages such as images.
+*/
+static BOOL http_preauth(struct esp_state *esp)
+{
+ const char *path = http_local_path(esp-web, HTTP_PREAUTH_URI);
+ int i;
+ if (path == NULL) {
+ http_error(esp-web, 500, Internal server error);
+ return False;
+ }
+ if (!file_exist(path)) {
+ /* if the preath script is not installed then allow access */
+ return True;
+ }
+ esp_request(esp, HTTP_PREAUTH_URI);
+ for (i=0;iesp-web-output.content.length;i++) {
+ if (!isspace(esp-web-output.content.data[i])) {
+ /* if the preauth has generated content, then force it
to be
+ html, so that we can show the login page for failed
+ access to images */
+ http_setHeader(esp-web, Content-Type: text/html, 0);
+ return False;
+ }
+ }
+ data_blob_free(esp-web-output.content);
+ return True;
+}
+
+
/*
handling of + and % escapes in http variables
*/
@@ -716,6 +744,7 @@
{jpg, image/jpeg},
{txt, text/plain},
{ico, image/x-icon},
+ {css, text/css},
{esp, text/html, True}
};
@@ -798,12 +827,23 @@
http_setHeader(web, Connection: close, 0);
http_setHeader(web, talloc_asprintf(esp, Content-Type: %s,
file_type), 0);
- if (esp_enable) {
- esp_request(esp);
- } else {
- http_simple_request(web);
+ http_setup_arrays(esp);
+
+ /* possibly do pre-authentication */
+ if (http_preauth(esp)) {
+ if (esp_enable) {
+ esp_request(esp, web-input.url);
+ } else {
+ http_simple_request(web);
+ }
}
+ if (!web-output.output_pending) {
+ http_output_headers(web);
+
svn commit: samba r7088 - in branches/SAMBA_4_0/swat: . docs esptest images scripting style
Author: tridge Date: 2005-05-30 06:15:01 + (Mon, 30 May 2005) New Revision: 7088 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7088 Log: start on some real structure for the SWAT web pages - this imports the basic css pages from samba.org - i have created some useful ejs scripts in common.js that will be included by all pages - added a real login page, and a logout button showing who you are logged in as - added page_header() and page_footer() functions that take a page type, allowing for plain or columms pages - added some simple menus on the left of the columns page type, with links to the esp tests and some useful links for samba4 developers Added: branches/SAMBA_4_0/swat/docs/ branches/SAMBA_4_0/swat/docs/menu.js branches/SAMBA_4_0/swat/esptest/menu.js branches/SAMBA_4_0/swat/images/linkpad.gif branches/SAMBA_4_0/swat/login.esp branches/SAMBA_4_0/swat/logout.esp branches/SAMBA_4_0/swat/scripting/common.js branches/SAMBA_4_0/swat/scripting/footer.esp branches/SAMBA_4_0/swat/scripting/footer_columns.esp branches/SAMBA_4_0/swat/scripting/footer_plain.esp branches/SAMBA_4_0/swat/scripting/header.esp branches/SAMBA_4_0/swat/scripting/header_columns.esp branches/SAMBA_4_0/swat/scripting/header_plain.esp branches/SAMBA_4_0/swat/scripting/preauth.esp branches/SAMBA_4_0/swat/style/ branches/SAMBA_4_0/swat/style/common.css branches/SAMBA_4_0/swat/style/main.css Removed: branches/SAMBA_4_0/swat/esptest/index.esp branches/SAMBA_4_0/swat/esptest/index.html Modified: branches/SAMBA_4_0/swat/esptest/auth.esp branches/SAMBA_4_0/swat/esptest/exception.esp branches/SAMBA_4_0/swat/esptest/formtest.esp branches/SAMBA_4_0/swat/esptest/include.esp branches/SAMBA_4_0/swat/esptest/ldb.esp branches/SAMBA_4_0/swat/esptest/loadparm.esp branches/SAMBA_4_0/swat/esptest/session.esp branches/SAMBA_4_0/swat/esptest/showvars.esp branches/SAMBA_4_0/swat/index.esp Changeset: Sorry, the patch is too large (1043 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7088
svn commit: samba r7089 - in branches/SAMBA_4_0/swat/scripting: .
Author: tridge
Date: 2005-05-30 06:22:56 + (Mon, 30 May 2005)
New Revision: 7089
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7089
Log:
ensure that headers['HOST'] is setup
Modified:
branches/SAMBA_4_0/swat/scripting/common.js
Changeset:
Modified: branches/SAMBA_4_0/swat/scripting/common.js
===
--- branches/SAMBA_4_0/swat/scripting/common.js 2005-05-30 06:15:01 UTC (rev
7088)
+++ branches/SAMBA_4_0/swat/scripting/common.js 2005-05-30 06:22:56 UTC (rev
7089)
@@ -8,6 +8,13 @@
/* fill in some defaults */
global.page.title = Samba Web Administration Tool;
+
+/* if the browser was too dumb to set the HOST header, then
+ set it now */
+if (headers['HOST'] == undefined) {
+ headers['HOST'] = server['SERVER_HOST'] + : + server['SERVER_PORT'];
+}
+
/*
show the page header. page types include plain and column
*/
svn commit: samba r7090 - in branches/SAMBA_4_0/swat/esptest: .
Author: tridge Date: 2005-05-30 06:23:50 + (Mon, 30 May 2005) New Revision: 7090 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7090 Log: added back in the showvars test Modified: branches/SAMBA_4_0/swat/esptest/menu.js Changeset: Modified: branches/SAMBA_4_0/swat/esptest/menu.js === --- branches/SAMBA_4_0/swat/esptest/menu.js 2005-05-30 06:22:56 UTC (rev 7089) +++ branches/SAMBA_4_0/swat/esptest/menu.js 2005-05-30 06:23:50 UTC (rev 7090) @@ -7,5 +7,5 @@ session variables, /esptest/session.esp, loadparm access,/esptest/loadparm.esp, exception handling, /esptest/exception.esp, - ); + environment variables, /esptest/showvars.esp);
svn commit: samba r7091 - in branches/SAMBA_4_0/swat/docs: .
Author: tridge Date: 2005-05-30 06:54:43 + (Mon, 30 May 2005) New Revision: 7091 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7091 Log: added some more useful links Modified: branches/SAMBA_4_0/swat/docs/menu.js Changeset: Modified: branches/SAMBA_4_0/swat/docs/menu.js === --- branches/SAMBA_4_0/swat/docs/menu.js2005-05-30 06:23:50 UTC (rev 7090) +++ branches/SAMBA_4_0/swat/docs/menu.js2005-05-30 06:54:43 UTC (rev 7091) @@ -3,4 +3,7 @@ Samba Information, Samba4 development, http://devel.samba.org/;, Recent Checkins, http://build.samba.org/?tree=samba4function=Recent+Checkins;, - Recent Builds, http://build.samba.org/?tree=samba4function=Recent+Builds;); + Recent Builds, http://build.samba.org/?tree=samba4function=Recent+Builds;, + EJS Information, http://www.appwebserver.org/products/ejs/ejs.html;, + ESP Information, http://www.appwebserver.org/products/ejs/ejs.html;, + HTML 4.01 Spec, http://www.w3.org/TR/html401/;);
svn commit: samba r7092 - in branches/SAMBA_4_0/swat: esptest scripting style
Author: tridge
Date: 2005-05-30 06:55:25 + (Mon, 30 May 2005)
New Revision: 7092
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7092
Log:
added some js for formatting table results in a nicer fashion
Modified:
branches/SAMBA_4_0/swat/esptest/ldb.esp
branches/SAMBA_4_0/swat/scripting/common.js
branches/SAMBA_4_0/swat/style/main.css
Changeset:
Modified: branches/SAMBA_4_0/swat/esptest/ldb.esp
===
--- branches/SAMBA_4_0/swat/esptest/ldb.esp 2005-05-30 06:54:43 UTC (rev
7091)
+++ branches/SAMBA_4_0/swat/esptest/ldb.esp 2005-05-30 06:55:25 UTC (rev
7092)
@@ -2,60 +2,26 @@
h1Samba4 ldb test/h1
-form name=LdbTest method=post action=@@request['SCRIPT_NAME']
-input name=submit type=submit value=Cancel /br /
-/form
+h3An attribute constrained search/h3
%
-if (request['REQUEST_METHOD'] == POST) {
- /* if they cancelled then take them back to the list of tests */
- if (form['submit'] == Cancel) {
- redirect(/);
- }
-}
-
-/*
- hmm, this gets fairly involved ...
-*/
-function showLdbRes(res) {
- for (i in res) {
- var r = res[i];
- for (j in r) {
- var a = r[j];
- if (typeof(a) == object) {
- for (k in a) {
- write(j + [ + k + ]= + a[k] + br
/\n);
- }
- } else {
- write(j + = + r[j] + br /\n);
- }
- }
- write(p);
- }
-}
-
-%
-
-Trying a attribute constrained search on samdb:p
-
-%
var dbfile = lpGet(sam database);
var attrs = new Array(name, dnsDomain, objectSid, dn);
res = ldbSearch(dbfile, (objectClass=domain), attrs);
-showLdbRes(res);
+multi_table(res, dn);
%
-and now an unconstrained search:p
+h3An unconstrained search/h3
%
var dbfile = lpGet(sam database);
res = ldbSearch(dbfile, (objectClass=user));
-showLdbRes(res);
+multi_table(res, dn);
%
-and a bad searchbr
+h3A search with bad arguments/h3
%
res = ldbSearch(foo);
Modified: branches/SAMBA_4_0/swat/scripting/common.js
===
--- branches/SAMBA_4_0/swat/scripting/common.js 2005-05-30 06:54:43 UTC (rev
7091)
+++ branches/SAMBA_4_0/swat/scripting/common.js 2005-05-30 06:55:25 UTC (rev
7092)
@@ -61,3 +61,34 @@
}
write(/ul\n);
}
+
+
+/*
+ display a ejs object as a table
+*/
+function simple_table(v) {
+ write(table class=\data\\n);
+ for (r in v) {
+ write(trtd + r + /tdtd + v[r] + /td/tr\n);
+ }
+ write(/table\n);
+}
+
+/*
+ display an array of objects, with the header for each element from the given
+ attribute
+*/
+function multi_table(array, header) {
+ write(table class=\data\\n);
+ for (i in array) {
+ var v = array[i];
+ write(trth colspan=2 + v[header] + /th/tr\n);
+ for (r in v) {
+ if (r != header) {
+ write(trtd align=left + r +
+ /tdtd align=left + v[r] +
/td/tr\n);
+ }
+ }
+ }
+ write(/table\n);
+}
Modified: branches/SAMBA_4_0/swat/style/main.css
===
--- branches/SAMBA_4_0/swat/style/main.css 2005-05-30 06:54:43 UTC (rev
7091)
+++ branches/SAMBA_4_0/swat/style/main.css 2005-05-30 06:55:25 UTC (rev
7092)
@@ -105,3 +105,19 @@
text-align:center;
margin:10px 0 25px 0;
}
+
+/*
+ styles for data tables
+*/
+table.data {
+ border: 2px;
+}
+table.data th {
+ margin-top:20px;
+ text-align:left;
+background-color: #F5C915;
+}
+table.data tr {
+background-color: #E5C995;
+ text-align:left;
+}
svn commit: samba r7093 - in branches/SAMBA_4_0/swat: . esptest scripting
Author: tridge
Date: 2005-05-30 08:13:34 + (Mon, 30 May 2005)
New Revision: 7093
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7093
Log:
- added a new Form() ejs object for producing simple forms.
- tidied up the html generation a bit
Modified:
branches/SAMBA_4_0/swat/esptest/exception.esp
branches/SAMBA_4_0/swat/esptest/formtest.esp
branches/SAMBA_4_0/swat/esptest/session.esp
branches/SAMBA_4_0/swat/esptest/showvars.esp
branches/SAMBA_4_0/swat/login.esp
branches/SAMBA_4_0/swat/scripting/common.js
Changeset:
Modified: branches/SAMBA_4_0/swat/esptest/exception.esp
===
--- branches/SAMBA_4_0/swat/esptest/exception.esp 2005-05-30 06:55:25 UTC
(rev 7092)
+++ branches/SAMBA_4_0/swat/esptest/exception.esp 2005-05-30 08:13:34 UTC
(rev 7093)
@@ -5,16 +5,10 @@
form name=ExceptionTest method=POST action=@@request['SCRIPT_NAME']
input name=submit type=submit value=Generate Exception
input name=submit type=submit value=No Exception
-input name=submit type=submit value=Cancelbr
/form
%
if (request['REQUEST_METHOD'] == POST) {
- /* if they cancelled then take them back to the list of tests */
- if (form['submit'] == Cancel) {
- redirect(/);
- }
-
function TestFunction(arg1, arg2) {
return OK;
}
Modified: branches/SAMBA_4_0/swat/esptest/formtest.esp
===
--- branches/SAMBA_4_0/swat/esptest/formtest.esp2005-05-30 06:55:25 UTC
(rev 7092)
+++ branches/SAMBA_4_0/swat/esptest/formtest.esp2005-05-30 08:13:34 UTC
(rev 7093)
@@ -1,34 +1,26 @@
% page_header(columns, ESP Form Test); %
-form name=FormTest method=POST action=@@request['SCRIPT_NAME']
-firstName: input name=firstName type=text value=br
-lastName: input name=lastName type=text value=br
-input name=submit type=submit value=OK
-input name=submit type=submit value=Cancelbr
-/form
+%
+var f = Form(FormTest, 2, 2);
+f.element[0].label = First Name;
+f.element[0].name = firstName;
+f.element[1].label = Last Name;
+f.element[1].name = lastName;
+f.submit[0] = OK;
+f.submit[1] = Cancel;
+display_form(f);
+
%
/* if its a post then the user has filled in the form, so
report the values
*/
- if (request['REQUEST_METHOD'] == POST) {
-
- /* if they cancelled then take them back to the list of tests */
- if (form['submit'] == Cancel) {
- redirect(/);
- }
+ if (form['OK']) {
%
- You chose firstName=@@form['firstName'] lastName=@@form['lastName']
+ You chose firstName=@@form['firstName'] lastName=@@form['lastName']p
+
%
-
- function showArray(name, array) {
- write(h3Array: + name + /h3\n);
- for (v in array) {
-write(name + [ + v + ]= + array[v] + br\n);
- }
- }
-
- showArray(form,form);
+ simple_table(form);
}
%
Modified: branches/SAMBA_4_0/swat/esptest/session.esp
===
--- branches/SAMBA_4_0/swat/esptest/session.esp 2005-05-30 06:55:25 UTC (rev
7092)
+++ branches/SAMBA_4_0/swat/esptest/session.esp 2005-05-30 08:13:34 UTC (rev
7093)
@@ -43,18 +43,7 @@
}
}
-function showArray(name, array) {
- write(h3Array: + name + /h3\n);
- if (array == undefined) {
- write(undefinedbr\n);
- return;
- }
- for (v in array) {
- write(name + [ + v + ]= + array[v] + br\n);
- }
-}
-
-showArray(session, session);
+simple_table(session);
write(SessionId= + request['SESSION_ID'] + br\n);
%
Modified: branches/SAMBA_4_0/swat/esptest/showvars.esp
===
--- branches/SAMBA_4_0/swat/esptest/showvars.esp2005-05-30 06:55:25 UTC
(rev 7092)
+++ branches/SAMBA_4_0/swat/esptest/showvars.esp2005-05-30 08:13:34 UTC
(rev 7093)
@@ -8,9 +8,7 @@
if (array == undefined) {
write(undefinedbr\n);
} else {
-for (v in array) {
- write(name + [ + v + ]= + array[v] + br\n);
- }
+ simple_table(array);
}
}
@@ -23,10 +21,6 @@
showArray(session, session);
%
-form name=Cancel method=POST action=/
-input name=submit type=submit value=Cancelbr
-/form
-
/ul
% page_footer(); %
Modified: branches/SAMBA_4_0/swat/login.esp
===
--- branches/SAMBA_4_0/swat/login.esp 2005-05-30 06:55:25 UTC (rev 7092)
+++ branches/SAMBA_4_0/swat/login.esp 2005-05-30 08:13:34 UTC (rev 7093)
@@ -1,12 +1,14 @@
% page_header(plain, SWAT Login); %
-form name=login method=POST action=@@request.SCRIPT_NAME
-Username: input name=Username type=text value=br
-Password: input name=Password type=password value=br
-br
-input name=submit type=submit
svn commit: samba r7094 - in branches/SAMBA_4_0/swat/esptest: .
Author: tridge
Date: 2005-05-30 08:23:37 + (Mon, 30 May 2005)
New Revision: 7094
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7094
Log:
use the Form() object in a few more places
Modified:
branches/SAMBA_4_0/swat/esptest/exception.esp
branches/SAMBA_4_0/swat/esptest/formtest.esp
branches/SAMBA_4_0/swat/esptest/session.esp
Changeset:
Modified: branches/SAMBA_4_0/swat/esptest/exception.esp
===
--- branches/SAMBA_4_0/swat/esptest/exception.esp 2005-05-30 08:13:34 UTC
(rev 7093)
+++ branches/SAMBA_4_0/swat/esptest/exception.esp 2005-05-30 08:23:37 UTC
(rev 7094)
@@ -2,12 +2,14 @@
h1Samba4 exception test/h1
-form name=ExceptionTest method=POST action=@@request['SCRIPT_NAME']
-input name=submit type=submit value=Generate Exception
-input name=submit type=submit value=No Exception
-/form
%
+var f = Form(ExceptionTest, 0, 2);
+f.submit[0] = Generate Exception;
+f.submit[1] = No Exception;
+
+display_form(f);
+
if (request['REQUEST_METHOD'] == POST) {
function TestFunction(arg1, arg2) {
return OK;
Modified: branches/SAMBA_4_0/swat/esptest/formtest.esp
===
--- branches/SAMBA_4_0/swat/esptest/formtest.esp2005-05-30 08:13:34 UTC
(rev 7093)
+++ branches/SAMBA_4_0/swat/esptest/formtest.esp2005-05-30 08:23:37 UTC
(rev 7094)
@@ -15,7 +15,7 @@
/* if its a post then the user has filled in the form, so
report the values
*/
- if (form['OK']) {
+ if (form['submit'] == OK) {
%
You chose firstName=@@form['firstName'] lastName=@@form['lastName']p
Modified: branches/SAMBA_4_0/swat/esptest/session.esp
===
--- branches/SAMBA_4_0/swat/esptest/session.esp 2005-05-30 08:13:34 UTC (rev
7093)
+++ branches/SAMBA_4_0/swat/esptest/session.esp 2005-05-30 08:23:37 UTC (rev
7094)
@@ -2,17 +2,18 @@
h1Samba4 session test/h1
-form name=SessionTest method=POST action=@@request['SCRIPT_NAME']
-Name: input name=Name type=text value=br
-Value: input name=Value type=text value=br
-Timeout: input name=Timeout type=text value=br
-input name=submit type=submit value=Append
-input name=submit type=submit value=Reset
-input name=submit type=submit value=Destroy
-input name=submit type=submit value=Cancelbr
-/form
+%
+var f = Form(SessionTest, 3, 4);
+f.element[0].label = Name;
+f.element[1].label = Value;
+f.element[2].label = Timeout;
+f.submit[0] = Append;
+f.submit[1] = Reset;
+f.submit[2] = Destroy;
+f.submit[3] = Cancel;
-%
+display_form(f);
+
/* if its a post then the user has filled in the form, so
report the values
*/
svn commit: samba r7095 - in branches/SAMBA_4_0/swat/esptest: .
Author: tridge
Date: 2005-05-30 08:30:24 + (Mon, 30 May 2005)
New Revision: 7095
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7095
Log:
more html tidying
Modified:
branches/SAMBA_4_0/swat/esptest/include.esp
branches/SAMBA_4_0/swat/esptest/loadparm.esp
Changeset:
Modified: branches/SAMBA_4_0/swat/esptest/include.esp
===
--- branches/SAMBA_4_0/swat/esptest/include.esp 2005-05-30 08:23:37 UTC (rev
7094)
+++ branches/SAMBA_4_0/swat/esptest/include.esp 2005-05-30 08:30:24 UTC (rev
7095)
@@ -11,8 +11,4 @@
% res = testfn('foo'); %
result is: @@res
-form name=Cancel method=POST action=/
-input name=submit type=submit value=Cancelbr
-/form
-
% page_footer(); %
Modified: branches/SAMBA_4_0/swat/esptest/loadparm.esp
===
--- branches/SAMBA_4_0/swat/esptest/loadparm.esp2005-05-30 08:23:37 UTC
(rev 7094)
+++ branches/SAMBA_4_0/swat/esptest/loadparm.esp2005-05-30 08:30:24 UTC
(rev 7095)
@@ -2,15 +2,14 @@
h1Samba4 loadparm test/h1
-form name=LoadparmTest method=POST action=@@request['SCRIPT_NAME']
-Share: input name=Share type=text value=br
-Parameter: input name=Name type=text value=br
-input name=submit type=submit value=OK
-input name=submit type=submit value=Cancelbr
-/form
-
%
+var f = Form(LoadparmTest, 2, 1);
+f.element[0].label = Share;
+f.element[1].label = Parameter;
+f.submit[0] = OK;
+display_form(f);
+
function stringVar(v) {
var type = typeof(v);
var ret = ;
@@ -40,7 +39,7 @@
var v;
share = form['Share'];
- name = form['Name'];
+ name = form['Parameter'];
if (share name) {
v = lpGet(share, name);
} else if (name) {
svn commit: samba r7096 - in branches/SAMBA_4_0/swat: esptest scripting
Author: tridge
Date: 2005-05-30 08:50:24 + (Mon, 30 May 2005)
New Revision: 7096
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7096
Log:
added support for select lists in forms
Modified:
branches/SAMBA_4_0/swat/esptest/formtest.esp
branches/SAMBA_4_0/swat/scripting/common.js
Changeset:
Modified: branches/SAMBA_4_0/swat/esptest/formtest.esp
===
--- branches/SAMBA_4_0/swat/esptest/formtest.esp2005-05-30 08:30:24 UTC
(rev 7095)
+++ branches/SAMBA_4_0/swat/esptest/formtest.esp2005-05-30 08:50:24 UTC
(rev 7096)
@@ -1,14 +1,21 @@
% page_header(columns, ESP Form Test); %
%
-var f = Form(FormTest, 2, 2);
+var f = Form(FormTest, 3, 2);
f.element[0].label = First Name;
f.element[0].name = firstName;
+f.element[0].value = form['firstName'];
f.element[1].label = Last Name;
f.element[1].name = lastName;
+f.element[1].value = form['lastName'];
+f.element[2].label = Color;
+f.element[2].type = select;
+f.element[2].list = new Array(Red, Green, Blue, Yellow);
+f.element[2].value = form['Color'];
f.submit[0] = OK;
f.submit[1] = Cancel;
+printVars(f);
display_form(f);
%
Modified: branches/SAMBA_4_0/swat/scripting/common.js
===
--- branches/SAMBA_4_0/swat/scripting/common.js 2005-05-30 08:30:24 UTC (rev
7095)
+++ branches/SAMBA_4_0/swat/scripting/common.js 2005-05-30 08:50:24 UTC (rev
7096)
@@ -121,7 +121,7 @@
f.submit= an array of submit labels
f.element[i].label = element label
f.element[i].name = element name (defaults to label)
-f.element[i].type = element type
+f.element[i].type = element type (defaults to text)
f.element[i].value = current value (optional, defaults to )
*/
function display_form(f) {
@@ -139,13 +139,24 @@
}
write(tr);
write(td + e.label + /td);
- write('tdinput name=' + e.name + ' type=' +
- e.type + ' value=' + e.value + '/td\n');
+ if (e.type == select) {
+ write('tdselect name=' + e.name + '\n');
+ for (s in e.list) {
+ if (e.value == e.list[s]) {
+ write('option selected=selected' +
e.list[s] + '/option\n');
+ } else {
+ write('option' + e.list[s] +
'/option\n');
+ }
+ }
+ write('/select/td\n');
+ } else {
+ write('tdinput name=' + e.name + ' type=' +
+ e.type + ' value=' + e.value + '/td\n');
+ }
}
write(/table\n);
for (i in f.submit) {
- write('input name=' + f.submit[i] +
- ' type=submit value=' + f.submit[i] + '\n');
+ write('input name=submit type=submit value=' +
f.submit[i] + '\n');
}
write(/form\n);
}
svn commit: samba r7097 - in branches/SAMBA_4_0/swat/esptest: .
Author: tridge Date: 2005-05-30 08:50:53 + (Mon, 30 May 2005) New Revision: 7097 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7097 Log: removed a debug line Modified: branches/SAMBA_4_0/swat/esptest/formtest.esp Changeset: Modified: branches/SAMBA_4_0/swat/esptest/formtest.esp === --- branches/SAMBA_4_0/swat/esptest/formtest.esp2005-05-30 08:50:24 UTC (rev 7096) +++ branches/SAMBA_4_0/swat/esptest/formtest.esp2005-05-30 08:50:53 UTC (rev 7097) @@ -15,7 +15,6 @@ f.submit[0] = OK; f.submit[1] = Cancel; -printVars(f); display_form(f); %
svn commit: samba r7098 - in branches/SAMBA_4_0/source/build/pidl: .
Author: metze Date: 2005-05-30 09:07:21 + (Mon, 30 May 2005) New Revision: 7098 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7098 Log: - make use of the NDR table instead of the IDL table in the client and server generation - add 'noid' property to allow functions to be not present in the function table, and not generate client and server functions for them - print out a warning about [id()] not being correctly supported yet metze Modified: branches/SAMBA_4_0/source/build/pidl/ndr.pm branches/SAMBA_4_0/source/build/pidl/ndr_client.pm branches/SAMBA_4_0/source/build/pidl/ndr_header.pm branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm branches/SAMBA_4_0/source/build/pidl/pidl.pl branches/SAMBA_4_0/source/build/pidl/server.pm branches/SAMBA_4_0/source/build/pidl/validator.pm Changeset: Sorry, the patch is too large (526 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7098
svn commit: samba r7099 - in branches/SAMBA_4_0/swat: .
Author: metze Date: 2005-05-30 09:31:17 + (Mon, 30 May 2005) New Revision: 7099 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7099 Log: make the password field a password field... metze Modified: branches/SAMBA_4_0/swat/login.esp Changeset: Modified: branches/SAMBA_4_0/swat/login.esp === --- branches/SAMBA_4_0/swat/login.esp 2005-05-30 09:07:21 UTC (rev 7098) +++ branches/SAMBA_4_0/swat/login.esp 2005-05-30 09:31:17 UTC (rev 7099) @@ -4,6 +4,7 @@ var f = Form(login, 2, 1); f.element[0].label = Username; f.element[1].label = Password; +f.element[1].type = password; f.submit[0] = Login; display_form(f);
svn commit: samba r7100 - in branches/SAMBA_4_0/source/script: .
Author: metze Date: 2005-05-30 09:31:59 + (Mon, 30 May 2005) New Revision: 7100 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7100 Log: install lately added files too metze Modified: branches/SAMBA_4_0/source/script/installswat.sh Changeset: Modified: branches/SAMBA_4_0/source/script/installswat.sh === --- branches/SAMBA_4_0/source/script/installswat.sh 2005-05-30 09:31:17 UTC (rev 7099) +++ branches/SAMBA_4_0/source/script/installswat.sh 2005-05-30 09:31:59 UTC (rev 7100) @@ -21,9 +21,14 @@ installdir . esp installdir . ico installdir esptest esp +installdir esptest js installdir images png +installdir images gif installdir scripting ejs installdir scripting esp +installdir scripting js +installdir style css +installdir docs js cat EOF ==
svn commit: samba r7101 - in branches/SAMBA_4_0/swat: . images
Author: tridge Date: 2005-05-30 09:41:01 + (Mon, 30 May 2005) New Revision: 7101 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7101 Log: moved favicon into images/ Added: branches/SAMBA_4_0/swat/images/favicon.ico Removed: branches/SAMBA_4_0/swat/favicon.ico Changeset: Deleted: branches/SAMBA_4_0/swat/favicon.ico === (Binary files differ) Copied: branches/SAMBA_4_0/swat/images/favicon.ico (from rev 7087, branches/SAMBA_4_0/swat/favicon.ico)
svn commit: samba r7102 - in branches/SAMBA_4_0/source/build/pidl: .
Author: metze
Date: 2005-05-30 11:25:26 + (Mon, 30 May 2005)
New Revision: 7102
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7102
Log:
fix subcontext(0)
metze
Modified:
branches/SAMBA_4_0/source/build/pidl/ndr.pm
Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/ndr.pm
===
--- branches/SAMBA_4_0/source/build/pidl/ndr.pm 2005-05-30 09:41:01 UTC (rev
7101)
+++ branches/SAMBA_4_0/source/build/pidl/ndr.pm 2005-05-30 11:25:26 UTC (rev
7102)
@@ -132,7 +132,8 @@
}
}
- if (my $hdr_size = util::has_property($e, subcontext)) {
+ if (defined(util::has_property($e, subcontext))) {
+ my $hdr_size = util::has_property($e, subcontext);
my $subsize = util::has_property($e, subcontext_size);
if (not defined($subsize)) {
$subsize = -1;
@@ -178,7 +179,7 @@
return 1 if ($e-{POINTERS});
return 0 if (typelist::is_scalar($e-{TYPE}));
- return 0 if (util::has_property($e, subcontext));
+ return 0 if (defined(util::has_property($e, subcontext)));
return 1 unless (typelist::hasType($e-{TYPE})); # assume the worst
my $type = typelist::getType($e-{TYPE});
svn commit: samba r7103 - in branches/SAMBA_4_0/source/script: .
Author: metze Date: 2005-05-30 11:51:30 + (Mon, 30 May 2005) New Revision: 7103 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7103 Log: fix make installswat again:-) metze Modified: branches/SAMBA_4_0/source/script/installswat.sh Changeset: Modified: branches/SAMBA_4_0/source/script/installswat.sh === --- branches/SAMBA_4_0/source/script/installswat.sh 2005-05-30 11:25:26 UTC (rev 7102) +++ branches/SAMBA_4_0/source/script/installswat.sh 2005-05-30 11:51:30 UTC (rev 7103) @@ -19,11 +19,11 @@ } installdir . esp -installdir . ico installdir esptest esp installdir esptest js installdir images png installdir images gif +installdir images ico installdir scripting ejs installdir scripting esp installdir scripting js
Re: svn commit: samba r7098 - in branches/SAMBA_4_0/source/build/pidl: .
Hi Metze, On Mon, May 30, 2005 at 09:07:22AM +, [EMAIL PROTECTED] wrote about 'svn commit: samba r7098 - in branches/SAMBA_4_0/source/build/pidl: .': Log: - make use of the NDR table instead of the IDL table in the client and server generation - add 'noid' property to allow functions to be not present in the function table, and not generate client and server functions for them Thanks! - print out a warning about [id()] not being correctly supported yet id() is an OLE (COM) attribute that can be used to assign identifiers to dispinterface methods and properties. It is not an opnum, so it doesn't make sense to warn about it here... Cheers, Jelmer -- Jelmer Vernooij [EMAIL PROTECTED] - http://jelmer.vernstok.nl/ Just -102 more Samba commits left before r7000! signature.asc Description: Digital signature
svn commit: samba r7104 - in branches/SAMBA_4_0/source/web_server: .
Author: tridge
Date: 2005-05-30 12:18:23 + (Mon, 30 May 2005)
New Revision: 7104
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7104
Log:
add support into the web server for session[] variables without cookies by using
query strings
Modified:
branches/SAMBA_4_0/source/web_server/http.c
Changeset:
Modified: branches/SAMBA_4_0/source/web_server/http.c
===
--- branches/SAMBA_4_0/source/web_server/http.c 2005-05-30 11:51:30 UTC (rev
7103)
+++ branches/SAMBA_4_0/source/web_server/http.c 2005-05-30 12:18:23 UTC (rev
7104)
@@ -31,7 +31,7 @@
#include web_server/esp/esp.h
#include dlinklist.h
-#define SWAT_SESSION_KEY _swat_session_
+#define SWAT_SESSION_KEY SwatSessionId
#define HTTP_PREAUTH_URI /scripting/preauth.esp
/* state of the esp subsystem for a specific request */
@@ -434,6 +434,7 @@
if (web-session) {
SETVAR(ESP_REQUEST_OBJ, SESSION_ID, web-session-id);
}
+ SETVAR(ESP_REQUEST_OBJ, COOKIE_SUPPORT,
web-input.cookie?True:False);
SETVAR(ESP_HEADERS_OBJ, HTT_REFERER, web-input.referer);
SETVAR(ESP_HEADERS_OBJ, HOST, web-input.host);
@@ -568,9 +569,15 @@
*/
static void esp_putvar(struct esp_state *esp, const char *var, const char
*value)
{
- espSetStringVar(esp-req, ESP_FORM_OBJ,
- http_unescape(esp, var),
- http_unescape(esp, value));
+ if (strcasecmp(var, SWAT_SESSION_KEY) == 0) {
+ /* special case support for browsers without cookie
+support */
+ esp-web-input.session_key = talloc_strdup(esp, value);
+ } else {
+ mprSetPropertyValue(esp-variables[ESP_FORM_OBJ],
+ http_unescape(esp, var),
+ mprCreateStringVar(http_unescape(esp,
value), 0));
+ }
}
@@ -676,13 +683,17 @@
key = talloc_strndup(esp, p, strcspn(p, ;));
}
- if (key == NULL) {
- key = generate_random_str_list(esp, 64, 0123456789);
+ if (key == NULL esp-web-input.session_key) {
+ key = esp-web-input.session_key;
+ } else if (key == NULL) {
+ key = generate_random_str_list(esp, 16,
0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ);
}
/* try to find this session in the existing session list */
for (s=edata-sessions;s;s=s-next) {
- if (strcmp(key, s-id) == 0) break;
+ if (strcmp(key, s-id) == 0) {
+ break;
+ }
}
if (s == NULL) {
@@ -774,16 +785,11 @@
edata-application_data, MPR_DEEP_COPY);
}
- http_setup_session(esp);
-
talloc_set_destructor(esp, esp_destructor);
smb_setup_ejs_functions();
http_setup_ejs_functions();
- esp-req = espCreateRequest(web, web-input.url, esp-variables);
- if (esp-req == NULL) goto internal_error;
-
if (web-input.url == NULL) {
http_error(web, 400, You must specify a GET or POST request);
return;
@@ -796,7 +802,8 @@
http_error(web, 400, Malformed POST data);
return;
}
- } else if (strchr(web-input.url, '?')) {
+ }
+ if (strchr(web-input.url, '?')) {
status = http_parse_get(esp);
if (!NT_STATUS_IS_OK(status)) {
http_error(web, 400, Malformed GET data);
@@ -804,6 +811,11 @@
}
}
+ http_setup_session(esp);
+
+ esp-req = espCreateRequest(web, web-input.url, esp-variables);
+ if (esp-req == NULL) goto internal_error;
+
/* work out the mime type */
p = strrchr(web-input.url, '.');
if (p == NULL) {
@@ -848,7 +860,8 @@
talloc_free(edata-application_data);
edata-application_data = talloc_zero(edata, struct MprVar);
mprSetCtx(edata-application_data);
- mprCopyVar(edata-application_data,
esp-variables[ESP_APPLICATION_OBJ], MPR_DEEP_COPY);
+ mprCopyVar(edata-application_data,
esp-variables[ESP_APPLICATION_OBJ],
+ MPR_DEEP_COPY);
/* copy any session data */
if (web-session) {
svn commit: samba r7105 - in branches/SAMBA_4_0/swat/docs: .
Author: tridge Date: 2005-05-30 12:18:49 + (Mon, 30 May 2005) New Revision: 7105 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7105 Log: fixed a typo Modified: branches/SAMBA_4_0/swat/docs/menu.js Changeset: Modified: branches/SAMBA_4_0/swat/docs/menu.js === --- branches/SAMBA_4_0/swat/docs/menu.js2005-05-30 12:18:23 UTC (rev 7104) +++ branches/SAMBA_4_0/swat/docs/menu.js2005-05-30 12:18:49 UTC (rev 7105) @@ -5,5 +5,5 @@ Recent Checkins, http://build.samba.org/?tree=samba4function=Recent+Checkins;, Recent Builds, http://build.samba.org/?tree=samba4function=Recent+Builds;, EJS Information, http://www.appwebserver.org/products/ejs/ejs.html;, - ESP Information, http://www.appwebserver.org/products/ejs/ejs.html;, + ESP Information, http://www.appwebserver.org/products/esp/esp.html;, HTML 4.01 Spec, http://www.w3.org/TR/html401/;);
svn commit: samba r7106 - in branches/SAMBA_4_0/swat: . esptest scripting
Author: tridge
Date: 2005-05-30 12:21:30 + (Mon, 30 May 2005)
New Revision: 7106
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7106
Log:
the web interface now works completely with or without cookies. If you have
cookies
they will be used, otherwise you will see URLs with ?SwatSessionId=XXX on the
end.
Modified:
branches/SAMBA_4_0/swat/esptest/menu.js
branches/SAMBA_4_0/swat/login.esp
branches/SAMBA_4_0/swat/scripting/common.js
branches/SAMBA_4_0/swat/scripting/header_columns.esp
Changeset:
Modified: branches/SAMBA_4_0/swat/esptest/menu.js
===
--- branches/SAMBA_4_0/swat/esptest/menu.js 2005-05-30 12:18:49 UTC (rev
7105)
+++ branches/SAMBA_4_0/swat/esptest/menu.js 2005-05-30 12:21:30 UTC (rev
7106)
@@ -1,11 +1,11 @@
/* show a menu for the esp test pages */
simple_menu(
ESP Tests,
- ldb database, /esptest/ldb.esp,
- html forms, /esptest/formtest.esp,
- esp includes, /esptest/include.esp,
- session variables, /esptest/session.esp,
- loadparm access,/esptest/loadparm.esp,
- exception handling, /esptest/exception.esp,
- environment variables, /esptest/showvars.esp);
+ ldb database, session_uri(/esptest/ldb.esp),
+ html forms, session_uri(/esptest/formtest.esp),
+ esp includes, session_uri(/esptest/include.esp),
+ session variables, session_uri(/esptest/session.esp),
+ loadparm access,session_uri(/esptest/loadparm.esp),
+ exception handling, session_uri(/esptest/exception.esp),
+ environment variables, session_uri(/esptest/showvars.esp));
Modified: branches/SAMBA_4_0/swat/login.esp
===
--- branches/SAMBA_4_0/swat/login.esp 2005-05-30 12:18:49 UTC (rev 7105)
+++ branches/SAMBA_4_0/swat/login.esp 2005-05-30 12:21:30 UTC (rev 7106)
@@ -3,7 +3,9 @@
%
var f = Form(login, 2, 1);
f.element[0].label = Username;
+f.element[0].value = form['Username'];
f.element[1].label = Password;
+f.element[1].value = form['Password'];
f.element[1].type = password;
f.submit[0] = Login;
@@ -23,9 +25,9 @@
redirect them to the current page, which will now
show its true content */
if (request.REQUEST_URI == /login.esp) {
- redirect(/);
+ redirect(session_uri(/));
} else {
- redirect(request.REQUEST_URI);
+ redirect(session_uri(request.REQUEST_URI));
}
}
%
Modified: branches/SAMBA_4_0/swat/scripting/common.js
===
--- branches/SAMBA_4_0/swat/scripting/common.js 2005-05-30 12:18:49 UTC (rev
7105)
+++ branches/SAMBA_4_0/swat/scripting/common.js 2005-05-30 12:21:30 UTC (rev
7106)
@@ -8,7 +8,23 @@
/* fill in some defaults */
global.page.title = Samba Web Administration Tool;
+/* to cope with browsers that don't support cookies we append the sessionid
+ to the URI */
+global.SESSIONURI = ;
+if (request['COOKIE_SUPPORT'] != True) {
+ global.SESSIONURI=?SwatSessionId= + request['SESSION_ID'];
+}
+/*
+ possibly adjust a local URI to have the session id appended
+ used for browsers that don't support cookies
+*/
+function session_uri(uri) {
+ return uri + global.SESSIONURI;
+}
+
+
+
/* if the browser was too dumb to set the HOST header, then
set it now */
if (headers['HOST'] == undefined) {
@@ -32,6 +48,7 @@
include(/scripting/footer_ + global.page.pagetype + .esp);
}
+
/*
check if a uri is one of the 'always allowed' pages, even when not logged in
This allows the login page to use the same style sheets and images
@@ -40,6 +57,7 @@
var allowed = new Array(/images/favicon.ico,
/images/linkpad.gif,
/images/logo.png,
+ /images/logo.gif,
/style/main.css,
/style/common.css);
for (i in allowed) {
@@ -102,7 +120,7 @@
f.name = name;
f.element = new Array(num_elements);
f.submit = new Array(num_submits);
- f.action = request.REQUEST_URI;
+ f.action = session_uri(request.REQUEST_URI);
f.class = form;
for (i in f.element) {
f.element[i] = new Object();
@@ -160,3 +178,4 @@
}
write(/form\n);
}
+
Modified: branches/SAMBA_4_0/swat/scripting/header_columns.esp
===
--- branches/SAMBA_4_0/swat/scripting/header_columns.esp2005-05-30
12:18:49 UTC (rev 7105)
+++ branches/SAMBA_4_0/swat/scripting/header_columns.esp2005-05-30
12:21:30 UTC (rev 7106)
@@ -42,14 +42,14 @@
div class=stripe/div
div class=logout
svn commit: samba r7107 - in branches/SAMBA_4_0/source/web_server: .
Author: tridge
Date: 2005-05-30 12:57:31 + (Mon, 30 May 2005)
New Revision: 7107
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7107
Log:
detect when a users session has expired and set request['SESSION_EXPIRED']
Modified:
branches/SAMBA_4_0/source/web_server/http.c
Changeset:
Modified: branches/SAMBA_4_0/source/web_server/http.c
===
--- branches/SAMBA_4_0/source/web_server/http.c 2005-05-30 12:21:30 UTC (rev
7106)
+++ branches/SAMBA_4_0/source/web_server/http.c 2005-05-30 12:57:31 UTC (rev
7107)
@@ -675,6 +675,7 @@
const char *key = NULL;
struct esp_data *edata = talloc_get_type(esp-web-task-private,
struct esp_data);
struct session_data *s;
+ BOOL generated_key = False;
/* look for our session key */
if (cookie (p = strstr(cookie, session_key))
@@ -687,6 +688,7 @@
key = esp-web-input.session_key;
} else if (key == NULL) {
key = generate_random_str_list(esp, 16,
0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ);
+ generated_key = True;
}
/* try to find this session in the existing session list */
@@ -706,6 +708,10 @@
s-lifetime = lp_parm_int(-1, web, sessiontimeout, 300);
DLIST_ADD(edata-sessions, s);
talloc_set_destructor(s, session_destructor);
+ if (!generated_key) {
+ mprSetPropertyValue(esp-variables[ESP_REQUEST_OBJ],
+ SESSION_EXPIRED,
mprCreateStringVar(True, 0));
+ }
}
http_setCookie(esp-web, session_key, key, s-lifetime, /, 0);
svn commit: samba r7108 - in branches/SAMBA_4_0/swat: .
Author: tridge
Date: 2005-05-30 12:57:59 + (Mon, 30 May 2005)
New Revision: 7108
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7108
Log:
display a session expired message
Modified:
branches/SAMBA_4_0/swat/login.esp
Changeset:
Modified: branches/SAMBA_4_0/swat/login.esp
===
--- branches/SAMBA_4_0/swat/login.esp 2005-05-30 12:57:31 UTC (rev 7107)
+++ branches/SAMBA_4_0/swat/login.esp 2005-05-30 12:57:59 UTC (rev 7108)
@@ -1,6 +1,11 @@
% page_header(plain, SWAT Login); %
%
+
+if (request['SESSION_EXPIRED'] == True) {
+ write(bYour session has expired - please authenticate againbr\n);
+}
+
var f = Form(login, 2, 1);
f.element[0].label = Username;
f.element[0].value = form['Username'];
svn commit: samba r7109 - in branches/SAMBA_4_0/source/build/pidl: .
Author: jelmer
Date: 2005-05-30 13:48:35 + (Mon, 30 May 2005)
New Revision: 7109
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7109
Log:
Change noid() to noopnum() so it isn't confusing to people familiar with id()
Modified:
branches/SAMBA_4_0/source/build/pidl/ndr.pm
branches/SAMBA_4_0/source/build/pidl/validator.pm
Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/ndr.pm
===
--- branches/SAMBA_4_0/source/build/pidl/ndr.pm 2005-05-30 12:57:59 UTC (rev
7108)
+++ branches/SAMBA_4_0/source/build/pidl/ndr.pm 2005-05-30 13:48:35 UTC (rev
7109)
@@ -452,7 +452,7 @@
$ndr-{PROPERTIES}-{pointer_default_top}
);
- if (not defined($d-{PROPERTIES}{noid})) {
+ if (not defined($d-{PROPERTIES}{noopnum})) {
$thisopnum = ${$opnum};
${$opnum}++;
}
Modified: branches/SAMBA_4_0/source/build/pidl/validator.pm
===
--- branches/SAMBA_4_0/source/build/pidl/validator.pm 2005-05-30 12:57:59 UTC
(rev 7108)
+++ branches/SAMBA_4_0/source/build/pidl/validator.pm 2005-05-30 13:48:35 UTC
(rev 7109)
@@ -62,8 +62,7 @@
idempotent= {},
# function
- id= {},# what is that? --metze
- noid = {},
+ noopnum = {},
in= {},
out = {},
@@ -259,14 +258,6 @@
ValidProperties($fn);
- if (util::has_property($fn, id)) {
- nonfatal $fn, [id()] is not correctly supported yet
($fn-{NAME});
- }
-
- if (util::has_property($fn, id) and util::has_property($fn, noid)) {
- fatal $fn, function can't have [id()] and [noid] property
($fn-{NAME});
- }
-
foreach my $e (@{$fn-{ELEMENTS}}) {
$e-{PARENT} = $fn;
if (util::has_property($e, ref) !$e-{POINTERS}) {
svn commit: samba r7110 - in branches/SAMBA_4_0/source/librpc/idl: .
Author: jelmer Date: 2005-05-30 13:52:52 + (Mon, 30 May 2005) New Revision: 7110 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7110 Log: Remove invalid use of id() Modified: branches/SAMBA_4_0/source/librpc/idl/eventlog.idl Changeset: Modified: branches/SAMBA_4_0/source/librpc/idl/eventlog.idl === --- branches/SAMBA_4_0/source/librpc/idl/eventlog.idl 2005-05-30 13:48:35 UTC (rev 7109) +++ branches/SAMBA_4_0/source/librpc/idl/eventlog.idl 2005-05-30 13:52:52 UTC (rev 7110) @@ -54,7 +54,7 @@ /**/ /* Function: 0x02 */ - [id(3)] NTSTATUS eventlog_CloseEventLog( + NTSTATUS eventlog_CloseEventLog( [in,out,ref] policy_handle *handle );
svn commit: samba r7111 - in branches/SAMBA_4_0/source/build/pidl: .
Author: jelmer
Date: 2005-05-30 14:15:20 + (Mon, 30 May 2005)
New Revision: 7111
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7111
Log:
Patch from Alan DeKok for correct use of the needed variables in Decl*
Modified:
branches/SAMBA_4_0/source/build/pidl/eth_parser.pm
Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/eth_parser.pm
===
--- branches/SAMBA_4_0/source/build/pidl/eth_parser.pm 2005-05-30 13:52:52 UTC
(rev 7110)
+++ branches/SAMBA_4_0/source/build/pidl/eth_parser.pm 2005-05-30 14:15:20 UTC
(rev 7111)
@@ -62,6 +62,7 @@
if (util::has_property($t, public)) {
$needed-{pull_$t-{NAME}} = not util::has_property($t,
nopull);
+ $needed-{decl_$t-{NAME}} = not util::has_property($t,
nopull);
}
if ($t-{DATA}-{TYPE} eq STRUCT or $t-{DATA}-{TYPE} eq UNION) {
@@ -70,7 +71,7 @@
$e-{PARENT} = $t-{DATA};
if ($needed-{pull_$t-{NAME}} and
not defined($needed-{pull_$e-{TYPE}})) {
- $needed-{pull_$e-{TYPE}} = 1;
+ $needed-{decl_$e-{TYPE}} =
$needed-{pull_$e-{TYPE}} = 1;
}
$needed-{hf_$t-{NAME}_$e-{NAME}} = {
@@ -1182,19 +1183,20 @@
# Typedefs
foreach my $d (@{$interface-{TYPEDEFS}}) {
- ($needed-{pull_$d-{NAME}}) DeclTypedef($d);
-
- # Make sure we don't generate a function twice...
- $needed-{pull_$d-{NAME}} = 0;
+ ($needed-{decl_$d-{NAME}}) DeclTypedef($d, $needed);
}
}
-sub DeclTypedef($)
+sub DeclTypedef($$)
{
my $e = shift;
+ my $needed = shift;
if (defined($typefamily{$e-{DATA}-{TYPE}}-{DECL})) {
$typefamily{$e-{DATA}-{TYPE}}-{DECL}-($e-{DATA},
$e-{NAME});
+
+ # Make sure we don't generate a function twice...
+ $needed-{decl_$e-{NAME}} = 0;
}
}
svn commit: samba r7112 - in branches/SAMBA_4_0/source/script/tests: .
Author: metze Date: 2005-05-30 14:55:26 + (Mon, 30 May 2005) New Revision: 7112 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7112 Log: add RPC-SPOOLSS test to the w2k3 tests, only with ncacn_np for now (I also noticed that RPC-SAMR and some other tests are faling against my w2k3 box...) metze Modified: branches/SAMBA_4_0/source/script/tests/test_w2k3.sh Changeset: Modified: branches/SAMBA_4_0/source/script/tests/test_w2k3.sh === --- branches/SAMBA_4_0/source/script/tests/test_w2k3.sh 2005-05-30 14:15:20 UTC (rev 7111) +++ branches/SAMBA_4_0/source/script/tests/test_w2k3.sh 2005-05-30 14:55:26 UTC (rev 7112) @@ -39,6 +39,9 @@ OPTIONS=-U$username%$password -W $domain --option realm=$realm +echo Testing RPC-SPOOLSS on ncacn_np +testit bin/smbtorture ncacn_np:$server $OPTIONS RPC-SPOOLSS $* + for bindoptions in padcheck connect sign seal spnego,sign spnego,seal validate bigendian; do for transport in ncacn_ip_tcp ncacn_np; do case $transport in
svn commit: samba r7113 - in branches/SAMBA_4_0/source/lib: com ldb/man/man1 registry registry/man
Author: jelmer Date: 2005-05-30 15:11:10 + (Mon, 30 May 2005) New Revision: 7113 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7113 Log: Move manpages from docs repository to source repository Added: branches/SAMBA_4_0/source/lib/com/README branches/SAMBA_4_0/source/lib/ldb/man/man1/ldbadd.1.xml branches/SAMBA_4_0/source/lib/ldb/man/man1/ldbdel.1.xml branches/SAMBA_4_0/source/lib/ldb/man/man1/ldbedit.1.xml branches/SAMBA_4_0/source/lib/ldb/man/man1/ldbmodify.1.xml branches/SAMBA_4_0/source/lib/ldb/man/man1/ldbrename.1.xml branches/SAMBA_4_0/source/lib/ldb/man/man1/ldbsearch.1.xml branches/SAMBA_4_0/source/lib/registry/man/ branches/SAMBA_4_0/source/lib/registry/man/regdiff.1.xml branches/SAMBA_4_0/source/lib/registry/man/regpatch.1.xml branches/SAMBA_4_0/source/lib/registry/man/regshell.1.xml branches/SAMBA_4_0/source/lib/registry/man/regtree.1.xml Changeset: Sorry, the patch is too large (1175 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7113
svn commit: samba-docs r602 - in trunk/manpages-4: .
Author: jelmer Date: 2005-05-30 15:13:16 + (Mon, 30 May 2005) New Revision: 602 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=602 Log: Move a few manpages to the source repository Removed: trunk/manpages-4/ldb.7.xml trunk/manpages-4/ldbadd.1.xml trunk/manpages-4/ldbdel.1.xml trunk/manpages-4/ldbedit.1.xml trunk/manpages-4/ldbmodify.1.xml trunk/manpages-4/ldbrename.1.xml trunk/manpages-4/ldbsearch.1.xml trunk/manpages-4/regdiff.1.xml trunk/manpages-4/regpatch.1.xml trunk/manpages-4/regshell.1.xml trunk/manpages-4/regtree.1.xml Changeset: Sorry, the patch is too large (1286 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=602
svn commit: samba r7114 - in branches/SAMBA_4_0/source/lib/ldb: . man/man3
Author: jelmer Date: 2005-05-30 15:59:08 + (Mon, 30 May 2005) New Revision: 7114 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7114 Log: Convert ldb documentation to DocBook/XML Added: branches/SAMBA_4_0/source/lib/ldb/man/man3/ldb.3.xml Removed: branches/SAMBA_4_0/source/lib/ldb/man/man3/ldb.yo Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in branches/SAMBA_4_0/source/lib/ldb/configure.in Changeset: Sorry, the patch is too large (451 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7114
svn commit: samba r7115 - in branches/SAMBA_4_0/source/build/pidl: .
Author: metze Date: 2005-05-30 16:19:23 + (Mon, 30 May 2005) New Revision: 7115 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7115 Log: specify what properties can be used on what objects... metze Modified: branches/SAMBA_4_0/source/build/pidl/validator.pm Changeset: Sorry, the patch is too large (254 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7115
svn commit: samba r7116 - in branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3: .
Author: derrell Date: 2005-05-30 16:46:54 + (Mon, 30 May 2005) New Revision: 7116 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7116 Log: work in progress Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/ldb_sqlite3.c branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/ldb_sqlite3.h branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/schema Changeset: Sorry, the patch is too large (585 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7116
svn commit: samba r7117 - in branches/SAMBA_4_0/source: build/pidl gtk gtk/man torture torture/man utils utils/man
Author: jelmer Date: 2005-05-30 16:50:32 + (Mon, 30 May 2005) New Revision: 7117 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7117 Log: Move more manpages to the source repository Added: branches/SAMBA_4_0/source/build/pidl/pidl.1.xml branches/SAMBA_4_0/source/gtk/man/ branches/SAMBA_4_0/source/gtk/man/gregedit.1.xml branches/SAMBA_4_0/source/torture/man/ branches/SAMBA_4_0/source/torture/man/gentest.1.xml branches/SAMBA_4_0/source/torture/man/locktest.1.xml branches/SAMBA_4_0/source/torture/man/masktest.1.xml branches/SAMBA_4_0/source/torture/man/smbtorture.1.xml branches/SAMBA_4_0/source/utils/man/ branches/SAMBA_4_0/source/utils/man/ndrdump.1.xml branches/SAMBA_4_0/source/utils/man/ntlm_auth.1.xml Changeset: Sorry, the patch is too large (1629 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7117
svn commit: samba r7118 - in branches/SAMBA_4_0/source/build/pidl: .
Author: metze
Date: 2005-05-30 17:58:12 + (Mon, 30 May 2005)
New Revision: 7118
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7118
Log:
allways pull scalars and buffers when pulling the subcontext context
(this, is not the full fix, still doesn't work :-( )
metze
Modified:
branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm
Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm
===
--- branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm 2005-05-30 16:50:32 UTC
(rev 7117)
+++ branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm 2005-05-30 17:58:12 UTC
(rev 7118)
@@ -601,9 +601,9 @@
my $ndr_flags = CalcNdrFlags($l, $primitives, $deferred);
if (defined($ndr_flags)) {
- if ($l-{TYPE} eq SUBCONTEXT) {
+ if ($l-{TYPE} eq SUBCONTEXT) {
$ndr = ParseSubcontextPushStart($e, $l, $ndr,
$var_name, $ndr_flags);
- ParseElementPushLevel($e, Ndr::GetNextLevel($e, $l),
$ndr, $var_name, $env, $primitives, $deferred);
+ ParseElementPushLevel($e, Ndr::GetNextLevel($e, $l),
$ndr, $var_name, $env, 1, 1);
ParseSubcontextPushEnd($e, $l, $ndr_flags);
} elsif ($l-{TYPE} eq POINTER) {
ParsePtrPush($e, $l, $var_name);
@@ -923,9 +923,9 @@
# Only pull something if there's actually something to be pulled
if (defined($ndr_flags)) {
if ($l-{TYPE} eq SUBCONTEXT) {
- ($ndr,$var_name) = ParseSubcontextPullStart($e,
$l, $ndr, $var_name, $ndr_flags, $env);
-
ParseElementPullLevel($e,Ndr::GetNextLevel($e,$l), $ndr, $var_name, $env,
$primitives, $deferred);
- ParseSubcontextPullEnd($e, $l);
+ ($ndr,$var_name) = ParseSubcontextPullStart($e, $l,
$ndr, $var_name, $ndr_flags, $env);
+ ParseElementPullLevel($e,Ndr::GetNextLevel($e,$l),
$ndr, $var_name, $env, 1, 1);
+ ParseSubcontextPullEnd($e, $l);
} elsif ($l-{TYPE} eq ARRAY) {
my $length = ParseArrayPullHeader($e, $l, $ndr,
$var_name, $env);
svn commit: samba r7119 - in branches/SAMBA_4_0/source/build/pidl: .
Author: metze
Date: 2005-05-30 18:40:36 + (Mon, 30 May 2005)
New Revision: 7119
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7119
Log:
the content of a subcontext can contain deferred data,
but for the caller a subcontext is like a scalar...
the first point is more important and is fixed with this commit,
however it would be nice if we could make them look like scalars to the callers
later
metze
Modified:
branches/SAMBA_4_0/source/build/pidl/ndr.pm
Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/ndr.pm
===
--- branches/SAMBA_4_0/source/build/pidl/ndr.pm 2005-05-30 17:58:12 UTC (rev
7118)
+++ branches/SAMBA_4_0/source/build/pidl/ndr.pm 2005-05-30 18:40:36 UTC (rev
7119)
@@ -179,7 +179,7 @@
return 1 if ($e-{POINTERS});
return 0 if (typelist::is_scalar($e-{TYPE}));
- return 0 if (defined(util::has_property($e, subcontext)));
+ return 1 if (defined(util::has_property($e, subcontext)));
return 1 unless (typelist::hasType($e-{TYPE})); # assume the worst
my $type = typelist::getType($e-{TYPE});
svn commit: samba-docs r603 - in trunk/Samba-Guide: .
Author: jht Date: 2005-05-30 19:07:40 + (Mon, 30 May 2005) New Revision: 603 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=603 Log: Minor edits prior to final copy edit. Modified: trunk/Samba-Guide/SBE-SimpleOfficeServer.xml Changeset: Modified: trunk/Samba-Guide/SBE-SimpleOfficeServer.xml === --- trunk/Samba-Guide/SBE-SimpleOfficeServer.xml2005-05-30 15:13:16 UTC (rev 602) +++ trunk/Samba-Guide/SBE-SimpleOfficeServer.xml2005-05-30 19:07:40 UTC (rev 603) @@ -643,7 +643,7 @@ /procedure smbconfexample id=charity-smbconfnew -titleCharity Administration Office smb.conf; File/title +titleCharity Administration Office smb.conf; New-style File/title smbconfcommentGlobal Parameters - Newer Configuration/smbconfcomment smbconfsection name=[global]/ smbconfoption name=workgroupMIDEARTH/smbconfoption @@ -681,7 +681,7 @@ /smbconfexample smbconfexample id=charity-smbconf -titleCharity Administration Office smb.conf; File/title +titleCharity Administration Office smb.conf; Old-style File/title smbconfcommentGlobal Parameters - Older Style Configuration/smbconfcomment smbconfsection name=[global]/ smbconfoption name=workgroupMIDEARTH/smbconfoption
svn commit: samba r7120 - in branches/SAMBA_4_0/source: librpc/idl librpc/ndr rpc_server/spoolss torture/rpc
Author: metze Date: 2005-05-30 22:44:17 + (Mon, 30 May 2005) New Revision: 7120 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7120 Log: make use of the new 'noopnum' property and get rid of handwritten parsing code for the spoolss_Enum* functions, there still same handwritten code needed but just to stack the autogenerated code into the correct way metze Modified: branches/SAMBA_4_0/source/librpc/idl/spoolss.idl branches/SAMBA_4_0/source/librpc/ndr/ndr_spoolss_buf.c branches/SAMBA_4_0/source/rpc_server/spoolss/dcesrv_spoolss.c branches/SAMBA_4_0/source/torture/rpc/spoolss.c Changeset: Sorry, the patch is too large (1571 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7120
svn commit: samba r7121 - in branches/SAMBA_4_0/source/build/pidl: .
Author: jelmer
Date: 2005-05-30 23:13:59 + (Mon, 30 May 2005)
New Revision: 7121
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7121
Log:
More subcontext fixes. A subcontext does not always imply internally deferred
data, though it might.
Modified:
branches/SAMBA_4_0/source/build/pidl/ndr.pm
branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm
Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/ndr.pm
===
--- branches/SAMBA_4_0/source/build/pidl/ndr.pm 2005-05-30 22:44:17 UTC (rev
7120)
+++ branches/SAMBA_4_0/source/build/pidl/ndr.pm 2005-05-30 23:13:59 UTC (rev
7121)
@@ -179,7 +179,6 @@
return 1 if ($e-{POINTERS});
return 0 if (typelist::is_scalar($e-{TYPE}));
- return 1 if (defined(util::has_property($e, subcontext)));
return 1 unless (typelist::hasType($e-{TYPE})); # assume the worst
my $type = typelist::getType($e-{TYPE});
Modified: branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm
===
--- branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm 2005-05-30 22:44:17 UTC
(rev 7120)
+++ branches/SAMBA_4_0/source/build/pidl/ndr_parser.pm 2005-05-30 23:13:59 UTC
(rev 7121)
@@ -489,8 +489,6 @@
my $ndr_flags = shift;
my $retndr = _ndr_$e-{NAME};
- return unless ($ndr_flags =~ /NDR_SCALARS/);
-
pidl {;
indent;
pidl struct ndr_push *$retndr;;
@@ -518,8 +516,6 @@
my $ndr_flags = shift;
my $ndr = _ndr_$e-{NAME};
- return unless ($ndr_flags =~ /NDR_SCALARS/);
-
if (defined $l-{COMPRESSION}) {
ParseCompressionPushEnd($e, $l, $ndr);
}
@@ -544,7 +540,7 @@
my $env = shift;
my $retndr = _ndr_$e-{NAME};
- pidl if (($ndr_flags) NDR_SCALARS) {;
+ pidl {;
indent;
pidl struct ndr_pull *$retndr;;
pidl NDR_ALLOC(ndr, $retndr);;
svn commit: samba-docs r604 - in trunk: .
Author: jelmer Date: 2005-05-30 23:26:24 + (Mon, 30 May 2005) New Revision: 604 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=604 Log: Remove Samba4 manpages (they're now in the source repository) Removed: trunk/manpages-4/ Changeset:
svn commit: samba r7122 - in branches/SAMBA_4_0/source/build/pidl: .
Author: jelmer Date: 2005-05-30 23:59:29 + (Mon, 30 May 2005) New Revision: 7122 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7122 Log: Some cleanups, simplification of the code. Modified: branches/SAMBA_4_0/source/build/pidl/ndr.pm branches/SAMBA_4_0/source/build/pidl/odl.pm branches/SAMBA_4_0/source/build/pidl/util.pm branches/SAMBA_4_0/source/build/pidl/validator.pm Changeset: Sorry, the patch is too large (491 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7122
Build status as of Tue May 31 00:00:03 2005
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2005-05-30 00:00:41.0 + +++ /home/build/master/cache/broken_results.txt 2005-05-31 00:01:07.0 + @@ -1,17 +1,17 @@ -Build status as of Mon May 30 00:00:01 2005 +Build status as of Tue May 31 00:00:03 2005 Build counts: Tree Total Broken Panic -ccache 38 7 0 +ccache 39 7 0 distcc 38 0 0 -lorikeet-heimdal 33 14 0 -ppp 21 1 0 -rsync37 1 0 +lorikeet-heimdal 34 14 0 +ppp 22 1 0 +rsync38 1 0 samba1 1 1 samba-docs 0 0 0 -samba4 42 24 0 -samba_3_039 8 0 -talloc 34 19 0 +samba4 42 23 0 +samba_3_038 7 0 +talloc 35 19 0 tdb 34 34 0 Currently broken builds: @@ -28,6 +28,7 @@ samba-s390 samba4 gccok/ 2/?/? samba-s390 talloc gccok/ 2/?/? samba-s390 tdb gcc 2/?/?/? +tuxtdb gcc 2/?/?/? rhonwynsamba4 gcc-4.0ok/ 2/?/? rhonwynsamba_3_0gcc-4.0ok/ 2/?/? rhonwynsamba4 tccok/ 2/?/? @@ -68,10 +69,7 @@ sbftdb gcc 2/?/?/? ragnarok ccache gccok/ 1/?/? ragnarok lorikeet-heimdal gcc 1/?/?/? -ragnarok samba4 gccok/ok/ 1/? -ragnarok samba_3_0gccok/ok/ok/ 32 ragnarok talloc gccok/ok/ 2/? -ragnarok tdb gcc 2/?/?/? smartserv1 ccache gccok/ 1/?/? smartserv1 samba4 gccok/ok/ 1/? smartserv1 talloc gccok/ok/ 2/?
svn commit: samba r7123 - in branches/tmp: .
Author: jerry Date: 2005-05-31 00:58:00 + (Tue, 31 May 2005) New Revision: 7123 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7123 Log: copying trunk to a tmp branch for work on the printerdb backend. reverting these changes in trunk since the work is moving along slightly slower than anticipated. Added: branches/tmp/PRINTERDB/ Changeset: Copied: branches/tmp/PRINTERDB (from rev 7122, trunk)
svn commit: samba r7124 - in branches/SAMBA_4_0/source/lib/ejs: .
Author: tridge
Date: 2005-05-31 01:16:01 + (Tue, 31 May 2005)
New Revision: 7124
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7124
Log:
fixed a bug in array construction (see ECMA standard section 15.4.2.2)
Modified:
branches/SAMBA_4_0/source/lib/ejs/ejsProcs.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/ejs/ejsProcs.c
===
--- branches/SAMBA_4_0/source/lib/ejs/ejsProcs.c2005-05-31 00:58:00 UTC
(rev 7123)
+++ branches/SAMBA_4_0/source/lib/ejs/ejsProcs.c2005-05-31 01:16:01 UTC
(rev 7124)
@@ -171,7 +171,7 @@
mprAssert(obj);
- if (argc == 1) {
+ if (argc == 1 mprVarIsNumber(argv[0]-type)) {
/*
* x = new Array(size);
*/
@@ -181,7 +181,7 @@
mprItoa(i, idx, sizeof(idx));
mprCreateProperty(obj, idx, undef);
}
- } else if (argc 1) {
+ } else {
/*
* x = new Array(element0, element1, ..., elementN):
*/
@@ -190,9 +190,6 @@
mprItoa(i, idx, sizeof(idx));
mprCreateProperty(obj, idx, argv[i]);
}
-
- } else {
- max = 0;
}
lp = mprCreatePropertyValue(obj, length, mprCreateIntegerVar(max));
svn commit: samba r7125 - in branches/SAMBA_4_0/testprogs/ejs: .
Author: tridge
Date: 2005-05-31 01:20:49 + (Tue, 31 May 2005)
New Revision: 7125
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7125
Log:
demonstrate some bugs in ejs
Added:
branches/SAMBA_4_0/testprogs/ejs/bugs.js
Changeset:
Added: branches/SAMBA_4_0/testprogs/ejs/bugs.js
===
--- branches/SAMBA_4_0/testprogs/ejs/bugs.js2005-05-31 01:16:01 UTC (rev
7124)
+++ branches/SAMBA_4_0/testprogs/ejs/bugs.js2005-05-31 01:20:49 UTC (rev
7125)
@@ -0,0 +1,76 @@
+/*
+ demonstrate some bugs in ejs
+
+ tridge [EMAIL PROTECTED]
+*/
+
+
+/
+demo a bug in constructing arrays
+fix at http://build.samba.org/build.pl?function=diff;tree=samba4;revision=7124
+*/
+function arraybug() {
+var a;
+
+println(First with 3 elements);
+a = new Array(one, two, three);
+printVars(a);
+assert(a.length == 3);
+assert(a[0] == one);
+assert(a[1] == two);
+assert(a[2] == three);
+
+println(with a array length);
+a = new Array(5);
+printVars(a);
+assert(a.length == 5);
+
+println(\nNow with 1 element);
+a = new Array(one);
+printVars(a);
+assert(a.length == 1);
+assert(a[0] == one);
+
+println(ALL OK);
+}
+
+
+/
+demo a bug in variable arguments
+fix at http://build.samba.org/build.pl?function=diff;tree=samba4;revision=7085
+*/
+function argsbug() {
+println(we should have been called with 3 arguments);
+assert(arguments.length == 3);
+assert(arguments[0] == one);
+assert(arguments[1] == two);
+assert(arguments[2] == three);
+}
+
+
+/
+demo a bug in constructing objects
+no fix available yet
+*/
+function MyObj() {
+var o = new Object();
+o.test = 42;
+return o;
+}
+
+function objbug() {
+println(the docs say you should use 'new');
+var o1 = new MyObj();
+var o2 = MyObj();
+printVars(o1);
+printVars(o2);
+assert(o1.test == 42);
+assert(o2.test == 42);
+}
+
+
+
+/* run the tests */
+arraybug();
+argsbug(one, two, three);
+objbug()
svn commit: samba r7126 - in branches/SAMBA_3_0/source/pam_smbpass: .
Author: jerry
Date: 2005-05-31 01:44:44 + (Tue, 31 May 2005)
New Revision: 7126
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7126
Log:
fixing paranoid malloc checker failures
Modified:
branches/SAMBA_3_0/source/pam_smbpass/pam_smb_auth.c
branches/SAMBA_3_0/source/pam_smbpass/pam_smb_passwd.c
branches/SAMBA_3_0/source/pam_smbpass/support.c
Changeset:
Modified: branches/SAMBA_3_0/source/pam_smbpass/pam_smb_auth.c
===
--- branches/SAMBA_3_0/source/pam_smbpass/pam_smb_auth.c2005-05-31
01:20:49 UTC (rev 7125)
+++ branches/SAMBA_3_0/source/pam_smbpass/pam_smb_auth.c2005-05-31
01:44:44 UTC (rev 7126)
@@ -82,7 +82,7 @@
/* Get a few bytes so we can pass our return value to
pam_sm_setcred(). */
-ret_data = malloc(sizeof(int));
+ret_data = SMB_MALLOC_P(int);
/* get the username */
retval = pam_get_user( pamh, name, Username: );
Modified: branches/SAMBA_3_0/source/pam_smbpass/pam_smb_passwd.c
===
--- branches/SAMBA_3_0/source/pam_smbpass/pam_smb_passwd.c 2005-05-31
01:20:49 UTC (rev 7125)
+++ branches/SAMBA_3_0/source/pam_smbpass/pam_smb_passwd.c 2005-05-31
01:44:44 UTC (rev 7126)
@@ -169,7 +169,7 @@
/* tell user what is happening */
#define greeting Changing password for
-Announce = (char *) malloc(sizeof(greeting)+strlen(user));
+Announce = SMB_MALLOC_ARRAY(char, sizeof(greeting)+strlen(user));
if (Announce == NULL) {
_log_err(LOG_CRIT, password: out of memory);
pdb_free_sam(sampass);
Modified: branches/SAMBA_3_0/source/pam_smbpass/support.c
===
--- branches/SAMBA_3_0/source/pam_smbpass/support.c 2005-05-31 01:20:49 UTC
(rev 7125)
+++ branches/SAMBA_3_0/source/pam_smbpass/support.c 2005-05-31 01:44:44 UTC
(rev 7126)
@@ -238,7 +238,7 @@
register int i;
for (i = 0; x[i]; ++i); /* length of string */
-if ((new = malloc(++i)) == NULL) {
+if ((new = SMB_MALLOC_ARRAY(char, ++i)) == NULL) {
i = 0;
_log_err( LOG_CRIT, out of memory in smbpXstrDup );
} else {
@@ -344,7 +344,7 @@
}
}
-data_name = (char *) malloc( sizeof(FAIL_PREFIX) + strlen( name ));
+data_name = SMB_MALLOC_ARRAY(char, sizeof(FAIL_PREFIX) + strlen( name ));
if (data_name == NULL) {
_log_err( LOG_CRIT, no memory for data-name );
}
@@ -379,8 +379,7 @@
/* get a failure recorder */
-new = (struct _pam_failed_auth *)
- malloc( sizeof(struct _pam_failed_auth) );
+new = SMB_MALLOC_P( struct _pam_failed_auth );
if (new != NULL) {
