[Samba] PDC SAMBA + WIN2K problem join domain.
Hi, I had success to join a samba domain with a win2K Station a few days ago. But today when a try to log with an another account, my station win2K say me she can't contact my PDC. I does not know what occurred since the last time. I disjoin my domain and after i has try to join again but with no success. The client Win2K and serveur PDC samba are on same network and switch thus no problem of network. The samba server starts and his logs says to me that is the PDC of my domain, but Win2K does no want to see it. somebody has an idea ? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] PDC SAMBA + WIN2K problem join domain.
piaff33z schrieb: Hi, I had success to join a samba domain with a win2K Station a few days ago. But today when a try to log with an another account, my station win2K say me she can't contact my PDC. I does not know what occurred since the last time. I disjoin my domain and after i has try to join again but with no success. The client Win2K and serveur PDC samba are on same network and switch thus no problem of network. The samba server starts and his logs says to me that is the PDC of my domain, but Win2K does no want to see it. somebody has an idea ? maybe it really doesn't see Samba PDC? try setting up Samba to be a WINS server, and then set WINS in win2k which would point to Samba (you can do it in DHCP or manually in network settings)- it should help. -- Tomek WPKG - software deployment with Samba http://wpkg.org -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] permissions not transferred using robocopy, xxcopy, net share migrate shares
Hi Tom Did you solve your problem woth robocopy? I have Access Denied error when trying to copy with /SEC option (in order to retain the NTFS permissions). It says it is not NTFS filesystem. Of course, I am using the ext3 filesystem with acl support so it should work? thanks very much for any suggestion dejan gambin -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] xp suddenly unable to find pdc after crash
Hi It's been the second time it happen to me on to different site and server After a anormal shutdown (electricity failure) my ldap database get corrupted and I had to repair/restore it. So samba was running but can't access the database after this samba seem to work without any problem but all the people on xp station can't logon the domain anymore Windows XP say IT can' find the domain controler The only solution for the xp is to rejoin the domain again. no change at all on samba One site got 40 XP workstation so It take a while But I'm sure I'm missing something I've check the domain SID I've check the ldap password I've delete the cache rm -r /var/cache/samba/* but there is no way to make it work again without rejoining the domain so if someone can help me and explain me why it happen ? thank -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] smbclient don't list all printers
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Marcos Antonio Dellazari wrote: Gerald (Jerry) Carter ([EMAIL PROTECTED]) escrito: Marcos Antonio Dellazari wrote: We have a windows 2003 printer server, and when I type smbclient -L server, it's return only about 40 printers atached, but we realy have 180 !!! smbclient cannot display share names longer that 12 characters. Thanks Jerry, but there's a way to show shares names longer that 12 characters? You need to use rpc rather the RAP calls. Try using 'net rpc share' 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.4.0 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFCuBY8IR7qMdg1EfYRAiz9AJ4q3HQqh1Qzv127hdpfrw3flFJS8wCeLRdU Cl+pTum0mLRrGoWAp9QG2Cs= =Mllh -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] Problem with NTLM
Thanks, Andrew. I did not know that the state of the ntlm_auth was marked by squid. I will forward the question to the squid list. Best regards; Rafael Sarres de Almeida Seção de Gerenciamento de Rede Superior Tribunal de Justiça Tel: (61) 319-9342 Andrew Bartlett [EMAIL PROTECTED] 21/06/2005 01:38 Para [EMAIL PROTECTED] cc samba@lists.samba.org Assunto Re: [Samba] Problem with NTLM On Fri, 2005-06-17 at 11:38 -0300, [EMAIL PROTECTED] wrote: Hi all; We have Squid 2.5.STABLE7running with 30 ntlm_auth helpers Version 3.0.10-1.fc3. The problem is that on the squid´s cachemgr.cgi-NTLM User Authenticator Stats is possible to verify that the ntlm_auth processes are slowly having the flag R (Reserved or Deferred) set and never being used again (the number of requests stops). This problem goes until there is no more ntlm_auth process available and the squid restarts itself, restarting all ntlm_auth too. After the restart, everything is goes back to normal and the problem repeats. We detected that the R flag appears more agressively if the domain controller is under more load (like running a backup script). Perhaps this question is best directed at the squid list? While I wrote ntlm_auth, I'm not sure I can help with how squid is marking the state of the helpers. It might be that we need to have a better way to have ntlm_auth tell Squid that there is a problem now, but it might go away (previous helper designs had to be restarted for that to happen, but ntlm_auth can recover on it's own). Andrew Bartlett -- Andrew Bartletthttp://samba.org/~abartlet/ Samba Developer, SuSE Labs, Novell Inc.http://suse.de Authentication Developer, Samba Team http://samba.org Student Network Administrator, Hawker College http://hawkerc.net -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Verbraucherinformation - Consumer information -
Verbraucherinformation - Consumer information - Newsletter - 06/2005 --- - English version on page 2 - Sehr geehrte Damen und Herren, 100% der Befragten machen sich Sorgen oder Gedanken über eine gesunde Ernährung und eine Vergiftung des Körpers durch belastete Lebensmittel. Dies ergab eine unveröffentliche Umfrage über Ernährungsverhalten. Unsere Stiftung hatte Gelegenheit, diese Umfrage vertraulich einsehen zu können. Und fast ebensoviele wussten nicht, wie man dies ändern könne oder hatten keine Lösung dafür. Aber wir recherchieren, findet oder erarbeiten Lösungsvorschläge, die unseren Lesern Vorteile und mehr Lebensqualität bringen sollen. Hier einige Punkte unserer Aufgabenstellung: - Ein Reinigungsprogramm für den Körper und ein Lebensmittel zu finden, welche möglichst vielen Ansprüchen gerecht werden können und eine Lösung für eine dauerhaft gesunde Ernährung böten. Wir wollten ein Reinigungsprogramm, dass erprobt, effizient und einfach anzuwenden ist. - Wir wollten ein gesundes unbehandeltes nicht genmanipuliertes Nahrungsmittel. - Dieses Nahrungsmittel sollte von unabhängigen Fachmedien oder Fachzeitschriften bereits überprüft und der wissenschaftliche Nachweis über eine langjährige Forschung für ein wirksames und gesundes Lebensmittel erbracht worden sein. - Eine besondere Rolle sollte die Ausgewogenheit in der Zusammensetzung und die Verträglichkeit des Reinigungsprogrammes für alle Altersgruppen spielen. - Weiter sollte das Lebensmittel möglichst über eine lange Zeit hinweg (historisch) seine Nützlichkeit und positive Wirkung für den Körper unter Beweis gestellt haben. Wir beauftragten einen freien Journalisten, eine Ernährungsberaterin, einen Doktor rer. nat./Heilpraktiker und einen Doktor med./Spezialist für Ganzheitliche Medizin und die machten sich an die Arbeit: Immer mehr Produkte fielen durch das strenge Raster bis letztendlich nur noch wenige übrig blieben und die unseren Auflagen gerecht werden konnten. Dann bekamen wir von dieser Gruppe zwei Produkte empfohlen, welche alle unsere Kriterien mit sehr gut oder gut bestanden hatten: Das CLEAN ME OUT Reinigungsprogramm und AKTIV BARLEY - ESSENTIAL FOOD Sie erfahren alles über das Clean me out Programm unter: http://www.naturepower.ch/clean-me-out.html Sie erfahren alles über AKTIV BARLEY - ESSENTIAL FOOD unter: http://www.naturepower.ch/4.html --- Wenn Sie keine weiteren Newsletter erhalten wollen, können Sie sich unter http://www.research4health.com aus unserer Datenbank austragen. --- page 2 Dear ladies and gentlemen, 100% of the interviewees distress themself or concerned about a healthy nutrition and a toxication of body by incriminated foods. It dues to an unpublished survey about nutritional attitude. Our foundation had the chance to see this survey confidentially. And almost as many of them did not knew how to change this or did not had any solution for it. But our foundation investigates, decides or works out suggestions for solution, that brings advantages and more quality of life to our readers. Here are some points of our task: - to find a cleaning program for the body and some food, which could satisfy as many claims as possible and give a solution for permanent healthy nutrition. - we wanted to have a cleaning-program, which is approved, efficient and simply in use. - we wanted to have healthy, untreated and non gene manipulated food. - this food should be generated already from independent practition media or professional journals, and the scientifically prove about a longtime research for an effective and healthy food should be also generated. - a special part should be the balance between composition and compatibility of the cleaning-program for all age group. - further more the food should prove for a long time (historically) its utility and positive effect for the body as much as possible. We assigned a freelanced journalist, a nutritionist,a Dr.rer Nat/alternative practicioner and a Dr.med/specialist for integral medicine and they set to work: More and more products were fallen through the tighten cracks until finally only a few femains, which could satisfy our conditions. Later this group approved two products to us, which passed all of our criteria well or very well: The CLEAN ME OUT cleaning-program and the ACTIVE BARLEY-ESSENTIAL FOOD You come to know everything about the CLEAN ME OUT program on: http://www.naturepower.ch/clean-me-out.html You come to know everything about AKTIV BARLEY-ESSENTIAL FOOD on: http://www.naturepower.ch/4.html --- Wenn Sie keine weiteren Newsletter erhalten wollen, können Sie sich unter http://www.research4health.com/ aus unserer Datenbank austragen. -- To unsubscribe from this list go to the following URL and read the instructions:
[Samba] pulling userinfo from trusted domain RE-POST
Sorry to repeat this but I had no answers. Anyone up for a chat about this. More info: wbinfo -m returns nothing wbinfo -t , wbinfo -u wbinfo -g returns users for the primary (Staff Domain, but not the student domain). I'm sure I had it returning info from both primary and secondary domains when the servers were windows 2000 servers earlier this year, So I believe winbind should be able to do the job. Oh, I have fixed the clock skew issue, but that did nothing to help. Hi, I'm trying to pull user info from a student domain. I can pull a user's info from a primary domain ok, but not from the domain (student) that trusts the primary domain. Lets say the primary is staff and secondary is student. Student trusts staff, but staff does not trust student. /usr/bin/net ads search ((objectCategory=person) (sAMAccountName=foo)) -P -I 192.168.0.2 The command tries to pull out the users ldap account info. I'm interested in seeing if the user's account is locked or not. (514 or 512) It works on the staff domain for staff users, so I know the syntax is ok. Any way of doing this? Error back is clock skew, I will check the server times tomorrow. I'm using Mandrake linux 10.1 samba v3.0.2a ADS server 2003K SP1 ADS and kerberos mode. Is there a simple samba command that will lock or unlock a user's account. Thanks -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Printer configuration Question
Hi, When A printer share is shared from a Linux Machine which is a member of AD, can we assign permissions (to Printer share) from the security window from a windows Client as we assign permissions to file shares (through acl's). If there are other options for the same. Actually I tried setting the permissions from the AD server, which is able to browse the Printer configured on a LInux joined to the domain, however the permissions were not effective. thanking you regards Chin Teongli -- You cannot prevent the birds of sorrow from flying over your head, but you can prevent them from building nests in your hair. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] Slow logon with samba
Hi matt, thanks for the reply. Whats very odd tho is why its started doing it all of a sudden. Ive now upgraded it to latest samba, cleared all the tdb's down and its still doing the odd thing of being really slow to logon / some times with file access. Though I will give that a try Many thanks Ross -Original Message- From: Matt Schwartz [mailto:[EMAIL PROTECTED] Sent: 20 June 2005 19:45 To: Ross McInnes Subject: Re: [Samba] Slow logon with samba Hi Ross, I have seen this one and even asked at a conference about it. Check the Windows box schannel settings and make certain they jibe with the ones in your smb.conf. I did this and saw a speed increase off the bat. I make certain client and server schannel is set to yes in Windows and Samba. Matt Ross McInnes wrote: Hi all. Everything has been running great, untill 2 weeks ago when I applied redhat errata including a new kernel. (done it loads of times before) Rebooted and all seemed ok (it was half term for me, so maybe 20 users in at the very most) It wasn't until last week people started to complain about how long it was taking to log in. unfortunatly everytime I tried it went in straight away. The only way I can replicate this is thus; 1st time logon in the morning, any username, takes between 2-3 mins to login. If I log in again straight away it goes in fine. Also im getting curious errors and delays opening up files. Again not all the time, but every now and then. Ive captured level 3 logs of when a user has logged on, what seems to happen is all the initial connections happen, then nothing, for a while then all of a sudden it lets them in, very very odd. Any help gratefully received. Ross -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] password aging in Samba 3
Ok, I'm rigging myself up a Samba 3 PDC for a variety of Windows clients. Anything from 98 on up to XP and everything in between. For the most part it hasn't been a big deal. I've got a couple of questions I want to run by the list and see if anyone has figured this one out. My first question is about the [profiles] share. Is this share really needed? The documentation never really comes out and says it. I'm not setting up roaming profiles so I'm assuming I won't need it. The next question is about password aging. I have a client that would like to have the user have to reset their password after 60 days. I've seen some inklings online of being able to do with pdbedit, but the documentation seems non-existent at best on how to do this. Maybe this is also doable with a policy setup. I haven't actually tried that one yet so if that works just let me know and I'll dig into that. Thanks 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] password aging in Samba 3
On Tuesday 21 June 2005 09:03, Kurt Bechstein wrote: Ok, I'm rigging myself up a Samba 3 PDC for a variety of Windows clients. Anything from 98 on up to XP and everything in between. For the most part it hasn't been a big deal. I've got a couple of questions I want to run by the list and see if anyone has figured this one out. My first question is about the [profiles] share. Is this share really needed? The documentation never really comes out and says it. I'm not setting up roaming profiles so I'm assuming I won't need it. If you are not using roaming profiles you do NOT need a profiles share. There! I've said it! The next question is about password aging. I have a client that would like to have the user have to reset their password after 60 days. I've seen some inklings online of being able to do with pdbedit, but the documentation seems non-existent at best on how to do this. Maybe this is also doable with a policy setup. I haven't actually tried that one yet so if that works just let me know and I'll dig into that. Thanks in advance. You can use either the NT4 Domain User Manager to manage all aspects of your user and group accounts, or you can use pdbedit from the command line. I am in the process of competing the second edition of the Samba-3 HOWTO. Apologies that it has not be done faster. I've been working full-time on the documentataion since January 2005. - 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
Re: [Samba] password aging in Samba 3
On Tue, 2005-06-21 at 09:13 -0600, John H Terpstra wrote: On Tuesday 21 June 2005 09:03, Kurt Bechstein wrote: Ok, I'm rigging myself up a Samba 3 PDC for a variety of Windows clients. Anything from 98 on up to XP and everything in between. For the most part it hasn't been a big deal. I've got a couple of questions I want to run by the list and see if anyone has figured this one out. My first question is about the [profiles] share. Is this share really needed? The documentation never really comes out and says it. I'm not setting up roaming profiles so I'm assuming I won't need it. If you are not using roaming profiles you do NOT need a profiles share. There! I've said it! Ok, Thanks! The next question is about password aging. I have a client that would like to have the user have to reset their password after 60 days. I've seen some inklings online of being able to do with pdbedit, but the documentation seems non-existent at best on how to do this. Maybe this is also doable with a policy setup. I haven't actually tried that one yet so if that works just let me know and I'll dig into that. Thanks in advance. You can use either the NT4 Domain User Manager to manage all aspects of your user and group accounts, or you can use pdbedit from the command line. I've tried using the NT4 Domain Manager in conjunction with the tdbsam backed but haven't had any luck as far as password aging goes. It doesn't seem to be making any changes at least as far pdbedit -L -v goes. Also, I've tried to change the max password age via pdbedit -P max password age -C . However, according to M$'s documentation this value is stored from 1-999 but this doesn't look like what the tdb file is storing. What type of parameter do I need to pass to pdbedit to enforce a 60 day password expiration? I'm doing this on Red Hat enterprise 4 by the way. Thanks in advance. I am in the process of competing the second edition of the Samba-3 HOWTO. Apologies that it has not be done faster. I've been working full-time on the documentataion since January 2005. This will be excellent. I've had my nose buried in the first edition for the last couple of days and it has been very helpful. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] smbd crash
A few times in the last couple months we have had our production Samba 3.0.14a-1server crash. We did not have detailed logging turned on at the time so the attached output of our log is the best process tracking I can give at the time of the crash. What will happen is our shares will no longer be accessible, and all the smbd processes will be hung. We can ssh to the server and do a restart on both smbd and nmbd and it acts like it is restarting them, but in fact if status is viewed on the smbd process after restarting it, all the old process ID's associated with it before it crashed will still be listed and it is still hung. As if it never was restarted and cleared out. After that point we just reboot the server and re-initialize everything to bring it back up. We have been using samba here for a while now and this is the first time I've ever had something like this happen over and over. We are running Fedora Core 3 with kernel version 2.6.11-1.14. At this point I'm just looking for some guidance for things to try and get this resolved. Any help would be appreciated. Thanks, Matt Lung MTD Corp. Jun 17 14:51:26 retainer smbd[8922]: [2005/06/17 14:51:26, 0] libsmb/clitrans.c:cli_receive_trans(190) Jun 17 14:51:26 retainer smbd[8922]: Expected SMBtrans response, got command 0x00 Jun 17 14:51:26 retainer smbd[8922]: [2005/06/17 14:51:26, 0] rpc_client/cli_pipe.c:cli_nt_session_open(1468) Jun 17 14:51:26 retainer smbd[8922]: cli_nt_session_open: pipe hnd state failed. Error was SUCCESS - 0 Jun 17 14:51:27 retainer smbd[8922]: [2005/06/17 14:51:27, 0] libsmb/clitrans.c:cli_receive_trans(190) Jun 17 14:51:27 retainer smbd[8922]: Expected SMBtrans response, got command 0x00 Jun 17 14:51:27 retainer smbd[8922]: [2005/06/17 14:51:27, 0] rpc_client/cli_pipe.c:cli_nt_session_open(1468) Jun 17 14:51:27 retainer smbd[8922]: cli_nt_session_open: pipe hnd state failed. Error was SUCCESS - 0 Jun 17 14:51:28 retainer smbd[8922]: [2005/06/17 14:51:28, 0] libsmb/clitrans.c:cli_receive_trans(190) Jun 17 14:51:28 retainer smbd[8922]: Expected SMBtrans response, got command 0x00 Jun 17 14:51:28 retainer smbd[8922]: [2005/06/17 14:51:28, 0] rpc_client/cli_pipe.c:cli_nt_session_open(1468) Jun 17 14:51:28 retainer smbd[8922]: cli_nt_session_open: pipe hnd state failed. Error was SUCCESS - 0 Jun 17 14:51:40 retainer smbd[8922]: [2005/06/17 14:51:40, 0] libsmb/clitrans.c:cli_receive_trans(190) Jun 17 14:51:40 retainer smbd[8922]: Expected SMBtrans response, got command 0x00 Jun 17 14:51:40 retainer smbd[8922]: [2005/06/17 14:51:40, 0] rpc_client/cli_pipe.c:cli_nt_session_open(1468) Jun 17 14:51:40 retainer smbd[8922]: cli_nt_session_open: pipe hnd state failed. Error was SUCCESS - 0 Jun 17 14:51:40 retainer smbd[8922]: [2005/06/17 14:51:40, 0] libsmb/clitrans.c:cli_receive_trans(190) Jun 17 14:51:40 retainer smbd[8922]: Expected SMBtrans response, got command 0x00 Jun 17 14:51:40 retainer smbd[8922]: [2005/06/17 14:51:40, 0] rpc_client/cli_pipe.c:cli_nt_session_open(1468) Jun 17 14:51:40 retainer smbd[8922]: cli_nt_session_open: pipe hnd state failed. Error was SUCCESS - 0 Jun 17 14:52:01 retainer crond(pam_unix)[13019]: session opened for user root by (uid=0) Jun 17 14:52:01 retainer crond(pam_unix)[13019]: session closed for user root Jun 17 14:53:01 retainer crond(pam_unix)[13062]: session opened for user root by (uid=0) Jun 17 14:53:01 retainer crond(pam_unix)[13062]: session closed for user root Jun 17 14:54:01 retainer crond(pam_unix)[13078]: session opened for user root by (uid=0) Jun 17 14:54:01 retainer crond(pam_unix)[13078]: session closed for user root Jun 17 14:54:03 retainer smbd[13082]: [2005/06/17 14:54:03, 0] lib/util_sock.c:get_peer_addr(1150) Jun 17 14:54:03 retainer smbd[13082]: getpeername failed. Error was Transport endpoint is not connected Jun 17 14:54:03 retainer smbd[13082]: [2005/06/17 14:54:03, 0] lib/util_sock.c:write_socket_data(430) Jun 17 14:54:03 retainer smbd[13082]: write_socket_data: write failure. Error = Connection reset by peer Jun 17 14:54:03 retainer smbd[13082]: [2005/06/17 14:54:03, 0] lib/util_sock.c:write_socket(455) Jun 17 14:54:03 retainer smbd[13082]: write_socket: Error writing 4 bytes to socket 5: ERRNO = Connection reset by peer Jun 17 14:54:03 retainer smbd[13082]: [2005/06/17 14:54:03, 0] lib/util_sock.c:send_smb(647) Jun 17 14:54:03 retainer smbd[13082]: Error writing 4 bytes to client. -1. (Connection reset by peer) Jun 17 14:55:01 retainer crond(pam_unix)[13103]: session opened for user root by (uid=0) Jun 17 14:55:01 retainer crond(pam_unix)[13103]: session closed for user root Jun 17 14:56:01 retainer crond(pam_unix)[13143]: session opened for user root by (uid=0) Jun 17 14:56:02 retainer crond(pam_unix)[13143]: session closed for user root Jun 17 14:57:01 retainer crond(pam_unix)[13168]: session opened for user root by (uid=0) Jun 17 14:57:01 retainer
Re: [Samba] password aging in Samba 3
On Tuesday 21 June 2005 09:26, Kurt Bechstein wrote: The next question is about password aging. I have a client that would like to have the user have to reset their password after 60 days. I've seen some inklings online of being able to do with pdbedit, but the documentation seems non-existent at best on how to do this. Maybe this is also doable with a policy setup. I haven't actually tried that one yet so if that works just let me know and I'll dig into that. Thanks in advance. You can use either the NT4 Domain User Manager to manage all aspects of your user and group accounts, or you can use pdbedit from the command line. I've tried using the NT4 Domain Manager in conjunction with the tdbsam backed but haven't had any luck as far as password aging goes. It doesn't seem to be making any changes at least as far pdbedit -L -v goes. Also, I've tried to change the max password age via pdbedit -P max password age -C . However, according to M$'s documentation this value is stored from 1-999 but this doesn't look like what the tdb file is storing. What type of parameter do I need to pass to pdbedit to enforce a 60 day password expiration? I'm doing this on Red Hat enterprise 4 by the way. Thanks in advance. The maximum password age is stored in seconds. 1 day == 86400 seconds The useful range that matches NT4 capabilities is 86400 - 86313600 sec (999 days). When you set this to never expire in NT4 it sets to 4294967295 sec. So, 60 days = 5184000 - 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
[Samba] How to disable the Windows PDC?
I'm looking to migrate the DC functions of an old NT server (running SBS) to Samba. While I'm nearly ready to complete the migration the one thing I have been unable to find out is how to remove the DC functionality from the old server. Is it good enough to just demote it to being a BDC? I don't want to take the old server off-line as I will be leaving some applications on there for a while. Any help appreciated. regards Alan -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] PDC SAMBA + WIN2K problem join domain.
piaff33z wrote: Hi, I had success to join a samba domain with a win2K Station a few days ago. But today when a try to log with an another account, my station win2K say me she can't contact my PDC. I does not know what occurred since the last time. I disjoin my domain and after i has try to join again but with no success. The client Win2K and serveur PDC samba are on same network and switch thus no problem of network. The samba server starts and his logs says to me that is the PDC of my domain, but Win2K does no want to see it. somebody has an idea ? Are you sure to do this follows, before try join win2k pc in your SAMBA PDC: [source http://nic.phys.ethz.ch/readme/145] *Changes for Windows 2000 to join the Samba Domain The following steps have to be done with an local administrator or a member of the local Administrators group. This steps must be done before joining the Samba Domain (D-PHYS Domain Logon): Changes for Windows 2000 (Service Pack 4 and later) To re-enable writing back the Roaming Profile to the home drive on our samba file server in the Group Policy Editor (C:\WINNT\system32\gpedit.msc) under Local Computer Policy/Computer Configuration/Administrative Templates/System/Logon the settings for Do not check for user ownership of Roaming Profiles Folders has to be enabled. It can also be done with the following script: * On X:\D-PHYS\Domain-Logon\ (How to connect to the X: drive) double click the Win2kXP-fix.cmd Now Windows 2000 is ready to join the Samba Domain (D-PHYS Domain Logon). * And check this just for prevent future problems with WinXP Pro machines: Changes for Windows XP to join the Samba Domain The following steps have to be done with an local administrator or a member of the local Administrators group. This steps must be done before joining the Samba Domain (D-PHYS Domain Logon): Changes for Windows XP (all versions) * Start the Administrative Tools (Start / Settings / Control Panel / Administrative Tools). From there start the Local Security Policy. * In the Local Security Policy open Local Policies and then Security Options. * Disable the following entries: o Domain member: Digitally encrypt or sign secure channel data (Always) o Domain member: Digitally encrypt secure channel data (when possible) o Domain member: Digitally sign secure channel data (when possible) o Domain member: Require strong (Windows 2000 or later) session key * In the Group Policy Editor (C:\windows\system32\gpedit.msc) enable the following entry: o Computer Configuration\Administrative Templates\System\User Profiles\do not check for user ownership of roaming profiles folders Now Windows XP is ready to join the Samba Domain (D-PHYS Domain Logon). -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Active directory authentication and Solaris 9 problems
Greetings, I currently have Samba 3.0.14a built using gcc 3.2.2 on a Solaris 9/Sparc box. This Samba server is a member server of our Active Directory (AD) domain called CSUNET. When logged unto a windows client machine as an AD user I can see and access resources on the Solaris server. I've been trying to get PAM working to pam_windbind.so and correctly configured. So far I am unable to log onto the solaris box as an AD user. If I am root, I can su to an AD user. If I am not root, I cannot su to an AD user. I cannot logon to the machine at all with an AD account, only the ones available in /etc/passwd - for which I am password prompted twice. /etc/nsswitch is set with the following: passwd: files winbind group: files winbind I think I have my /etc/pam.conf set up as it should be (at bottom of this message.) I don't know if I missed something there, if there is a problem with my build of samba - or supporting software - or if the issue is with out Active Directory server. The AD server is Windows 2003 vanilla. The people in charge of it DO NOT want to make any sort of change from the Microsoft stock configuration. Any ideas will be appreciated. I was able to get a SuSE 9.2 configured to work with AD and allow logins, but the Solaris machine seems to enjoy being more of a challenge. In /var/adm/messages I see: --- Jun 21 13:39:13 techops pam_winbind[4648]: [ID 467601 auth.error] request failed: No such user, PAM error was 13, NT error was NT_STATUS_NO_SUCH_USER Jun 21 13:39:15 techops last message repeated 1 time Jun 21 13:40:56 techops su[4658]: [ID 810491 auth.crit] 'su 1001362' failed for bob on /dev/pts/7 --- From the winbind log it looks like winbind is getting correct info from the AD server - the UID and GID I see are correct, them it becomes unhappy around the end with client_read: read 0 bytes. Need 1824 more for a full request (A more complete copy if anyone want to look at it is at: http://urban.csuohio.edu/~bob/samba3/smblog.winbindd.txt ) --- ... [2005/06/21 13:40:56, 10] sam/idmap_tdb.c:internal_get_id_from_sid(228) internal_get_id_from_sid: record S-1-5-21-3414352988-972178952-4124595837-91888 - UID 1 [2005/06/21 13:40:56, 10] sam/idmap_tdb.c:internal_get_id_from_sid(243) internal_get_id_from_sid: ID_USERID fetching record S-1-5-21-3414352988-972178952-4124595837-91888 - UID 1 [2005/06/21 13:40:56, 10] sam/idmap_tdb.c:internal_get_sid_from_id(190) internal_get_sid_from_id: fetching record UID 1 [2005/06/21 13:40:56, 10] sam/idmap_tdb.c:internal_get_sid_from_id(196) internal_get_sid_from_id: fetching record UID 1 - S-1-5-21-3414352988-972178952-4124595837-91888 [2005/06/21 13:40:56, 10] sam/idmap_util.c:idmap_sid_to_uid(157) idmap_sid_to_uid: uid = [1] [2005/06/21 13:40:56, 10] sam/idmap_util.c:idmap_sid_to_gid(179) sid_to_gid: sid = [S-1-5-21-3414352988-972178952-4124595837-513] [2005/06/21 13:40:56, 10] sam/idmap_tdb.c:db_get_id_from_sid(315) db_get_id_from_sid [2005/06/21 13:40:56, 10] sam/idmap_tdb.c:internal_get_id_from_sid(221) internal_get_id_from_sid: fetching record S-1-5-21-3414352988-972178952-4124595837-513 of type 0x2 [2005/06/21 13:40:56, 10] sam/idmap_tdb.c:internal_get_id_from_sid(228) internal_get_id_from_sid: record S-1-5-21-3414352988-972178952-4124595837-513 - GID 1 [2005/06/21 13:40:56, 10] sam/idmap_tdb.c:internal_get_id_from_sid(262) internal_get_id_from_sid: ID_GROUPID fetching record S-1-5-21-3414352988-972178952-4124595837-513 - GID 1 [2005/06/21 13:40:56, 10] sam/idmap_tdb.c:internal_get_sid_from_id(190) internal_get_sid_from_id: fetching record GID 1 [2005/06/21 13:40:56, 10] sam/idmap_tdb.c:internal_get_sid_from_id(196) internal_get_sid_from_id: fetching record GID 1 - S-1-5-21-3414352988-972178952-4124595837-513 [2005/06/21 13:40:56, 10] sam/idmap_util.c:idmap_sid_to_gid(187) idmap_sid_to_gid: gid = [1] [2005/06/21 13:40:56, 10] nsswitch/winbindd.c:client_write(524) client_write: wrote 1300 bytes. [2005/06/21 13:40:56, 10] nsswitch/winbindd.c:winbind_client_read(470) client_read: read 0 bytes. Need 1824 more for a full request. [2005/06/21 13:40:56, 5] nsswitch/winbindd.c:winbind_client_read(477) read failed on sock 21, pid 4658: EOF [2005/06/21 13:40:56, 10] nsswitch/winbindd.c:winbind_client_read(470) client_read: read 0 bytes. Need 1824 more for a full request. [2005/06/21 13:40:56, 5] nsswitch/winbindd.c:winbind_client_read(477) read failed on sock 20, pid 4658: EOF - /etc/pam.conf # Authentication management # # login service (explicit because of pam_dial_auth) # login auth required /usr/lib/security/pam_winbind.so debug login auth requisite pam_authtok_get.so.1 login auth required pam_dhkeys.so.1 login auth required pam_unix_auth.so.1 try_first_pass
Re: [Samba] Configuring Samba with LDAP
On 06/20/2005 08:51 AM, Mattier, Ricardo wrote: Hi Bob, Thanks for the info. Are you using openldap? If so, which switches are you using to compile openldap? Greetings, Rick, Yes, but just to build Samba - we are not using at this point for anything else. I was using http://www.samag.com/documents/s=9427/sam0414e/0414e.htm as a guide for my build and I used the same switches outlined in the article - modified for my environment - our open ssl is in /opt/local/ossl and Cyrus SASL is in /opt/local/sasl2 - YMMV. CFLAGS=-I/opt/local/ossl/include -I/opt/local/sasl2/include CPPFLAGS=-I/opt/local/ossl/include -I/opt/local/sasl2/include LDFLAGS=-L/opt/local/ossl/lib -R /opt/local/ossl/lib -L/opt/local/sasl2/lib -R/opt/local/sasl2/lib ./configure --prefix=/opt/local/openldap --without-bdb --disable-bdb --enable-null The samba 3.0.14a I ended up with(AD) domain. I've been able to access it from MS Windows clients without any problems. I have not been able to get PAM working to the point where AD users can log onto the unix host. -Bob -- *** Bob Martel,System Administrator I met someone who looks a lot like you Levin College of Urban Affairs She does the things you do Cleveland State University But she is an IBM (216) 687-2214 [EMAIL PROTECTED]-Jeff Lynne *** -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Help request: Windows and Linux authorisation in windows domain.
I have problem (as you noticed ;] ). I have to make unified authorisation system for large, unsecure network connected to a two Polish skelete networks. As you see I need to do it right to avoid big problems. The goal is to have windows and linux computers authorized by one Linux mashine. I can do it by installing samba as a windows domain controller. It would work for windows. Linuxes can authorize using windows domain serwer too, but I would like to avoid unneeded mess with this as they can authorize in that serwer more native way. Any user not authorized in a windows domain will not have acces to the outer world nor to the local serwers (except domain server, of course), so... so they should be visible, no matter of the authorisation way. Aslo, home folders (or at least document subfolder) should mount automaticly from authorisation server (linux boxes does it automatically right now so I don't want to destroy it), changing password should be global, pasword _can not_ be send throught the net without encryption. As you see, it is a quite big thing. I'm reading documentation a long time, but I do need some advices/links/anything. -- --- Advocatus Diaboli - someone should do this job. some kind of Molot some kind of monster ;) jid:[EMAIL PROTECTED] alt mailto:[EMAIL PROTECTED] gg:4588787 --- -- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Samba and Clearcase 2003
Dear all I currently have samba running with ClearCase 2003 and all works well except I cant make views from the windows PCs. I need to make them from the Unix box and then synchronise them. Has any one ever managed to got this functionality to work. Apart from that samba works perfectly. I can read/write via ClearCase perfectly IBM can't seem to make their mind up if this is possible or not just interested to find out if any one has don eit an if so how I am Unix the hpux version of samba (samba 3.0.7), and have tried user, domains and ADS authentication. Thanks Andrew -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] How to disable the Windows PDC?
Unfortunately, with NT you can not demote it from a DC. You have to reinstall the software as a member server Alan Munday wrote: I'm looking to migrate the DC functions of an old NT server (running SBS) to Samba. While I'm nearly ready to complete the migration the one thing I have been unable to find out is how to remove the DC functionality from the old server. Is it good enough to just demote it to being a BDC? I don't want to take the old server off-line as I will be leaving some applications on there for a while. Any help appreciated. regards Alan -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] How to disable PDC
On Tuesday 21 June 2005 12:41, Matt Schwartz wrote: Unfortunately, with NT you can not demote it from a DC. You have to reinstall the software as a member server No! It can be demoted using a commercial software package called Upromote. See http://utools.com/UPromote.asp for further info. - John T. Alan Munday wrote: I'm looking to migrate the DC functions of an old NT server (running SBS) to Samba. While I'm nearly ready to complete the migration the one thing I have been unable to find out is how to remove the DC functionality from the old server. Is it good enough to just demote it to being a BDC? I don't want to take the old server off-line as I will be leaving some applications on there for a while. Any help appreciated. regards Alan -- 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] Tracking down a Samba problem under load
We use Samba as an interop file sharing solution for the ClearCase version control system. Unfortunately we have run into a problem after a recent upgrade to RedHat Enterprise 3. This problem occurs both with the RedHat included 3.0.9-1.3E.3, and a custom compile of the latest 3.0.14a direct from Samba. The symptoms are: under high load, such as during a build, new samba processes will spawn, but not respond. A ps list shows many smbd processes active, but no new connections can be established. Older connections seem to still function ok. Shutting down samba via the standard RedHat method service smb stop only kills the older processes, and the new non-responding ones must be kill -9'd to get them to terminate. Base level logging tells me nothing, and turning up the debug level just gets more of the same, but I'm not extremely well versed in what I'd be looking for to isolate the problem. I have seen a few panic's in the log, usually one or two per day, but the not responding problem doesn't seem to coincide with any of those. My basic problem is, I don't have any way of figuring out where the problem lies, and what to submit as a bug. Any pointers in that direction would be very helpful. Just for reference, here is the smb.conf, basically our only change from default is to turn off oplocks, as instructed by the ClearCase documentation: [global] log level = 1 log file = /var/log/samba/smbd.log max log size = 0 password server = * server string = ClearCase VOB Server workgroup = SEL username map = /etc/samba/smbusers socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 load printers = No wins server = x.x.x.x security = DOMAIN kernel oplocks = No create mask = 0775 directory mask = 0775 [array] comment = VOB Storage path = /array read only = No oplocks = No level2 oplocks = No Brian Pickering - [EMAIL PROTECTED] System Administrator - Information Services Schweitzer Engineering Laboratories, Inc. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] How to disable PDC
John H Terpstra wrote the following on 21/06/2005 19:53: On Tuesday 21 June 2005 12:41, Matt Schwartz wrote: Unfortunately, with NT you can not demote it from a DC. You have to reinstall the software as a member server No! It can be demoted using a commercial software package called Upromote. See http://utools.com/UPromote.asp for further info. - John T. Matt/John Thanks, though from the FAQ: Windows NT Small Business Server Q: Is UPromote compatible with Windows NT Small Business Server? A: No. SBS is hard-coded to always be a PDC. It lacks the intrinsic capability to run as a standalone server. Presumably, if you uninstall SBS, you might then be able to remove the DC capability? Alan -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba and Clearcase 2003
The only way you can do this is to write your own application that executes on the Unix box (via rsh or ssh, etc). ClearCase on the windows computers can't create views on the Unix system directly, it has nothing to do with Samba itself. We haven't done that yet, but I did build a script that automates view creation so that its now only one command to create the view, and make a windows region view tag. Eventually I may set this up to allow users to create their own views directly. Brian Pickering - [EMAIL PROTECTED] System Administrator - Information Services Schweitzer Engineering Laboratories, Inc. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Problems Authetincating users by group in Active Directoy
Hi, I got a Samba box that is part of an Active Directory. It is working with the most basic functions, but I want to start customizing the security a little bit more. For that I want to grant access to different shares by group using valid users = @AD+group in the smb.conf, but hasn't worked. I increased the verbosity of the log files and this has caught my attention: [2005/06/21 18:07:23, 10] lib/username.c:user_in_list(533) user_in_list: checking user |CONTORG0+aalse001| against |@CONTORG0+fsswebusers| [2005/06/21 18:07:23, 5] lib/username.c:user_in_netgroup_list(315) Unable to get default yp domain [2005/06/21 18:07:23, 10] lib/username.c:user_in_list(533) user_in_list: checking user |CONTORG0+aalse001| against |@CONTORG0+testgroup| [2005/06/21 18:07:23, 5] lib/username.c:user_in_netgroup_list(315) Unable to get default yp domain [2005/06/21 18:07:23, 2] smbd/service.c:make_connection_snum(321) user 'CONTORG0+aalse001' (from session setup) not permitted to access this share (fss_web) But if I do a getent group | grep aalse001 I get the following: CONTORG0+testgroup:x:10026:CONTORG0+aalse001 CONTORG0+fsswebusers:x:10027:CONTORG0+aalse001 Is it seems that unix box is getting the group through winbind, so it is either a bug, or I haven't done something. Any ideas? I am using Samba 3.0.13-1.4E.2 on a Centos 4 Linux box. Thank you, Pepe This is my smb.conf: [global] netbios name = CONTWEB #socket options = TCP_NODELAY SO_RCVBUF=16384 SO_SNDBUF=16384 idmap uid = 1-2 idmap gid = 1-2 winbind enum users = yes winbind gid = 1-2 workgroup = CONTORG0 #os level = 20 winbind enum groups = yes #socket address = contweb password server = contorg1 preferred master = no winbind separator = + max log size = 50 log file = /var/log/samba/log.%m encrypt passwords = yes dns proxy = no realm = CONTORG.BUSSERV.MY.REALM security = ADS #wins server = contorg1 wins proxy = no log level = 30 [fss_web] comment = Controller's Office Webserver writeable = yes path = /var/www/html force group = apache force user = apache #write list = @CONTORG0+fsswebusers valid users = @CONTORG0+fsswebusers @CONTORG0+testgroup -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: Help request: Windows and Linux authorisation in windows domain.
Molot wrote: I have problem (as you noticed ;] ). I have to make unified authorisation system for large, unsecure network connected to a two Polish skelete networks. As you see I need to do it right to avoid big problems. Not sure if I understood your problem but my first thought was about using LDAP for the job. You can use it as a backend for samba and your linux clients will be able to auth against it (mostly) out of the box. There is password sync with samba credentials in place and it can be used with SSL/TLS. hth Paul -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Problem Connecting from Windows to Samba-OpenLDAP PDC
Every time I try to add a pc to the domain I get the response that it
is an un-recognized user name. I have followed the instructions
located here:
http://samba.idealx.org/smbldap-howto.en.html
and am setting it up on a copy of Fedora Core 4 using the default
installed packages and versions. I am also unable to complete step
4.5 in the guide to test out the setup because it gives me the
following error:
[EMAIL PROTECTED] namedb]# ssh [EMAIL PROTECTED]
[EMAIL PROTECTED]'s password:
Permission denied, please try again.
[EMAIL PROTECTED] password:
Permission denied, please try again.
[EMAIL PROTECTED]'s password:
Permission denied (publickey,gssapi-with-mic,password).
I have made sure that the user directory does in fact exist and has
permissions on it because I know that ssh can fail if there is no user
directory. I have pasted in my configuration files as well. I am
only working on it in a test environment so I don't care about any
passwords that may appear. I have included all the configuration
files for Samba, Ldap, Nss, System Auth, and the DNS information.
Following that will be some of the log entries. I hope this should
provide enough information as to what is going on so I can get the
most help possible. And thanks for any help that people can provide
into this.
== NAMED.CONF =
//
// named.conf for Red Hat caching-nameserver
//
options {
directory /etc/namedb;
dump-file /var/cache_dump.db;
statistics-file /var/run/named.stats;
pid-file /var/run/named.pid;
allow-query { 10.0.0.0/24; localhost; };
allow-recursion { 10.0.0.0/24; localhost; };
/*
* If there is a firewall between you and nameservers you want
* to talk to, you might need to uncomment the query-source
* directive below. Previous versions of BIND always asked
* questions using port 53, but BIND 8.1 uses an unprivileged
* port by default.
*/
// query-source address * port 53;
};
//
// a caching only nameserver config
//
controls {
inet 127.0.0.1 allow { localhost; } keys { rndckey; };
};
zone 0.0.127.in-addr.arpa {
type master;
file pz/127.0.0;
};
zone mtgmilw.biz {
type master;
notify no;
file pz/mtgmilw.biz;
allow-query { any; };
};
zone 0.0.10.in-addr.arpa {
type master;
notify no;
file pz/10.0.0;
allow-query { any; };
};
include /etc/rndc.key;
= 10.0.0 =
$TTL 3D
@ IN SOA ns.mtgmilw.biz. hostmaster.mtgmilw.biz. (
200506192 ; Serial, todays date + todays serial
8H ; Refresh
2H ; Retry
4W ; Expire
1D ); Minimum TTL
NS ns.mtgmilw.biz
1 PTR gw.mtgmilw.biz.
2 PTR ns.mtgmilw.biz.
3 PTR ftp.mtgmilw.biz.
4 PTR pdc-srv.mtgmilw.biz.
==127.0.0
$TTL 3D
@ IN SOA ns.mtgmilw.biz. hostmaster.mtgmilw.biz. (
1 ; Serial
8H ; Refresh
2H ; Retry
4W ; Expire
1D) ; Minimum TTL
NS ns.mtgmilw.biz.
1 PTR localhost.
==
==mtgmilw.biz
;
; Zone file for mtgmilw.biz
;
; the full zone file
;
$TTL 3D
@ IN SOA ns.mtgmilw.biz. hostmaster.mtgmilw.biz. (
200506191 ; serial, todays date + todays serial #
8H ; refresh, seconds
2H ; retry, seconds
4W ; expire, seconds
1D ); minimum, seconds
;
NS ns ; Inet Address of name server
;
localhost A 127.0.0.1
;
gw A 10.0.0.1
TXT The router
;
ns A 10.0.0.75
www CNAME ns
;
ftp A 10.0.0.75
;
pdc-srv A 10.0.0.75
TXT Domain Controller
=
=SYSTEM-AUTH
#%PAM-1.0
# This file is auto-generated.
# User changes will be destroyed the next time authconfig is run.
authrequired /lib/security/$ISA/pam_env.so
authsufficient/lib/security/$ISA/pam_unix.so likeauth nullok
authsufficient/lib/security/$ISA/pam_ldap.so use_first_pass
authrequired /lib/security/$ISA/pam_deny.so
account required /lib/security/$ISA/pam_unix.so broken_shadow
account sufficient/lib/security/$ISA/pam_succeed_if.so uid 100 quiet
account
[Samba] Samba 3.0.20pre1 Available for Download
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 == Do you have a 27B-6? I'm kind of a stickler for paperwork. -- Sam Lowery == Release Announcements = This is a preview release of the Samba 3.0.20 code base and is provided for testing only. This release is *not* intended for production servers. There has been a substantial amount of development since the 3.0.14a stable release (and since the 3.015pre2 release as well). We would like to ask the Samba community for help in testing these changes as we work towards the next official, production Samba 3.0 release. Additional features introduced in Samba 3.0.20pre1 include: o New asynchronous winbindd. o Support for Microsoft Print Migrator. o New Windows NT registry file I/O library. o New user right (SeTakeOwnershipPrivilege) added. o New net share migrate options. What happened to 3.0.15 - 3.0.19? == After some discussion it was deemed that the amount of changes going into the next Samba 3.0 release needed something to catch people's attention. Skipping several releases was chosen as the best solution with the least overhead. There will be no 3.0.15 - 3.0.19 ever released. The next production release following 3.0.20 should be 3.0.21. The original announcement about the version number change can be found in the samba mailing list archives: http://marc.theaimsgroup.com/?l=sambam=111721010206997w=2 Asynchronous Winbind Implementation === Winbindd has been completely rewritten in this release to support an almost completely non-blocking, asynchronous request/reply model. This means that winbindd will scale much better in large domain environments and on high latency networks. Neither the client interface nor the command line tools (i.e. wbinfo) have changed in their calling conventions or syntax. However, due to internal structure changes, it is required (more so than normal) that you install the nss_winbind.so library included in this release. Support for Microsoft Print Migrator Samba 3.0.20pre1 supports backing up print drivers and queues using the Microsoft Print Migrator (printmig.exe) tool. Currently only support for restoring drivers onto a Samba server has been implemented. The final 3.0.20 release will include for restoring the print queues and printer settings as well. This will allow organizations to easily migrate or consolidate from a Windows print server environment to a Samba print server without having to individually reinstall drivers and printers. The current restore support also allows administrators to create a master list of drivers which can be installed on a new Samba host in a single action. Download Details The uncompressed tarballs and patch files have been signed using GnuPG (ID F17F9772). The source code can be downloaded from: http://download.samba.org/samba/ftp/pre/ The release notes are available online at: http://www.samba.org/samba/ftp/pre/WHATSNEW-3-0-20pre1.txt Binary packages are available at http://download.samba.org/samba/ftp/Binary_Packages/ Our Code, Our Bugs, Our Responsibility. (https://bugzilla.samba.org/) --Enjoy The Samba Team -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.0 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFCuM7CIR7qMdg1EfYRAomDAKDrSjr/OTCvprvONseGOPloGnlzbACgtmaP DRGTqJyBy1sHFB76ySbw4qg= =fYp/ -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Restarting SMB service with the SWAT kill my DECW session
Hi, On the Freeware 7.0 cd's, they is a version of SAMBA for VMS (2.2.8). I have insalled it on an alphastation running VMS7.3-2 with Motif 1.3. Each time I want to restart the smbd service via the SWAT (under STATUS option), my DECWindows session is killed. The Stop smbd button seems to have no effect. There is no problems with Stop nmbd and Restart nmbd buttons. Is somebody has had the same problem and did he find a workaround or is this simply a bug and I can thus no more use those buttons ? Thanks for your help Seghers Bruno OpenVMS System Engineer Tel : 00 32 (2) 727 68 83 Tel BCP : 00 32 (2) 337 10 13 Email : [EMAIL PROTECTED] Web : www.banksys.be Banksys S.A. 1442 Chaussée de Haacht B 1130 Bruxelles --- Confidentiality The information in this document is confidential and shall not be disclosed to any third party in whole or in part without the prior written consent of Banksys S.A. The Requester shall duly remit a copy of the signed non-disclosure which is attached in annex Copyright The information in this document is subject to change without notice and shall not be construed as a commitment by Banksys S.A./N.V. The content of this document, including but not limited to trademarks, designs, logos, text, images, is the property of Banksys S.A/N.V. and is protected by the Belgian Act of 30.06.1994 related to author's right and by the other applicable Acts. The contents of this document must not be reproduced in any form whatsoever, by or on behalf of third parties, without the prior written consent of Banksys S.A./N.V. Except with respect to the limited license to download and print certain material from this document for non-commercial and personal use only, nothing contained in this document shall grant any license or right to use any of Banksys S.A./N.V.'s proprietary material. Legal disclaimer While Banksys S.A./N.V. has made every attempt to ensure that the information contained in this document is correct, Banksys S.A.:N.V. does not provide any legal of commercial warranty on the document that is described in this specification. The technology is thus provided as is without warranties of any kind, expressed or implied, included those of merchantability and fitness for a particular purpose. Banksys S.A./N.V. does not warrant or assume any legal liability or responsibility for the accuracy, completeness, or usefulness of any information, product or process disclosed To the fullest extend permitted under applicable law, neither Banksys S.A./N.V. nor its affiliates, directors, employees and agents shall be liable to any party for any damages that might result from the use of the technology as described in this document (including without limitation direct, indirect, incidental, special, consequential and punitive damages, lost profits). Jurisdiction and applicable law These terms shall be governed by and construed in accordance with the laws of Belgium. You irrevocably consent to the jurisdiction of the courts located in Brussels for any action arising from or related to the use of this document. The information contained in this e-mail and any attachment thereto is confidential and may contain information which is protected by intellectual property rights. This information is intended for the exclusive use of the recipient(s) named above. This e-mail does not constitute any binding relationship or offer toward any of the addressees. If you are not one of the addressees , one of their employees or a proxy holder entitled to hand over this message to the addressee(s), any use of the information contained herein (e.g. reproduction, divulgation, communication or distribution,...) is prohibited. If you have received this message in error, please notify the sender and destroy it immediately after. The integrity and security of this message cannot be guaranteed and it may be subject to data corruption, interception and unauthorized amendment, for which we accept no liability. PLEASE READ THIS IMPORTANT ETIQUETTE MESSAGE BEFORE POSTING: http://www.catb.org/~esr/faqs/smart-questions.html
$B$3$N%A%c%s%9$r8+F($9$J!*(B$B7n}#1#0#0K|1_0Je$bL4$8$c$J$$!*(B
様へ 今の生活に満足ですか？稼ぎたい！自分を変えたい！ 業界最大手ついに再始動！稼ぐ秘密を教えます 情報料・登録料一切無料！パチンコ・パチスロ集客宣伝部員大募集！ お好きな時間・空いた時間にひと稼ぎ！ 無敗神話ここに降臨！あなたもう負ける事ができなくなる！ 詳しくはこちらから！！ ↓↓ http://pnetpnet.com/ ↑↑ お気軽にお問い合わせください！！ 日本のパチンコ、パチスロホールは集客宣伝部員を募集しています！！ あなたのまわりで必ずホールでドル箱を積んでる人はいるはずです。 短時間、リスク一切無しで確実に稼げるお仕事です！！ 日本全国で緊急募集をしてるので、締め切りまであと少し！！ 今あなたは大きなチャンスを目の前にしてるのです！！ 見て！聞いて！試して！完全無料！！ ↓↓ http://pnetpnet.com/ ↑↑ 副業の方も大歓迎！！情報料・登録料一切無料！ 社名：P-NET 住所：東京都台東区東上野4-1-5 TEL：0120-979-168 FAX:0120-979-169 PLEASE READ THIS IMPORTANT ETIQUETTE MESSAGE BEFORE POSTING: http://www.catb.org/~esr/faqs/smart-questions.html
svn commit: samba r7800 - in branches/SAMBA_4_0/source/rpc_server: .
Author: tridge
Date: 2005-06-21 06:03:11 + (Tue, 21 Jun 2005)
New Revision: 7800
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7800
Log:
added the same request serialisation logic to our socket based rpc
servers as I added to the smb server yesterday. This means rpc server
code can assume it runs serially unless it explicitly sets the async
flag on the request and returns
Modified:
branches/SAMBA_4_0/source/rpc_server/dcerpc_server.c
branches/SAMBA_4_0/source/rpc_server/dcerpc_server.h
branches/SAMBA_4_0/source/rpc_server/dcerpc_sock.c
Changeset:
Modified: branches/SAMBA_4_0/source/rpc_server/dcerpc_server.c
===
--- branches/SAMBA_4_0/source/rpc_server/dcerpc_server.c2005-06-21
05:27:09 UTC (rev 7799)
+++ branches/SAMBA_4_0/source/rpc_server/dcerpc_server.c2005-06-21
06:03:11 UTC (rev 7800)
@@ -320,6 +320,7 @@
p-auth_state.session_info = NULL;
p-auth_state.session_key = dcesrv_generic_session_key;
p-srv_conn = srv_conn;
+ p-processing = False;
talloc_set_destructor(p, dcesrv_endpoint_destructor);
Modified: branches/SAMBA_4_0/source/rpc_server/dcerpc_server.h
===
--- branches/SAMBA_4_0/source/rpc_server/dcerpc_server.h2005-06-21
05:27:09 UTC (rev 7799)
+++ branches/SAMBA_4_0/source/rpc_server/dcerpc_server.h2005-06-21
06:03:11 UTC (rev 7800)
@@ -177,6 +177,8 @@
/* the transport level session key */
DATA_BLOB transport_session_key;
+
+ BOOL processing;
};
Modified: branches/SAMBA_4_0/source/rpc_server/dcerpc_sock.c
===
--- branches/SAMBA_4_0/source/rpc_server/dcerpc_sock.c 2005-06-21 05:27:09 UTC
(rev 7799)
+++ branches/SAMBA_4_0/source/rpc_server/dcerpc_sock.c 2005-06-21 06:03:11 UTC
(rev 7800)
@@ -87,6 +87,11 @@
DATA_BLOB tmp_blob;
size_t nread;
+ if (dce_conn-processing) {
+ EVENT_FD_NOT_READABLE(conn-event.fde);
+ return;
+ }
+
tmp_blob = data_blob_talloc(conn-socket, NULL, 0x1000);
if (tmp_blob.data == NULL) {
dcesrv_terminate_connection(dce_conn, out of memory);
@@ -105,9 +110,13 @@
tmp_blob.length = nread;
+ dce_conn-processing = True;
status = dcesrv_input(dce_conn, tmp_blob);
+ dce_conn-processing = False;
talloc_free(tmp_blob.data);
+ EVENT_FD_READABLE(conn-event.fde);
+
if (!NT_STATUS_IS_OK(status)) {
dcesrv_terminate_connection(dce_conn, nt_errstr(status));
return;
svn commit: samba r7801 - in branches/SAMBA_4_0/source/ldap_server: .
Author: tridge
Date: 2005-06-21 06:08:40 + (Tue, 21 Jun 2005)
New Revision: 7801
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7801
Log:
the ldap server needs this logic too
Modified:
branches/SAMBA_4_0/source/ldap_server/ldap_server.c
branches/SAMBA_4_0/source/ldap_server/ldap_server.h
Changeset:
Modified: branches/SAMBA_4_0/source/ldap_server/ldap_server.c
===
--- branches/SAMBA_4_0/source/ldap_server/ldap_server.c 2005-06-21 06:03:11 UTC
(rev 7800)
+++ branches/SAMBA_4_0/source/ldap_server/ldap_server.c 2005-06-21 06:08:40 UTC
(rev 7801)
@@ -245,6 +245,11 @@
NTSTATUS status;
size_t npending, nread;
+ if (conn-processing) {
+ EVENT_FD_NOT_READABLE(c-event.fde);
+ return;
+ }
+
/* work out how much data is pending */
status = tls_socket_pending(conn-tls, npending);
if (!NT_STATUS_IS_OK(status)) {
@@ -279,12 +284,16 @@
}
conn-partial.length += nread;
+ conn-processing = True;
/* see if we can decode what we have */
if (conn-enable_wrap) {
ldapsrv_try_decode_wrapped(conn);
} else {
ldapsrv_try_decode_plain(conn);
}
+ conn-processing = False;
+
+ EVENT_FD_READABLE(c-event.fde);
}
/*
@@ -338,6 +347,7 @@
conn-send_queue = NULL;
conn-connection = c;
conn-service = talloc_get_type(c-private, struct ldapsrv_service);
+ conn-processing = False;
c-private= conn;
port = socket_get_my_port(c-socket);
Modified: branches/SAMBA_4_0/source/ldap_server/ldap_server.h
===
--- branches/SAMBA_4_0/source/ldap_server/ldap_server.h 2005-06-21 06:03:11 UTC
(rev 7800)
+++ branches/SAMBA_4_0/source/ldap_server/ldap_server.h 2005-06-21 06:08:40 UTC
(rev 7801)
@@ -39,6 +39,8 @@
struct ldapsrv_send *next, *prev;
DATA_BLOB data;
} *send_queue;
+
+ BOOL processing;
};
struct ldapsrv_call {
svn commit: samba r7802 - in branches/SAMBA_4_0/source/rpc_server/spoolss: .
Author: tpot Date: 2005-06-21 06:15:43 + (Tue, 21 Jun 2005) New Revision: 7802 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7802 Log: Remove a junk file. Removed: branches/SAMBA_4_0/source/rpc_server/spoolss/enumprinters.txt Changeset: Deleted: branches/SAMBA_4_0/source/rpc_server/spoolss/enumprinters.txt === --- branches/SAMBA_4_0/source/rpc_server/spoolss/enumprinters.txt 2005-06-21 06:08:40 UTC (rev 7801) +++ branches/SAMBA_4_0/source/rpc_server/spoolss/enumprinters.txt 2005-06-21 06:15:43 UTC (rev 7802) @@ -1,71 +0,0 @@ -18 spoolss_io_r_enumprinters -18 spoolss_io_buffer -0018 ptr: 000d1918 -001c size: 0238 -0258 needed: 0238 -025c returned: 0004 -0260 status: WERR_OK -00 smb_io_printer_info_1 - flags: 0080 -0004 offset: 0200 -000200 smb_io_unistr description -0200 unistr: \.\.W.I.N.2.K.D.C.1.\.q.,.H.P. .L.a.s.e.r.J.e.t. .4.,... -0008 offset: 01e6 -0001e6 smb_io_unistr name -01e6 unistr: \.\.W.I.N.2.K.D.C.1.\.q... -000c offset: 01cc -0001cc smb_io_unistr comment -01cc unistr: c.h.e.e.p.y. .b.i.r.d.s... -10 smb_io_printer_info_1 -0010 flags: 0080 -0014 offset: 0166 -000176 smb_io_unistr description -0176 unistr: \.\.W.I.N.2.K.D.C.1.\.p.,.H.P. .L.a.s.e.r.J.e.t. .4.,.C.a.n.b.e.r.r.a. .o.f.f.i.c.e... -0018 offset: 014c -00015c smb_io_unistr name -015c unistr: \.\.W.I.N.2.K.D.C.1.\.p... -001c offset: 0130 -000140 smb_io_unistr comment -0140 unistr: I.'.m. .a. .t.e.a.p.o.t.!... -20 smb_io_printer_info_1 -0020 flags: 0080 -0024 offset: 00d2 -f2 smb_io_unistr description -00f2 unistr: \.\.W.I.N.2.K.D.C.1.\.m.a.g.p.i.e.,.G.e.n.e.r.i.c. ./. .T.e.x.t. .O.n.l.y.,... -0028 offset: 00ae -ce smb_io_unistr name -00ce unistr: \.\.W.I.N.2.K.D.C.1.\.m.a.g.p.i.e... -002c offset: 00ac -cc smb_io_unistr comment -00cc unistr: -30 smb_io_printer_info_1 -0030 flags: 0080 -0034 offset: 0042 -72 smb_io_unistr description -0072 unistr: \.\.W.I.N.2.K.D.C.1.\.\.\.p.r.o.f.o.r.m.a.\.p.,.G.e.n.e.r.i.c. ./. .T.e.x.t. .O.n.l.y.,... -0038 offset: 0012 -42 smb_io_unistr name -0042 unistr: \.\.W.I.N.2.K.D.C.1.\.\.\.p.r.o.f.o.r.m.a.\.p... -003c offset: 0010 -40 smb_io_unistr comment -0040 unistr: - - flags:[0x80] - name:[\\WIN2KDC1\q] - description:[\\WIN2KDC1\q,HP LaserJet 4,] - comment:[cheepy birds] - - flags:[0x80] - name:[\\WIN2KDC1\p] - description:[\\WIN2KDC1\p,HP LaserJet 4,Canberra office] - comment:[I'm a teapot!] - - flags:[0x80] - name:[\\WIN2KDC1\magpie] - description:[\\WIN2KDC1\magpie,Generic / Text Only,] - comment:[] - - flags:[0x80] - name:[\\WIN2KDC1\\\proforma\p] - description:[\\WIN2KDC1\\\proforma\p,Generic / Text Only,] - comment:[]
svn commit: samba r7803 - in branches/SAMBA_4_0/source/lib/ldb: common include
Author: tridge
Date: 2005-06-21 06:35:55 + (Tue, 21 Jun 2005)
New Revision: 7803
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7803
Log:
added support in ldb for callers to setup ldif read/write functions,
so that ldbedit, ldbsearch etc can display nice human readable ldif,
while storing the data as binary blobs. This will be used for storing
NDR encoded objectSid and similar attributes, while making the command
line interface sane
Modified:
branches/SAMBA_4_0/source/lib/ldb/common/ldb_ldif.c
branches/SAMBA_4_0/source/lib/ldb/include/ldb.h
branches/SAMBA_4_0/source/lib/ldb/include/ldb_private.h
Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_ldif.c
===
--- branches/SAMBA_4_0/source/lib/ldb/common/ldb_ldif.c 2005-06-21 06:15:43 UTC
(rev 7802)
+++ branches/SAMBA_4_0/source/lib/ldb/common/ldb_ldif.c 2005-06-21 06:35:55 UTC
(rev 7803)
@@ -41,17 +41,55 @@
#include ldb/include/ldb_private.h
#include ctype.h
+/*
+ default function for ldif read/write
+*/
+static int ldb_ldif_default(struct ldb_context *ldb, const struct ldb_val *in,
+ struct ldb_val *out)
+{
+ *out = *in;
+ return 0;
+}
+
/*
+ return a function for reading an ldif encoded attributes into a ldb_val
+*/
+static ldb_ldif_handler_t ldb_ldif_read_fn(struct ldb_context *ldb, const char
*attr)
+{
+ int i;
+ for (i=0;ildb-ldif_num_handlers;i++) {
+ if (strcmp(attr, ldb-ldif_handlers[i].attr) == 0) {
+ return ldb-ldif_handlers[i].read_fn;
+ }
+ }
+ return ldb_ldif_default;
+}
+
+/*
+ return a function for writing an ldif encoded attribute from a ldb_val
+*/
+static ldb_ldif_handler_t ldb_ldif_write_fn(struct ldb_context *ldb, const
char *attr)
+{
+ int i;
+ for (i=0;ildb-ldif_num_handlers;i++) {
+ if (strcmp(attr, ldb-ldif_handlers[i].attr) == 0) {
+ return ldb-ldif_handlers[i].write_fn;
+ }
+ }
+ return ldb_ldif_default;
+}
+
+/*
this base64 decoder was taken from jitterbug (written by tridge).
we might need to replace it with a new version
*/
int ldb_base64_decode(char *s)
{
const char *b64 =
ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/;
- int bit_offset, byte_offset, idx, i, n;
+ int bit_offset=0, byte_offset, idx, i, n;
uint8_t *d = (uint8_t *)s;
- char *p;
+ char *p=NULL;
n=i=0;
@@ -254,13 +292,17 @@
}
for (j=0;jmsg-elements[i].num_values;j++) {
- if (ldb_should_b64_encode(msg-elements[i].values[j]))
{
+ ldb_ldif_handler_t write_fn = ldb_ldif_write_fn(ldb,
+
msg-elements[i].name);
+ struct ldb_val v;
+ ret = write_fn(ldb, msg-elements[i].values[j], v);
+ CHECK_RET;
+ if (ldb_should_b64_encode(v)) {
ret = fprintf_fn(private_data, %s:: ,
msg-elements[i].name);
CHECK_RET;
ret = base64_encode_f(ldb, fprintf_fn,
private_data,
-
msg-elements[i].values[j].data,
-
msg-elements[i].values[j].length,
+ v.data, v.length,
strlen(msg-elements[i].name)+3);
CHECK_RET;
ret = fprintf_fn(private_data, \n);
@@ -269,13 +311,15 @@
ret = fprintf_fn(private_data, %s: ,
msg-elements[i].name);
CHECK_RET;
ret = fold_string(fprintf_fn, private_data,
-
msg-elements[i].values[j].data,
-
msg-elements[i].values[j].length,
+ v.data, v.length,
strlen(msg-elements[i].name)+2);
CHECK_RET;
ret = fprintf_fn(private_data, \n);
CHECK_RET;
}
+ if (v.data != msg-elements[i].values[j].data) {
+ talloc_free(v.data);
+ }
}
if (ldif-changetype == LDB_CHANGETYPE_MODIFY) {
fprintf_fn(private_data, -\n);
@@ -510,8 +554,9 @@
msg-dn = value.data;
while (next_attr(s, attr, value) == 0) {
+
svn commit: samba r7804 - in branches/SAMBA_4_0/source/lib/ldb: . common include samba tools
Author: tridge
Date: 2005-06-21 07:52:00 + (Tue, 21 Jun 2005)
New Revision: 7804
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7804
Log:
added the samba specific ldif handlers into the tree, but don't enable
them just yet. I have tested them, and they work fine, but enabling
them will break code in rpc_server/ and samdb, so we need to fix that
first
Added:
branches/SAMBA_4_0/source/lib/ldb/samba/
branches/SAMBA_4_0/source/lib/ldb/samba/README
branches/SAMBA_4_0/source/lib/ldb/samba/ldif_handlers.c
Modified:
branches/SAMBA_4_0/source/lib/ldb/common/ldb_ldif.c
branches/SAMBA_4_0/source/lib/ldb/config.mk
branches/SAMBA_4_0/source/lib/ldb/include/ldb.h
branches/SAMBA_4_0/source/lib/ldb/tools/cmdline.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_ldif.c
===
--- branches/SAMBA_4_0/source/lib/ldb/common/ldb_ldif.c 2005-06-21 06:35:55 UTC
(rev 7803)
+++ branches/SAMBA_4_0/source/lib/ldb/common/ldb_ldif.c 2005-06-21 07:52:00 UTC
(rev 7804)
@@ -41,7 +41,31 @@
#include ldb/include/ldb_private.h
#include ctype.h
+
/*
+ add to the list of ldif handlers for this ldb context
+*/
+int ldb_ldif_add_handlers(struct ldb_context *ldb,
+ const struct ldb_ldif_handler *handlers,
+ unsigned num_handlers)
+{
+ struct ldb_ldif_handler *h;
+ h = talloc_realloc(ldb, ldb-ldif_handlers,
+ struct ldb_ldif_handler,
+ ldb-ldif_num_handlers + num_handlers);
+ if (h == NULL) {
+ ldb_oom(ldb);
+ return -1;
+ }
+ ldb-ldif_handlers = h;
+ memcpy(h + ldb-ldif_num_handlers,
+ handlers, sizeof(*h) * num_handlers);
+ ldb-ldif_num_handlers += num_handlers;
+ return 0;
+}
+
+
+/*
default function for ldif read/write
*/
static int ldb_ldif_default(struct ldb_context *ldb, const struct ldb_val *in,
@@ -59,7 +83,7 @@
{
int i;
for (i=0;ildb-ldif_num_handlers;i++) {
- if (strcmp(attr, ldb-ldif_handlers[i].attr) == 0) {
+ if (ldb_attr_cmp(attr, ldb-ldif_handlers[i].attr) == 0) {
return ldb-ldif_handlers[i].read_fn;
}
}
@@ -73,7 +97,7 @@
{
int i;
for (i=0;ildb-ldif_num_handlers;i++) {
- if (strcmp(attr, ldb-ldif_handlers[i].attr) == 0) {
+ if (ldb_attr_cmp(attr, ldb-ldif_handlers[i].attr) == 0) {
return ldb-ldif_handlers[i].write_fn;
}
}
Modified: branches/SAMBA_4_0/source/lib/ldb/config.mk
===
--- branches/SAMBA_4_0/source/lib/ldb/config.mk 2005-06-21 06:35:55 UTC (rev
7803)
+++ branches/SAMBA_4_0/source/lib/ldb/config.mk 2005-06-21 07:52:00 UTC (rev
7804)
@@ -91,11 +91,19 @@
+# Start SUBSYSTEM LDBSAMBA
+[SUBSYSTEM::LDBSAMBA]
+OBJ_FILES = \
+ lib/ldb/samba/ldif_handlers.o
+# End SUBSYSTEM LDBSAMBA
+
+
+
# Start SUBSYSTEM LIBLDB_CMDLINE
[SUBSYSTEM::LIBLDB_CMDLINE]
OBJ_FILES= \
lib/ldb/tools/cmdline.o
-REQUIRED_SUBSYSTEMS = LIBLDB LIBCMDLINE LIBBASIC
+REQUIRED_SUBSYSTEMS = LIBLDB LIBCMDLINE LIBBASIC LDBSAMBA
# End SUBSYSTEM LIBLDB_CMDLINE
Modified: branches/SAMBA_4_0/source/lib/ldb/include/ldb.h
===
--- branches/SAMBA_4_0/source/lib/ldb/include/ldb.h 2005-06-21 06:35:55 UTC
(rev 7803)
+++ branches/SAMBA_4_0/source/lib/ldb/include/ldb.h 2005-06-21 07:52:00 UTC
(rev 7804)
@@ -285,6 +285,9 @@
int ldb_ldif_write_file(struct ldb_context *ldb, FILE *f, const struct
ldb_ldif *msg);
char *ldb_base64_encode(void *mem_ctx, const char *buf, int len);
int ldb_base64_decode(char *s);
+int ldb_ldif_add_handlers(struct ldb_context *ldb,
+ const struct ldb_ldif_handler *handlers,
+ unsigned num_handlers);
/* useful functions for ldb_message structure manipulation */
Added: branches/SAMBA_4_0/source/lib/ldb/samba/README
===
--- branches/SAMBA_4_0/source/lib/ldb/samba/README 2005-06-21 06:35:55 UTC
(rev 7803)
+++ branches/SAMBA_4_0/source/lib/ldb/samba/README 2005-06-21 07:52:00 UTC
(rev 7804)
@@ -0,0 +1,7 @@
+This directory contains Samba specific extensions to ldb. It also
+serves as example code on how to extend ldb for your own application.
+
+The main extension Samba uses is to provide ldif encode/decode
+routines for specific attributes, so users can get nice pretty
svn commit: samba-docs r664 - in trunk/Samba3-HOWTO: .
Author: jht Date: 2005-06-21 07:54:37 + (Tue, 21 Jun 2005) New Revision: 664 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=664 Log: More updates. Modified: trunk/Samba3-HOWTO/TOSHARG-NetworkBrowsing.xml Changeset: Sorry, the patch is too large (1490 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=664
svn commit: samba r7805 - in branches/SAMBA_4_0/source/lib/ldb/common: .
Author: idra
Date: 2005-06-21 11:14:54 + (Tue, 21 Jun 2005)
New Revision: 7805
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7805
Log:
add support to read binary files into attributes data like ldap tools does
Modified:
branches/SAMBA_4_0/source/lib/ldb/common/ldb_ldif.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_ldif.c
===
--- branches/SAMBA_4_0/source/lib/ldb/common/ldb_ldif.c 2005-06-21 07:52:00 UTC
(rev 7804)
+++ branches/SAMBA_4_0/source/lib/ldb/common/ldb_ldif.c 2005-06-21 11:14:54 UTC
(rev 7805)
@@ -105,6 +105,62 @@
}
/*
+
+*/
+static int ldb_read_data_file(void *mem_ctx, struct ldb_val *value)
+{
+ struct stat statbuf;
+ char *buf;
+ int count, size, bytes;
+ int ret;
+ int f;
+
+ f = open(value-data, O_RDONLY);
+ if (f == -1) {
+ return -1;
+ }
+
+ if (fstat(f, statbuf) != 0) {
+ ret = -1;
+ goto done;
+ }
+
+ if (statbuf.st_size == 0) {
+ ret = -1;
+ goto done;
+ }
+
+ value-data = talloc_size(mem_ctx, statbuf.st_size + 1);
+ if (value-data == NULL) {
+ ret = -1;
+ goto done;
+ }
+ value-data[statbuf.st_size] = 0;
+
+ count = 0;
+ size = statbuf.st_size;
+ buf = value-data;
+ while (count statbuf.st_size) {
+ bytes = read(f, buf, size);
+ if (bytes == -1) {
+ talloc_free(value-data);
+ ret = -1;
+ goto done;
+ }
+ count += bytes;
+ buf += bytes;
+ size -= bytes;
+ }
+
+ value-length = statbuf.st_size;
+ ret = statbuf.st_size;
+
+done:
+ close(f);
+ return ret;
+}
+
+/*
this base64 decoder was taken from jitterbug (written by tridge).
we might need to replace it with a new version
*/
@@ -426,10 +482,11 @@
/* simple ldif attribute parser */
-static int next_attr(char **s, const char **attr, struct ldb_val *value)
+static int next_attr(void *mem_ctx, char **s, const char **attr, struct
ldb_val *value)
{
char *p;
int base64_encoded = 0;
+ int binary_file = 0;
if (strncmp(*s, -\n, 2) == 0) {
value-length = 0;
@@ -450,6 +507,11 @@
p++;
}
+ if (*p == '') {
+ binary_file = 1;
+ p++;
+ }
+
*attr = *s;
while (*p == ' ' || *p == '\t') {
@@ -478,6 +540,14 @@
value-length = len;
}
+ if (binary_file) {
+ int len = ldb_read_data_file(mem_ctx, value);
+ if (len == -1) {
+ /* an error occured hile trying to retrieve the file */
+ return -1;
+ }
+ }
+
return 0;
}
@@ -564,7 +634,7 @@
msg-private_data = chunk;
s = chunk;
- if (next_attr(s, attr, value) != 0) {
+ if (next_attr(ldif, s, attr, value) != 0) {
goto failed;
}
@@ -577,7 +647,7 @@
msg-dn = value.data;
- while (next_attr(s, attr, value) == 0) {
+ while (next_attr(ldif, s, attr, value) == 0) {
ldb_ldif_handler_t read_fn;
struct ldb_message_element *el;
int ret, empty = 0;
svn commit: samba r7806 - in branches/SAMBA_4_0/source/lib/ldb/tests: .
Author: idra Date: 2005-06-21 11:22:05 + (Tue, 21 Jun 2005) New Revision: 7806 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7806 Log: add test for binary files as attribute values Added: branches/SAMBA_4_0/source/lib/ldb/tests/photo.ldif branches/SAMBA_4_0/source/lib/ldb/tests/samba4.png Modified: branches/SAMBA_4_0/source/lib/ldb/tests/test-generic.sh Changeset: Added: branches/SAMBA_4_0/source/lib/ldb/tests/photo.ldif === --- branches/SAMBA_4_0/source/lib/ldb/tests/photo.ldif 2005-06-21 11:14:54 UTC (rev 7805) +++ branches/SAMBA_4_0/source/lib/ldb/tests/photo.ldif 2005-06-21 11:22:05 UTC (rev 7806) @@ -0,0 +1,5 @@ +dn: cn=Hampster Ursula,ou=Alumni Association,ou=People,o=University of Michigan,c=US +changetype: modify +add: photo +photo: tests/samba4.png + Added: branches/SAMBA_4_0/source/lib/ldb/tests/samba4.png === (Binary files differ) Property changes on: branches/SAMBA_4_0/source/lib/ldb/tests/samba4.png ___ Name: svn:mime-type + application/octet-stream Modified: branches/SAMBA_4_0/source/lib/ldb/tests/test-generic.sh === --- branches/SAMBA_4_0/source/lib/ldb/tests/test-generic.sh 2005-06-21 11:14:54 UTC (rev 7805) +++ branches/SAMBA_4_0/source/lib/ldb/tests/test-generic.sh 2005-06-21 11:22:05 UTC (rev 7806) @@ -50,3 +50,6 @@ echo returned $count records - expected 3 exit 1 fi + +echo Testing binary file attribute value +$VALGRIND bin/ldbmodify tests/photo.ldif || exit 1
svn commit: samba r7807 - branches/SAMBA_3_0/source/modules trunk/source/modules
Author: gd
Date: 2005-06-21 11:27:17 + (Tue, 21 Jun 2005)
New Revision: 7807
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7807
Log:
Allow to touch mtime in vfs-recycle with
recycle:touch_mtime = true
Guenther
Modified:
branches/SAMBA_3_0/source/modules/vfs_recycle.c
trunk/source/modules/vfs_recycle.c
Changeset:
Modified: branches/SAMBA_3_0/source/modules/vfs_recycle.c
===
--- branches/SAMBA_3_0/source/modules/vfs_recycle.c 2005-06-21 11:22:05 UTC
(rev 7806)
+++ branches/SAMBA_3_0/source/modules/vfs_recycle.c 2005-06-21 11:27:17 UTC
(rev 7807)
@@ -109,6 +109,17 @@
return ret;
}
+static BOOL recycle_touch_mtime(vfs_handle_struct *handle)
+{
+ BOOL ret;
+
+ ret = lp_parm_bool(SNUM(handle-conn), recycle, touch_mtime, False);
+
+ DEBUG(10, (recycle: touch_mtime = %s\n, ret?True:False));
+
+ return ret;
+}
+
static const char **recycle_exclude(vfs_handle_struct *handle)
{
const char **tmp_lp;
@@ -317,9 +328,9 @@
}
/**
- * Touch access date
+ * Touch access or modify date
**/
-static void recycle_do_touch(vfs_handle_struct *handle, const char *fname)
+static void recycle_do_touch(vfs_handle_struct *handle, const char *fname,
BOOL touch_mtime)
{
SMB_STRUCT_STAT st;
struct utimbuf tb;
@@ -331,7 +342,7 @@
}
currtime = time(currtime);
tb.actime = currtime;
- tb.modtime = st.st_mtime;
+ tb.modtime = touch_mtime ? currtime : st.st_mtime;
if (SMB_VFS_NEXT_UTIME(handle, handle-conn, fname, tb) == -1 ) {
DEBUG(0, (recycle: touching %s failed, reason = %s\n, fname,
strerror(errno)));
@@ -490,8 +501,8 @@
}
/* touch access date of moved file */
- if (recycle_touch(handle) == True )
- recycle_do_touch(handle, final_name);
+ if (recycle_touch(handle) == True || recycle_touch_mtime(handle))
+ recycle_do_touch(handle, final_name,
recycle_touch_mtime(handle));
done:
SAFE_FREE(path_name);
Modified: trunk/source/modules/vfs_recycle.c
===
--- trunk/source/modules/vfs_recycle.c 2005-06-21 11:22:05 UTC (rev 7806)
+++ trunk/source/modules/vfs_recycle.c 2005-06-21 11:27:17 UTC (rev 7807)
@@ -109,6 +109,17 @@
return ret;
}
+static BOOL recycle_touch_mtime(vfs_handle_struct *handle)
+{
+ BOOL ret;
+
+ ret = lp_parm_bool(SNUM(handle-conn), recycle, touch_mtime, False);
+
+ DEBUG(10, (recycle: touch_mtime = %s\n, ret?True:False));
+
+ return ret;
+}
+
static const char **recycle_exclude(vfs_handle_struct *handle)
{
const char **tmp_lp;
@@ -317,9 +328,9 @@
}
/**
- * Touch access date
+ * Touch access or modify date
**/
-static void recycle_do_touch(vfs_handle_struct *handle, const char *fname)
+static void recycle_do_touch(vfs_handle_struct *handle, const char *fname,
BOOL touch_mtime)
{
SMB_STRUCT_STAT st;
struct utimbuf tb;
@@ -331,7 +342,7 @@
}
currtime = time(currtime);
tb.actime = currtime;
- tb.modtime = st.st_mtime;
+ tb.modtime = touch_mtime ? currtime : st.st_mtime;
if (SMB_VFS_NEXT_UTIME(handle, handle-conn, fname, tb) == -1 ) {
DEBUG(0, (recycle: touching %s failed, reason = %s\n, fname,
strerror(errno)));
@@ -490,8 +501,8 @@
}
/* touch access date of moved file */
- if (recycle_touch(handle) == True )
- recycle_do_touch(handle, final_name);
+ if (recycle_touch(handle) == True || recycle_touch_mtime(handle))
+ recycle_do_touch(handle, final_name,
recycle_touch_mtime(handle));
done:
SAFE_FREE(path_name);
svn commit: samba r7808 - in branches/SAMBA_4_0/source/lib/ldb/common: .
Author: tridge Date: 2005-06-21 13:18:09 + (Tue, 21 Jun 2005) New Revision: 7808 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7808 Log: fixed the build of ldb after the binary file support in ldif was added Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_ldif.c Changeset: Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_ldif.c === --- branches/SAMBA_4_0/source/lib/ldb/common/ldb_ldif.c 2005-06-21 11:27:17 UTC (rev 7807) +++ branches/SAMBA_4_0/source/lib/ldb/common/ldb_ldif.c 2005-06-21 13:18:09 UTC (rev 7808) @@ -40,8 +40,10 @@ #include ldb/include/ldb.h #include ldb/include/ldb_private.h #include ctype.h +#ifdef _SAMBA_BUILD_ +#include system/filesys.h +#endif - /* add to the list of ldif handlers for this ldb context */
svn commit: samba r7809 - in branches/SAMBA_3_0_RELEASE: .
Author: jerry Date: 2005-06-21 13:27:35 + (Tue, 21 Jun 2005) New Revision: 7809 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7809 Log: working copy of release notes Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt Changeset: Sorry, the patch is too large (273 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7809
svn commit: samba r7810 - in branches/SAMBA_4_0/source/libcli/ldap: .
Author: tridge
Date: 2005-06-21 13:42:47 + (Tue, 21 Jun 2005)
New Revision: 7810
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7810
Log:
don't give errors when the ldap server sends us reference replies
Modified:
branches/SAMBA_4_0/source/libcli/ldap/ldap_client.c
Changeset:
Modified: branches/SAMBA_4_0/source/libcli/ldap/ldap_client.c
===
--- branches/SAMBA_4_0/source/libcli/ldap/ldap_client.c 2005-06-21 13:27:35 UTC
(rev 7809)
+++ branches/SAMBA_4_0/source/libcli/ldap/ldap_client.c 2005-06-21 13:42:47 UTC
(rev 7810)
@@ -130,7 +130,8 @@
req-replies[req-num_replies] = talloc_steal(req-replies, msg);
req-num_replies++;
- if (msg-type != LDAP_TAG_SearchResultEntry) {
+ if (msg-type != LDAP_TAG_SearchResultEntry
+ msg-type != LDAP_TAG_SearchResultReference) {
/* currently only search results expect multiple
replies */
req-state = LDAP_REQUEST_DONE;
svn commit: samba r7811 - in trunk/source/rpc_server: .
Author: vlendec Date: 2005-06-21 17:16:30 + (Tue, 21 Jun 2005) New Revision: 7811 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7811 Log: Get rid of an uninitialized variable warning. Jerry, you might want to check this. Volker Modified: trunk/source/rpc_server/srv_reg_nt.c Changeset: Modified: trunk/source/rpc_server/srv_reg_nt.c === --- trunk/source/rpc_server/srv_reg_nt.c2005-06-21 13:42:47 UTC (rev 7810) +++ trunk/source/rpc_server/srv_reg_nt.c2005-06-21 17:16:30 UTC (rev 7811) @@ -1378,6 +1378,8 @@ write_result = store_reg_keys( newparent, subkeys ); regsubkey_ctr_destroy( subkeys ); + + result = write_result ? WERR_OK : WERR_REG_IO_FAILURE; done: /* close any intermediate key handles */ @@ -1387,7 +1389,7 @@ /* rpc_reg.h says there is a POLICY_HDN in the reply...no idea if that is correct */ - return write_result ? WERR_OK : WERR_REG_IO_FAILURE; + return result; }
svn commit: samba-web r708 - in trunk: .
Author: deryck Date: 2005-06-21 17:56:07 + (Tue, 21 Jun 2005) New Revision: 708 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=708 Log: Fix path to header (a goof from when I rearranged.) Thanks, derrell. Also cleaned up for XHTML while on the file. deryck Modified: trunk/subversion.html Changeset: Modified: trunk/subversion.html === --- trunk/subversion.html 2005-06-20 17:59:22 UTC (rev 707) +++ trunk/subversion.html 2005-06-21 17:56:07 UTC (rev 708) @@ -1,36 +1,36 @@ !--#include virtual=/samba/header.html -- titleSamba - Subversion Instructions/title -!--#include virtual=/samba/download/header_download.html -- +!--#include virtual=/samba/header_wide.html -- -h2 align=centerSubversion access to svnanon.samba.org/h2 +h2Subversion access to svnanon.samba.org/h2 -H2Overview/H2 +h3Overview/h3 -svnanon.samba.org contains an anonymous Subversion repository. The source -code in this repository is synchronised from the main branch every 5 minutes. +psvnanon.samba.org contains an anonymous Subversion repository. The source +code in this repository is synchronised from the main branch every 5 minutes./p -pSubversion is available from a href=http://subversion.tigris.org/;subversion.tigris.org/a. +pSubversion is available from a href=http://subversion.tigris.org/;subversion.tigris.org/a./p -H3Web access to the source/H3 +h3Web access to the source/h3 pYou can access the subversion repository via websvn at a -href=http://websvn.samba.org/;http://websvn.samba.org//a. +href=http://websvn.samba.org/;http://websvn.samba.org//a./p -H3Access via subversion/H3 +h3Access via subversion/h3 -pTo access the 'trunk', run: +pTo access the 'trunk', run:/p pre svn co svn://svnanon.samba.org/samba/trunk samba-trunk /pre -pTo check out a certain branch, say a branch called bBRANCH/b, run: +pTo check out a certain branch, say a branch called bBRANCH/b, run:/p pre svn co svn://svnanon.samba.org/samba/branches/bBRANCH/b samba-bBRANCH/b /pre -pMajor current branches include: +pMajor current branches include:/p pre svn co svn://svnanon.samba.org/samba/branches/SAMBA_3_0 samba-3_0 @@ -40,30 +40,30 @@ /pre -H3Access via rsync and ftp/H3 +h3Access via rsync and ftp/h3 -svnanon.samba.org also exports unpacked copies of most parts of the Subversion +psvnanon.samba.org also exports unpacked copies of most parts of the Subversion tree at A HREF=ftp://svnanon.samba.org/pub/unpacked;ftp://svnanon.samba.org/pub/unpacked/A -and also via anonymous rsync at rsync://svnanon.samba.org/ftp/unpacked/ +and also via anonymous rsync at rsync://svnanon.samba.org/ftp/unpacked//p -I recommend using rsync rather than ftp. See A +pI recommend using rsync rather than ftp. See A HREF=http://rsync.samba.org/;http://rsync.samba.org//A -for more info on rsync.p +for more info on rsync./p -The disadvantage of the unpacked trees is that they do not support +pThe disadvantage of the unpacked trees is that they do not support automatic merging of local changes like CVS or Subversion does. rsync access is -most convenient for an initial install. +most convenient for an initial install./p h3Available branches/h3 p Please refer the a href=/samba/devel/Development and General Roadmap/a -page for information on the current cvs branches. +page for information on the current cvs branches./p -H2Reporting problems/H2 +h3Reporting problems/h3 -If you have any problems with this system please ask on the a -href=http://lists.samba.org/;Samba mailing list/a. +pIf you have any problems with this system please ask on the a +href=http://lists.samba.org/;Samba mailing list/a./p !--#include virtual=/samba/footer.html --
svn commit: samba-web r709 - in trunk/news: style team
Author: deryck
Date: 2005-06-21 18:12:06 + (Tue, 21 Jun 2005)
New Revision: 709
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=709
Log:
Adding news item on steve's book. Cleanup CSS for news from recent changes.
Added:
trunk/news/style/common.css
trunk/news/team/performance_tuning_stevef.html
Changeset:
Copied: trunk/news/style/common.css (from rev 706, trunk/style/common.css)
===
--- trunk/style/common.css 2005-06-19 21:18:39 UTC (rev 706)
+++ trunk/news/style/common.css 2005-06-21 18:12:06 UTC (rev 709)
@@ -0,0 +1,211 @@
+/*
+ common.css
+ by Deryck Hodge [EMAIL PROTECTED]
+
+ Basic styles common to all of samba.org, including VirtualHosts
+ bugzilla.samba.org, build.samba.org, and news.samba.org.
+
+ You may freely use and modify the styles here, but if you
+ intend to recreate the samba.org look exactly, please ask
+ permission first.
+*/
+
+
+/* Base elements
+***/
+body {
+ margin:0;
+ padding:0;
+ background-color:#E5E9F5;
+ font-family:Lucidasans, Helvetica, Verdana, sans-serif;
+ font-size:medium;
+ color:#000;
+}
+blockquote {
+ margin:35px;
+ padding:15px;
+ border-left:2px groove #CCC;
+ border-top:2px groove #CCC;
+}
+img {
+ border:0;
+}
+
+
+
+/* Headings
+***/
+h1 {
+ font-size:x-large;
+}
+h2 {
+ text-align:left;
+ color:#64;
+ font-size:large;
+ background-color:#3878CD;
+ margin-top:60px;
+ margin-bottom:15px;
+ padding:2px;
+ padding-left:5px;
+}
+h3 {
+ font-size:medium;
+}
+h5 {
+ font-size:small;
+ text-align:right;
+ display:inline;
+}
+* html h5 {
+ padding-right:4px;
+}
+h6 {
+ font-size:small;
+ text-align:right;
+ text-align:right;
+}
+h6 a {
+ margin-right:3px;
+}
+
+
+/* Lists
+***/
+ol li {
+ margin-bottom:12px;
+}
+
+
+/* Tables
+***/
+table.real thead {
+background-color: #E5E9F5;
+}
+table.real th,
+table.real td {
+border: 1px solid #3878CD;
+padding: 2px;
+}
+table.real {
+border: 2px solid #3878CD;
+background-color: #F5F8FF;
+}
+a:link:hover {
+ color:#CC0033;
+ background-color:#64;
+}
+
+
+/* Header (yellow and blue stripes)
+***/
+#banner {
+ position:absolute;
+ top:0;
+ left:0;
+ height:95px;
+ width:100%;
+ padding-top:4px;
+ z-index:1;
+}
+.srch {
+ text-align:right;
+ margin:0 5px 0 0;
+}
+.srch form {
+ display:inline;
+}
+
+
+/* Slogan (Opening windows to a wider world)
+***/
+.slogan {
+ position:absolute;
+ left:187px;
+ z-index:1;
+}
+htmlbody .slogan {/ Opera needs its own rule */
+ top:100px;
+}
+:root .slogan {/ Undo the Opera rule for all other
browsers /
+ top:80px;
+}
+* html .slogan { /** Then, give IE 5/6 its own rule ** */
+ top:100px;
+}
+
+
+/* Logo (with hacks for PNG transparency across browsers)
+***/
+#logo.logo_hack {
+ background-image:url(/samba/images/logo.png);
+ background-position:center;
+ background-repeat:no-repeat;
+}
+.logo_hack {
+ position:absolute;
+ top:25px;
+ left:0;
+ width:250px;
+ height:119px;
+ padding:0;
+ margin:0;
+ z-index:1;
+}
+.logo_hack a:hover {
+ background:transparent;
+}
+
+
+/* Nav menu
+***/
+.nav {
+ position:absolute;
+ top:152px;
+ left:20px;
+ width:180px;
+ background-color:#F5F8FF;
+ border:2px groove #3878CD;
+ padding:0;
+ padding-bottom:5px;
+ margin:0;
+ z-index:1;
+}
+.nav ul {
+ list-style-type:none;
+ text-align:center;
+ padding:0;
+ margin:0;
+}
+.nav a,
+.nav a:link,
+.nav a:visited {
+ display:block;
+ height:20px;
+ font-size:small;
+ color:#2B5C9F;
+}
+.nav a:hover {
+ color:#FFF;
+ background-color:#3878CD;
+}
+.nav a:active {
+ color:#64;
+ background-color:#3878CD;
+ font-size:14px;
+}
+.nav img {
+ padding:0;
+ margin:0;
+ width:180px;
+ height:30px;
+}
+
+
+/* Text and alignment formats
+***/
+.punch {
+ font-weight:bold;
+}
+.colophon {
+
svn commit: samba r7812 - in branches/SAMBA_3_0_RELEASE: .
Author: jerry Date: 2005-06-21 18:43:12 + (Tue, 21 Jun 2005) New Revision: 7812 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7812 Log: finish the commit log for 3.0.20pre1 release; need to update a few more announcement sections Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt Changeset: Sorry, the patch is too large (348 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7812
svn commit: samba-web r710 - in trunk/news: . calendar
Author: deryck Date: 2005-06-21 18:52:28 + (Tue, 21 Jun 2005) New Revision: 710 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=710 Log: Link to the correct style sheet. deryck Modified: trunk/news/about.html trunk/news/calendar/index.html trunk/news/header2.html trunk/news/submission_policy.html trunk/news/submit.html trunk/news/success.html Changeset: Modified: trunk/news/about.html === --- trunk/news/about.html 2005-06-21 18:12:06 UTC (rev 709) +++ trunk/news/about.html 2005-06-21 18:52:28 UTC (rev 710) @@ -4,7 +4,7 @@ head -link rel=stylesheet href=/samba/style/common.css type=text/css media=all / +link rel=stylesheet href=/samba/news/style/common.css type=text/css media=all / link rel=stylesheet href=/samba/news/style/news.css type=text/css media=all / link rel=shortcut icon href=/samba/news/images/favicon.ico / Modified: trunk/news/calendar/index.html === --- trunk/news/calendar/index.html 2005-06-21 18:12:06 UTC (rev 709) +++ trunk/news/calendar/index.html 2005-06-21 18:52:28 UTC (rev 710) @@ -6,7 +6,7 @@ titleSamba Team Calendar of Events/title -link rel=stylesheet href=/samba/style/common.css type=text/css media=all / +link rel=stylesheet href=/samba/news/style/common.css type=text/css media=all / link rel=stylesheet href=/samba/news/style/news.css type=text/css media=all / link rel=shortcut icon href=/samba/news/images/favicon.ico / Modified: trunk/news/header2.html === --- trunk/news/header2.html 2005-06-21 18:12:06 UTC (rev 709) +++ trunk/news/header2.html 2005-06-21 18:52:28 UTC (rev 710) @@ -1,4 +1,4 @@ -link rel=stylesheet href=/samba/style/common.css type=text/css media=all / +link rel=stylesheet href=/samba/news/style/common.css type=text/css media=all / link rel=stylesheet href=/samba/news/style/news.css type=text/css media=all / link rel=shortcut icon href=/samba/news/images/favicon.ico / Modified: trunk/news/submission_policy.html === --- trunk/news/submission_policy.html 2005-06-21 18:12:06 UTC (rev 709) +++ trunk/news/submission_policy.html 2005-06-21 18:52:28 UTC (rev 710) @@ -4,7 +4,7 @@ head -link rel=stylesheet href=/samba/style/common.css type=text/css +link rel=stylesheet href=/samba/news/style/common.css type=text/css media=all / link rel=stylesheet href=/samba/news/style/news.css type=text/css media=all / Modified: trunk/news/submit.html === --- trunk/news/submit.html 2005-06-21 18:12:06 UTC (rev 709) +++ trunk/news/submit.html 2005-06-21 18:52:28 UTC (rev 710) @@ -4,7 +4,7 @@ head -link rel=stylesheet href=/samba/style/common.css type=text/css +link rel=stylesheet href=/samba/news/style/common.css type=text/css media=all / link rel=stylesheet href=/samba/news/style/news.css type=text/css media=all / Modified: trunk/news/success.html === --- trunk/news/success.html 2005-06-21 18:12:06 UTC (rev 709) +++ trunk/news/success.html 2005-06-21 18:52:28 UTC (rev 710) @@ -4,7 +4,7 @@ head -link rel=stylesheet href=/samba/style/common.css type=text/css +link rel=stylesheet href=/samba/news/style/common.css type=text/css media=all / link rel=stylesheet href=/samba/news/style/news.css type=text/css media=all /
svn commit: samba r7813 - in branches/SAMBA_4_0/source/libcli/resolve: .
Author: mimir
Date: 2005-06-21 20:18:08 + (Tue, 21 Jun 2005)
New Revision: 7813
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7813
Log:
Make async request independent from config file routines.
rafal
Modified:
branches/SAMBA_4_0/source/libcli/resolve/resolve.c
Changeset:
Modified: branches/SAMBA_4_0/source/libcli/resolve/resolve.c
===
--- branches/SAMBA_4_0/source/libcli/resolve/resolve.c 2005-06-21 18:43:12 UTC
(rev 7812)
+++ branches/SAMBA_4_0/source/libcli/resolve/resolve.c 2005-06-21 20:18:08 UTC
(rev 7813)
@@ -132,17 +132,9 @@
status = nbt_name_dup(state, name, state-name);
if (!NT_STATUS_IS_OK(status)) goto failed;
- /* use default methods from config file if not passed explicitly */
- if (methods == NULL) {
- state-methods = lp_name_resolve_order();
- if (state-methods == NULL) {
- return NULL;
- }
+ if (methods == NULL) goto failed;
+ state-methods = methods;
- } else {
- state-methods = methods;
- }
-
c-state = SMBCLI_REQUEST_SEND;
c-private = state;
if (event_ctx == NULL) {
@@ -186,7 +178,7 @@
*/
NTSTATUS resolve_name(struct nbt_name *name, TALLOC_CTX *mem_ctx, const char
**reply_addr)
{
- struct composite_context *c = resolve_name_send(name, NULL, NULL);
+ struct composite_context *c = resolve_name_send(name, NULL,
lp_name_resolve_order());
return resolve_name_recv(c, mem_ctx, reply_addr);
}
svn commit: samba r7814 - in branches/SAMBA_4_0/source/libcli/composite: .
Author: mimir Date: 2005-06-21 20:19:17 + (Tue, 21 Jun 2005) New Revision: 7814 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7814 Log: Propagate the change in resolve_name_send function. Modified: branches/SAMBA_4_0/source/libcli/composite/connect.c Changeset: Modified: branches/SAMBA_4_0/source/libcli/composite/connect.c === --- branches/SAMBA_4_0/source/libcli/composite/connect.c2005-06-21 20:18:08 UTC (rev 7813) +++ branches/SAMBA_4_0/source/libcli/composite/connect.c2005-06-21 20:19:17 UTC (rev 7814) @@ -349,7 +349,7 @@ make_nbt_name_server(name, io-in.dest_host); - state-creq = resolve_name_send(name, c-event_ctx, NULL); + state-creq = resolve_name_send(name, c-event_ctx, lp_name_resolve_order()); if (state-creq == NULL) goto failed; state-creq-async.private = c;
svn commit: samba r7815 - in branches/SAMBA_3_0_RELEASE: .
Author: jerry Date: 2005-06-21 20:19:19 + (Tue, 21 Jun 2005) New Revision: 7815 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7815 Log: fix a mistake in attributions and clarify the mention of nss_winbind.so Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt Changeset: Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt === --- branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2005-06-21 20:19:17 UTC (rev 7814) +++ branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2005-06-21 20:19:19 UTC (rev 7815) @@ -13,8 +13,11 @@ Additional features introduced in Samba 3.0.20pre1 include: - o New asynchronous winbindd + o New asynchronous winbindd. o Support for Microsoft Print Migrator. + o New Windows NT registry file I/O library. + o New user right (SeTakeOwnershipPrivilege) added. + o New net share migrate options. What happened to 3.0.15 - 3.0.19? @@ -41,17 +44,27 @@ model. This means that winbindd will scale much better in large domain environments and on high latency networks. Neither the client interface nor the command line tools (i.e. wbinfo) have -changed in their calling conventions or syntax. However, it is -required (more so than normal) that you install the nss_winbind.so -library included in this release. +changed in their calling conventions or syntax. However, due to +internal structure changes, it is required (more so than normal) +that you install the nss_winbind.so library included in this release. Support for Microsoft Print Migrator +Samba 3.0.20pre1 supports backing up print drivers and queues +using the Microsoft Print Migrator (printmig.exe) tool. Currently +only support for restoring drivers onto a Samba server has been +implemented. The final 3.0.20 release will include for +restoring the print queues and printer settings as well. This +will allow organizations to easily migrate or consolidate from a +Windows print server environment to a Samba print server without +having to individually reinstall drivers and printers. The current +restore support also allows administrators to create a master list +of drivers which can be installed on a new Samba host in a single +action. - ## Changes ### @@ -216,8 +229,6 @@ o Guenther Deschner [EMAIL PROTECTED] -* Adding robustness checks for tdbdump and tdbtool. -* Extend tdb command line parsing to arbitrary hex characters. * Document pam_winbind.c to clarify the working status of require-membership-of option. * Added client-support for various lsa_query_trust_dom_info() @@ -292,6 +303,8 @@ o Herb Lewis [EMAIL PROTECTED] +* Adding robustness checks for tdbdump and tdbtool. +* Extend tdb command line parsing to arbitrary hex characters. * Add LOCKING debug class. * Fix more compiler warnings.
svn commit: samba r7816 - in branches/SAMBA_4_0/source: libnet torture torture/libnet
Author: mimir
Date: 2005-06-21 20:22:38 + (Tue, 21 Jun 2005)
New Revision: 7816
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7816
Log:
Implementation of shortcut function for those (probably many) who
don't like to bother with netbios type names when looking for common
types: hosts (servers) and domain controllers. Also, apropriate tests
rafal
Modified:
branches/SAMBA_4_0/source/libnet/libnet_lookup.c
branches/SAMBA_4_0/source/torture/libnet/libnet_lookup.c
branches/SAMBA_4_0/source/torture/torture.c
Changeset:
Modified: branches/SAMBA_4_0/source/libnet/libnet_lookup.c
===
--- branches/SAMBA_4_0/source/libnet/libnet_lookup.c2005-06-21 20:19:19 UTC
(rev 7815)
+++ branches/SAMBA_4_0/source/libnet/libnet_lookup.c2005-06-21 20:22:38 UTC
(rev 7816)
@@ -39,6 +39,12 @@
};
+/**
+ * Sends asynchronous Lookup request
+ *
+ * @param io arguments and result of the call
+ */
+
struct composite_context *libnet_Lookup_send(struct libnet_Lookup *io)
{
struct composite_context *c;
@@ -77,6 +83,15 @@
}
+/**
+ * Waits for and receives results of asynchronous Lookup call
+ *
+ * @param c composite context returned by asynchronous Lookup call
+ * @param mem_ctx memory context of the call
+ * @param io pointer to results (and arguments) of the call
+ * @return nt status code of execution
+ */
+
NTSTATUS libnet_Lookup_recv(struct composite_context *c, TALLOC_CTX *mem_ctx,
struct libnet_Lookup *io)
{
@@ -90,8 +105,63 @@
}
+/**
+ * Synchronous version of Lookup call
+ *
+ * @param mem_ctx memory context for the call
+ * @param io arguments and results of the call
+ * @return nt status code of execution
+ */
+
NTSTATUS libnet_Lookup(TALLOC_CTX *mem_ctx, struct libnet_Lookup *io)
{
struct composite_context *c = libnet_Lookup_send(io);
return libnet_Lookup_recv(c, mem_ctx, io);
}
+
+
+/*
+ * Shortcut functions to find common types of name
+ * (and skip nbt name type argument)
+ */
+
+
+/**
+ * Sends asynchronous LookupHost request
+ */
+struct composite_context* libnet_LookupHost_send(struct libnet_Lookup *io)
+{
+ io-in.type = NBT_NAME_SERVER;
+ return libnet_Lookup_send(io);
+}
+
+
+
+/**
+ * Synchronous version of LookupHost call
+ */
+NTSTATUS libnet_LookupHost(TALLOC_CTX *mem_ctx, struct libnet_Lookup *io)
+{
+ struct composite_context *c = libnet_LookupHost_send(io);
+ return libnet_Lookup_recv(c, mem_ctx, io);
+}
+
+
+/**
+ * Sends asynchronous LookupPdc request
+ */
+struct composite_context* libnet_LookupPdc_send(struct libnet_Lookup *io)
+{
+ io-in.type = NBT_NAME_PDC;
+ return libnet_Lookup_send(io);
+}
+
+
+/**
+ * Synchronous version of LookupPdc
+ */
+NTSTATUS libnet_LookupPdc(TALLOC_CTX *mem_ctx, struct libnet_Lookup *io)
+{
+ struct composite_context *c = libnet_LookupPdc_send(io);
+ return libnet_Lookup_recv(c, mem_ctx, io);
+}
Modified: branches/SAMBA_4_0/source/torture/libnet/libnet_lookup.c
===
--- branches/SAMBA_4_0/source/torture/libnet/libnet_lookup.c2005-06-21
20:19:19 UTC (rev 7815)
+++ branches/SAMBA_4_0/source/torture/libnet/libnet_lookup.c2005-06-21
20:22:38 UTC (rev 7816)
@@ -32,21 +32,71 @@
TALLOC_CTX *mem_ctx;
struct libnet_Lookup lookup;
const char address[16];
- const char* methods[] = { wins, bcast, NULL };
+ const char** methods = lp_name_resolve_order();
- mem_ctx = talloc_init(test_userinfo);
+ mem_ctx = talloc_init(test_lookup);
lookup.in.hostname = lp_netbios_name();
- lookup.in.methods = NULL;
- lookup.in.type = NBT_NAME_SERVER;
+ lookup.in.methods = lp_name_resolve_order();
+ lookup.in.type = NBT_NAME_CLIENT;
lookup.out.address = (const char**)address;
status = libnet_Lookup(mem_ctx, lookup);
if (!NT_STATUS_IS_OK(status)) {
+ printf(Couldn't lookup name %s: %s\n, lookup.in.hostname,
nt_errstr(status));
+ return False;
+ }
+
+ return True;
+}
+
+
+BOOL torture_lookup_host(void)
+{
+ NTSTATUS status;
+ TALLOC_CTX *mem_ctx;
+ struct libnet_Lookup lookup;
+ const char address[16];
+ const char** methods = lp_name_resolve_order();
+
+ mem_ctx = talloc_init(test_lookup_host);
+
+ lookup.in.hostname = lp_netbios_name();
+ lookup.in.methods = lp_name_resolve_order();
+ lookup.out.address = (const char**)address;
+
+ status = libnet_LookupHost(mem_ctx, lookup);
+
+ if (!NT_STATUS_IS_OK(status)) {
printf(Couldn't lookup host %s: %s\n, lookup.in.hostname,
nt_errstr(status));
return False;
}
return True;
}
+
+
+BOOL torture_lookup_pdc(void)
+{
+ NTSTATUS status;
+ TALLOC_CTX *mem_ctx;
+
svn commit: samba-docs r665 - in trunk/Samba3-HOWTO: .
Author: jerry
Date: 2005-06-21 20:27:16 + (Tue, 21 Jun 2005)
New Revision: 665
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=665
Log:
fix bad link
Modified:
trunk/Samba3-HOWTO/index.xml
Changeset:
Modified: trunk/Samba3-HOWTO/index.xml
===
--- trunk/Samba3-HOWTO/index.xml2005-06-21 07:54:37 UTC (rev 664)
+++ trunk/Samba3-HOWTO/index.xml2005-06-21 20:27:16 UTC (rev 665)
@@ -16,7 +16,7 @@
?latex \setcounter{page}{5} ?
- xi:include href=../Samba-HOWTO-Collection-attributions.xml
+ xi:include href=../Samba-HOWTO-attributions.xml
xi:fallback/
/xi:include
svn commit: samba r7817 - in branches/SAMBA_3_0/source/libsmb: .
Author: derrell
Date: 2005-06-21 20:34:24 + (Tue, 21 Jun 2005)
New Revision: 7817
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7817
Log:
Eliminate use of ctime_r() in libsmbclient DEBUG statement. It seems that
ctime_r() takes different parameters on Solaris than it does on Linux, and
it's easier to just eliminate the use of it than to write a configure test.
Modified:
branches/SAMBA_3_0/source/libsmb/libsmbclient.c
Changeset:
Modified: branches/SAMBA_3_0/source/libsmb/libsmbclient.c
===
--- branches/SAMBA_3_0/source/libsmb/libsmbclient.c 2005-06-21 20:22:38 UTC
(rev 7816)
+++ branches/SAMBA_3_0/source/libsmb/libsmbclient.c 2005-06-21 20:34:24 UTC
(rev 7817)
@@ -3017,14 +3017,26 @@
m_time = tbuf[1].tv_sec;
}
+if (DEBUGLVL(4))
{
+char *p;
char atimebuf[32];
char mtimebuf[32];
-DEBUG(4, (smbc_utimes(%s, atime = %s mtime = %s)\n,
- fname,
- ctime_r(a_time, atimebuf),
- ctime_r(m_time, mtimebuf)));
+strncpy(atimebuf, ctime(a_time), sizeof(atimebuf));
+atimebuf[sizeof(atimebuf) - 1] = '\0';
+if ((p = strchr(atimebuf, '\n')) != NULL) {
+*p = '\0';
+}
+
+strncpy(mtimebuf, ctime(m_time), sizeof(mtimebuf));
+mtimebuf[sizeof(mtimebuf) - 1] = '\0';
+if ((p = strchr(mtimebuf, '\n')) != NULL) {
+*p = '\0';
+}
+
+dbgtext(smbc_utimes(%s, atime = %s mtime = %s)\n,
+fname, atimebuf, mtimebuf);
}
if (smbc_parse_path(context, fname,
svn commit: samba-docs r666 - in trunk/Samba3-HOWTO: .
Author: jht Date: 2005-06-21 20:34:29 + (Tue, 21 Jun 2005) New Revision: 666 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=666 Log: Fixing index problems. Modified: trunk/Samba3-HOWTO/TOSHARG-NetworkBrowsing.xml trunk/Samba3-HOWTO/TOSHARG-Passdb.xml trunk/Samba3-HOWTO/TOSHARG-StandAloneServer.xml trunk/Samba3-HOWTO/index.xml Changeset: Sorry, the patch is too large (578 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=666
svn commit: samba r7818 - in trunk/source/libsmb: .
Author: derrell
Date: 2005-06-21 20:39:51 + (Tue, 21 Jun 2005)
New Revision: 7818
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7818
Log:
merge r7817 from SAMBA_3_0
Modified:
trunk/source/libsmb/libsmbclient.c
Changeset:
Modified: trunk/source/libsmb/libsmbclient.c
===
--- trunk/source/libsmb/libsmbclient.c 2005-06-21 20:34:24 UTC (rev 7817)
+++ trunk/source/libsmb/libsmbclient.c 2005-06-21 20:39:51 UTC (rev 7818)
@@ -3017,14 +3017,26 @@
m_time = tbuf[1].tv_sec;
}
+if (DEBUGLVL(4))
{
+char *p;
char atimebuf[32];
char mtimebuf[32];
-DEBUG(4, (smbc_utimes(%s, atime = %s mtime = %s)\n,
- fname,
- ctime_r(a_time, atimebuf),
- ctime_r(m_time, mtimebuf)));
+strncpy(atimebuf, ctime(a_time), sizeof(atimebuf));
+atimebuf[sizeof(atimebuf) - 1] = '\0';
+if ((p = strchr(atimebuf, '\n')) != NULL) {
+*p = '\0';
+}
+
+strncpy(mtimebuf, ctime(m_time), sizeof(mtimebuf));
+mtimebuf[sizeof(mtimebuf) - 1] = '\0';
+if ((p = strchr(mtimebuf, '\n')) != NULL) {
+*p = '\0';
+}
+
+dbgtext(smbc_utimes(%s, atime = %s mtime = %s)\n,
+fname, atimebuf, mtimebuf);
}
if (smbc_parse_path(context, fname,
svn commit: samba r7819 - in branches/SAMBA_3_0_RELEASE: . source/libsmb source/modules
Author: jerry
Date: 2005-06-21 20:56:52 + (Tue, 21 Jun 2005)
New Revision: 7819
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7819
Log:
svn merge -r7798:7817 svn+ssh://svn.samba.org/home/svn/samba/branches/SAMBA_3_0
Modified:
branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
branches/SAMBA_3_0_RELEASE/source/libsmb/libsmbclient.c
branches/SAMBA_3_0_RELEASE/source/modules/vfs_recycle.c
Changeset:
Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
===
--- branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2005-06-21 20:39:51 UTC (rev
7818)
+++ branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2005-06-21 20:56:52 UTC (rev
7819)
@@ -242,6 +242,8 @@
* Error code fixes when attempting to manipulating
non-existent shares.
* Cleanup net share migrate code.
+* Allow to touch mtime in vfs-recycle with recycle:touch_mtime
+ = true.
o Renaud Duhaut [EMAIL PROTECTED]
@@ -318,6 +320,8 @@
* Correctly detect AF_LOCAL support in configure.
* Fix problem updating file times on Windows 98 hosts using
libsmbclient.
+* Fix compile breakage on Solaris by eliminating the use of
+ ctime_r() in libsmbclient DEBUG statement.
o Jason Mader [EMAIL PROTECTED]
Modified: branches/SAMBA_3_0_RELEASE/source/libsmb/libsmbclient.c
===
--- branches/SAMBA_3_0_RELEASE/source/libsmb/libsmbclient.c 2005-06-21
20:39:51 UTC (rev 7818)
+++ branches/SAMBA_3_0_RELEASE/source/libsmb/libsmbclient.c 2005-06-21
20:56:52 UTC (rev 7819)
@@ -3017,14 +3017,26 @@
m_time = tbuf[1].tv_sec;
}
+if (DEBUGLVL(4))
{
+char *p;
char atimebuf[32];
char mtimebuf[32];
-DEBUG(4, (smbc_utimes(%s, atime = %s mtime = %s)\n,
- fname,
- ctime_r(a_time, atimebuf),
- ctime_r(m_time, mtimebuf)));
+strncpy(atimebuf, ctime(a_time), sizeof(atimebuf));
+atimebuf[sizeof(atimebuf) - 1] = '\0';
+if ((p = strchr(atimebuf, '\n')) != NULL) {
+*p = '\0';
+}
+
+strncpy(mtimebuf, ctime(m_time), sizeof(mtimebuf));
+mtimebuf[sizeof(mtimebuf) - 1] = '\0';
+if ((p = strchr(mtimebuf, '\n')) != NULL) {
+*p = '\0';
+}
+
+dbgtext(smbc_utimes(%s, atime = %s mtime = %s)\n,
+fname, atimebuf, mtimebuf);
}
if (smbc_parse_path(context, fname,
Modified: branches/SAMBA_3_0_RELEASE/source/modules/vfs_recycle.c
===
--- branches/SAMBA_3_0_RELEASE/source/modules/vfs_recycle.c 2005-06-21
20:39:51 UTC (rev 7818)
+++ branches/SAMBA_3_0_RELEASE/source/modules/vfs_recycle.c 2005-06-21
20:56:52 UTC (rev 7819)
@@ -109,6 +109,17 @@
return ret;
}
+static BOOL recycle_touch_mtime(vfs_handle_struct *handle)
+{
+ BOOL ret;
+
+ ret = lp_parm_bool(SNUM(handle-conn), recycle, touch_mtime, False);
+
+ DEBUG(10, (recycle: touch_mtime = %s\n, ret?True:False));
+
+ return ret;
+}
+
static const char **recycle_exclude(vfs_handle_struct *handle)
{
const char **tmp_lp;
@@ -317,9 +328,9 @@
}
/**
- * Touch access date
+ * Touch access or modify date
**/
-static void recycle_do_touch(vfs_handle_struct *handle, const char *fname)
+static void recycle_do_touch(vfs_handle_struct *handle, const char *fname,
BOOL touch_mtime)
{
SMB_STRUCT_STAT st;
struct utimbuf tb;
@@ -331,7 +342,7 @@
}
currtime = time(currtime);
tb.actime = currtime;
- tb.modtime = st.st_mtime;
+ tb.modtime = touch_mtime ? currtime : st.st_mtime;
if (SMB_VFS_NEXT_UTIME(handle, handle-conn, fname, tb) == -1 ) {
DEBUG(0, (recycle: touching %s failed, reason = %s\n, fname,
strerror(errno)));
@@ -490,8 +501,8 @@
}
/* touch access date of moved file */
- if (recycle_touch(handle) == True )
- recycle_do_touch(handle, final_name);
+ if (recycle_touch(handle) == True || recycle_touch_mtime(handle))
+ recycle_do_touch(handle, final_name,
recycle_touch_mtime(handle));
done:
SAFE_FREE(path_name);
svn commit: samba r7820 - in trunk/source/smbd: .
Author: jra
Date: 2005-06-21 21:26:26 + (Tue, 21 Jun 2005)
New Revision: 7820
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7820
Log:
Don't check permissions for setting POSIX pathname request.
Jeremy.
Modified:
trunk/source/smbd/trans2.c
Changeset:
Modified: trunk/source/smbd/trans2.c
===
--- trunk/source/smbd/trans2.c 2005-06-21 20:56:52 UTC (rev 7819)
+++ trunk/source/smbd/trans2.c 2005-06-21 21:26:26 UTC (rev 7820)
@@ -2428,22 +2428,11 @@
{
char *pdata = *ppdata;
char *params = *pparams;
- files_struct *fsp = NULL;
uint16 info_level;
int outsize;
- SMB_NTQUOTA_STRUCT quotas;
-
- ZERO_STRUCT(quotas);
DEBUG(10,(call_trans2setfsinfo: for service
[%s]\n,lp_servicename(SNUM(conn;
- /* access check */
- if ((current_user.uid != 0)||!CAN_WRITE(conn)) {
- DEBUG(0,(set_user_quota: access_denied service [%s] user
[%s]\n,
- lp_servicename(SNUM(conn)),conn-user));
- return ERROR_DOS(ERRSRV,ERRaccess);
- }
-
/* */
if (total_params 4) {
DEBUG(0,(call_trans2setfsinfo: requires total_params(%d) = 4
bytes!\n,
@@ -2484,62 +2473,76 @@
break;
}
case SMB_FS_QUOTA_INFORMATION:
- /* note: normaly there're 48 bytes,
-* but we didn't use the last 6 bytes for now
-* --metze
-*/
- fsp = file_fsp(params,0);
- if (!CHECK_NTQUOTA_HANDLE_OK(fsp,conn)) {
- DEBUG(3,(TRANSACT_GET_USER_QUOTA: no valid
QUOTA HANDLE\n));
- return ERROR_NT(NT_STATUS_INVALID_HANDLE);
- }
+ {
+ files_struct *fsp = NULL;
+ SMB_NTQUOTA_STRUCT quotas;
+
+ ZERO_STRUCT(quotas);
- if (total_data 42) {
- DEBUG(0,(call_trans2setfsinfo: SET_FS_QUOTA:
requires total_data(%d) = 42 bytes!\n,
- total_data));
- return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
- }
+ /* access check */
+ if ((current_user.uid != 0)||!CAN_WRITE(conn)) {
+ DEBUG(0,(set_user_quota: access_denied
service [%s] user [%s]\n,
+
lp_servicename(SNUM(conn)),conn-user));
+ return ERROR_DOS(ERRSRV,ERRaccess);
+ }
+
+ /* note: normaly there're 48 bytes,
+* but we didn't use the last 6 bytes for now
+* --metze
+*/
+ fsp = file_fsp(params,0);
+ if (!CHECK_NTQUOTA_HANDLE_OK(fsp,conn)) {
+ DEBUG(3,(TRANSACT_GET_USER_QUOTA: no
valid QUOTA HANDLE\n));
+ return
ERROR_NT(NT_STATUS_INVALID_HANDLE);
+ }
+
+ if (total_data 42) {
+ DEBUG(0,(call_trans2setfsinfo:
SET_FS_QUOTA: requires total_data(%d) = 42 bytes!\n,
+ total_data));
+ return
ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+ }
- /* unknown_1 24 NULL bytes in pdata*/
+ /* unknown_1 24 NULL bytes in pdata*/
- /* the soft quotas 8 bytes (SMB_BIG_UINT)*/
- quotas.softlim = (SMB_BIG_UINT)IVAL(pdata,24);
+ /* the soft quotas 8 bytes (SMB_BIG_UINT)*/
+ quotas.softlim = (SMB_BIG_UINT)IVAL(pdata,24);
#ifdef LARGE_SMB_OFF_T
- quotas.softlim |= (((SMB_BIG_UINT)IVAL(pdata,28))
32);
+ quotas.softlim |=
(((SMB_BIG_UINT)IVAL(pdata,28)) 32);
#else /* LARGE_SMB_OFF_T */
- if ((IVAL(pdata,28) != 0)
- ((quotas.softlim != 0x)||
- (IVAL(pdata,28)!=0x))) {
- /* more than 32 bits? */
- return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
- }
+ if ((IVAL(pdata,28) != 0)
+ ((quotas.softlim
svn commit: samba r7821 - in branches/SAMBA_3_0/source/smbd: .
Author: jra
Date: 2005-06-21 21:26:29 + (Tue, 21 Jun 2005)
New Revision: 7821
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7821
Log:
Don't check permissions for setting POSIX pathname request.
Jeremy.
Modified:
branches/SAMBA_3_0/source/smbd/trans2.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/trans2.c
===
--- branches/SAMBA_3_0/source/smbd/trans2.c 2005-06-21 21:26:26 UTC (rev
7820)
+++ branches/SAMBA_3_0/source/smbd/trans2.c 2005-06-21 21:26:29 UTC (rev
7821)
@@ -2426,22 +2426,11 @@
{
char *pdata = *ppdata;
char *params = *pparams;
- files_struct *fsp = NULL;
uint16 info_level;
int outsize;
- SMB_NTQUOTA_STRUCT quotas;
-
- ZERO_STRUCT(quotas);
DEBUG(10,(call_trans2setfsinfo: for service
[%s]\n,lp_servicename(SNUM(conn;
- /* access check */
- if ((current_user.uid != 0)||!CAN_WRITE(conn)) {
- DEBUG(0,(set_user_quota: access_denied service [%s] user
[%s]\n,
- lp_servicename(SNUM(conn)),conn-user));
- return ERROR_DOS(ERRSRV,ERRaccess);
- }
-
/* */
if (total_params 4) {
DEBUG(0,(call_trans2setfsinfo: requires total_params(%d) = 4
bytes!\n,
@@ -2482,62 +2471,76 @@
break;
}
case SMB_FS_QUOTA_INFORMATION:
- /* note: normaly there're 48 bytes,
-* but we didn't use the last 6 bytes for now
-* --metze
-*/
- fsp = file_fsp(params,0);
- if (!CHECK_NTQUOTA_HANDLE_OK(fsp,conn)) {
- DEBUG(3,(TRANSACT_GET_USER_QUOTA: no valid
QUOTA HANDLE\n));
- return ERROR_NT(NT_STATUS_INVALID_HANDLE);
- }
+ {
+ files_struct *fsp = NULL;
+ SMB_NTQUOTA_STRUCT quotas;
+
+ ZERO_STRUCT(quotas);
- if (total_data 42) {
- DEBUG(0,(call_trans2setfsinfo: SET_FS_QUOTA:
requires total_data(%d) = 42 bytes!\n,
- total_data));
- return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
- }
+ /* access check */
+ if ((current_user.uid != 0)||!CAN_WRITE(conn)) {
+ DEBUG(0,(set_user_quota: access_denied
service [%s] user [%s]\n,
+
lp_servicename(SNUM(conn)),conn-user));
+ return ERROR_DOS(ERRSRV,ERRaccess);
+ }
+
+ /* note: normaly there're 48 bytes,
+* but we didn't use the last 6 bytes for now
+* --metze
+*/
+ fsp = file_fsp(params,0);
+ if (!CHECK_NTQUOTA_HANDLE_OK(fsp,conn)) {
+ DEBUG(3,(TRANSACT_GET_USER_QUOTA: no
valid QUOTA HANDLE\n));
+ return
ERROR_NT(NT_STATUS_INVALID_HANDLE);
+ }
+
+ if (total_data 42) {
+ DEBUG(0,(call_trans2setfsinfo:
SET_FS_QUOTA: requires total_data(%d) = 42 bytes!\n,
+ total_data));
+ return
ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+ }
- /* unknown_1 24 NULL bytes in pdata*/
+ /* unknown_1 24 NULL bytes in pdata*/
- /* the soft quotas 8 bytes (SMB_BIG_UINT)*/
- quotas.softlim = (SMB_BIG_UINT)IVAL(pdata,24);
+ /* the soft quotas 8 bytes (SMB_BIG_UINT)*/
+ quotas.softlim = (SMB_BIG_UINT)IVAL(pdata,24);
#ifdef LARGE_SMB_OFF_T
- quotas.softlim |= (((SMB_BIG_UINT)IVAL(pdata,28))
32);
+ quotas.softlim |=
(((SMB_BIG_UINT)IVAL(pdata,28)) 32);
#else /* LARGE_SMB_OFF_T */
- if ((IVAL(pdata,28) != 0)
- ((quotas.softlim != 0x)||
- (IVAL(pdata,28)!=0x))) {
- /* more than 32 bits? */
- return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
- }
+ if ((IVAL(pdata,28) !=
svn commit: samba-web r711 - in trunk/news/team: .
Author: deryck Date: 2005-06-21 21:46:14 + (Tue, 21 Jun 2005) New Revision: 711 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=711 Log: news.samba.org was up to date with Steve's story, but the headlines on samba.org hadn't updated. Turns out my news script can't handle line breaks. Fix the break in the file for now. I'll revist the script when time allows. deryck Modified: trunk/news/team/performance_tuning_stevef.html Changeset: Modified: trunk/news/team/performance_tuning_stevef.html === --- trunk/news/team/performance_tuning_stevef.html 2005-06-21 18:52:28 UTC (rev 710) +++ trunk/news/team/performance_tuning_stevef.html 2005-06-21 21:46:14 UTC (rev 711) @@ -1,5 +1,4 @@ -h3a name=performance_tuning_stevefPerformance Tuning for Linux -Servers/a/h3 +h3a name=performance_tuning_stevefPerformance Tuning for Linux Servers/a/h3 div class=article pThe new book emPerformance Tuning for Linux Servers/em from IBM Press
svn commit: samba r7822 - in branches/SAMBA_3_0/packaging: Fedora RedHat
Author: jerry
Date: 2005-06-21 22:13:58 + (Tue, 21 Jun 2005)
New Revision: 7822
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7822
Log:
fixing specfiles after removing testprns
Modified:
branches/SAMBA_3_0/packaging/Fedora/samba.spec.tmpl
branches/SAMBA_3_0/packaging/RedHat/samba.spec.tmpl
Changeset:
Modified: branches/SAMBA_3_0/packaging/Fedora/samba.spec.tmpl
===
--- branches/SAMBA_3_0/packaging/Fedora/samba.spec.tmpl 2005-06-21 21:26:29 UTC
(rev 7821)
+++ branches/SAMBA_3_0/packaging/Fedora/samba.spec.tmpl 2005-06-21 22:13:58 UTC
(rev 7822)
@@ -359,7 +359,6 @@
%{_libdir}/samba/idmap/idmap*.so
%{_includedir}/libsmbclient.h
%{_bindir}/testparm
-%{_bindir}/testprns
%{_bindir}/smbpasswd
# %{_bindir}/make_printerdef
%{_bindir}/wbinfo
@@ -382,7 +381,6 @@
%{_mandir}/man1/profiles.1*
%{_mandir}/man1/smbcquotas.1*
%{_mandir}/man1/testparm.1*
-%{_mandir}/man1/testprns.1*
%{_mandir}/man5/smb.conf.5*
%{_mandir}/man5/lmhosts.5*
%{_mandir}/man8/smbpasswd.8*
@@ -390,13 +388,6 @@
%{_mandir}/man8/winbindd.8*
%{_mandir}/man1/vfstest.1*
-# #%lang(ja) %{_mandir}/ja/man1/make_smbcodepage.1*
-#%lang(ja) %{_mandir}/ja/man1/testparm.1*
-#%lang(ja) %{_mandir}/ja/man1/testprns.1*
-#%lang(ja) %{_mandir}/ja/man5/smb.conf.5*
-#%lang(ja) %{_mandir}/ja/man5/lmhosts.5*
-#%lang(ja) %{_mandir}/ja/man8/smbpasswd.8*
-
%changelog
* Fri Jan 16 2004 Gerald (Jerry) Carter [EMAIL PROTECTED],org
- Removed ChangeLog entries since they are kept in CVS
Modified: branches/SAMBA_3_0/packaging/RedHat/samba.spec.tmpl
===
--- branches/SAMBA_3_0/packaging/RedHat/samba.spec.tmpl 2005-06-21 21:26:29 UTC
(rev 7821)
+++ branches/SAMBA_3_0/packaging/RedHat/samba.spec.tmpl 2005-06-21 22:13:58 UTC
(rev 7822)
@@ -125,7 +125,7 @@
mkdir -p $RPM_BUILD_ROOT%{prefix}/{lib,include}
# Install standard binary files
-for i in nmblookup smbclient smbpasswd smbstatus testparm testprns \
+for i in nmblookup smbclient smbpasswd smbstatus testparm \
rpcclient smbspool smbcacls smbcontrol wbinfo smbmnt net \
smbcacls pdbedit tdbbackup smbtree ntlm_auth smbcquotas
do
@@ -413,7 +413,6 @@
%{prefix}/bin/smbspool
%{prefix}/bin/rpcclient
%{prefix}/bin/testparm
-%{prefix}/bin/testprns
%{prefix}/bin/findsmb
%{prefix}/bin/smbstatus
%{prefix}/bin/nmblookup
svn commit: samba r7823 - in trunk/source: . nsswitch rpc_client
Author: vlendec Date: 2005-06-21 22:20:08 + (Tue, 21 Jun 2005) New Revision: 7823 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7823 Log: More work in progress. wbinfo --groupmem sid now should expand aliases and nested domain groups. It needs optimization and extended error checking, but for basic tests it should work. Volker Added: trunk/source/nsswitch/winbindd_groupmem.c Modified: trunk/source/Makefile.in trunk/source/nsswitch/wbinfo.c trunk/source/nsswitch/winbindd.c trunk/source/nsswitch/winbindd.h trunk/source/nsswitch/winbindd_ads.c trunk/source/nsswitch/winbindd_async.c trunk/source/nsswitch/winbindd_cache.c trunk/source/nsswitch/winbindd_dual.c trunk/source/nsswitch/winbindd_group.c trunk/source/nsswitch/winbindd_lookupsids.c trunk/source/nsswitch/winbindd_nss.h trunk/source/nsswitch/winbindd_passdb.c trunk/source/nsswitch/winbindd_reconnect.c trunk/source/nsswitch/winbindd_rpc.c trunk/source/rpc_client/cli_samr.c Changeset: Sorry, the patch is too large (1670 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7823
svn commit: samba r7824 - in branches/SAMBA_3_0_RELEASE/packaging: Fedora RedHat
Author: jerry
Date: 2005-06-21 22:25:43 + (Tue, 21 Jun 2005)
New Revision: 7824
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7824
Log:
merging specfile fixes from 3.0
Modified:
branches/SAMBA_3_0_RELEASE/packaging/Fedora/samba.spec.tmpl
branches/SAMBA_3_0_RELEASE/packaging/RedHat/samba.spec.tmpl
Changeset:
Modified: branches/SAMBA_3_0_RELEASE/packaging/Fedora/samba.spec.tmpl
===
--- branches/SAMBA_3_0_RELEASE/packaging/Fedora/samba.spec.tmpl 2005-06-21
22:20:08 UTC (rev 7823)
+++ branches/SAMBA_3_0_RELEASE/packaging/Fedora/samba.spec.tmpl 2005-06-21
22:25:43 UTC (rev 7824)
@@ -359,7 +359,6 @@
%{_libdir}/samba/idmap/idmap*.so
%{_includedir}/libsmbclient.h
%{_bindir}/testparm
-%{_bindir}/testprns
%{_bindir}/smbpasswd
# %{_bindir}/make_printerdef
%{_bindir}/wbinfo
@@ -382,7 +381,6 @@
%{_mandir}/man1/profiles.1*
%{_mandir}/man1/smbcquotas.1*
%{_mandir}/man1/testparm.1*
-%{_mandir}/man1/testprns.1*
%{_mandir}/man5/smb.conf.5*
%{_mandir}/man5/lmhosts.5*
%{_mandir}/man8/smbpasswd.8*
@@ -390,13 +388,6 @@
%{_mandir}/man8/winbindd.8*
%{_mandir}/man1/vfstest.1*
-# #%lang(ja) %{_mandir}/ja/man1/make_smbcodepage.1*
-#%lang(ja) %{_mandir}/ja/man1/testparm.1*
-#%lang(ja) %{_mandir}/ja/man1/testprns.1*
-#%lang(ja) %{_mandir}/ja/man5/smb.conf.5*
-#%lang(ja) %{_mandir}/ja/man5/lmhosts.5*
-#%lang(ja) %{_mandir}/ja/man8/smbpasswd.8*
-
%changelog
* Fri Jan 16 2004 Gerald (Jerry) Carter [EMAIL PROTECTED],org
- Removed ChangeLog entries since they are kept in CVS
Modified: branches/SAMBA_3_0_RELEASE/packaging/RedHat/samba.spec.tmpl
===
--- branches/SAMBA_3_0_RELEASE/packaging/RedHat/samba.spec.tmpl 2005-06-21
22:20:08 UTC (rev 7823)
+++ branches/SAMBA_3_0_RELEASE/packaging/RedHat/samba.spec.tmpl 2005-06-21
22:25:43 UTC (rev 7824)
@@ -125,7 +125,7 @@
mkdir -p $RPM_BUILD_ROOT%{prefix}/{lib,include}
# Install standard binary files
-for i in nmblookup smbclient smbpasswd smbstatus testparm testprns \
+for i in nmblookup smbclient smbpasswd smbstatus testparm \
rpcclient smbspool smbcacls smbcontrol wbinfo smbmnt net \
smbcacls pdbedit tdbbackup smbtree ntlm_auth smbcquotas
do
@@ -413,7 +413,6 @@
%{prefix}/bin/smbspool
%{prefix}/bin/rpcclient
%{prefix}/bin/testparm
-%{prefix}/bin/testprns
%{prefix}/bin/findsmb
%{prefix}/bin/smbstatus
%{prefix}/bin/nmblookup
svn commit: samba r7825 - in branches: SAMBA_3_0/packaging/Fedora SAMBA_3_0_RELEASE/packaging/Fedora
Author: jerry
Date: 2005-06-21 22:46:34 + (Tue, 21 Jun 2005)
New Revision: 7825
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7825
Log:
Fedora packaging fixes after docs change
Modified:
branches/SAMBA_3_0/packaging/Fedora/samba.spec.tmpl
branches/SAMBA_3_0_RELEASE/packaging/Fedora/samba.spec.tmpl
Changeset:
Modified: branches/SAMBA_3_0/packaging/Fedora/samba.spec.tmpl
===
--- branches/SAMBA_3_0/packaging/Fedora/samba.spec.tmpl 2005-06-21 22:25:43 UTC
(rev 7824)
+++ branches/SAMBA_3_0/packaging/Fedora/samba.spec.tmpl 2005-06-21 22:46:34 UTC
(rev 7825)
@@ -205,6 +205,8 @@
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/smbget.1*
rm -f $RPM_BUILD_ROOT%{_mandir}/man5/smbgetrc.5*
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/mount.cifs.8*
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/umount.cifs.8*
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/testprns.1*
%clean
rm -rf $RPM_BUILD_ROOT
@@ -269,11 +271,9 @@
%attr(755,root,root) /%{_lib}/security/pam_smbpass.so
%{_sbindir}/smbd
%{_sbindir}/nmbd
-# %{_bindir}/make_unicodemap
%{_bindir}/mksmbpasswd.sh
%{_bindir}/smbcontrol
%{_bindir}/smbstatus
-# %{_bindir}/smbadduser
%{_bindir}/tdbbackup
%{_bindir}/tdbtool
%config(noreplace) %{_sysconfdir}/sysconfig/samba
@@ -281,7 +281,6 @@
%attr(755,root,root) %config %{initdir}/smb
%config(noreplace) %{_sysconfdir}/logrotate.d/samba
%config(noreplace) %{_sysconfdir}/pam.d/samba
-# %{_mandir}/man1/make_unicodemap.1*
%{_mandir}/man1/smbcontrol.1*
%{_mandir}/man1/smbstatus.1*
%{_mandir}/man5/smbpasswd.5*
@@ -291,11 +290,8 @@
%{_mandir}/man8/smbd.8*
%{_mandir}/man8/pam_winbind.8*
%{_mandir}/man8/tdbbackup.8*
-#%{_mandir}/ja/man1/smbstatus.1*
-#%{_mandir}/ja/man5/smbpasswd.5*
-#%{_mandir}/ja/man7/samba.7*
-#%{_mandir}/ja/man8/smbd.8*
-#%{_mandir}/ja/man8/nmbd.8*
+%{_mandir}/man8/libsmbclient.8*
+
%{_libdir}/samba/vfs
%attr(0700,root,root) %dir /var/log/samba
@@ -307,7 +303,6 @@
%{_datadir}/swat
%{_sbindir}/swat
%{_mandir}/man8/swat.8*
-#%{_mandir}/ja/man8/swat.8*
%attr(755,root,root) %{_libdir}/samba/*.msg
%files client
Modified: branches/SAMBA_3_0_RELEASE/packaging/Fedora/samba.spec.tmpl
===
--- branches/SAMBA_3_0_RELEASE/packaging/Fedora/samba.spec.tmpl 2005-06-21
22:25:43 UTC (rev 7824)
+++ branches/SAMBA_3_0_RELEASE/packaging/Fedora/samba.spec.tmpl 2005-06-21
22:46:34 UTC (rev 7825)
@@ -205,6 +205,8 @@
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/smbget.1*
rm -f $RPM_BUILD_ROOT%{_mandir}/man5/smbgetrc.5*
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/mount.cifs.8*
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/umount.cifs.8*
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/testprns.1*
%clean
rm -rf $RPM_BUILD_ROOT
@@ -269,11 +271,9 @@
%attr(755,root,root) /%{_lib}/security/pam_smbpass.so
%{_sbindir}/smbd
%{_sbindir}/nmbd
-# %{_bindir}/make_unicodemap
%{_bindir}/mksmbpasswd.sh
%{_bindir}/smbcontrol
%{_bindir}/smbstatus
-# %{_bindir}/smbadduser
%{_bindir}/tdbbackup
%{_bindir}/tdbtool
%config(noreplace) %{_sysconfdir}/sysconfig/samba
@@ -281,7 +281,6 @@
%attr(755,root,root) %config %{initdir}/smb
%config(noreplace) %{_sysconfdir}/logrotate.d/samba
%config(noreplace) %{_sysconfdir}/pam.d/samba
-# %{_mandir}/man1/make_unicodemap.1*
%{_mandir}/man1/smbcontrol.1*
%{_mandir}/man1/smbstatus.1*
%{_mandir}/man5/smbpasswd.5*
@@ -291,11 +290,8 @@
%{_mandir}/man8/smbd.8*
%{_mandir}/man8/pam_winbind.8*
%{_mandir}/man8/tdbbackup.8*
-#%{_mandir}/ja/man1/smbstatus.1*
-#%{_mandir}/ja/man5/smbpasswd.5*
-#%{_mandir}/ja/man7/samba.7*
-#%{_mandir}/ja/man8/smbd.8*
-#%{_mandir}/ja/man8/nmbd.8*
+%{_mandir}/man8/libsmbclient.8*
+
%{_libdir}/samba/vfs
%attr(0700,root,root) %dir /var/log/samba
@@ -307,7 +303,6 @@
%{_datadir}/swat
%{_sbindir}/swat
%{_mandir}/man8/swat.8*
-#%{_mandir}/ja/man8/swat.8*
%attr(755,root,root) %{_libdir}/samba/*.msg
%files client
svn commit: samba r7826 - in tags: .
Author: jerry Date: 2005-06-21 22:50:04 + (Tue, 21 Jun 2005) New Revision: 7826 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7826 Log: tagging 3.0.20pre1 Added: tags/release-3-0-20pre1/ Changeset: Copied: tags/release-3-0-20pre1 (from rev 7825, branches/SAMBA_3_0_RELEASE)
svn commit: samba-docs r667 - in tags: .
Author: jerry Date: 2005-06-21 22:50:07 + (Tue, 21 Jun 2005) New Revision: 667 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=667 Log: tagging 3.0.20pre1 Added: tags/release-3-0-20pre1/ Changeset: Copied: tags/release-3-0-20pre1 (from rev 666, trunk)
Re: svn commit: samba r7759 - in branches/SAMBA_4_0/source/lib/ldb/common: .
Derrell, Shouldn't this be talloc_strdup(ldb not connected)? The error string from some modules is likely to have to be allocated, as it may be coming, initially, from an external library which malloc()s it, so the string will have to be talloc_strdup()ed to be returned. (e.g. sqlite). No. The caller does not free in this API. It's fine for a backend to allocate the string, in which case the backend will need to do something like this: talloc_free(mybackend-last_error_string); mybackend-last_error_string = talloc_strdup(mybackend, a new error); return mybackend-last_error_string; Cheers, Tridge
Build status as of Wed Jun 22 00:00:01 2005
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2005-06-21 00:00:31.0 + +++ /home/build/master/cache/broken_results.txt 2005-06-22 00:00:05.0 + @@ -1,4 +1,4 @@ -Build status as of Tue Jun 21 00:00:02 2005 +Build status as of Wed Jun 22 00:00:01 2005 Build counts: Tree Total Broken Panic @@ -9,9 +9,9 @@ rsync39 1 0 samba0 0 0 samba-docs 0 0 0 -samba4 39 35 6 -samba_3_039 15 0 -talloc 36 18 0 +samba4 39 36 6 +samba_3_039 11 0 +talloc 36 19 0 tdb 37 37 0 Currently broken builds: @@ -57,6 +57,7 @@ shelob ccache iccok/ok/ok/ 2 shelob samba4 iccok/ok/ok/ 237/PANIC shelob samba_3_0iccok/ 2/?/? +shelob talloc iccok/ok/ 2/? shelob tdb icc 2/?/?/? gc8lorikeet-heimdal gccok/ 137/?/? gc8samba4 gccok/ 1/?/? @@ -103,11 +104,9 @@ svamp tdb gcc 2/?/?/? homer tdb gcc 2/?/?/? shubnigurath samba4 cc ok/ 1/?/? -shubnigurath samba_3_0cc ok/ 1/?/? shubnigurath tdb cc 2/?/?/? sol10 lorikeet-heimdal gccok/ok/ 1/? sol10 samba4 gccok/ok/ok/ 12 -sol10 samba_3_0gccok/ 1/?/? sol10 tdb gcc 2/?/?/? gc20 lorikeet-heimdal gccok/ 137/?/? gc20 samba4 gccok/ 2/?/? @@ -119,10 +118,8 @@ sun1 talloc cc ok/ok/ok/ 2 sun1 tdb cc 2/?/?/? sun1 samba4 gccok/ok/ok/ 12 -sun1 samba_3_0gccok/ 2/?/? sun1 talloc gccok/ok/ok/ 2 sun1 tdb gcc 2/?/?/? -fire1 samba_3_0gccok/ 2/?/? fire1 talloc gccok/ok/ 2/? fire1 tdb gcc 2/?/?/? m30ccache gccok/ 127/?/? @@ -133,6 +130,7 @@ m30talloc gccok/ 127/?/? m30tdb gcc 2/?/?/? metze02samba4 gcc-3.4ok/ok/ok/ 240/PANIC +metze01samba4 gccok/ok/ok/ 237/PANIC metze01tdb gcc 2/?/?/? PCS1 samba4 gccok/ok/ok/ 1 PCS1 tdb gcc 2/?/?/? @@ -142,7 +140,7 @@ l390vme1 tdb gcc 2/?/?/? opilorikeet-heimdal gccok/ 2/?/? opippp gccok/ 2/?/? -opisamba4 gccok/ok/ok/ 237/PANIC +opisamba4 gccok/ok/ok/ 76 opitalloc gccok/ok/ 2/? opitdb gcc 2/?/?/?
Re: svn commit: samba r7759 - in branches/SAMBA_4_0/source/lib/ldb/common: .
Andrew Tridgell [EMAIL PROTECTED] writes: Derrell, Shouldn't this be talloc_strdup(ldb not connected)? The error string from some modules is likely to have to be allocated, as it may be coming, initially, from an external library which malloc()s it, so the string will have to be talloc_strdup()ed to be returned. (e.g. sqlite). No. The caller does not free in this API. It's fine for a backend to allocate the string, in which case the backend will need to do something like this: talloc_free(mybackend-last_error_string); mybackend-last_error_string = talloc_strdup(mybackend, a new error); return mybackend-last_error_string; That's kinda yucky. (No, that's really yucky.) Is there some reason that you wouldn't want the caller to just free the error string, or better yet, for the error string to always just be allocated on the ldb context so that it gets freed automagically? With everything so clean in ldb, this seems like a real oversight. Derrell
Re: svn commit: samba r7759 - in branches/SAMBA_4_0/source/lib/ldb/common: .
Derrell, That's kinda yucky. (No, that's really yucky.) Is there some reason that you wouldn't want the caller to just free the error string, or better yet, for the error string to always just be allocated on the ldb context so that it gets freed automagically? With everything so clean in ldb, this seems like a real oversight. yes, there are very good reasons for doing it the way it is done! 1) callers mostly don't look for the error string, so if we allocate at the time the error happens and the caller doesn't call ldb_errstring() then we have leaked. So the backend has to free it in that case anyway. 2) when the backend gets an allocation error, the last thing you want to do to report the error is another allocation! 3) always allocating on the ldb context would give us a massive memory leak for long lived connections. Notice that ldb_errstring() retruns a const char *. The const is a hint that the caller does not free (note that talloc_free() takes a non-const, just like free()). Having an error function that returns a string that the caller does not free is the normal approach to this problem in lots and lots of APIs. Have a look at calls like ldap_err2string() for an example. Cheers, Tridge
Re: svn commit: samba r7759 - in branches/SAMBA_4_0/source/lib/ldb/common: .
On Tue, 2005-06-21 at 20:06 -0400, [EMAIL PROTECTED] wrote: Andrew Tridgell [EMAIL PROTECTED] writes: Derrell, Shouldn't this be talloc_strdup(ldb not connected)? The error string from some modules is likely to have to be allocated, as it may be coming, initially, from an external library which malloc()s it, so the string will have to be talloc_strdup()ed to be returned. (e.g. sqlite). No. The caller does not free in this API. It's fine for a backend to allocate the string, in which case the backend will need to do something like this: talloc_free(mybackend-last_error_string); mybackend-last_error_string = talloc_strdup(mybackend, a new error); return mybackend-last_error_string; That's kinda yucky. (No, that's really yucky.) Is there some reason that you wouldn't want the caller to just free the error string, The reason is that the caller is not obliged to read (and free) the error message on an error, so that would make, either the caller code too heavy and unreadable, or it will leak memory. or better yet, for the error string to always just be allocated on the ldb context so that it gets freed automagically? it would get freed at he ldb close, that may be thousand of operations and erros later, that would make a huge memleak. With everything so clean in ldb, this seems like a real oversight. I think that system is good enough right now, others have worse problems imho. Simo. -- Simo Sorce- [EMAIL PROTECTED] Samba Team- http://www.samba.org Italian Site - http://samba.xsec.it
svn commit: samba-docs r669 - in trunk/Samba3-HOWTO: .
Author: jht Date: 2005-06-22 02:17:10 + (Wed, 22 Jun 2005) New Revision: 669 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=669 Log: Another partial update. Modified: trunk/Samba3-HOWTO/TOSHARG-Passdb.xml Changeset: Sorry, the patch is too large (837 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=669
svn commit: samba-docs r670 - in trunk/Samba3-HOWTO: .
Author: jht Date: 2005-06-22 02:27:09 + (Wed, 22 Jun 2005) New Revision: 670 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=670 Log: Progress commit. Modified: trunk/Samba3-HOWTO/TOSHARG-Passdb.xml Changeset: Sorry, the patch is too large (318 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=670
svn commit: samba-web r712 - in trunk: .
Author: jerry Date: 2005-06-22 02:32:17 + (Wed, 22 Jun 2005) New Revision: 712 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=712 Log: announcing 3.0.20pre1 Modified: trunk/index.html Changeset: Modified: trunk/index.html === --- trunk/index.html2005-06-21 21:46:14 UTC (rev 711) +++ trunk/index.html2005-06-22 02:32:17 UTC (rev 712) @@ -19,32 +19,44 @@ h2Current Release/h2 -h4a name=latest18 April 2005/a/h4 -p class=headlineSamba 3.0.15pre2 Available for Download/p +h4a name=latest21 June 2005/a/h4 +p class=headlineSamba 3.0.20pre1 Available for Download/p -pSamba 3.0.15pre2 is a preview release of the Samba 3.0.15 code base and +pSamba 3.0.20pre1 is a preview release of the Samba 3.0.20 code base and is provided for testing only. This release is emnot/em intended - for production servers. However, there have been several bug - fixes and new features added since 3.0.14a that we feel are - important to make available to the Samba community for wider - testing. There are still more changes planned before the - final 3.0.15 release. Please read about the important a - href=/samba/ftp/pre/WHATSNEW-3-0-15pre2.txtchanges in this - snapshot/a./p + for production servers. There has been a substantial amount + of development since the 3.0.14a stable release (and since the + 3.015pre2 release as well). We would like to ask the Samba + community for help in testing these changes as we work towards + the next official, production Samba 3.0 release. It is strongly + recommended that you read the + a href=/samba/ftp/pre/WHATSNEW-3-0-20pre1.txtchanges in this + preview release/a to learn about smb.conf changes, new features, + etc.../p -pThe a href=/samba/ftp/pre/samba-3.0.15pre2.tar.gzSamba 3.0.15pre2 +pemSo what happened to 3.0.15 trough 3.0.19?/em After some + discussion it was deemed that the amount of changes + going into the next Samba 3.0 release needed something to catch + people's attention. Skipping several releases was chosen as + the best solution with the least overhead. There will be no + 3.0.15 - 3.0.19 ever released. The next production release + following 3.0.20 should be 3.0.21. You can also read the + a href=http://marc.theaimsgroup.com/?l=sambam=111721010206997w=2;original + announcement on the samba mailing list/a./p + +pThe a href=/samba/ftp/pre/samba-3.0.20pre1.tar.gzSamba 3.0.20pre1 source code/a can be downloaded now. The a - href=/samba/ftp/pre/samba-3.0.15pre2.tar.ascGnuPG + href=/samba/ftp/pre/samba-3.0.20pre1.tar.ascGnuPG signature for the emun/emcompressed tarball/a is also available. Precompiled packages for RedHat and Fedora platforms are available in the a href=/samba/ftp/Binary_Packages/Binary_Packages download area/a./p -pSamba 3.0.15pre2 is also available via BitTorrent - (a href=http://torrent.samba.org/samba/ftp/pre/samba-3.0.15pre2.tar.gz.torrent;samba-3.0.15pre2.tar.gz.torrent/a). +pSamba 3.0.20pre1 is also available via BitTorrent + (a href=http://torrent.samba.org/samba/ftp/pre/samba-3.0.20pre1.tar.gz.torrent;samba-3.0.20pre1.tar.gz.torrent/a). Note that when downloading via BitTorrent, you are encouraged to verify the resulting uncompressed tarball's - a href=/samba/ftp/pre/samba-3.0.15pre2.tar.ascGPG signature/a./p + a href=/samba/ftp/pre/samba-3.0.20pre1.tar.ascGPG signature/a./p h4a name=stable15 April 2005/a/h4
svn commit: samba r7828 - in branches/SAMBA_4_0/source/lib/ldb: common include ldb_sqlite3 tests tools
Author: derrell Date: 2005-06-22 02:39:07 + (Wed, 22 Jun 2005) New Revision: 7828 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7828 Log: Although there is still plenty to do, ldb_sqlite3 now passes the set of tests in tests/test-sqlite3.sh (tests/test-generic.sh). There are lots of optimizations still TBD, and some things are REALLY slow right now (e.g. each add() operation takes 1/3 - 1/2 second) but it's ready for interested parties to poke it and prod it and see how (un)reasonable it is. Play away. Still to be implemented or improved: - tdb specials (@MODULES, @SUBCLASSES, etc.) - all DNs are case-folded in their entirty right now (since doing otherwise would require @ATTRIBUTES to be implemented) - speed improvements and optimizations. I am quite confident that the excessively slow add() operation can be much improved, and other areas can be somewhat improved. Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb.c branches/SAMBA_4_0/source/lib/ldb/include/ldb.h branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/base160.c 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 branches/SAMBA_4_0/source/lib/ldb/tests/test-sqlite3.sh branches/SAMBA_4_0/source/lib/ldb/tools/ldbtest.c Changeset: Sorry, the patch is too large (2370 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7828
svn commit: samba r7829 - branches/SAMBA_3_0/source/printing trunk/source/printing
Author: jerry Date: 2005-06-22 02:51:22 + (Wed, 22 Jun 2005) New Revision: 7829 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7829 Log: fix unitialized printer status field that was breaking migration of print queues Modified: branches/SAMBA_3_0/source/printing/printing.c trunk/source/printing/printing.c Changeset: Modified: branches/SAMBA_3_0/source/printing/printing.c === --- branches/SAMBA_3_0/source/printing/printing.c 2005-06-22 02:39:07 UTC (rev 7828) +++ branches/SAMBA_3_0/source/printing/printing.c 2005-06-22 02:51:22 UTC (rev 7829) @@ -2094,6 +2094,8 @@ const char* sharename = lp_const_servicename( snum ); print_status_struct status; int len; + + ZERO_STRUCT( status ); /* make sure the database is up to date */ if (print_cache_expired(lp_const_servicename(snum), True)) Modified: trunk/source/printing/printing.c === --- trunk/source/printing/printing.c2005-06-22 02:39:07 UTC (rev 7828) +++ trunk/source/printing/printing.c2005-06-22 02:51:22 UTC (rev 7829) @@ -2094,6 +2094,8 @@ const char* sharename = lp_const_servicename( snum ); print_status_struct status; int len; + + ZERO_STRUCT( status ); /* make sure the database is up to date */ if (print_cache_expired(lp_const_servicename(snum), True))
svn commit: samba r7830 - in branches/SAMBA_3_0/packaging/Fedora: .
Author: jerry
Date: 2005-06-22 03:05:54 + (Wed, 22 Jun 2005)
New Revision: 7830
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7830
Log:
fix directory typo with testprns manpage
Modified:
branches/SAMBA_3_0/packaging/Fedora/samba.spec.tmpl
Changeset:
Modified: branches/SAMBA_3_0/packaging/Fedora/samba.spec.tmpl
===
--- branches/SAMBA_3_0/packaging/Fedora/samba.spec.tmpl 2005-06-22 02:51:22 UTC
(rev 7829)
+++ branches/SAMBA_3_0/packaging/Fedora/samba.spec.tmpl 2005-06-22 03:05:54 UTC
(rev 7830)
@@ -206,7 +206,7 @@
rm -f $RPM_BUILD_ROOT%{_mandir}/man5/smbgetrc.5*
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/mount.cifs.8*
rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/umount.cifs.8*
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/testprns.1*
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/testprns.1*
%clean
rm -rf $RPM_BUILD_ROOT
svn commit: samba r7831 - in branches/SAMBA_4_0/source/lib/ldb/tests: .
Author: tridge Date: 2005-06-22 03:08:06 + (Wed, 22 Jun 2005) New Revision: 7831 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7831 Log: use cn=TEST as base of test DNs so we don't interfere with potentially real records Modified: branches/SAMBA_4_0/source/lib/ldb/tests/init.ldif branches/SAMBA_4_0/source/lib/ldb/tests/slapd.conf branches/SAMBA_4_0/source/lib/ldb/tests/test-extended.sh branches/SAMBA_4_0/source/lib/ldb/tests/test-generic.sh branches/SAMBA_4_0/source/lib/ldb/tests/test-modify.ldif branches/SAMBA_4_0/source/lib/ldb/tests/test.ldif Changeset: Sorry, the patch is too large (417 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7831
svn commit: samba r7832 - in branches/SAMBA_4_0/source/lib/ldb/tests: .
Author: tridge Date: 2005-06-22 03:09:25 + (Wed, 22 Jun 2005) New Revision: 7832 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7832 Log: missed one Modified: branches/SAMBA_4_0/source/lib/ldb/tests/photo.ldif Changeset: Modified: branches/SAMBA_4_0/source/lib/ldb/tests/photo.ldif === --- branches/SAMBA_4_0/source/lib/ldb/tests/photo.ldif 2005-06-22 03:08:06 UTC (rev 7831) +++ branches/SAMBA_4_0/source/lib/ldb/tests/photo.ldif 2005-06-22 03:09:25 UTC (rev 7832) @@ -1,4 +1,4 @@ -dn: cn=Hampster Ursula,ou=Alumni Association,ou=People,o=University of Michigan,c=US +dn: cn=Hampster Ursula,ou=Alumni Association,ou=People,o=University of Michigan,c=TEST changetype: modify add: photo photo: tests/samba4.png
svn commit: samba r7833 - in branches/SAMBA_4_0/source/lib/ldb: tests tools
Author: tridge
Date: 2005-06-22 03:10:40 + (Wed, 22 Jun 2005)
New Revision: 7833
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=7833
Log:
changed ldbsearch and ldbedit to have command line syntax closer to
ldapsearch. They look for an '=' in the first argument to see if it is
a search expression, and if not then it does an 'all records' search
Modified:
branches/SAMBA_4_0/source/lib/ldb/tests/test-generic.sh
branches/SAMBA_4_0/source/lib/ldb/tools/ldbedit.c
branches/SAMBA_4_0/source/lib/ldb/tools/ldbsearch.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/tests/test-generic.sh
===
--- branches/SAMBA_4_0/source/lib/ldb/tests/test-generic.sh 2005-06-22
03:09:25 UTC (rev 7832)
+++ branches/SAMBA_4_0/source/lib/ldb/tests/test-generic.sh 2005-06-22
03:10:40 UTC (rev 7833)
@@ -37,7 +37,7 @@
$VALGRIND bin/ldbsearch '((uid=uham)(uid=uham)(!(objectclass=xxx)))' || exit
1
$VALGRIND bin/ldbsearch '((objectclass=person)(uid=uham)(!(uid=uhamxx)))' uid
\* \+ dn || exit 1
$VALGRIND bin/ldbsearch '((uid=uham)(uid=uha*)(title=*))' uid || exit 1
-$VALGRIND bin/ldbsearch '((' uid exit 1
+$VALGRIND bin/ldbsearch '((' uid || exit 1
$VALGRIND bin/ldbsearch '(objectclass=)' uid || exit 1
$VALGRIND bin/ldbsearch -b 'cn=Hampster Ursula,ou=Alumni
Association,ou=People,o=University of Michigan,c=TEST' -s base sn || exit 1
Modified: branches/SAMBA_4_0/source/lib/ldb/tools/ldbedit.c
===
--- branches/SAMBA_4_0/source/lib/ldb/tools/ldbedit.c 2005-06-22 03:09:25 UTC
(rev 7832)
+++ branches/SAMBA_4_0/source/lib/ldb/tools/ldbedit.c 2005-06-22 03:10:40 UTC
(rev 7833)
@@ -278,28 +278,23 @@
struct ldb_context *ldb;
struct ldb_message **msgs;
int ret;
- const char *expression = NULL;
+ const char *expression = (|(objectclass=*)(dn=*));
const char * const * attrs = NULL;
ldb = ldb_init(NULL);
options = ldb_cmdline_process(ldb, argc, argv, usage);
- if (options-all_records) {
- expression = (|(objectclass=*)(dn=*));
- }
-
- if (!expression) {
- if (options-argc == 0) {
- usage();
- }
+ /* the check for '=' is for compatibility with ldapsearch */
+ if (options-argc 0
+ strchr(options-argv[0], '=')) {
expression = options-argv[0];
- options-argc--;
options-argv++;
+ options-argc--;
}
if (options-argc 0) {
- attrs = (const char * const *)options-argv;
+ attrs = (const char * const *)(options-argv);
}
ret = ldb_search(ldb, options-basedn, options-scope, expression,
attrs, msgs);
Modified: branches/SAMBA_4_0/source/lib/ldb/tools/ldbsearch.c
===
--- branches/SAMBA_4_0/source/lib/ldb/tools/ldbsearch.c 2005-06-22 03:09:25 UTC
(rev 7832)
+++ branches/SAMBA_4_0/source/lib/ldb/tools/ldbsearch.c 2005-06-22 03:10:40 UTC
(rev 7833)
@@ -120,18 +120,23 @@
const char * const * attrs = NULL;
struct ldb_cmdline *options;
int ret = -1;
+ const char *expression = (|(objectclass=*)(dn=*));
ldb = ldb_init(NULL);
options = ldb_cmdline_process(ldb, argc, argv, usage);
-
- if (options-argc 1 !options-interactive) {
- usage();
- exit(1);
+
+ /* the check for '=' is for compatibility with ldapsearch */
+ if (!options-interactive
+ options-argc 0
+ strchr(options-argv[0], '=')) {
+ expression = options-argv[0];
+ options-argv++;
+ options-argc--;
}
- if (options-argc 1) {
- attrs = (const char * const *)(options-argv+1);
+ if (options-argc 0) {
+ attrs = (const char * const *)(options-argv);
}
if (options-interactive) {
@@ -144,7 +149,7 @@
}
} else {
ret = do_search(ldb, options-basedn, options-scope,
options-sorted,
- options-argv[0], attrs);
+ expression, attrs);
}
talloc_free(ldb);
