Re: [Samba] Fwd: another problem with printing
Hello! This doesn't look like a Samba problem. It's CUPS, who can't send the job to the printer. To me, it looks like either your print server (network printer) does not support IPP printer or the printer-URI is not set up correctly. Some my have the format hostname/ipp/lp0 or hostname/printers/queuename or whatsoever. You can check this out by printing directly from linux to the printer using either lp from the CUPS tools or the ipp backend itself. Bye, Martin Ezlak schrieb: Hi! I have Samba version 3.0.10-1.4E.9 installed and CUPS v1.1.22rc1. the network printer is Xerox WorkCentre 4150. Once in a while (about every 20-30 jobs) i get an error I [23/May/2007:08:55:28 -0500] Adding start banner page none to job 165. I [23/May/2007:08:55:28 -0500] Adding end banner page none to job 165. I [23/May/2007:08:55:28 -0500] Job 165 queued on 'Xerox' by 'mezlakowski'. I [23/May/2007:08:55:28 -0500] Started backend /usr/lib/cups/backend/ ipp (PID 5755) for job 165. E [23/May/2007:08:55:29 -0500] [Job 165] Print file was not accepted (server-error-not-accepting-jobs)! E [23/May/2007:08:55:29 -0500] PID 5755 stopped with status 1! I [23/May/2007:08:55:29 -0500] Hint: Try setting the LogLevel to debug to find out more. I [23/May/2007:08:55:29 -0500] Saving printers.conf... and the printer stops printing. I have to stop the printer, reject all jobs, accept them and then start the printer again to print the documents which is pretty annoying. I'm new to Samba, I was trying to find the solution online and in the documentation but nothing seems right. I would appreciate any help Mateusz -- Martin Zielinski [EMAIL PROTECTED] Software Development SEH Computertechnik GmbH www.seh.de -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] SAMBA in CentOS 5
Hello, After patient, I see that can only use samba if the directory is in the same partition of /. Anyone know if Samba have problems sharing directories in other partitions different of / or problems using home directory in different partition? -- -- Publicidad http://www.pas-world.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] SAMBA in CentOS 5
devel pisze: Hello, After patient, I see that can only use samba if the directory is in the same partition of /. Anyone know if Samba have problems sharing directories in other partitions different of / or problems using home directory in different partition? Maybe try off selinux for samba deamon or create new policy ... My 1 cent Irens -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] grant privileges issue
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Lutieri G. wrote: I'm using security = ADS and winbind. I need to grant SePrintOperatorPrivilege to a user in domain. When i try to grant SePrintOperatorPrivilege to my user(realm\lutierib) i use: net -d 1 -Uroot -Slocalhost rpc rights grant realm\lutierib SePrintOperatorPrivilege executing the above command return me a error(Acces denied) because root is not found in domain and doesn't has permittion for grant privileges. Use -U root -W MACHINE. cheers, jerry = Samba--- http://www.samba.org Centeris --- http://www.centeris.com What man is a man who does not make the world better? --Balian -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.4 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGXBccIR7qMdg1EfYRArMuAJwO9rnNPKeNgUhnDXUSokDT4R5qOgCgx5yH SzzF3qewqzR18fsQGNUPlbM= =uB9R -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] how to get SID from samba 2
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 empirium wrote: How to get SID from samba 2 working as PDC. I try to use smbpasswd -S DOMAIN but my smbpasswd doesnt have such option -S You can use rpcclient and pull the SID over the network. cheers, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.2.2 (Darwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGXBtoIR7qMdg1EfYRAjvoAJwPoQkfHjbMxDreDvNcShJ6ZwSZxgCeP0hF NFANdH4JUrCRK0A7G5KeFiw= =+966 -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Need Help .............Urgent........
Hi Folks, Currently i am using samba version 2.5. Now the following patches for security vulnerabilities are available on the samba.org... http://us4.samba.org/samba/ftp/patches/security/samba-3.0.24-CVE-2007-2444.patch http://us4.samba.org/samba/ftp/patches/security/samba-3.0.24-CVE-2007-2446.patch http://us4.samba.org/samba/ftp/patches/security/samba-3.0.24-CVE-2007-2447.patch But these patches are for samba 3 onwards. So if i need to apply these patches for my samba (2.5) . I have no clue how to proceed? As there are a lot of changes in code between 2.5 and 3 . So its becoming very tough for me , how to backport these patches? I have no clue also , is these security holes are valid for my samba version 2.5. If you guys have any suggestions ...please let me know... Thanks in advance... vikash -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Need Help .............Urgent........
On Tue, May 29, 2007 at 06:14:46PM +0530, Vikash Jha wrote: I have no clue also , is these security holes are valid for my samba version 2.5. First, there is no version 2.2.5. Second, we've put Samba 2.2 end of life two and a half years ago. Please upgrade to Samba 3. Volker pgpbZbLssAIlA.pgp Description: PGP signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] (no subject)
Hello, We are running Version 3.0.23a-1.fc4.1 on three similar systems, all were NT4 domain members and we'd like to migrate to Active Directory. The AD join and kinit seem to work fine. So do all the other normal commands (wbinfo, getent, etc). However, we are unable to add a group to the smb.conf. It doesn't ever appear to get recognized. We can share to individual users just fine. As I said, getent group works fine and returns the active directory groups and the correct members. We can change the group membership with chgrp to a domain group but the group members cannot access the share unless they are explicity called out in the smb.conf. We've scoured the newsgroups and web and are coming up empty. Any help is GREATLY appreciated. Thanks, Phil _ Change is good. See what’s different about Windows Live Hotmail. www.windowslive-hotmail.com/learnmore/default.html?locale=en-usocid=TXT_TAGLM_HMWL_reten_changegood_0507-- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] The conflicting domain portions are not supported for NETLOGON calls
Debain etch with samba 3.0.24-6 I'm trying to logon with an XP machine after joining it to the domain. I'm getting the following error in the machine log. rpc_server/srv_netlog_nt.c:_net_sam_logon_internal(1004) _net_sam_logon: user USIT\chris.boyd has user sid S-1-5-21-1953726507-754737620-746616776 but group sid S-1-5-21-1953726507-754737620-746616776-513. The conflicting domain portions are not supported for NETLOGON calls net groupmap list Domain Admins (S-1-5-21-1953726507-754737620-746616776) - admins Domain Users (S-1-5-21-1953726507-754737620-746616776) - users Domain Guests (S-1-5-21-1953726507-754737620-746616776) - guests Chris Boyd Systems Administrator Usit Ireland 016021670 - This email message is intended only for the addressee(s) and contains information that may be confidential and/or copyrighted. If you are not the intended recipient please notify the sender by reply email and immediately delete this email. Use, disclosure or reproduction of this email by anyone other than the intended recipient(s) is strictly prohibited. USIT has scanned this email for viruses and dangerous content and believes it to be clean. However, virus scanning is ultimately the responsibility of the recipient. - USIT Ireland Ltd. Company No. 377526. Registered Office 19/21 Aston Quay Dublin 2. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Roaming profiles on demand?
Hello Samba-world, We are planning to upgrade our network incl. clients and server. So there are then exclusive Win XPSP2-Systems and one single Samba-3 Server on Linux. In the past,ocassionly there are network issues (dying switch, broken cable, uncooperative NICs, you all know the list :) ) so there are some chances to FU a roaming profile, if used.Usual, we dont need them because any user has his own PC. More: if I give them roaming profiles, the uers complain about the long start time, because they dont want to delete one single holliday picture in BMP-style for the desktop background, and because of the long shutdown time, they simply switch off their machines,... (you know this type of users). :( But there is a nice-to-have feature: An user can switch to another machine and take his own settings to this machine (this needs roaming profile) because of broken machine or holliday substition. So I want to have local profiles on client systems, and from time to time roaming profiles. Are there a way to realise this? If I see this correct, I (or better: the user) only have to do: -copy the User Profile from C: to the server. -local log out on the current machine -log in to the domain on his new machine. in return, he has to -log out of the domain from his actual used machine -domain log in on his main PC (to copy the actual profile to this machine) -log out from the Domain -local log in on the machine Have I forgotten some point? Is this possible? How can I do this? Greetings Andy -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Sharp AR-M550N and SAMBA
We have a similar machine, Sharp AR-M355N, that we use for the same purpose. We don't have samba involved in the setup at all. For scanning, we use ftp directly to the server, for printing we use the client drivers on windows. Our server performs as a dhcp server and we have simply set the copier up to obtain an ip from the server. We haven't found a need for samba yet and the copier works wonderfully. -- David C. Rankin, J.D., P.E. 510 Ochiltree Street Nacogdoches, Texas 75961 (936) 715-9333 (936) 715-9339 fax www.rankinlawfirm.com -- - Original Message - From: [EMAIL PROTECTED] To: samba@lists.samba.org Sent: Thursday, May 24, 2007 3:52 PM Subject: [Samba] Sharp AR-M550N and SAMBA Recently, we added a Sharp AR-M550N copier to our network. This device functions as an MFC (scanner/printer/copier). When I attempt to install the drivers to the SAMBA server, I receive an error message which displays briefly and then I receive the following error message when trying to access the properties of the printer. Function address 0x3119c9f caused a protection fault. (exception code 0xc05). Some or all property pages may not be displayed. I have tried this with the PCL5e and the PCL6 driver with the same results. Has anyone else seen this type of behavior? And, do you think uploading the drivers using rpcclient as opposed to the Add Printer Wizard, would make any difference? Thanks in advance for your assistance. Jay -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Need Help .............Urgent........
On Tue, May 29, 2007 at 07:11:46PM +0530, Vikash Jha wrote: sorry my samba version is 2.5.. Ok, then it is not the Samba from http://samba.org. Please contact the correct vendor where you got the software from, it's not samba.org. Volker pgpU20Mv8p46V.pgp Description: PGP signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] The conflicting domain portions are not supported for NETLOGON calls
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Chris Boyd wrote: Debain etch with samba 3.0.24-6 I'm trying to logon with an XP machine after joining it to the domain. I'm getting the following error in the machine log. rpc_server/srv_netlog_nt.c:_net_sam_logon_internal(1004) _net_sam_logon: user USIT\chris.boyd has user sid S-1-5-21-1953726507-754737620-746616776 ^^^ You;re missing the last 32bit RID here. cheers, jerry = Samba--- http://www.samba.org Centeris --- http://www.centeris.com What man is a man who does not make the world better? --Balian -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGXD9TIR7qMdg1EfYRAvd9AKDxSDOi9MOG2/0HmjYvNcR9gTiluwCgjpSY uEPrEJgBNfm7Sy5R8LH6tj8= =uPpe -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] The conflicting domain portions are not supported for NETLOGON calls
Where would I look to correct that? Thanks -Original Message- From: Gerald (Jerry) Carter [mailto:[EMAIL PROTECTED] Sent: 29 May 2007 15:57 To: Chris Boyd Cc: samba@lists.samba.org Subject: Re: [Samba] The conflicting domain portions are not supported for NETLOGON calls -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Chris Boyd wrote: Debain etch with samba 3.0.24-6 I'm trying to logon with an XP machine after joining it to the domain. I'm getting the following error in the machine log. rpc_server/srv_netlog_nt.c:_net_sam_logon_internal(1004) _net_sam_logon: user USIT\chris.boyd has user sid S-1-5-21-1953726507-754737620-746616776 ^^^ You;re missing the last 32bit RID here. cheers, jerry = Samba--- http://www.samba.org Centeris --- http://www.centeris.com What man is a man who does not make the world better? --Balian -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGXD9TIR7qMdg1EfYRAvd9AKDxSDOi9MOG2/0HmjYvNcR9gTiluwCgjpSY uEPrEJgBNfm7Sy5R8LH6tj8= =uPpe -END PGP SIGNATURE- - This email message is intended only for the addressee(s) and contains information that may be confidential and/or copyrighted. If you are not the intended recipient please notify the sender by reply email and immediately delete this email. Use, disclosure or reproduction of this email by anyone other than the intended recipient(s) is strictly prohibited. USIT has scanned this email for viruses and dangerous content and believes it to be clean. However, virus scanning is ultimately the responsibility of the recipient. - USIT Ireland Ltd. Company No. 377526. Registered Office 19/21 Aston Quay Dublin 2. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Binary_Packages/Debian
Dear users, I have uploaded the new 3.0.25a packages compiled for sarge. At the same time I have removed older 2.2.x and 3.0.x packages for Woody. Support for back porting packages to Woody was already discontinued, but older packages were still provided. As these packages were not updated after the recent security issues, I decided to remove them to avoid pushing people to use outdated and insecure packages with the believe they are ok because they are hosted on samba.org I am looking to see if I have time to start publishing packages for Etch, I am undecided yet, and I may discontinue this service. If someone is highly motivated and wants to give a hand, please contact me privately. Simo. -- Simo Sorce Samba Team GPL Compliance Officer email: [EMAIL PROTECTED] http://samba.org -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Samba prints to wrong CUPS queue
Ok, here is an interesting one... I have a server (CentOS5) with 67 print queues in CUPS. The server also runs Samba (samba-3.0.23c-2.el5.2.0.2) to supporting printing from Win32. Printing to the server via IPP works perfectly. Printing to the server via LPD works perfectly. But Samba is ever so slightly confused. There are two print queues: brtps, and cenlp. If a Win32 user prints to brtps it goes to the CUPS queue cenlp. All the other queues appear to work fine. If I look at the brtps printer properties from a Win32 box, under the Sharing tab of the properties dialog box the Shared as field says cenlp. If I change that to brtps and hit apply I get a very polite dialog box saying Share name already exists and the value reverts to cenlp. I tried stopping Samba, and deleting /var/cache/samba/printing/brtps.tdb, but upon restarting it seems to have been recreated with the same exact behavour - so the value is somewhere else? Where? Thoughts, suggestions, comments? -- Adam Tauno Williams, Network Systems Administrator Consultant - http://www.whitemiceconsulting.com Developer - http://www.opengroupware.org -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] samba.org DNS trouble
He may have encountered what I just did... when clicking on the link to lists.samba.org I got a Hmmm this host isn't necessarily who they say they are error. Haven't really looked into it on my end, but then I don't put valuable info into mailman per the bold instructions on the subscribe page. Pat On Sun, 2007-05-27 at 13:10 +1000, Res wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hello, On Sun, 27 May 2007, Gaye Abdoulaye wrote: Hello list, I think samba.org has DNS trouble! No? No... well unless you can elaborate further :) - -- Cheers Res -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQFGWPaasWhAmSIQh7MRAmujAKCUZJOBNg5qlwq4nZpfC/hWU2q2nQCeI4Ag mUsEH7SbvgZP5Iaz76m2ieo= =ZZLs -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] Binary_Packages/Debian
simo escribió: Dear users, I have uploaded the new 3.0.25a packages compiled for sarge. At the same time I have removed older 2.2.x and 3.0.x packages for Woody. Support for back porting packages to Woody was already discontinued, but older packages were still provided. As these packages were not updated after the recent security issues, I decided to remove them to avoid pushing people to use outdated and insecure packages with the believe they are ok because they are hosted on samba.org I am looking to see if I have time to start publishing packages for Etch, I am undecided yet, and I may discontinue this service. If someone is highly motivated and wants to give a hand, please contact me privately. Simo. I am pretty confused. Etch is the latest stable version, why this service would be discontinued? The sarge package is already in the official debian oldstable repository? Miguel -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Help Please! - Copying files from Windows to Samba share loses connection
Hello all, I haven't been able to solve an issue I am having when copying over data from a Windows box to a Samba share. I have found others with the same issue and I have made some configuration changes to try and solve the issue but the issue is still lingering. I want to migrate off my old Windows box but until I solve this issue I am I cannot move forward. Please let me know if you need any further info. Thanks!!! Here is the two lines I have added to my smb.conf file. Niether change did the trick. client schannel = no smb ports = 139 Here is my smb.config file: # smb.conf is the main Samba configuration file. You find a full commented # version at /usr/share/doc/packages/samba/examples/smb.conf.SUSE # Date: 2004-07-01 [global] workgroup = FMIC printing = cups printcap name = cups printcap cache time = 750 cups options = raw printer admin = @ntadmin, root, administrator username map = /etc/samba/smbusers map to guest = Bad User logon path = \\%L\profiles\.msprofile logon home = \\%L\%U\.9xprofile logon drive = P: security = ADS encrypt passwords = yes domain logons = no ldap idmap suffix = ou=Idmap ldap machine suffix = ou=Computers local master = yes wins server = wins support = no netbios name = FMICLINUX add machine script = preferred master = auto ldap suffix = dc=example,dc=com realm = FMIC.FMIC.COM idmap uid = 15000-2 idmap gid = 15000-2 server string = allow trusted domains = yes password server = * nt acl support = yes map acl inherit = yes winbind use default domain = yes client schannel = no smb ports = 139 System Log errors: May 23 12:59:00 fmiclinux /USR/SBIN/CRON[2745]: (root) CMD ( rm -f /var/spool/cron/lastrun/cron.hourly)│ │May 23 13:59:00 fmiclinux /USR/SBIN/CRON[2755]: (root) CMD ( rm -f /var/spool/cron/lastrun/cron.hourly)│ │May 25 09:00:03 fmiclinux smbd[3241]: [2007/05/25 09:00:03, 0] lib/util_sock.c:get_peer_addr(978) │ │May 25 09:00:03 fmiclinux smbd[3242]: [2007/05/25 09:00:03, 0] lib/util_sock.c:get_peer_addr(978) │ │May 25 09:00:03 fmiclinux sshd[2983]: fatal: Timeout before authentication for :::10.0.0.158 │ │May 25 09:00:03 fmiclinux smbd[2263]: Error writing 51 bytes to client. -1. (Broken pipe)│ │May 25 09:00:03 fmiclinux smbd[3241]: getpeername failed. Error was Transport endpoint is not connected │ │May 25 09:00:03 fmiclinux smbd[3240]: [2007/05/25 09:00:03, 0] lib/util_sock.c:write_socket_data(413) │ │May 25 09:00:03 fmiclinux smbd[3242]: getpeername failed. Error was Transport endpoint is not connected │ │May 25 09:00:03 fmiclinux smbd[3241]: [2007/05/25 09:00:03, 0] lib/util_sock.c:get_peer_addr(978) │ │May 25 09:00:03 fmiclinux smbd[3241]: getpeername failed. Error was Transport endpoint is not connected │ │May 25 09:00:03 fmiclinux smbd[3241]: [2007/05/25 09:00:03, 0] lib/util_sock.c:write_socket_data(413) │ │May 25 09:00:03 fmiclinux smbd[3240]: write_socket_data: write failure. Error = Connection reset by peer │ │May 25 09:00:04 fmiclinux smbd[3240]: [2007/05/25 09:00:04, 0] lib/util_sock.c:write_socket(438) │ │May 25 09:00:04 fmiclinux smbd[3240]: write_socket: Error writing 4 bytes to socket 5: ERRNO = Connection res│ │~et by peer │ │May 25 09:00:04 fmiclinux smbd[3240]: [2007/05/25 09:00:04, 0] lib/util_sock.c:send_smb(630) │ │May 25 09:00:03 fmiclinux smbd[3242]: [2007/05/25 09:00:03, 0] lib/util_sock.c:get_peer_addr(978) │ │May 25 09:00:04 fmiclinux smbd[3242]: getpeername failed. Error was Transport endpoint is not connected │ │May 25 09:00:04 fmiclinux smbd[3242]: [2007/05/25 09:00:04, 0] lib/util_sock.c:write_socket_data(413) │ │May 25 09:00:04 fmiclinux smbd[3242]: write_socket_data: write failure. Error = Connection reset by peer │ │May 25 09:00:04 fmiclinux smbd[3242]: [2007/05/25 09:00:04, 0] lib/util_sock.c:write_socket(438) │ │May 25 09:00:04 fmiclinux smbd[3242]: write_socket: Error writing 4 bytes to socket 21: ERRNO = Connection re│ Thanks in advance!! Will Holmes Programmer Analyst Fremont Insurance Company Ph: 231-924-0302 Ext. 145 E-Mail: [EMAIL PROTECTED] -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: Samba prints to wrong CUPS queue
On Tue, 2007-05-29 at 11:20 -0400, Adam Tauno Williams wrote: Ok, here is an interesting one... I have a server (CentOS5) with 67 print queues in CUPS. The server also runs Samba (samba-3.0.23c-2.el5.2.0.2) to supporting printing from Win32. Printing to the server via IPP works perfectly. Printing to the server via LPD works perfectly. But Samba is ever so slightly confused. There are two print queues: brtps, and cenlp. If a Win32 user prints to brtps it goes to the CUPS queue cenlp. All the other queues appear to work fine. If I look at the brtps printer properties from a Win32 box, under the Sharing tab of the properties dialog box the Shared as field says cenlp. If I change that to brtps and hit apply I get a very polite dialog box saying Share name already exists and the value reverts to cenlp. Huh! rpcclient enumprinters shows Samba has TWO entries for this print queue: flags:[0x80] name:[\\crew\brtps] description:[\\crew\brtps,HP LaserJet 4200 PS,Central Parts Warehouse Printer] comment:[Central Parts Warehouse Printer] flags:[0x80] name:[\\crew\brtps] description:[\\crew\brtps,HP LaserJet 4200 PS,Brighton Laser Printer] comment:[Brighton Laser Printer] Okay so how do I delete one? -- Adam Tauno Williams, Network Systems Administrator Consultant - http://www.whitemiceconsulting.com Developer - http://www.opengroupware.org -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Help Please! - Copying files from Windows to Samba share loses connection
I see you don't have the server string set. Have you tried to join this server to the domain with a net ads join command? Will Holmes wrote: Hello all, I haven't been able to solve an issue I am having when copying over data from a Windows box to a Samba share. I have found others with the same issue and I have made some configuration changes to try and solve the issue but the issue is still lingering. I want to migrate off my old Windows box but until I solve this issue I am I cannot move forward. Please let me know if you need any further info. Thanks!!! Here is the two lines I have added to my smb.conf file. Niether change did the trick. client schannel = no smb ports = 139 Here is my smb.config file: # smb.conf is the main Samba configuration file. You find a full commented # version at /usr/share/doc/packages/samba/examples/smb.conf.SUSE # Date: 2004-07-01 [global] workgroup = FMIC printing = cups printcap name = cups printcap cache time = 750 cups options = raw printer admin = @ntadmin, root, administrator username map = /etc/samba/smbusers map to guest = Bad User logon path = \\%L\profiles\.msprofile logon home = \\%L\%U\.9xprofile logon drive = P: security = ADS encrypt passwords = yes domain logons = no ldap idmap suffix = ou=Idmap ldap machine suffix = ou=Computers local master = yes wins server = wins support = no netbios name = FMICLINUX add machine script = preferred master = auto ldap suffix = dc=example,dc=com realm = FMIC.FMIC.COM idmap uid = 15000-2 idmap gid = 15000-2 server string = allow trusted domains = yes password server = * nt acl support = yes map acl inherit = yes winbind use default domain = yes client schannel = no smb ports = 139 System Log errors: May 23 12:59:00 fmiclinux /USR/SBIN/CRON[2745]: (root) CMD ( rm -f /var/spool/cron/lastrun/cron.hourly)│ │May 23 13:59:00 fmiclinux /USR/SBIN/CRON[2755]: (root) CMD ( rm -f /var/spool/cron/lastrun/cron.hourly)│ │May 25 09:00:03 fmiclinux smbd[3241]: [2007/05/25 09:00:03, 0] lib/util_sock.c:get_peer_addr(978) │ │May 25 09:00:03 fmiclinux smbd[3242]: [2007/05/25 09:00:03, 0] lib/util_sock.c:get_peer_addr(978) │ │May 25 09:00:03 fmiclinux sshd[2983]: fatal: Timeout before authentication for :::10.0.0.158 │ │May 25 09:00:03 fmiclinux smbd[2263]: Error writing 51 bytes to client. -1. (Broken pipe)│ │May 25 09:00:03 fmiclinux smbd[3241]: getpeername failed. Error was Transport endpoint is not connected │ │May 25 09:00:03 fmiclinux smbd[3240]: [2007/05/25 09:00:03, 0] lib/util_sock.c:write_socket_data(413) │ │May 25 09:00:03 fmiclinux smbd[3242]: getpeername failed. Error was Transport endpoint is not connected │ │May 25 09:00:03 fmiclinux smbd[3241]: [2007/05/25 09:00:03, 0] lib/util_sock.c:get_peer_addr(978) │ │May 25 09:00:03 fmiclinux smbd[3241]: getpeername failed. Error was Transport endpoint is not connected │ │May 25 09:00:03 fmiclinux smbd[3241]: [2007/05/25 09:00:03, 0] lib/util_sock.c:write_socket_data(413) │ │May 25 09:00:03 fmiclinux smbd[3240]: write_socket_data: write failure. Error = Connection reset by peer │ │May 25 09:00:04 fmiclinux smbd[3240]: [2007/05/25 09:00:04, 0] lib/util_sock.c:write_socket(438) │ │May 25 09:00:04 fmiclinux smbd[3240]: write_socket: Error writing 4 bytes to socket 5: ERRNO = Connection res│ │~et by peer │ │May 25 09:00:04 fmiclinux smbd[3240]: [2007/05/25 09:00:04, 0] lib/util_sock.c:send_smb(630) │ │May 25 09:00:03 fmiclinux smbd[3242]: [2007/05/25 09:00:03, 0] lib/util_sock.c:get_peer_addr(978) │ │May 25 09:00:04 fmiclinux smbd[3242]: getpeername failed. Error was Transport endpoint is not connected │ │May 25 09:00:04 fmiclinux smbd[3242]: [2007/05/25 09:00:04, 0] lib/util_sock.c:write_socket_data(413) │ │May 25 09:00:04 fmiclinux smbd[3242]: write_socket_data: write failure. Error = Connection reset by peer │ │May 25 09:00:04 fmiclinux smbd[3242]: [2007/05/25 09:00:04, 0] lib/util_sock.c:write_socket(438) │ │May 25 09:00:04 fmiclinux smbd[3242]: write_socket: Error writing 4 bytes to socket 21: ERRNO = Connection re│ Thanks in advance!! Will Holmes Programmer Analyst Fremont Insurance Company Ph: 231-924-0302 Ext. 145 E-Mail: [EMAIL PROTECTED] -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] samba.org DNS trouble
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Pat Riehecky wrote: He may have encountered what I just did... when clicking on the link to lists.samba.org I got a Hmmm this host isn't necessarily who they say they are error. The cert for https://lists.samba.rog should be signed by CA Cert and will expire on June 10, 2007. If you don't have CA Cert in you list ed of trusted certificate authoritories, you'll get some warnings. jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGXFt9IR7qMdg1EfYRArngAKCah+fUELSell+f0t98Bu9Zr09xtwCgtMip mb4CdKqRgtMrVySzXCRfU/E= =mMqZ -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Assigning shares - Samba 2.2.7
Hi All, I have an issue that I can't understand why it's happening. I have about 5 shares created. One is reports another is user_data and there are a few others. What I have run into is that for me to assign, for example, the user_data share, I have to also assign the reports share. I have to assign this reports share to anyone that needs any of the other shares. I should be able to assign user_data on it's own, but I cannot. The assignment during login does not work. Could it be that user_data, being a folder under the reports directory could be confusing Samba? Has anyone else run into this situation? Dave -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Binary_Packages/Debian
On Tue, 2007-05-29 at 11:36 -0400, Miguel Gonzalez Castaños wrote: I am pretty confused. Etch is the latest stable version, why this service would be discontinued? The sarge package is already in the official debian oldstable repository? I have historically backported new versions to debian stable, as the Debian policy is to never upgrade packages in stable but just do security updates or fix bugs in that version. Etch is the new stable release so I should stop providing packages for Sarge and start to provide packages for Etch. I am not yet sure I have time to do this. If I can't I will discontinue the service of providing packages for Debian Stable (Etch currently). Simo. -- Simo Sorce Samba Team GPL Compliance Officer email: [EMAIL PROTECTED] http://samba.org -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Binary_Packages/Debian
simo escribió: On Tue, 2007-05-29 at 11:36 -0400, Miguel Gonzalez Castaños wrote: I am pretty confused. Etch is the latest stable version, why this service would be discontinued? The sarge package is already in the official debian oldstable repository? I have historically backported new versions to debian stable, as the Debian policy is to never upgrade packages in stable but just do security updates or fix bugs in that version. Etch is the new stable release so I should stop providing packages for Sarge and start to provide packages for Etch. I am not yet sure I have time to do this. If I can't I will discontinue the service of providing packages for Debian Stable (Etch currently). I am an average linux sysadmin, I have compiled tarballs, kernels, etc, but I have never created any RPM or debian package. If it is not a very complicated process I might help you out a bit. Anyway, current Samba etch package seems not to work with ADS, so this can be lay on the fixing tasks you mentioned. Miguel -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Binary_Packages/Debian
(extending the discussion to the ML of the Debian packaging team in the Debian project. Sorry for the extensive quote) Simo Sorce in samba|samba-technical: Dear users, I have uploaded the new 3.0.25a packages compiled for sarge. At the same time I have removed older 2.2.x and 3.0.x packages for Woody. Support for back porting packages to Woody was already discontinued, but older packages were still provided. As these packages were not updated after the recent security issues, I decided to remove them to avoid pushing people to use outdated and insecure packages with the believe they are ok because they are hosted on samba.org I am looking to see if I have time to start publishing packages for Etch, I am undecided yet, and I may discontinue this service. If someone is highly motivated and wants to give a hand, please contact me privately. Simo. -- Simo Sorce Samba Team GPL Compliance Officer email: [EMAIL PROTECTED] http://samba.org Simo, we already discussed this at SambaXP but why not try to merge the efforts of the Debian packaging team for samba and yours/upstream ones? Of course, everybody knows about the policy in Debian to not update software in stable. That policy means that we're stuck with 3.0.24 in Etch (indeed, we're still working on an update to fix regressions after the two already published security fixes). However, it does not prevent us to work on the backportability of the packages we build for the next Debian release. What would IMHO be pretty easy to do is: - reduce the number of Debian specific patches we use in the Debian packages. Ideally, down to 0...:-) - check what specific changes you use yourself in the deb packages published by the Samba Team and decide whether we can incorporate them in the Debian packages. I suspect you indeed make as few changes as possible, if any. After all, *you* are upstream - keep Debian packages in unstable backportable to Etch (they are right now) All this should make both packaging styles to converge together and, ideally, the DEB files published on samba.org could then be simple backports of the packages in Debian unstable. The major obstacle to this are the patches we use. Just after SambaXP, I and Steve Langasek examined all of them and commented them. Several are marked forward upstream so it's just a matter of time for us to recover from the recent security fixes/release hype (and the associated bug reports mini-flood) and come back at you discussing about these patches. Side effect of this: the Ubuntu packages would also converge and that would probably help providing up-to-dat packages for earlier Ubuntu releases. Currently, the Ubuntu packages are essentially derived from the Debian ones with no (IIRC) patch to source code. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Binary_Packages/Debian
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Christian Perrier wrote: Simo, we already discussed this at SambaXP but why not try to merge the efforts of the Debian packaging team for samba and yours/upstream ones? Simo, One possibility would be to basically swap the Fedora and Debian responsibilities that you and I share. This would make more sense I think. Then you would have complete control over the Fedora packages posted to samba.org and I would be able to dig into dpkg (which I've been interested in doing anyways since I've completed the migration of my servers to Ubuntu). The 3.0.26 release might be a good swap over point. Let me know if you are interested. cheers, jerry = Samba--- http://www.samba.org Centeris --- http://www.centeris.com What man is a man who does not make the world better? --Balian -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGXHSiIR7qMdg1EfYRAnCHAJ91yCe6lmvoWGFguDKTYJlvRlRNFACfbDMZ U2ns81ii4DRPY7xGy2rZzSM= =p/Iv -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] Roaming profiles on demand?
Dear Andres Andreas Paulick skrev: Hello Samba-world, We are planning to upgrade our network incl. clients and server. So there are then exclusive Win XPSP2-Systems and one single Samba-3 Server on Linux. In the past,ocassionly there are network issues (dying switch, broken cable, uncooperative NICs, you all know the list :) ) so there are some chances to FU a roaming profile, if used.Usual, we dont need them because any user has his own PC. More: if I give them roaming profiles, the uers complain about the long start time, because they dont want to delete one single holliday picture in BMP-style for the desktop background, and because of the long shutdown time, they simply switch off their machines,... (you know this type of users). :( This kind of Users are known to exist ;-) The easiests way to cut login time to something users can cope with, is to redirect the documents folder, this can be done by applying a registryfile from the login script. I can post my litle trick if you want it. This also makes backup a lot easier to have profiles and documents a central place. Results: My users profiles are around 5 MB pr. user logintime is low (10-15 sec) The second thing to do is to use poledit to limit the size of the profile, this way the login time is kept low. But there is a nice-to-have feature: An user can switch to another machine and take his own settings to this machine (this needs roaming profile) because of broken machine or holliday substition. So I want to have local profiles on client systems, and from time to time roaming profiles. Are there a way to realise this? If I see this correct, I (or better: the user) only have to do: -copy the User Profile from C: to the server. -local log out on the current machine -log in to the domain on his new machine. in return, he has to -log out of the domain from his actual used machine -domain log in on his main PC (to copy the actual profile to this machine) -log out from the Domain -local log in on the machine Have I forgotten some point? Is this possible? How can I do this? It can be done if the user has to identical accounts one on the local computer and one on the server, and he/she must keep the passwords in sync and there might be problems with users permissions. This seems a bit complicated, See easier solutions above Best Regards Rune -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Binary_Packages/Debian
On Tue, 2007-05-29 at 13:44 -0500, Gerald (Jerry) Carter wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Christian Perrier wrote: Simo, we already discussed this at SambaXP but why not try to merge the efforts of the Debian packaging team for samba and yours/upstream ones? Simo, One possibility would be to basically swap the Fedora and Debian responsibilities that you and I share. This would make more sense I think. Then you would have complete control over the Fedora packages posted to samba.org and I would be able to dig into dpkg (which I've been interested in doing anyways since I've completed the migration of my servers to Ubuntu). The 3.0.26 release might be a good swap over point. Let me know if you are interested. I like this idea. I have to play with Fedora packages anyway. Simo. -- Simo Sorce Samba Team GPL Compliance Officer email: [EMAIL PROTECTED] http://samba.org -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Forcing user/group with winbindd
Is it possible to force a particular user/group to own files when using winbindd? I have tried force user without any success. What I need to be able to do is have the system administrators connect to the user's account and then have the use access files placed in their directory. When I do this currently, the owner is root and the group is domain admins. Following is how the share is configured. [1234] comment = Linda Bell's Home Directory browseable = Yes valid users = mo+linda,mo+jay,mo+karen # write list = mo+linda,mo+jay # force user = linda create mode = 0770 directory mode = 0770 writeable = Yes admin users = mo+jay, mo+karen path = /home/linda Any suggestions would be greatly appreciated. Thanks, Jay -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Binary_Packages/Debian
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 simo wrote: One possibility would be to basically swap the Fedora and Debian responsibilities that you and I share. This would make more sense I think. Then you would have complete control over the Fedora packages posted to samba.org and I would be able to dig into dpkg (which I've been interested in doing anyways since I've completed the migration of my servers to Ubuntu). The 3.0.26 release might be a good swap over point. Let me know if you are interested. I like this idea. I have to play with Fedora packages anyway. Yeah. I thought you might. Want to use 3.0.26 as the hand off point? I'll keep rolling the Fedora packages in the 3.0.24/3.0.25 series (ass needed) and you pick up the packaging/RHEL directory in SAMBA_3_0_26. I'll do the same for packaging/Debian/. cheers, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGXICQIR7qMdg1EfYRAkdsAJ4lV5Zyo8szKgx7UCRpPB0kQ7TffgCeO2AN FboaxGGzVzi727QxEBkitMk= =tfE4 -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] Forcing user/group with winbindd
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 [EMAIL PROTECTED] wrote: Is it possible to force a particular user/group to own files when using winbindd? Yes. But you have to fully qualify the name. Depending on the version of Samba you are running, this may either be a hard or soft requirement. cheer,s jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGXIQpIR7qMdg1EfYRAq1SAKCuwU+0UHV+rPsLpIAYJohT3zsyAwCfTYaR s5KzwNFlcTELBS3aT09N2j8= =bTJP -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Group mapping not working consistently - addendum
Pardon me, I meant to include this information: [EMAIL PROTECTED]:~$ net rpc -d1 group members Caseworkers Password: [2007/05/29 20:53:13, 1] utils/net_rpc.c:run_rpc_command(170) rpc command function failed! (STATUS_SOME_UNMAPPED) -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Roaming profiles on demand?
On 5/29/07, Rune Tønnesen [EMAIL PROTECTED] wrote: Dear Andres Andreas Paulick skrev: Hello Samba-world, We are planning to upgrade our network incl. clients and server. So there are then exclusive Win XPSP2-Systems and one single Samba-3 Server on Linux. In the past,ocassionly there are network issues (dying switch, broken cable, uncooperative NICs, you all know the list :) ) so there are some chances to FU a roaming profile, if used.Usual, we dont need them because any user has his own PC. More: if I give them roaming profiles, the uers complain about the long start time, because they dont want to delete one single holliday picture in BMP-style for the desktop background, and because of the long shutdown time, they simply switch off their machines,... (you know this type of users). :( This kind of Users are known to exist ;-) The easiests way to cut login time to something users can cope with, is to redirect the documents folder, this can be done by applying a registryfile from the login script. I can post my litle trick if you want it. Please Rune , post your trick :) This also makes backup a lot easier to have profiles and documents a central place. Results: My users profiles are around 5 MB pr. user logintime is low (10-15 sec) The second thing to do is to use poledit to limit the size of the profile, this way the login time is kept low. But there is a nice-to-have feature: An user can switch to another machine and take his own settings to this machine (this needs roaming profile) because of broken machine or holliday substition. So I want to have local profiles on client systems, and from time to time roaming profiles. Are there a way to realise this? If I see this correct, I (or better: the user) only have to do: -copy the User Profile from C: to the server. -local log out on the current machine -log in to the domain on his new machine. in return, he has to -log out of the domain from his actual used machine -domain log in on his main PC (to copy the actual profile to this machine) -log out from the Domain -local log in on the machine Have I forgotten some point? Is this possible? How can I do this? It can be done if the user has to identical accounts one on the local computer and one on the server, and he/she must keep the passwords in sync and there might be problems with users permissions. This seems a bit complicated, See easier solutions above Best Regards Rune -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- []'s Salatiel O maior prazer do inteligente é bancar o idiota diante de um idiota que banca o inteligente. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Group mapping not working consistently - addendum
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Ben Tisdall wrote: Pardon me, I meant to include this information: [EMAIL PROTECTED]:~$ net rpc -d1 group members Caseworkers Password: [2007/05/29 20:53:13, 1] utils/net_rpc.c:run_rpc_command(170) rpc command function failed! (STATUS_SOME_UNMAPPED) First off, it appears that you are just trying to enumerate members of a group. There's no enough context from your original post to assume otherwise. In this case, the output indicates that some accounts belonging to the group have most likely been deleted. Granted, we shouldn't fail here anyways. But that's pretty much what the error msg in telling you. cheers, jerry = Samba--- http://www.samba.org Centeris --- http://www.centeris.com What man is a man who does not make the world better? --Balian -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGXIbTIR7qMdg1EfYRAsT3AKCYFmLHuDlq2WEuGPYadSCUzLHJ0wCcDjZq aKNa3PzFJUzZNXMI8di4jvc= =UgsP -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Problems with Windows 2003 connecting a Samba server
Hi list, I am encountering a problem in connecting a Windows 2003 to a Samba 3.0.21b server. The Samba server is configured to have a security = share option, so that no password is needed. I can connect to the server by typing net use z: \\192.168.51.1\data, and it is successful. However, if I try to do dir z:, no file found! Same behaviour are found in Windows operation, i.e. type \\192.168.51.1\data under Run box in Start Menu. Strangely, another server with 3.0.14a does not have such problem, and another Windows XP does not have such problem too! They can view the files in share easily. Here comes the log file: [2007/05/30 04:13:15, 1] smbd/service.c:close_cnum(885) 192.168.2.37 (192.168.2.37) closed connection to service data [2007/05/30 04:15:35, 1] smbd/service.c:make_connection_snum(693) 192.168.2.37 (192.168.2.37) connect to service data initially as user nobody (uid=99, gid=99) (pid 30283) [2007/05/30 04:17:00, 1] smbd/service.c:close_cnum(885) 192.168.2.37 (192.168.2.37) closed connection to service data [2007/05/30 04:17:00, 1] smbd/service.c:make_connection_snum(693) 192.168.2.37 (192.168.2.37) connect to service data initially as user nobody (uid=99, gid=99) (pid 30301) [2007/05/30 04:18:08, 1] smbd/service.c:close_cnum(885) 192.168.2.37 (192.168.2.37) closed connection to service data Here comes the testparm: [global] unix charset = big5 workgroup = CC netbios name = CCSERVER server string = Samba Server security = SHARE log file = /var/log/samba/%m.log max log size = 50 socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 printcap name = /etc/printcap dns proxy = No cups options = raw [homes] comment = Home Directories read only = No browseable = No [printers] comment = All Printers path = /var/spool/samba printable = Yes browseable = No [data] comment = Public Data path = /data read only = No create mask = 0777 guest ok = Yes Also here is the traffic log: 0.00 192.168.2.37 - 192.168.51.1 TCP 1902 microsoft-ds [SYN] Seq=2266364078 Ack=0 Win=65535 Len=0 0.000356 192.168.2.37 - 192.168.51.1 TCP 1903 netbios-ssn [SYN] Seq=1017632209 Ack=0 Win=65535 Len=0 0.010996 192.168.51.1 - 192.168.2.37 TCP microsoft-ds 1902 [SYN, ACK] Seq=1194648936 Ack=2266364079 Win=5808 Len=0 0.011333 192.168.2.37 - 192.168.51.1 TCP 1902 microsoft-ds [ACK] Seq=2266364079 Ack=1194648937 Win=65535 Len=0 0.011445 192.168.2.37 - 192.168.51.1 SMB Negotiate Protocol Request 0.011599 192.168.51.1 - 192.168.2.37 TCP netbios-ssn 1903 [SYN, ACK] Seq=1190050630 Ack=1017632210 Win=5808 Len=0 0.011758 192.168.2.37 - 192.168.51.1 TCP 1903 netbios-ssn [RST] Seq=1017632210 Ack=1017632210 Win=0 Len=0 0.022912 192.168.51.1 - 192.168.2.37 TCP microsoft-ds 1902 [ACK] Seq=1194648937 Ack=2266364216 Win=6432 Len=0 0.024424 192.168.51.1 - 192.168.2.37 SMB Negotiate Protocol Response 0.025427 192.168.2.37 - 192.168.51.1 SMB Session Setup AndX Request, User: EXPRESS-11AIQI4\Administrator; Tree Connect AndX, Path: \\192.168.51.1\DATA 0.039981 192.168.51.1 - 192.168.2.37 SMB Session Setup AndX Response; Tree Connect AndX 0.040262 192.168.2.37 - 192.168.51.1 SMB Transaction2 Request QUERY_PATH_INFORMATION, Path: 0.051879 192.168.51.1 - 192.168.2.37 SMB Transaction2 Response QUERY_PATH_INFORMATION 0.052291 192.168.2.37 - 192.168.51.1 SMB Transaction2 Request FIND_FIRST2, Pattern: \* 1.519710 192.168.2.37 - 192.168.51.1 SMB Transaction2 Request FIND_FIRST2, Pattern: \* 1.530914 192.168.51.1 - 192.168.2.37 TCP microsoft-ds 1902 [ACK] Seq=1194652038 Ack=2266364728 Win=7504 Len=0 51.023255 192.168.2.37 - 192.168.51.1 SMB Echo Request 51.033769 192.168.51.1 - 192.168.2.37 TCP microsoft-ds 1902 [ACK] Seq=1194652038 Ack=2266364781 Win=7504 Len=0 85.150658 192.168.2.37 - 192.168.51.1 TCP 1902 microsoft-ds [FIN, ACK] Seq=2266364781 Ack=1194649246 Win=65226 Len=0 85.169401 192.168.51.1 - 192.168.2.37 NBSS NBSS Continuation Message 85.169910 192.168.2.37 - 192.168.51.1 TCP 1902 microsoft-ds [ACK] Seq=2266364782 Ack=1194649246 Win=65226 Len=0 85.170486 192.168.2.37 - 192.168.51.1 TCP 1904 microsoft-ds [SYN] Seq=3224569487 Ack=0 Win=65535 Len=0 85.170724 192.168.2.37 - 192.168.51.1 TCP 1905 netbios-ssn [SYN] Seq=494418265 Ack=0 Win=65535 Len=0 85.179785 192.168.51.1 - 192.168.2.37 TCP microsoft-ds 1904 [SYN, ACK] Seq=1275220318 Ack=3224569488 Win=5808 Len=0 85.180158 192.168.2.37 - 192.168.51.1 TCP 1904 microsoft-ds [ACK] Seq=3224569488 Ack=1275220319 Win=65535 Len=0 85.180250 192.168.2.37 - 192.168.51.1 SMB Negotiate Protocol Request 85.183753 192.168.51.1 - 192.168.2.37 TCP netbios-ssn 1905 [SYN, ACK] Seq=1269633862 Ack=494418266 Win=5808 Len=0 85.183982 192.168.2.37 - 192.168.51.1 TCP 1905 netbios-ssn [RST] Seq=494418266 Ack=494418266 Win=0 Len=0 85.191855 192.168.51.1 - 192.168.2.37 TCP microsoft-ds 1904 [ACK] Seq=1275220319 Ack=3224569625
Re: [Samba] Binary_Packages/Debian
On Tue, 2007-05-29 at 14:35 -0500, Gerald (Jerry) Carter wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 simo wrote: One possibility would be to basically swap the Fedora and Debian responsibilities that you and I share. This would make more sense I think. Then you would have complete control over the Fedora packages posted to samba.org and I would be able to dig into dpkg (which I've been interested in doing anyways since I've completed the migration of my servers to Ubuntu). The 3.0.26 release might be a good swap over point. Let me know if you are interested. I like this idea. I have to play with Fedora packages anyway. Yeah. I thought you might. Want to use 3.0.26 as the hand off point? I'll keep rolling the Fedora packages in the 3.0.24/3.0.25 series (ass needed) and you pick up the packaging/RHEL directory in SAMBA_3_0_26. I'll do the same for packaging/Debian/. Make sense. I'll flush the latest changes I have for packaging/Debian/Stable asap. Simo. -- Simo Sorce Samba Team GPL Compliance Officer email: [EMAIL PROTECTED] http://samba.org -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Group mapping not working consistently
I'm trying to understand why my group mapping doesn't work in a consistent fashion. I've studied Important Samba-3.0.23 Change Notes chapter 13 of TOSHARG but am still struggling. I'm on 3.0.23a-1.fc4.1 (Fedora Core 4) as a PDC, tdbsam backend. 'net groupmap list' gives this: Domain Power Users (S-1-5-21-1365060548-1276164359-2333037906-31037) - pwrusers Domain Webmasters (S-1-5-21-1365060548-1276164359-2333037906-31031) - webmaster Staff (S-1-5-21-1365060548-1276164359-2333037906-3057) - staff Domain Admins (S-1-5-21-1365060548-1276164359-2333037906-512) - root General Managers (S-1-5-21-1365060548-1276164359-2333037906-3051) - genmgrs Domain Guests (S-1-5-21-1365060548-1276164359-2333037906-514) - nobody Caseworkers (S-1-5-21-1365060548-1276164359-2333037906-3053) - caseworkers 'getent group webmaster' outputs this: webmaster:x:15015:foo,bar,foobar And 'net rpc group members Domain Webmasters' gives: REDRESSTRUST\foo REDRESSTRUST\bar REDRESSTRUST\foo So far so good, but in the case of 'getent group caseworkers': caseworkers:x:1026:foo,bar.foobar 'net rpc group members Caseworkers' prints nothing. The problem seems to be related to GIDs - new unix groups are created with GIDs above 15000 mapping works fine, but mapping to existing groups with GIDs in the 1000 area seems to fail. Here's my smb.conf: [global] workgroup = REDRESSTRUST passwd chat = *New*Password* %n\n*Re-enter*new*password* %n\n *Password*changed* username map = /etc/samba/users.conf syslog = 0 log level = 1 name resolve order = wins bcast hosts time server = yes printcap name = CUPS show add printer wizard = No add user script = /usr/sbin/useradd -m %u delete user script = /usr/sbin/userdel -r %u add group script = /usr/sbin/groupadd %g delete group script = /usr/sbin/groupdel %g add user to group script = /usr/sbin/usermod -a -G %g %u add machine script = /usr/sbin/useradd -s /bin/false -d /dev/null %u logon script = login.bat logon drive = P: domain logons = Yes preferred master = Yes wins support = Yes printing = CUPS #idmap uid = 15000-2 #idmap gid = 15000-2 Cheers. -- Ben Tisdall RedCircle IT Ltd, London NW1. www.redcircleit.com [EMAIL PROTECTED] +44 (0)20 7387 0351 +44 (0)7932 745803 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Authentication Failure in member server
I have a samba server configured that is member of a samba domain called PRODESAN.COM.BR. After we had to reinstall the domain controller some samba shares stopped working on the member server. I get this when I try to use the share: [2007/05/29 17:26:28, 3] auth/auth.c:check_ntlm_password(219) check_ntlm_password: Checking password for unmapped user [EMAIL PROTECTED] with the new password interface [2007/05/29 17:26:28, 3] auth/auth.c:check_ntlm_password(222) check_ntlm_password: mapped user is: [EMAIL PROTECTED] [2007/05/29 17:26:28, 3] smbd/sec_ctx.c:push_sec_ctx(256) push_sec_ctx(0, 0) : sec_ctx_stack_ndx = 1 [2007/05/29 17:26:28, 3] smbd/uid.c:push_conn_ctx(365) push_conn_ctx(0) : conn_ctx_stack_ndx = 0 [2007/05/29 17:26:28, 3] smbd/sec_ctx.c:set_sec_ctx(288) setting sec ctx (0, 0) - sec_ctx_stack_ndx = 1 [2007/05/29 17:26:28, 3] smbd/sec_ctx.c:pop_sec_ctx(386) pop_sec_ctx (0, 0) - sec_ctx_stack_ndx = 0 [2007/05/29 17:26:28, 3] smbd/sec_ctx.c:push_sec_ctx(256) push_sec_ctx(0, 0) : sec_ctx_stack_ndx = 1 [2007/05/29 17:26:28, 3] smbd/uid.c:push_conn_ctx(365) push_conn_ctx(0) : conn_ctx_stack_ndx = 0 [2007/05/29 17:26:28, 3] smbd/sec_ctx.c:set_sec_ctx(288) setting sec ctx (0, 0) - sec_ctx_stack_ndx = 1 [2007/05/29 17:26:28, 3] smbd/sec_ctx.c:pop_sec_ctx(386) pop_sec_ctx (0, 0) - sec_ctx_stack_ndx = 0 [2007/05/29 17:26:28, 2] auth/auth.c:check_ntlm_password(312) check_ntlm_password: Authentication for user [USER1] - [USER1] FAILED with error NT_STATUS_NO_SUCH_USER However when I try to use the same user on the domain controller things work perfectly: [2007/05/29 17:32:39, 2] lib/smbldap.c:smbldap_open_connection(788) smbldap_open_connection: connection opened [2007/05/29 17:32:39, 2] passdb/pdb_ldap.c:init_sam_from_ldap(541) init_sam_from_ldap: Entry found for user: pr907899 [2007/05/29 17:32:39, 2] passdb/pdb_ldap.c:init_group_from_ldap(2140) init_group_from_ldap: Entry found for group: 513 [2007/05/29 17:32:39, 2] auth/auth.c:check_ntlm_password(309) check_ntlm_password: authentication for user [USER1] - [USER1] - [pr907899] succeeded I can see the domain users using wbinfo -u on the member server and I have (re)joined the domain using net rpc join: net rpc join -U root Password: Joined domain PRODESAN.COM.BR. Any ideas why the server isn't being able to authenticate the user? -- Diego Alencar Alves de Lima Departamento de Informática - DINF www.prodesan.com.br -- Esta mensagem foi verificada pelo sistema de antiv�rus e acredita-se estar livre de perigo. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
FW: [Samba] Help Please! - Copying files from Windows to Samba share loses connection
Aaron, Yes, I left the server string out intentionally because of how the mapped drive description showed in Windows. Could this be causing my problem? I was able to join this server to the domain and I could retrieive a list of users using the winfo command. Thanks! Will -Original Message- From: Aaron Kincer [mailto:[EMAIL PROTECTED] Sent: Tuesday, May 29, 2007 12:21 PM To: Will Holmes Cc: samba@lists.samba.org Subject: Re: [Samba] Help Please! - Copying files from Windows to Samba share loses connection I see you don't have the server string set. Have you tried to join this server to the domain with a net ads join command? Will Holmes wrote: Hello all, I haven't been able to solve an issue I am having when copying over data from a Windows box to a Samba share. I have found others with the same issue and I have made some configuration changes to try and solve the issue but the issue is still lingering. I want to migrate off my old Windows box but until I solve this issue I am I cannot move forward. Please let me know if you need any further info. Thanks!!! Here is the two lines I have added to my smb.conf file. Niether change did the trick. client schannel = no smb ports = 139 Here is my smb.config file: # smb.conf is the main Samba configuration file. You find a full commented # version at /usr/share/doc/packages/samba/examples/smb.conf.SUSE # Date: 2004-07-01 [global] workgroup = FMIC printing = cups printcap name = cups printcap cache time = 750 cups options = raw printer admin = @ntadmin, root, administrator username map = /etc/samba/smbusers map to guest = Bad User logon path = \\%L\profiles\.msprofile logon home = \\%L\%U\.9xprofile logon drive = P: security = ADS encrypt passwords = yes domain logons = no ldap idmap suffix = ou=Idmap ldap machine suffix = ou=Computers local master = yes wins server = wins support = no netbios name = FMICLINUX add machine script = preferred master = auto ldap suffix = dc=example,dc=com realm = FMIC.FMIC.COM idmap uid = 15000-2 idmap gid = 15000-2 server string = allow trusted domains = yes password server = * nt acl support = yes map acl inherit = yes winbind use default domain = yes client schannel = no smb ports = 139 System Log errors: May 23 12:59:00 fmiclinux /USR/SBIN/CRON[2745]: (root) CMD ( rm -f /var/spool/cron/lastrun/cron.hourly)│ │May 23 13:59:00 fmiclinux /USR/SBIN/CRON[2755]: (root) CMD ( rm -f /var/spool/cron/lastrun/cron.hourly)│ │May 25 09:00:03 fmiclinux smbd[3241]: [2007/05/25 09:00:03, 0] lib/util_sock.c:get_peer_addr(978) │ │May 25 09:00:03 fmiclinux smbd[3242]: [2007/05/25 09:00:03, 0] lib/util_sock.c:get_peer_addr(978) │ │May 25 09:00:03 fmiclinux sshd[2983]: fatal: Timeout before authentication for :::10.0.0.158 │ │May 25 09:00:03 fmiclinux smbd[2263]: Error writing 51 bytes to client. -1. (Broken pipe)│ │May 25 09:00:03 fmiclinux smbd[3241]: getpeername failed. Error was Transport endpoint is not connected │ │May 25 09:00:03 fmiclinux smbd[3240]: [2007/05/25 09:00:03, 0] lib/util_sock.c:write_socket_data(413) │ │May 25 09:00:03 fmiclinux smbd[3242]: getpeername failed. Error was Transport endpoint is not connected │ │May 25 09:00:03 fmiclinux smbd[3241]: [2007/05/25 09:00:03, 0] lib/util_sock.c:get_peer_addr(978) │ │May 25 09:00:03 fmiclinux smbd[3241]: getpeername failed. Error was Transport endpoint is not connected │ │May 25 09:00:03 fmiclinux smbd[3241]: [2007/05/25 09:00:03, 0] lib/util_sock.c:write_socket_data(413) │ │May 25 09:00:03 fmiclinux smbd[3240]: write_socket_data: write failure. Error = Connection reset by peer │ │May 25 09:00:04 fmiclinux smbd[3240]: [2007/05/25 09:00:04, 0] lib/util_sock.c:write_socket(438) │ │May 25 09:00:04 fmiclinux smbd[3240]: write_socket: Error writing 4 bytes to socket 5: ERRNO = Connection res│ │~et by peer │ │May 25 09:00:04 fmiclinux smbd[3240]: [2007/05/25 09:00:04, 0] lib/util_sock.c:send_smb(630) │ │May 25 09:00:03 fmiclinux smbd[3242]: [2007/05/25 09:00:03, 0] lib/util_sock.c:get_peer_addr(978) │ │May 25 09:00:04 fmiclinux smbd[3242]: getpeername failed. Error was Transport endpoint is not connected │ │May 25 09:00:04 fmiclinux smbd[3242]: [2007/05/25 09:00:04, 0] lib/util_sock.c:write_socket_data(413) │ │May 25 09:00:04 fmiclinux smbd[3242]: write_socket_data:
Re: [Samba] Authentication Failure in member server
Adding some more information to my previous post: I can see all domain users when I use getent passwd from the member server and this is the log I get from the LDAP server that at the domain controller: - May 29 17:53:07 servsso slapd[5036]: conn=814 op=10 SRCH base=dc=prodesan,dc=com,dc=br scope=2 deref=0 filter=((uid=USER1) (objectClass=sambaSamAccount)) May 29 17:53:07 servsso slapd[5036]: conn=814 op=10 SRCH attr=uid uidNumber gidNumber homeDirectory sambaPwdLastSet sambaPwdCanChange sambaPwdMustChange sambaLogonTime sambaLogoffTime sambaKickoffTime cn sn displayName sambaHomeDrive sambaHomePath sambaLogonScript sambaProfilePath description sambaUserWorkstations sambaSID sambaPrimaryGroupSID sambaLMPassword sambaNTPassword sambaDomainName objectClass sambaAcctFlags sambaMungedDial sambaBadPasswordCount sambaBadPasswordTime sambaPasswordHistory modifyTimestamp sambaLogonHours modifyTimestamp uidNumber May 29 17:53:07 servsso slapd[5036]: conn=814 op=10 SEARCH RESULT tag=101 err=0 nentries=1 text= May 29 17:53:07 servsso slapd[5036]: conn=814 op=11 SRCH base=ou=grupos,dc=prodesan,dc=com,dc=br scope=2 deref=0 filter=((objectClass=sambaGroupMapping)(gidNumber=100)) May 29 17:53:07 servsso slapd[5036]: conn=814 op=11 SRCH attr=gidNumber sambaSID sambaGroupType sambaSIDList description displayName cn objectClass May 29 17:53:07 servsso slapd[5036]: conn=814 op=11 SEARCH RESULT tag=101 err=0 nentries=0 text= May 29 17:53:07 servsso slapd[5036]: conn=814 op=12 SRCH base=ou=grupos,dc=prodesan,dc=com,dc=br scope=2 deref=0 filter=((objectClass=sambaGroupMapping)(gidNumber=100)) May 29 17:53:07 servsso slapd[5036]: conn=814 op=12 SRCH attr=gidNumber sambaSID sambaGroupType sambaSIDList description displayName cn objectClass May 29 17:53:07 servsso slapd[5036]: conn=814 op=12 SEARCH RESULT tag=101 err=0 nentries=0 text= - -- Diego Alencar Alves de Lima Departamento de Informática - DINF www.prodesan.com.br -- Esta mensagem foi verificada pelo sistema de antiv�rus e acredita-se estar livre de perigo. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Problems with Windows 2003 connecting a Samba server
Am Dienstag, 29. Mai 2007 22:12 schrieb Chan Jason: Hi list, I am encountering a problem in connecting a Windows 2003 to a Samba 3.0.21b server. The Samba server is configured to have a security = share option, so that no password is needed. I can connect to the server by typing net use z: \\192.168.51.1\data, and it is successful. However, if I try to do dir z:, no file found! Same behaviour are found in Windows operation, i.e. type \\192.168.51.1\data under Run box in Start Menu. Strangely, another server with 3.0.14a does not have such problem, and another Windows XP does not have such problem too! They can view the files in share easily. Here comes the log file: [2007/05/30 04:13:15, 1] smbd/service.c:close_cnum(885) 192.168.2.37 (192.168.2.37) closed connection to service data [2007/05/30 04:15:35, 1] smbd/service.c:make_connection_snum(693) 192.168.2.37 (192.168.2.37) connect to service data initially as user nobody (uid=99, gid=99) (pid 30283) [2007/05/30 04:17:00, 1] smbd/service.c:close_cnum(885) 192.168.2.37 (192.168.2.37) closed connection to service data [2007/05/30 04:17:00, 1] smbd/service.c:make_connection_snum(693) 192.168.2.37 (192.168.2.37) connect to service data initially as user nobody (uid=99, gid=99) (pid 30301) [2007/05/30 04:18:08, 1] smbd/service.c:close_cnum(885) 192.168.2.37 (192.168.2.37) closed connection to service data Here comes the testparm: [global] unix charset = big5 workgroup = CC netbios name = CCSERVER server string = Samba Server security = SHARE log file = /var/log/samba/%m.log max log size = 50 socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 printcap name = /etc/printcap dns proxy = No cups options = raw [homes] comment = Home Directories read only = No browseable = No [printers] comment = All Printers path = /var/spool/samba printable = Yes browseable = No [data] comment = Public Data path = /data read only = No create mask = 0777 guest ok = Yes Also here is the traffic log: 0.00 192.168.2.37 - 192.168.51.1 TCP 1902 microsoft-ds [SYN] Seq=2266364078 Ack=0 Win=65535 Len=0 0.000356 192.168.2.37 - 192.168.51.1 TCP 1903 netbios-ssn [SYN] Seq=1017632209 Ack=0 Win=65535 Len=0 0.010996 192.168.51.1 - 192.168.2.37 TCP microsoft-ds 1902 [SYN, ACK] Seq=1194648936 Ack=2266364079 Win=5808 Len=0 0.011333 192.168.2.37 - 192.168.51.1 TCP 1902 microsoft-ds [ACK] Seq=2266364079 Ack=1194648937 Win=65535 Len=0 0.011445 192.168.2.37 - 192.168.51.1 SMB Negotiate Protocol Request 0.011599 192.168.51.1 - 192.168.2.37 TCP netbios-ssn 1903 [SYN, ACK] Seq=1190050630 Ack=1017632210 Win=5808 Len=0 0.011758 192.168.2.37 - 192.168.51.1 TCP 1903 netbios-ssn [RST] Seq=1017632210 Ack=1017632210 Win=0 Len=0 0.022912 192.168.51.1 - 192.168.2.37 TCP microsoft-ds 1902 [ACK] Seq=1194648937 Ack=2266364216 Win=6432 Len=0 0.024424 192.168.51.1 - 192.168.2.37 SMB Negotiate Protocol Response 0.025427 192.168.2.37 - 192.168.51.1 SMB Session Setup AndX Request, User: EXPRESS-11AIQI4\Administrator; Tree Connect AndX, Path: \\192.168.51.1\DATA 0.039981 192.168.51.1 - 192.168.2.37 SMB Session Setup AndX Response; Tree Connect AndX 0.040262 192.168.2.37 - 192.168.51.1 SMB Transaction2 Request QUERY_PATH_INFORMATION, Path: 0.051879 192.168.51.1 - 192.168.2.37 SMB Transaction2 Response QUERY_PATH_INFORMATION 0.052291 192.168.2.37 - 192.168.51.1 SMB Transaction2 Request FIND_FIRST2, Pattern: \* 1.519710 192.168.2.37 - 192.168.51.1 SMB Transaction2 Request FIND_FIRST2, Pattern: \* 1.530914 192.168.51.1 - 192.168.2.37 TCP microsoft-ds 1902 [ACK] Seq=1194652038 Ack=2266364728 Win=7504 Len=0 51.023255 192.168.2.37 - 192.168.51.1 SMB Echo Request 51.033769 192.168.51.1 - 192.168.2.37 TCP microsoft-ds 1902 [ACK] Seq=1194652038 Ack=2266364781 Win=7504 Len=0 85.150658 192.168.2.37 - 192.168.51.1 TCP 1902 microsoft-ds [FIN, ACK] Seq=2266364781 Ack=1194649246 Win=65226 Len=0 85.169401 192.168.51.1 - 192.168.2.37 NBSS NBSS Continuation Message 85.169910 192.168.2.37 - 192.168.51.1 TCP 1902 microsoft-ds [ACK] Seq=2266364782 Ack=1194649246 Win=65226 Len=0 85.170486 192.168.2.37 - 192.168.51.1 TCP 1904 microsoft-ds [SYN] Seq=3224569487 Ack=0 Win=65535 Len=0 85.170724 192.168.2.37 - 192.168.51.1 TCP 1905 netbios-ssn [SYN] Seq=494418265 Ack=0 Win=65535 Len=0 85.179785 192.168.51.1 - 192.168.2.37 TCP microsoft-ds 1904 [SYN, ACK] Seq=1275220318 Ack=3224569488 Win=5808 Len=0 85.180158 192.168.2.37 - 192.168.51.1 TCP 1904 microsoft-ds [ACK] Seq=3224569488 Ack=1275220319 Win=65535 Len=0 85.180250 192.168.2.37 - 192.168.51.1 SMB Negotiate Protocol Request 85.183753 192.168.51.1 - 192.168.2.37 TCP netbios-ssn 1905 [SYN, ACK] Seq=1269633862 Ack=494418266
[Samba] Restricting to a subset of the domain controllers on a site
Had a situation where users could not map drives from Windows XP to
Solaris 9 system running Samba-3.0.10 for Active Directory. This
system has been running for a couple of years without problems. Now
recently, the site administrators have added some new servers to the
domain which may have introduced a problem.
This krb5.conf file has been modified to hide the site in question.
[libdefaults]
default_realm = sanatized
default_tgs-enctypes = DES-CBC-CRC DES-CBC-MD5 RC4-HMAC
default_tkt-enctypes = DES-CBC-CRC DES-CBC-MD5 RC4-HMAC
default_enctypes = DES-CBC-CRC DES-CBC-MD5 RC4-HMAC
[realms]
sanatized = {
kdc = DC1a.sanatized
kdc = DC2a.sanatized
kdc = DC3a.sanatized
kdc = DC4a.sanatized
admin_server = DC3a.sanatized
}
[domain_realm]
.sanatized = sanatized
sanatized = sanatized
[logging]
default = FILE:/var/krb5/kdc.log
kdc = FILE:/var/krb5/kdc.log
admin_server = FILE:/var/log/kadmin.log
kdc_rotate = {
# How often to rotate kdc.log. Logs will get rotated no more
# often than the period, and less often if the KDC is not used
# frequently.
period = 1d
# how many versions of kdc.log to keep around (kdc.log.0, kdc.log.1,
...)
versions = 10
}
[appdefaults]
kinit = {
renewable = true
forwardable= true
}
gkadmin = {
help_url =
http://docs.sun.com:80/ab2/coll.384.1/SEAM/@AB2PageView/1195
}
So the system is expecting to see the following Domain Controllers:
DC1a DC2a DC3a DC4a
However, when users were experiencing problems, we saw the following
when
klist was run.
Ticket cache: FILE:/tmp/krb5cc_0
Default principal: [EMAIL PROTECTED]
Valid starting ExpiresService principal
05/29/07 11:04:53 05/29/07 21:04:53 krbtgt/[EMAIL PROTECTED]
renew until 05/30/07 11:04:53
05/29/07 11:05:09 05/29/07 21:04:53 [EMAIL PROTECTED]
renew until 05/30/07 11:04:53
05/29/07 11:05:09 05/29/07 11:07:09 kadmin/[EMAIL PROTECTED]
renew until 05/29/07 11:07:09
Kerberos 4 ticket cache: /tmp/tkt0
The line that concerns me is:
05/29/07 11:05:09 05/29/07 21:04:53 [EMAIL PROTECTED]
renew until 05/30/07 11:04:53
Anytime a DC other than DC1a DC2a DC3a DC4a gets used, users have
problems
mapping drives.
We had no record of a domain controller named exchgc01a in the
environment.
The admins have recently added a number of servers which they are saying
they are catalog servers as part of their exchange setup and should not
be used for authentication at all. The domain controllers they have
added
are: EXCHGC01A EXCHGC02A EXCHGC03A EXCHGC04A DC1SE DC2SE
They are telling us that we must restrict to only authenticating to the
domain controllers: DC1a DC2a DC3a DC4a
Is there a way to do this? Is their request unreasonable?
There is a password server setting, but is that good enough and can you
give it more than a single machine? What if the machine is down for an
unscheduled problem?
Personally, I don't think the new servers should be issuing tickets if
they are not used for authentication. They just called be and will
checking to see if that is the case...
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Roaming profiles on demand?
Salatiel Filho skrev: On 5/29/07, *Rune Tønnesen* [EMAIL PROTECTED] mailto:[EMAIL PROTECTED] wrote: Dear Andres Andreas Paulick skrev: Hello Samba-world, We are planning to upgrade our network incl. clients and server. So there are then exclusive Win XPSP2-Systems and one single Samba-3 Server on Linux. In the past,ocassionly there are network issues (dying switch, broken cable, uncooperative NICs, you all know the list :) ) so there are some chances to FU a roaming profile, if used.Usual, we dont need them because any user has his own PC. More: if I give them roaming profiles, the uers complain about the long start time, because they dont want to delete one single holliday picture in BMP-style for the desktop background, and because of the long shutdown time, they simply switch off their machines,... (you know this type of users). :( This kind of Users are known to exist ;-) The easiests way to cut login time to something users can cope with, is to redirect the documents folder, this can be done by applying a registryfile from the login script. I can post my litle trick if you want it. Please Rune , post your trick :) I tried to attach the files, but recieved and error about illegal attachment from a gmail.com server, so I've put them on a website. Here is 3 links: The sample logon file http://www.tonnesen.org/~rune/logon.bat The registry extracts http://www.tonnesen.org/~rune/userfolder.reg http://www.tonnesen.org/~rune/usershellfolder.reg You should be able edit the files, using a simple editor like vim or notepad from windows, to suit your needs. Another way to get to the same results is here (this is written from my memory): Prerequisite: working samba server as domain controller and roaming profiles enabled. 1. Initial changes We use the possibility to change which folder My Documents points to. 1.1 From a windows workstation login in as a ordinary samba user. Change where the My Documents folder points by right clicking and choose where, you want your users to save their documents, this must a location that is the same for every user i.e. \\servername\homes\Documents or i.e. p:\Documents Click OK 1.2 Now we check it works Save something in the My Documents folder. On the Samba server check that files are created in the users folder. i.e. use a ssh client to check this 1.2.1 logout and login again 1.2.2 Check that My Documents still points to the right place, by right clicking on it. 2. Export the registry settings 2.1 open the registry editor Start - Run type regedit 2.1.1 User Shell Folders Goto HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders File - Export the registry key, so you get the contents of [HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders], to a file i.e. userhellfolder.reg 2.1.2 Shell Folders Goto HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders File - Export the registry key, so you get the contents of [HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders], to a file i.e. shellfolder.reg 2.1.3 Check the files Open the files using a editor i.e. notepad and check the contents, remove anything unnecessary One of them will contain data in hex ignore it or remove it, I usually ignore the hex, We primarily wants a working system, beauty comes seconf. 3. Applying this to all users 3.1 Copy the files to your netlogon share, It can be a good idea to give root write access to your [netlogon] share, that would this easier. 3.2 check that ordinary users have read access to the files. correct this with chmod +r *.reg 3.3 edit your logon file. add this regedit /s \\server\netlogon\userfolder.reg regedit /s \\server\netlogon\usershellfolder.reg regedit /s silently applies a registry files to the registry, since we only apply to the HKEY_CURRENT_USER section (the current user login) we will not have problems with access rights. 4 check it works before you celebrate. 4.1 Login from a useraccount different from the one used under 1 and 2. 4.2 Check My Documents by right clicking and what directory that My Documents points to. 4.3 Celebrate just a litlle bit 4.4 Move your users documents You have to move all your users Documentfolders out of their profiles to a separate directory i.e. Documents in their homefolder. This can be done from a preexec script or by hand, anything under 50 users I would suggest you do it by hand to keep things simple. When you move your users Documents, then please make sure the folders have the right owner afterwards. This can be done from a root preexec script Please give some feedback sorry about typos, english is not my motherthoung /Rune -- To unsubscribe from this list go to the following URL and read the instructions:
Re: [Samba] Binary_Packages/Debian
On Tue, 2007-05-29 at 16:12 -0400, simo wrote: On Tue, 2007-05-29 at 14:35 -0500, Gerald (Jerry) Carter wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 simo wrote: One possibility would be to basically swap the Fedora and Debian responsibilities that you and I share. This would make more sense I think. Then you would have complete control over the Fedora packages posted to samba.org and I would be able to dig into dpkg (which I've been interested in doing anyways since I've completed the migration of my servers to Ubuntu). The 3.0.26 release might be a good swap over point. Let me know if you are interested. I like this idea. I have to play with Fedora packages anyway. Yeah. I thought you might. Want to use 3.0.26 as the hand off point? I'll keep rolling the Fedora packages in the 3.0.24/3.0.25 series (ass needed) and you pick up the packaging/RHEL directory in SAMBA_3_0_26. I'll do the same for packaging/Debian/. Make sense. I'll flush the latest changes I have for packaging/Debian/Stable asap. Jerry, I committed the latest changes I had to make in order to successfully build sarge packages. They are under debian-sarge There are other 2 directories named debian-unstable and debian-woody. They are probably very well outdated, so you may want to actually get rid of them and import etch's debian/ directory in the tree instead. I don;t think we need to maintain also a debian-unstable one unless you are willing to build for unstable or someone else is willing to send back changes when they are done in Debian. Simo. -- Simo Sorce Samba Team GPL Compliance Officer email: [EMAIL PROTECTED] http://samba.org -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Binary_Packages/Debian
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 simo wrote: I committed the latest changes I had to make in order to successfully build sarge packages. They are under debian-sarge There are other 2 directories named debian-unstable and debian-woody. They are probably very well outdated, so you may want to actually get rid of them and import etch's debian/ directory in the tree instead. I don;t think we need to maintain also a debian-unstable one unless you are willing to build for unstable or someone else is willing to send back changes when they are done in Debian. Thanks. I'll take a look at the latest files and check with Christian about how to reduce diffs (in Debian and in our tree). cheers, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGXNhoIR7qMdg1EfYRAuQkAJ9jQn0GdFAF1b/1FVL5hAujVBcLJwCfY6uB KrgaFulNPwIevlSeCs3xAYY= =nd4e -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: [CentOS] SAMBA in CentOS 5, shared level
Hello, After patient, I see that can only use samba if the directory is in the same partition of /. Anyone know if Samba have problems sharing directories in other partitions different of / or problems using home directory in different partition? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Samba in Debian Etch (was: Re: [Samba] Binary_Packages/Debian)
(samba-technical dropped as this is not really on-topic for it) Quoting Miguel Gonzalez Castaños ([EMAIL PROTECTED]): If it is not a very complicated process I might help you out a bit. Anyway, current Samba etch package seems not to work with ADS, so this can be lay on the fixing tasks you mentioned. If you're affected by issues of the samba 3.0.24-6etch2 packages in Debia (I mean packages provided by Debian), please try the following packages which are targeted to be uploaded soon to security.debian.org as fixes for regressions introduces by the recent security updates: http://people.debian.org/~vorlon/samba/ These packages are signed by Steve Langasek, member of the samba packaging team in Debian. We'd be delighted to hear about any feedback abot the packages as we know that the status of samba in Debian Etch is currently not optimal. signature.asc Description: Digital signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Rev 385: - make more options configurable in http://samba.org/~tridge/ctdb
revno: 385
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Tue 2007-05-29 16:02:02 +1000
message:
- make more options configurable
- fixed some warnings
modified:
direct/ctdbd_test.cctdbd_test.c-20070411085057-17kgjzfktsh28g99-1
packaging/RHEL/ctdb.spec ctdb.spec-20070527204758-biuh7znabuwan3zn-3
packaging/RHEL/setup/ctdb.init ctdb.init-20070527204758-biuh7znabuwan3zn-6
packaging/RHEL/setup/ctdb.sysconfig
ctdb.sysconfig-20070527204758-biuh7znabuwan3zn-7
tools/ctdb_control.c
ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1
=== modified file 'direct/ctdbd_test.c'
--- a/direct/ctdbd_test.c 2007-05-04 01:41:29 +
+++ b/direct/ctdbd_test.c 2007-05-29 06:02:02 +
@@ -228,7 +228,7 @@
int main(int argc, const char *argv[])
{
- int fd, pid, vnn, dstvnn, dstpid;
+ int fd, pid=0, vnn, dstvnn, dstpid;
TDB_DATA message;
struct ctdb_req_message *reply;
TDB_DATA dbname;
=== modified file 'packaging/RHEL/ctdb.spec'
--- a/packaging/RHEL/ctdb.spec 2007-05-29 05:52:03 +
+++ b/packaging/RHEL/ctdb.spec 2007-05-29 06:02:02 +
@@ -72,6 +72,7 @@
rm -rf $RPM_BUILD_ROOT
%post
+/sbin/chkconfig --add ctdb
%preun
if [ $1 = 0 ] ; then
=== modified file 'packaging/RHEL/setup/ctdb.init'
--- a/packaging/RHEL/setup/ctdb.init2007-05-29 05:36:42 +
+++ b/packaging/RHEL/setup/ctdb.init2007-05-29 06:02:02 +
@@ -20,6 +20,8 @@
# Source networking configuration.
. /etc/sysconfig/network
+CTDB_OPTIONS=
+
# pull in admin specified config
if [ -f /etc/sysconfig/ctdb ]; then
. /etc/sysconfig/ctdb
@@ -29,12 +31,14 @@
[ ${NETWORKING} = no ] exit 0
# build up CTDB_OPTIONS variable
-CTDB_OPTIONS=
[ -z $LOGFILE ] || CTDB_OPTIONS=$CTDB_OPTIONS --logfile=$LOGFILE
+[ -z $NODES ]|| CTDB_OPTIONS=$CTDB_OPTIONS --nlist=$NODES
+[ -z $CTDB_SOCKET ] || CTDB_OPTIONS=$CTDB_OPTIONS
--socket=$CTDB_SOCKET
[ -z $PUBLIC_ADDRESSES ] || CTDB_OPTIONS=$CTDB_OPTIONS
--public-addresses=$PUBLIC_ADDRESSES
-[ -z $NODES ]|| CTDB_OPTIONS=$CTDB_OPTIONS --nlist=$NODES
[ -z $PUBLIC_INTERFACE ] || CTDB_OPTIONS=$CTDB_OPTIONS
--public-interface=$PUBLIC_INTERFACE
[ -z $DBDIR ]|| CTDB_OPTIONS=$CTDB_OPTIONS --dbdir=$DBDIR
+[ -z $EVENT_SCRIPT ] || CTDB_OPTIONS=$CTDB_OPTIONS --event-script
$EVENT_SCRIPT
+[ -z $TRANSPORT ]|| CTDB_OPTIONS=$CTDB_OPTIONS --transport
$TRANSPORT
[ -z $DEBUGLEVEL ] || CTDB_OPTIONS=$CTDB_OPTIONS -d $DEBUGLEVEL
start() {
=== modified file 'packaging/RHEL/setup/ctdb.sysconfig'
--- a/packaging/RHEL/setup/ctdb.sysconfig 2007-05-29 05:36:42 +
+++ b/packaging/RHEL/setup/ctdb.sysconfig 2007-05-29 06:02:02 +
@@ -2,7 +2,14 @@
# DBDIR=/var/ctdb
# NODES=/etc/ctdb/nodes
+# EVENT_SCRIPT=/etc/ctdb/events
+# CTDB_SOCKET=/tmp/ctdb.socket
+# TRANSPORT=tcp
# PUBLIC_ADDRESSES=/etc/ctdb/public_addresses
# PUBLIC_INTERFACE=eth0
# LOGFILE=/var/log/log.ctdb
# DEBUGLEVEL=0
+
+# any other options
+# CTDB_OPTIONS=
+
=== modified file 'tools/ctdb_control.c'
--- a/tools/ctdb_control.c 2007-05-29 02:16:59 +
+++ b/tools/ctdb_control.c 2007-05-29 06:02:02 +
@@ -737,7 +737,7 @@
int opt;
const char **extra_argv;
int extra_argc = 0;
- int ret, i;
+ int ret=-1, i;
poptContext pc;
struct event_context *ev;
const char *control;
Rev 386: - ignore blank lines at end of lists in http://samba.org/~tridge/ctdb
revno: 386
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Tue 2007-05-29 16:23:47 +1000
message:
- ignore blank lines at end of lists
- rpm tweaks
modified:
common/ctdb.c ctdb.c-20061127094323-t50f58d65iaao5of-2
packaging/RHEL/ctdb.spec ctdb.spec-20070527204758-biuh7znabuwan3zn-3
takeover/ctdb_takeover.c
ctdb_takeover.c-20070525071636-a5n1ihghjtppy08r-2
=== modified file 'common/ctdb.c'
--- a/common/ctdb.c 2007-05-29 02:49:25 +
+++ b/common/ctdb.c 2007-05-29 06:23:47 +
@@ -151,6 +151,9 @@
ctdb_set_error(ctdb, Failed to load nlist '%s'\n, nlist);
return -1;
}
+ while (nlines 0 strcmp(lines[nlines-1], ) == 0) {
+ nlines--;
+ }
for (i=0;inlines;i++) {
if (ctdb_add_node(ctdb, lines[i]) != 0) {
=== modified file 'packaging/RHEL/ctdb.spec'
--- a/packaging/RHEL/ctdb.spec 2007-05-29 06:02:02 +
+++ b/packaging/RHEL/ctdb.spec 2007-05-29 06:23:47 +
@@ -43,6 +43,8 @@
CFLAGS=$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE ./configure \
--prefix=%{_prefix} \
+ --sysconfdir=%{_sysconfdir} \
+ --localstatedir=/var
make showflags
make
=== modified file 'takeover/ctdb_takeover.c'
--- a/takeover/ctdb_takeover.c 2007-05-29 03:48:30 +
+++ b/takeover/ctdb_takeover.c 2007-05-29 06:23:47 +
@@ -237,6 +237,9 @@
ctdb_set_error(ctdb, Failed to load public address list
'%s'\n, alist);
return -1;
}
+ while (nlines 0 strcmp(lines[nlines-1], ) == 0) {
+ nlines--;
+ }
if (nlines != ctdb-num_nodes) {
DEBUG(0,(Number of lines in %s does not match number of
nodes!\n, alist));
Rev 387: fixed shell syntax in events script in http://samba.org/~tridge/ctdb
revno: 387 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: tridge timestamp: Tue 2007-05-29 16:28:18 +1000 message: fixed shell syntax in events script modified: tools/events events-20070529030121-04fjh63cxfh8v1pj-1 === modified file 'tools/events' --- a/tools/events 2007-05-29 03:33:59 + +++ b/tools/events 2007-05-29 06:28:18 + @@ -30,8 +30,12 @@ ;; recovered) +# restart any services as necessary, like NFS + exit 0 + ;; + shutdown) -# restart any services as necessary, like NFS +# shutdown any services as necessary exit 0 ;; esac
svn commit: samba r23179 - in branches/SAMBA_4_0/source/selftest: .
Author: mimir Date: 2007-05-29 06:33:55 + (Tue, 29 May 2007) New Revision: 23179 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23179 Log: I forgot ejsnet.js script is one of tests. Disable it temporarily. rafal Modified: branches/SAMBA_4_0/source/selftest/test_ejs.sh Changeset: Modified: branches/SAMBA_4_0/source/selftest/test_ejs.sh === --- branches/SAMBA_4_0/source/selftest/test_ejs.sh 2007-05-29 05:49:35 UTC (rev 23178) +++ branches/SAMBA_4_0/source/selftest/test_ejs.sh 2007-05-29 06:33:55 UTC (rev 23179) @@ -15,7 +15,7 @@ plantest base.js dc $SCRIPTDIR/base.js $CONFIGURATION plantest samr.js dc $SCRIPTDIR/samr.js $CONFIGURATION ncalrpc: -U\$USERNAME%\$PASSWORD plantest echo.js dc $SCRIPTDIR/echo.js $CONFIGURATION ncalrpc: -U\$USERNAME%\$PASSWORD -plantest ejsnet.js dc $SCRIPTDIR/ejsnet.js $CONFIGURATION -U\$USERNAME%\$PASSWORD \$DOMAIN ejstestuser +#plantest ejsnet.js dc $SCRIPTDIR/ejsnet.js $CONFIGURATION -U\$USERNAME%\$PASSWORD \$DOMAIN ejstestuser plantest ldb.js none $SCRIPTDIR/ldb.js `pwd` $CONFIGURATION plantest samba3sam.js none $SCRIPTDIR/samba3sam.js $CONFIGURATION `pwd` $DATADIR/samba3/ plantest winreg dc scripting/bin/winreg $CONFIGURATION ncalrpc: 'HKLM' -U\$USERNAME%\$PASSWORD
Rev 388: fixed broadcast controls from the command line in http://samba.org/~tridge/ctdb
revno: 388
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Tue 2007-05-29 16:34:50 +1000
message:
fixed broadcast controls from the command line
modified:
common/ctdb_control.c
ctdb_control.c-20070426122724-j6gkpiofhbwdin63-1
=== modified file 'common/ctdb_control.c'
--- a/common/ctdb_control.c 2007-05-29 03:33:59 +
+++ b/common/ctdb_control.c 2007-05-29 06:34:50 +
@@ -442,7 +442,7 @@
return -1;
}
- if (destnode != CTDB_BROADCAST_VNNMAP destnode !=
CTDB_BROADCAST_VNNMAP
+ if (destnode != CTDB_BROADCAST_VNNMAP destnode != CTDB_BROADCAST_ALL
(!ctdb_validate_vnn(ctdb, destnode) ||
!(ctdb-nodes[destnode]-flags NODE_FLAGS_CONNECTED))) {
if (!(flags CTDB_CTRL_FLAG_NOREPLY)) {
svn commit: samba-web r1118 - in trunk/devel: .
Author: kai Date: 2007-05-29 06:55:13 + (Tue, 29 May 2007) New Revision: 1118 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1118 Log: The current production release is 3.0.25a, not 3.0.24. Modified: trunk/devel/index.html Changeset: Modified: trunk/devel/index.html === --- trunk/devel/index.html 2007-05-25 17:44:55 UTC (rev 1117) +++ trunk/devel/index.html 2007-05-29 06:55:13 UTC (rev 1118) @@ -14,8 +14,8 @@ pAs of 4 April 2004, the Samba Team converted from CVS to Subversion for maintaining the Samba source code. All current development is done in a Subversion repository. All older code is in the original CVS tree; this would include 2.2.x versions of Samba, which are no longer in active development./p -pThe latest production release is emSamba 3.0.24/em (a -href=/samba/history/samba-3.0.24.htmlrelease notes/a and a +pThe latest production release is emSamba 3.0.25a/em (a +href=/samba/history/samba-3.0.25a.htmlrelease notes/a and a href=/samba/download/download/a)./p pOngoing future research is being done for Samba 4.0
svn commit: samba r23180 - in branches/SAMBA_4_0/source/torture/raw: .
Author: tridge
Date: 2007-05-29 07:32:28 + (Tue, 29 May 2007)
New Revision: 23180
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23180
Log:
auto-reconnect on both NT_STATUS_END_OF_FILE and NT_STATUS_LOCAL_DISCONNECT
Modified:
branches/SAMBA_4_0/source/torture/raw/lockbench.c
branches/SAMBA_4_0/source/torture/raw/openbench.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/raw/lockbench.c
===
--- branches/SAMBA_4_0/source/torture/raw/lockbench.c 2007-05-29 06:33:55 UTC
(rev 23179)
+++ branches/SAMBA_4_0/source/torture/raw/lockbench.c 2007-05-29 07:32:28 UTC
(rev 23180)
@@ -212,7 +212,8 @@
NTSTATUS status = smbcli_request_simple_recv(req);
state-req = NULL;
if (!NT_STATUS_IS_OK(status)) {
- if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE)) {
+ if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE) ||
+ NT_STATUS_EQUAL(status, NT_STATUS_LOCAL_DISCONNECT)) {
talloc_free(state-tree);
state-tree = NULL;
num_connected--;
@@ -249,7 +250,8 @@
struct benchlock_state *state = talloc_get_type(req-async.private,
struct benchlock_state);
NTSTATUS status = smbcli_request_simple_recv(req);
- if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE)) {
+ if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE) ||
+ NT_STATUS_EQUAL(status, NT_STATUS_LOCAL_DISCONNECT)) {
talloc_free(state-tree);
state-tree = NULL;
num_connected--;
Modified: branches/SAMBA_4_0/source/torture/raw/openbench.c
===
--- branches/SAMBA_4_0/source/torture/raw/openbench.c 2007-05-29 06:33:55 UTC
(rev 23179)
+++ branches/SAMBA_4_0/source/torture/raw/openbench.c 2007-05-29 07:32:28 UTC
(rev 23180)
@@ -283,7 +283,8 @@
struct benchopen_state *state = talloc_get_type(req-async.private,
struct benchopen_state);
NTSTATUS status = smbcli_request_simple_recv(req);
- if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE)) {
+ if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE) ||
+ NT_STATUS_EQUAL(status, NT_STATUS_LOCAL_DISCONNECT)) {
talloc_free(state-tree);
state-tree = NULL;
num_connected--;
svn commit: samba r23181 - in branches/SAMBA_4_0/source/torture/raw: .
Author: tridge
Date: 2007-05-29 08:22:45 + (Tue, 29 May 2007)
New Revision: 23181
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23181
Log:
prevent attempts to reopen the connection twice at the same time
Modified:
branches/SAMBA_4_0/source/torture/raw/lockbench.c
branches/SAMBA_4_0/source/torture/raw/openbench.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/raw/lockbench.c
===
--- branches/SAMBA_4_0/source/torture/raw/lockbench.c 2007-05-29 07:32:28 UTC
(rev 23180)
+++ branches/SAMBA_4_0/source/torture/raw/lockbench.c 2007-05-29 08:22:45 UTC
(rev 23181)
@@ -54,6 +54,7 @@
int lastcount;
struct smbcli_request *req;
struct smb_composite_connect reconnect;
+ struct timed_event *te;
/* these are used for reconnections */
int dest_port;
@@ -148,9 +149,10 @@
status = smb_composite_connect_recv(ctx, state-mem_ctx);
if (!NT_STATUS_IS_OK(status)) {
- event_add_timed(state-ev, state-mem_ctx,
- timeval_current_ofs(1,0),
- reopen_connection, state);
+ talloc_free(state-te);
+ state-te = event_add_timed(state-ev, state-mem_ctx,
+ timeval_current_ofs(1,0),
+ reopen_connection, state);
return;
}
@@ -218,9 +220,10 @@
state-tree = NULL;
num_connected--;
DEBUG(0,(reopening connection to %s\n,
state-dest_host));
- event_add_timed(state-ev, state-mem_ctx,
- timeval_current_ofs(1,0),
- reopen_connection, state);
+ talloc_free(state-te);
+ state-te = event_add_timed(state-ev, state-mem_ctx,
+ timeval_current_ofs(1,0),
+ reopen_connection, state);
} else {
DEBUG(0,(Lock failed - %s\n, nt_errstr(status)));
lock_failed++;
@@ -256,9 +259,10 @@
state-tree = NULL;
num_connected--;
DEBUG(0,(reopening connection to %s\n, state-dest_host));
- event_add_timed(state-ev, state-mem_ctx,
- timeval_current_ofs(1,0),
- reopen_connection, state);
+ talloc_free(state-te);
+ state-te = event_add_timed(state-ev, state-mem_ctx,
+ timeval_current_ofs(1,0),
+ reopen_connection, state);
}
}
Modified: branches/SAMBA_4_0/source/torture/raw/openbench.c
===
--- branches/SAMBA_4_0/source/torture/raw/openbench.c 2007-05-29 07:32:28 UTC
(rev 23180)
+++ branches/SAMBA_4_0/source/torture/raw/openbench.c 2007-05-29 08:22:45 UTC
(rev 23181)
@@ -57,6 +57,7 @@
struct smbcli_request *req_open;
struct smbcli_request *req_close;
struct smb_composite_connect reconnect;
+ struct timed_event *te;
/* these are used for reconnections */
int dest_port;
@@ -81,9 +82,10 @@
status = smb_composite_connect_recv(ctx, state-mem_ctx);
if (!NT_STATUS_IS_OK(status)) {
- event_add_timed(state-ev, state-mem_ctx,
- timeval_current_ofs(1,0),
- reopen_connection, state);
+ talloc_free(state-te);
+ state-te = event_add_timed(state-ev, state-mem_ctx,
+ timeval_current_ofs(1,0),
+ reopen_connection, state);
return;
}
@@ -210,9 +212,10 @@
state-cli = NULL;
num_connected--;
DEBUG(0,(reopening connection to %s\n, state-dest_host));
- event_add_timed(state-ev, state-mem_ctx,
- timeval_current_ofs(1,0),
- reopen_connection, state);
+ talloc_free(state-te);
+ state-te = event_add_timed(state-ev, state-mem_ctx,
+ timeval_current_ofs(1,0),
+ reopen_connection, state);
return;
}
@@ -262,9 +265,10 @@
state-cli = NULL;
num_connected--;
DEBUG(0,(reopening connection to %s\n, state-dest_host));
- event_add_timed(state-ev, state-mem_ctx,
-
svn commit: samba r23182 - in branches/SAMBA_4_0/source/torture/raw: .
Author: tridge
Date: 2007-05-29 08:30:41 + (Tue, 29 May 2007)
New Revision: 23182
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23182
Log:
fixed valgrind error
Modified:
branches/SAMBA_4_0/source/torture/raw/lockbench.c
branches/SAMBA_4_0/source/torture/raw/openbench.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/raw/lockbench.c
===
--- branches/SAMBA_4_0/source/torture/raw/lockbench.c 2007-05-29 08:22:45 UTC
(rev 23181)
+++ branches/SAMBA_4_0/source/torture/raw/lockbench.c 2007-05-29 08:30:41 UTC
(rev 23182)
@@ -176,6 +176,8 @@
struct smb_composite_connect *io = state-reconnect;
char *host, *share;
+ state-te = NULL;
+
if (!torture_get_conn_index(state-client_num, state-mem_ctx, host,
share)) {
DEBUG(0,(Can't find host/share for reconnect?!\n));
exit(1);
Modified: branches/SAMBA_4_0/source/torture/raw/openbench.c
===
--- branches/SAMBA_4_0/source/torture/raw/openbench.c 2007-05-29 08:22:45 UTC
(rev 23181)
+++ branches/SAMBA_4_0/source/torture/raw/openbench.c 2007-05-29 08:30:41 UTC
(rev 23182)
@@ -114,6 +114,8 @@
struct smb_composite_connect *io = state-reconnect;
char *host, *share;
+ state-te = NULL;
+
if (!torture_get_conn_index(state-client_num, state-mem_ctx, host,
share)) {
DEBUG(0,(Can't find host/share for reconnect?!\n));
exit(1);
Rev 389: fixed system() return handling in http://samba.org/~tridge/ctdb
revno: 389
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Tue 2007-05-29 17:00:08 +1000
message:
fixed system() return handling
modified:
takeover/system.c system.c-20070525071636-a5n1ihghjtppy08r-3
=== modified file 'takeover/system.c'
--- a/takeover/system.c 2007-05-29 02:55:24 +
+++ b/takeover/system.c 2007-05-29 07:00:08 +
@@ -275,6 +275,9 @@
CTDB_NO_MEMORY(ctdb, cmdstr);
ret = system(cmdstr);
+ if (ret != -1) {
+ ret = WEXITSTATUS(ret);
+ }
talloc_free(cmdstr);
talloc_free(options);
Rev 390: don't block SIGCHLD, or we lose return values from system() ! in http://samba.org/~tridge/ctdb
revno: 390
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Tue 2007-05-29 17:23:29 +1000
message:
don't block SIGCHLD, or we lose return values from system() !
nicer log messages from events script
modified:
common/ctdb_daemon.c ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1
tools/events events-20070529030121-04fjh63cxfh8v1pj-1
=== modified file 'common/ctdb_daemon.c'
--- a/common/ctdb_daemon.c 2007-05-29 03:58:41 +
+++ b/common/ctdb_daemon.c 2007-05-29 07:23:29 +
@@ -734,7 +734,6 @@
setsid();
}
block_signal(SIGPIPE);
- block_signal(SIGCHLD);
/* try to set us up as realtime */
ctdb_set_realtime();
=== modified file 'tools/events'
--- a/tools/events 2007-05-29 06:28:18 +
+++ b/tools/events 2007-05-29 07:23:29 +
@@ -13,8 +13,11 @@
iface=$1
ip=$2
maskbits=$3
- exec /sbin/ip addr add $ip/$maskbits dev $iface
- exit 1
+ /sbin/ip addr add $ip/$maskbits dev $iface || {
+echo Failed to add $ip/$maskbits on dev $iface
+exit 1
+ }
+ exit 0
;;
releaseip)
@@ -25,8 +28,11 @@
iface=$1
ip=$2
maskbits=$3
- exec /sbin/ip addr del $ip dev $iface
- exit 1
+ /sbin/ip addr del $ip dev $iface || {
+echo Failed to del $ip on dev $iface
+exit 1
+ }
+ exit 0
;;
recovered)
Re: svn commit: samba r23175 - in branches/SAMBA_4_0: . source/lib/replace source/script source/selftest
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 [EMAIL PROTECTED] schrieb: Log: Handle PKG_CONFIG_PATH not set yet - fixes warning in selftest.pl Modified: branches/SAMBA_4_0/source/lib/replace/replace.h === --- branches/SAMBA_4_0/source/lib/replace/replace.h 2007-05-28 14:24:36 UTC (rev 23174) +++ branches/SAMBA_4_0/source/lib/replace/replace.h 2007-05-28 21:04:59 UTC (rev 23175) @@ -258,6 +258,14 @@ #endif #endif +#ifndef _DEPRECATED_ +#if (__GNUC__ = 3) (__GNUC_MINOR__ = 1 ) +#define _DEPRECATED_ __attribute__ ((deprecated)) +#else +#define _DEPRECATED_ +#endif +#endif + #ifndef HAVE_VASPRINTF #define vasprintf rep_vasprintf int rep_vasprintf(char **ptr, const char *format, va_list ap) PRINTF_ATTRIBUTE(2,0); Modified: branches/SAMBA_4_0/source/script/mkproto.pl === --- branches/SAMBA_4_0/source/script/mkproto.pl 2007-05-28 14:24:36 UTC (rev 23174) +++ branches/SAMBA_4_0/source/script/mkproto.pl 2007-05-28 21:04:59 UTC (rev 23175) @@ -180,10 +180,10 @@ } next unless ( $is_public || $line =~ / - ^void|^BOOL|^bool|^int|^struct|^char|^const|^\w+_[tT]\s|^uint|^unsigned|^long| - ^NTSTATUS|^ADS_STATUS|^enum\s.*\(|^DATA_BLOB|^WERROR|^XFILE|^FILE|^DIR| - ^double|^TDB_CONTEXT|^TDB_DATA|^TALLOC_CTX|^NTTIME|^FN_|^init_module| - ^GtkWidget|^GType|^smb_ucs2_t|^krb5_error_code + (_DEPRECATED_ )?^(void|BOOL|bool|int|struct|char|const|\w+_[tT]\s|uint|unsigned|long|NTSTATUS| + ADS_STATUS|enum\s.*\(|DATA_BLOB|WERROR|XFILE|FILE|DIR| + double|TDB_CONTEXT|TDB_DATA|TALLOC_CTX|NTTIME|FN_|init_module| + GtkWidget|GType|smb_ucs2_t|krb5_error_code) /xo); next if ($line =~ /^int\s*main/); Hi Jelmer, I don't think you wanted to commit this... metze -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.5 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org iD8DBQFGW+xxm70gjA5TCD8RAk8UAJ9tAWbzq0uYImkSWKeRBkrUqu2t9QCfewCR oD2p26M65i5hKGF89yUJnCU= =tAX3 -END PGP SIGNATURE-
svn commit: samba r23183 - in branches: SAMBA_3_0/source SAMBA_3_0/source/include SAMBA_3_0/source/lib SAMBA_3_0/source/libsmb SAMBA_3_0/source/locking SAMBA_3_0/source/printing SAMBA_3_0/source/rpc_s
Author: vlendec Date: 2007-05-29 09:30:34 + (Tue, 29 May 2007) New Revision: 23183 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23183 Log: Check in a change made by Tridge: This replaces the internal explicit dev/ino file id representation by a struct file_id. This is necessary as cluster file systems and NFS don't necessarily assign the same device number to the shared file system. With this structure in place we can now easily add different schemes to map a file to a unique 64-bit device node. Jeremy, you might note that I did not change the external interface of smb_share_modes.c. Volker Added: branches/SAMBA_3_0/source/lib/file_id.c Modified: branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0/source/include/locking.h branches/SAMBA_3_0/source/include/smb.h branches/SAMBA_3_0/source/libsmb/smb_share_modes.c branches/SAMBA_3_0/source/locking/brlock.c branches/SAMBA_3_0/source/locking/locking.c branches/SAMBA_3_0/source/locking/posix.c branches/SAMBA_3_0/source/printing/printfsp.c branches/SAMBA_3_0/source/rpc_server/srv_srvsvc_nt.c branches/SAMBA_3_0/source/smbd/close.c branches/SAMBA_3_0/source/smbd/filename.c branches/SAMBA_3_0/source/smbd/files.c branches/SAMBA_3_0/source/smbd/nttrans.c branches/SAMBA_3_0/source/smbd/open.c branches/SAMBA_3_0/source/smbd/oplock.c branches/SAMBA_3_0/source/smbd/oplock_irix.c branches/SAMBA_3_0/source/smbd/oplock_linux.c branches/SAMBA_3_0/source/smbd/reply.c branches/SAMBA_3_0/source/smbd/trans2.c branches/SAMBA_3_0/source/torture/locktest.c branches/SAMBA_3_0/source/torture/locktest2.c branches/SAMBA_3_0/source/utils/status.c branches/SAMBA_3_0_26/source/Makefile.in branches/SAMBA_3_0_26/source/include/locking.h branches/SAMBA_3_0_26/source/include/smb.h branches/SAMBA_3_0_26/source/libsmb/smb_share_modes.c branches/SAMBA_3_0_26/source/locking/brlock.c branches/SAMBA_3_0_26/source/locking/locking.c branches/SAMBA_3_0_26/source/locking/posix.c branches/SAMBA_3_0_26/source/printing/printfsp.c branches/SAMBA_3_0_26/source/rpc_server/srv_srvsvc_nt.c branches/SAMBA_3_0_26/source/smbd/close.c branches/SAMBA_3_0_26/source/smbd/filename.c branches/SAMBA_3_0_26/source/smbd/files.c branches/SAMBA_3_0_26/source/smbd/nttrans.c branches/SAMBA_3_0_26/source/smbd/open.c branches/SAMBA_3_0_26/source/smbd/oplock.c branches/SAMBA_3_0_26/source/smbd/oplock_irix.c branches/SAMBA_3_0_26/source/smbd/oplock_linux.c branches/SAMBA_3_0_26/source/smbd/reply.c branches/SAMBA_3_0_26/source/smbd/trans2.c branches/SAMBA_3_0_26/source/torture/locktest.c branches/SAMBA_3_0_26/source/torture/locktest2.c branches/SAMBA_3_0_26/source/utils/status.c Changeset: Sorry, the patch is too large (3485 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23183
svn commit: samba r23184 - in branches: SAMBA_3_0/source/lib/tdb/tools SAMBA_3_0_26/source/lib/tdb/tools
Author: vlendec
Date: 2007-05-29 10:15:01 + (Tue, 29 May 2007)
New Revision: 23184
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23184
Log:
Checkin for Tridge: Add a speed test to tdbtool
Modified:
branches/SAMBA_3_0/source/lib/tdb/tools/tdbtool.c
branches/SAMBA_3_0_26/source/lib/tdb/tools/tdbtool.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/tdb/tools/tdbtool.c
===
--- branches/SAMBA_3_0/source/lib/tdb/tools/tdbtool.c 2007-05-29 09:30:34 UTC
(rev 23183)
+++ branches/SAMBA_3_0/source/lib/tdb/tools/tdbtool.c 2007-05-29 10:15:01 UTC
(rev 23184)
@@ -35,6 +35,7 @@
char *line;
TDB_DATA iterate_kbuf;
char cmdline[1024];
+static int disable_mmap;
enum commands {
CMD_CREATE_TDB,
@@ -51,6 +52,8 @@
CMD_LIST_HASH_FREE,
CMD_LIST_FREE,
CMD_INFO,
+ CMD_MMAP,
+ CMD_SPEED,
CMD_FIRST,
CMD_NEXT,
CMD_SYSTEM,
@@ -78,6 +81,8 @@
{list,CMD_LIST_HASH_FREE},
{free,CMD_LIST_FREE},
{info,CMD_INFO},
+ {speed, CMD_SPEED},
+ {mmap,CMD_MMAP},
{first, CMD_FIRST},
{1, CMD_FIRST},
{next,CMD_NEXT},
@@ -88,6 +93,20 @@
{NULL, CMD_HELP}
};
+struct timeval tp1,tp2;
+
+static void _start_timer(void)
+{
+ gettimeofday(tp1,NULL);
+}
+
+static double _end_timer(void)
+{
+ gettimeofday(tp2,NULL);
+ return((tp2.tv_sec - tp1.tv_sec) +
+ (tp2.tv_usec - tp1.tv_usec)*1.0e-6);
+}
+
/* a tdb tool for manipulating a tdb database */
static TDB_CONTEXT *tdb;
@@ -176,7 +195,7 @@
static void create_tdb(const char *tdbname)
{
if (tdb) tdb_close(tdb);
- tdb = tdb_open(tdbname, 0, TDB_CLEAR_IF_FIRST,
+ tdb = tdb_open(tdbname, 0, TDB_CLEAR_IF_FIRST |
(disable_mmap?TDB_NOMMAP:0),
O_RDWR | O_CREAT | O_TRUNC, 0600);
if (!tdb) {
printf(Could not create %s: %s\n, tdbname, strerror(errno));
@@ -186,7 +205,7 @@
static void open_tdb(const char *tdbname)
{
if (tdb) tdb_close(tdb);
- tdb = tdb_open(tdbname, 0, 0, O_RDWR, 0600);
+ tdb = tdb_open(tdbname, 0, disable_mmap?TDB_NOMMAP:0, O_RDWR, 0600);
if (!tdb) {
printf(Could not open %s: %s\n, tdbname, strerror(errno));
}
@@ -366,6 +385,31 @@
printf(%d records totalling %d bytes\n, count, total_bytes);
}
+static void speed_tdb(const char *tlimit)
+{
+ unsigned timelimit = tlimit?atoi(tlimit):0;
+ double t;
+ int ops=0;
+ if (timelimit == 0) timelimit = 10;
+ printf(Testing traverse speed for %u seconds\n, timelimit);
+ _start_timer();
+ while ((t=_end_timer()) timelimit) {
+ tdb_traverse(tdb, traverse_fn, NULL);
+ printf(%10.3f ops/sec\r, (++ops)/t);
+ }
+ printf(\n);
+}
+
+static void toggle_mmap(void)
+{
+ disable_mmap = !disable_mmap;
+ if (disable_mmap) {
+ printf(mmap is disabled\n);
+ } else {
+ printf(mmap is enabled\n);
+ }
+}
+
static char *tdb_getline(const char *prompt)
{
static char thisline[1024];
@@ -494,6 +538,12 @@
case CMD_INFO:
info_tdb();
return 0;
+ case CMD_SPEED:
+ speed_tdb(arg1);
+ return 0;
+ case CMD_MMAP:
+ toggle_mmap();
+ return 0;
case CMD_FIRST:
bIterate = 1;
first_record(tdb, iterate_kbuf);
Modified: branches/SAMBA_3_0_26/source/lib/tdb/tools/tdbtool.c
===
--- branches/SAMBA_3_0_26/source/lib/tdb/tools/tdbtool.c2007-05-29
09:30:34 UTC (rev 23183)
+++ branches/SAMBA_3_0_26/source/lib/tdb/tools/tdbtool.c2007-05-29
10:15:01 UTC (rev 23184)
@@ -35,6 +35,7 @@
char *line;
TDB_DATA iterate_kbuf;
char cmdline[1024];
+static int disable_mmap;
enum commands {
CMD_CREATE_TDB,
@@ -51,6 +52,8 @@
CMD_LIST_HASH_FREE,
CMD_LIST_FREE,
CMD_INFO,
+ CMD_MMAP,
+ CMD_SPEED,
CMD_FIRST,
CMD_NEXT,
CMD_SYSTEM,
@@ -78,6 +81,8 @@
{list,CMD_LIST_HASH_FREE},
{free,CMD_LIST_FREE},
{info,CMD_INFO},
+ {speed, CMD_SPEED},
+ {mmap,CMD_MMAP},
{first, CMD_FIRST},
{1, CMD_FIRST},
{next,CMD_NEXT},
@@ -88,6 +93,20 @@
{NULL, CMD_HELP}
};
+struct timeval tp1,tp2;
+
+static void _start_timer(void)
+{
+ gettimeofday(tp1,NULL);
+}
+
+static double _end_timer(void)
+{
+ gettimeofday(tp2,NULL);
+ return((tp2.tv_sec - tp1.tv_sec) +
+ (tp2.tv_usec - tp1.tv_usec)*1.0e-6);
+}
+
/* a tdb tool for manipulating a
Rev 391: flush any local arp entries for the given ip on add/del in http://samba.org/~tridge/ctdb
revno: 391 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: tridge timestamp: Tue 2007-05-29 19:34:04 +1000 message: flush any local arp entries for the given ip on add/del modified: tools/events events-20070529030121-04fjh63cxfh8v1pj-1 === modified file 'tools/events' --- a/tools/events 2007-05-29 07:23:29 + +++ b/tools/events 2007-05-29 09:34:04 + @@ -17,6 +17,8 @@ echo Failed to add $ip/$maskbits on dev $iface exit 1 } + # if we have a local arp entry for this IP then remove it + /sbin/arp -d $ip 2 /dev/null exit 0 ;; @@ -32,6 +34,8 @@ echo Failed to del $ip on dev $iface exit 1 } + # if we have a local arp entry for this IP then remove it + /sbin/arp -d $ip 2 /dev/null exit 0 ;;
svn commit: samba r23185 - in branches: SAMBA_3_0/source/lib SAMBA_3_0/source/smbd SAMBA_3_0_26/source/lib SAMBA_3_0_26/source/smbd
Author: vlendec
Date: 2007-05-29 10:48:42 + (Tue, 29 May 2007)
New Revision: 23185
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23185
Log:
Try to fix the IRIX build, also add the forgotten file_id.c in .26
Added:
branches/SAMBA_3_0_26/source/lib/file_id.c
Modified:
branches/SAMBA_3_0/source/lib/file_id.c
branches/SAMBA_3_0/source/smbd/oplock_irix.c
branches/SAMBA_3_0_26/source/smbd/oplock_irix.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/file_id.c
===
--- branches/SAMBA_3_0/source/lib/file_id.c 2007-05-29 10:15:01 UTC (rev
23184)
+++ branches/SAMBA_3_0/source/lib/file_id.c 2007-05-29 10:48:42 UTC (rev
23185)
@@ -26,7 +26,7 @@
return a file_id which gives a unique ID for a file given the device and
inode numbers
*/
-static struct file_id file_id_create(SMB_DEV_T dev, SMB_INO_T inode)
+struct file_id file_id_create(SMB_DEV_T dev, SMB_INO_T inode)
{
struct file_id key;
/* the ZERO_STRUCT ensures padding doesn't break using the key as a
Modified: branches/SAMBA_3_0/source/smbd/oplock_irix.c
===
--- branches/SAMBA_3_0/source/smbd/oplock_irix.c2007-05-29 10:15:01 UTC
(rev 23184)
+++ branches/SAMBA_3_0/source/smbd/oplock_irix.c2007-05-29 10:48:42 UTC
(rev 23185)
@@ -140,8 +140,9 @@
* is the first fsp open with this dev,ino pair.
*/
- if ((fsp = file_find_di_first((SMB_DEV_T)os.os_dev,
- (SMB_INO_T)os.os_ino)) == NULL) {
+ if ((fsp = file_find_di_first(
+file_id_create((SMB_DEV_T)os.os_dev,
+ (SMB_INO_T)os.os_ino))) == NULL) {
DEBUG(0,(irix_oplock_receive_message: unable to find open
file with dev = %x, inode = %.0f\n,
(unsigned int)os.os_dev, (double)os.os_ino ));
Added: branches/SAMBA_3_0_26/source/lib/file_id.c
===
--- branches/SAMBA_3_0_26/source/lib/file_id.c 2007-05-29 10:15:01 UTC (rev
23184)
+++ branches/SAMBA_3_0_26/source/lib/file_id.c 2007-05-29 10:48:42 UTC (rev
23185)
@@ -0,0 +1,102 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ file_id structure handling
+
+ Copyright (C) Andrew Tridgell 2007
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include includes.h
+
+/*
+ return a file_id which gives a unique ID for a file given the device and
+ inode numbers
+ */
+struct file_id file_id_create(SMB_DEV_T dev, SMB_INO_T inode)
+{
+ struct file_id key;
+ /* the ZERO_STRUCT ensures padding doesn't break using the key as a
+* blob */
+ ZERO_STRUCT(key);
+ key.devid = dev;
+ key.inode = inode;
+ return key;
+}
+
+/*
+ generate a file_id from a stat structure
+ */
+struct file_id file_id_sbuf(const SMB_STRUCT_STAT *sbuf)
+{
+ return file_id_create(sbuf-st_dev, sbuf-st_ino);
+}
+
+
+/*
+ return True if two file_id structures are equal
+ */
+BOOL file_id_equal(const struct file_id *id1, const struct file_id *id2)
+{
+ return id1-inode == id2-inode id1-devid == id2-devid;
+}
+
+/*
+ a static string for a file_id structure
+ */
+const char *file_id_static_string(const struct file_id *id)
+{
+ static char buf[32];
+ snprintf(buf, sizeof(buf), %llx:%llx,
+(unsigned long long)id-devid,
+(unsigned long long)id-inode);
+ return buf;
+}
+
+/*
+ a 2nd static string for a file_id structure so we can print 2 at once
+ */
+const char *file_id_static_string2(const struct file_id *id)
+{
+ static char buf[32];
+ snprintf(buf, sizeof(buf), %llx:%llx,
+(unsigned long long)id-devid,
+(unsigned long long)id-inode);
+ return buf;
+}
+
+/*
+ push a 16 byte version of a file id into a buffer
+ */
+void push_file_id_16(char *buf, const struct file_id *id)
+{
+ SIVAL(buf, 0, id-devid0x);
+ SIVAL(buf, 4, id-devid32);
+ SIVAL(buf, 8, id-inode0x);
+ SIVAL(buf, 12, id-inode32);
+}
+
+/*
+ pul a 16 byte version of a file id from a buffer
+ */
+void pull_file_id_16(char *buf,
svn commit: samba r23186 - in branches: SAMBA_3_0/source/smbd SAMBA_3_0_26/source/smbd
Author: vlendec Date: 2007-05-29 10:50:25 + (Tue, 29 May 2007) New Revision: 23186 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23186 Log: Checkin on behalf of Tridge: Change notify.tdb to use dbwrap Modified: branches/SAMBA_3_0/source/smbd/notify_internal.c branches/SAMBA_3_0_26/source/smbd/notify_internal.c Changeset: Sorry, the patch is too large (639 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23186
svn commit: samba r23187 - in branches/SAMBA_4_0/source/heimdal_build: .
Author: metze
Date: 2007-05-29 11:03:07 + (Tue, 29 May 2007)
New Revision: 23187
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23187
Log:
revert 23145 and 23135 to fix the build on solaris...
metze
Modified:
branches/SAMBA_4_0/source/heimdal_build/config.m4
branches/SAMBA_4_0/source/heimdal_build/config.mk
Changeset:
Modified: branches/SAMBA_4_0/source/heimdal_build/config.m4
===
--- branches/SAMBA_4_0/source/heimdal_build/config.m4 2007-05-29 10:50:25 UTC
(rev 23186)
+++ branches/SAMBA_4_0/source/heimdal_build/config.m4 2007-05-29 11:03:07 UTC
(rev 23187)
@@ -70,7 +70,9 @@
atexit \
cgetent \
getprogname \
+ inet_ntop \
inet_aton \
+ inet_pton \
gethostname \
getnameinfo \
iruserok\
@@ -239,6 +241,18 @@
SMB_ENABLE(HEIMDAL_ROKEN_INET_ATON, YES)
fi
+if test x$ac_cv_func_inet_pton = xno; then
+AC_CHECK_LIB_EXT(nsl_s, NSL_LIBS, inet_pton)
+AC_CHECK_LIB_EXT(nsl, NSL_LIBS, inet_pton)
+SMB_ENABLE(NSL,YES)
+if test x$ac_cv_lib_ext_nsl_s_inet_pton != xyes
+ test x$ac_cv_lib_ext_nsl_inet_pton != xyes; then
+ AC_MSG_ERROR([no inet_pton() function available!])
+fi
+fi
+
+SMB_EXT_LIB(NSL,[${NSL_LIBS}],[],[],[])
+
# only add closefrom if needed
SMB_ENABLE(HEIMDAL_ROKEN_CLOSEFROM, NO)
if test t$ac_cv_func_closefrom != tyes; then
Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk
===
--- branches/SAMBA_4_0/source/heimdal_build/config.mk 2007-05-29 10:50:25 UTC
(rev 23186)
+++ branches/SAMBA_4_0/source/heimdal_build/config.mk 2007-05-29 11:03:07 UTC
(rev 23187)
@@ -439,9 +439,9 @@
HEIMDAL_ROKEN_GETPROGNAME \
HEIMDAL_ROKEN_CLOSEFROM \
GAI \
+ NSL \
RESOLV \
- EXT_SOCKET \
- EXT_NSL
+ EXT_SOCKET
# End SUBSYSTEM HEIMDAL_ROKEN
###
svn commit: samba r23188 - in branches/SAMBA_4_0/source/lib/replace: .
Author: metze
Date: 2007-05-29 11:13:07 + (Tue, 29 May 2007)
New Revision: 23188
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23188
Log:
revert 23123 and 23118.
as a long term solution this was the correct approach,
but it's a bit more complex and we need to provide the
whole socket api and libnsl.so checking in libreplace...
as a short term solution to fix the build on host 'hape'
we'll use the same trick as with inet_aton.c from
heimdal's lib/roken/
metze
Removed:
branches/SAMBA_4_0/source/lib/replace/inet.m4
branches/SAMBA_4_0/source/lib/replace/inet_ntop.c
branches/SAMBA_4_0/source/lib/replace/inet_pton.c
Modified:
branches/SAMBA_4_0/source/lib/replace/README
branches/SAMBA_4_0/source/lib/replace/libreplace.m4
branches/SAMBA_4_0/source/lib/replace/replace.h
Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/README
===
--- branches/SAMBA_4_0/source/lib/replace/README2007-05-29 11:03:07 UTC
(rev 23187)
+++ branches/SAMBA_4_0/source/lib/replace/README2007-05-29 11:13:07 UTC
(rev 23188)
@@ -54,8 +54,6 @@
strtoull
socketpair
strptime
-inet_pton
-inet_ntop
Types:
bool
Deleted: branches/SAMBA_4_0/source/lib/replace/inet.m4
===
--- branches/SAMBA_4_0/source/lib/replace/inet.m4 2007-05-29 11:03:07 UTC
(rev 23187)
+++ branches/SAMBA_4_0/source/lib/replace/inet.m4 2007-05-29 11:13:07 UTC
(rev 23188)
@@ -1,2 +0,0 @@
-AC_CHECK_FUNCS(inet_pton,[],[LIBREPLACEOBJ=${LIBREPLACEOBJ} inet_pton.o])
-AC_CHECK_FUNCS(inet_ntop,[],[LIBREPLACEOBJ=${LIBREPLACEOBJ} inet_ntop.o])
Deleted: branches/SAMBA_4_0/source/lib/replace/inet_ntop.c
===
--- branches/SAMBA_4_0/source/lib/replace/inet_ntop.c 2007-05-29 11:03:07 UTC
(rev 23187)
+++ branches/SAMBA_4_0/source/lib/replace/inet_ntop.c 2007-05-29 11:13:07 UTC
(rev 23188)
@@ -1,188 +0,0 @@
-/*
- * Copyright (C) 1996-2001 Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED AS IS AND INTERNET SOFTWARE CONSORTIUM
- * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
- * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* Adapted for Samba lib/replace by Michael Adam */
-
-#include replace.h
-#include system/network.h
-
-#define NS_INT16SZ 2
-#define NS_IN6ADDRSZ 16
-
-/*
- * WARNING: Don't even consider trying to compile this on a system where
- * sizeof(int) 4. sizeof(int) 4 is fine; all the world's not a VAX.
- */
-
-static const char *inet_ntop4(const unsigned char *src, char *dst,
- size_t size);
-
-#ifdef AF_INET6
-static const char *inet_ntop6(const unsigned char *src, char *dst,
- size_t size);
-#endif
-
-/* char *
- * isc_net_ntop(af, src, dst, size)
- * convert a network format address to presentation format.
- * return:
- * pointer to presentation format address (`dst'), or NULL (see errno).
- * author:
- * Paul Vixie, 1996.
- */
-const char *
-rep_inet_ntop(int af, const void *src, char *dst, size_t size)
-{
- switch (af) {
- case AF_INET:
- return (inet_ntop4(src, dst, size));
-#ifdef AF_INET6
- case AF_INET6:
- return (inet_ntop6(src, dst, size));
-#endif
- default:
- errno = EAFNOSUPPORT;
- return (NULL);
- }
- /* NOTREACHED */
-}
-
-/* const char *
- * inet_ntop4(src, dst, size)
- * format an IPv4 address
- * return:
- * `dst' (as a const)
- * notes:
- * (1) uses no statics
- * (2) takes a unsigned char* not an in_addr as input
- * author:
- * Paul Vixie, 1996.
- */
-static const char *
-inet_ntop4(const unsigned char *src, char *dst, size_t size)
-{
- static const char *fmt = %u.%u.%u.%u;
- char tmp[sizeof 255.255.255.255];
- size_t len;
-
- len = snprintf(tmp, sizeof tmp, fmt, src[0], src[1], src[2], src[3]);
- if (len = size) {
- errno = ENOSPC;
- return (NULL);
- }
- memcpy(dst, tmp, len + 1);
-
- return (dst);
-}
-
-/* const char *
- * isc_inet_ntop6(src, dst, size)
- * convert IPv6 binary address into presentation (printable) format
- * author:
- * Paul Vixie, 1996.
- */
-#ifdef AF_INET6
svn commit: samba r23189 - in branches/SAMBA_4_0/source: script scripting/libjs selftest setup
Author: abartlet
Date: 2007-05-29 12:18:41 + (Tue, 29 May 2007)
New Revision: 23189
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23189
Log:
Work towards a totally scripted setup of LDAP backends, so others can
easily try this out.
I also intend to use this for the selftest, but I'm chasing issues
with the OpenlDAP (but not Fedora DS) backend.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/script/installmisc.sh
branches/SAMBA_4_0/source/scripting/libjs/provision.js
branches/SAMBA_4_0/source/selftest/Samba4.pm
branches/SAMBA_4_0/source/setup/fedorads-partitions.ldif
branches/SAMBA_4_0/source/setup/fedorads.inf
branches/SAMBA_4_0/source/setup/provision
branches/SAMBA_4_0/source/setup/provision-backend
branches/SAMBA_4_0/source/setup/slapd.conf
Changeset:
Modified: branches/SAMBA_4_0/source/script/installmisc.sh
===
--- branches/SAMBA_4_0/source/script/installmisc.sh 2007-05-29 11:13:07 UTC
(rev 23188)
+++ branches/SAMBA_4_0/source/script/installmisc.sh 2007-05-29 12:18:41 UTC
(rev 23189)
@@ -15,6 +15,7 @@
echo Installing setup templates
mkdir -p $SETUPDIR || exit 1
cp setup/schema-map-* $SETUPDIR || exit 1
+cp setup/DB_CONFIG $SETUPDIR || exit 1
cp setup/*.inf $SETUPDIR || exit 1
cp setup/*.ldif $SETUPDIR || exit 1
cp setup/*.zone $SETUPDIR || exit 1
Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js
===
--- branches/SAMBA_4_0/source/scripting/libjs/provision.js 2007-05-29
11:13:07 UTC (rev 23188)
+++ branches/SAMBA_4_0/source/scripting/libjs/provision.js 2007-05-29
12:18:41 UTC (rev 23189)
@@ -385,10 +385,10 @@
paths.keytab = secrets.keytab;
paths.dns = lp.get(private dir) + / + subobj.DNSDOMAIN + .zone;
paths.winsdb = wins.ldb;
- paths.ldap_basedn_ldif = lp.get(private dir) + / + subobj.DNSDOMAIN
+ .ldif;
- paths.ldap_config_basedn_ldif = lp.get(private dir) + / +
subobj.DNSDOMAIN + -config.ldif;
- paths.ldap_schema_basedn_ldif = lp.get(private dir) + / +
subobj.DNSDOMAIN + -schema.ldif;
paths.ldapdir = lp.get(private dir) + /ldap;
+ paths.ldap_basedn_ldif = paths.ldapdir + / + subobj.DNSDOMAIN +
.ldif;
+ paths.ldap_config_basedn_ldif = paths.ldapdir + / + subobj.DNSDOMAIN
+ -config.ldif;
+ paths.ldap_schema_basedn_ldif = paths.ldapdir + / + subobj.DNSDOMAIN
+ -schema.ldif;
return paths;
}
@@ -793,6 +793,8 @@
subobj.RDN_DC = substr(rdns[0], strlen(DC=));
+ sys.mkdir(paths.ldapdir, 0700);
+
setup_file(provision_basedn.ldif,
message, paths.ldap_basedn_ldif,
subobj);
@@ -805,7 +807,6 @@
message, paths.ldap_schema_basedn_ldif,
subobj);
- message(Please install the LDIF located in + paths.ldap_basedn_ldif
+ , + paths.ldap_config_basedn_ldif + and +
paths.ldap_schema_basedn_ldif + into your LDAP server, and re-run with
--ldap-backend=ldap://my.ldap.server\n;);
}
Modified: branches/SAMBA_4_0/source/selftest/Samba4.pm
===
--- branches/SAMBA_4_0/source/selftest/Samba4.pm2007-05-29 11:13:07 UTC
(rev 23188)
+++ branches/SAMBA_4_0/source/selftest/Samba4.pm2007-05-29 12:18:41 UTC
(rev 23189)
@@ -422,8 +422,8 @@
}
system(slaptest -u -f $slapd_conf) == 0 or die(slaptest still fails
after adding modules);
- system(slapadd -b cn=Configuration,$basedn -f $slapd_conf -l
$privatedir/$dnsname-config.ldif /dev/null) == 0 or die(slapadd failed);
- system(slapadd -b cn=Schema,cn=Configuration,$basedn -f $slapd_conf -l
$privatedir/$dnsname-schema.ldif /dev/null) == 0 or die(slapadd failed);
+ system(slapadd -b cn=Configuration,$basedn -f $slapd_conf -l
$ldapdir/$dnsname-config.ldif /dev/null) == 0 or die(slapadd failed);
+ system(slapadd -b cn=Schema,cn=Configuration,$basedn -f $slapd_conf -l
$ldapdir/$dnsname-schema.ldif /dev/null) == 0 or die(slapadd failed);
system(slaptest -u -f $slapd_conf /dev/null) == 0 or
die (slaptest after database load failed);
@@ -458,7 +458,7 @@
my $winbindd_socket_dir = $prefix_abs/winbind_socket;
my $configuration = --configfile=$conffile;
- my $ldapdir = $prefix_abs/ldap;
+ my $ldapdir = $privatedir/ldap;
my $tlsdir = $privatedir/tls;
Modified: branches/SAMBA_4_0/source/setup/fedorads-partitions.ldif
===
--- branches/SAMBA_4_0/source/setup/fedorads-partitions.ldif2007-05-29
11:13:07 UTC (rev 23188)
+++ branches/SAMBA_4_0/source/setup/fedorads-partitions.ldif2007-05-29
12:18:41 UTC (rev 23189)
@@ -1,4 +1,4 @@
-dn: cn=\${CONFIGDN}\,cn=mapping tree,cn=config
+dn: cn=${CONFIGDN},cn=mapping
svn commit: samba r23190 - in branches/SAMBA_3_0_26/source: auth include lib smbd
Author: jerry
Date: 2007-05-29 12:53:42 + (Tue, 29 May 2007)
New Revision: 23190
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23190
Log:
svn merge ../SAMBA_3_0 -r22019:22026
This is abartlet's talloc changes to the samu struct stored
in the server info state.
Modified:
branches/SAMBA_3_0_26/source/auth/auth_sam.c
branches/SAMBA_3_0_26/source/auth/auth_util.c
branches/SAMBA_3_0_26/source/include/smb.h
branches/SAMBA_3_0_26/source/lib/util_pw.c
branches/SAMBA_3_0_26/source/smbd/password.c
branches/SAMBA_3_0_26/source/smbd/session.c
Changeset:
Modified: branches/SAMBA_3_0_26/source/auth/auth_sam.c
===
--- branches/SAMBA_3_0_26/source/auth/auth_sam.c2007-05-29 12:18:41 UTC
(rev 23189)
+++ branches/SAMBA_3_0_26/source/auth/auth_sam.c2007-05-29 12:53:42 UTC
(rev 23190)
@@ -263,10 +263,10 @@
return NT_STATUS_UNSUCCESSFUL;
}
- /* Can't use the talloc version here, because the returned struct gets
- kept on the server_info */
+ /* the returned struct gets kept on the server_info, by means
+ of a steal further down */
- if ( !(sampass = samu_new( NULL )) ) {
+ if ( !(sampass = samu_new( mem_ctx )) ) {
return NT_STATUS_NO_MEMORY;
}
Modified: branches/SAMBA_3_0_26/source/auth/auth_util.c
===
--- branches/SAMBA_3_0_26/source/auth/auth_util.c 2007-05-29 12:18:41 UTC
(rev 23189)
+++ branches/SAMBA_3_0_26/source/auth/auth_util.c 2007-05-29 12:53:42 UTC
(rev 23190)
@@ -561,19 +561,23 @@
DOM_SID unix_group_sid;
- if ( !(pwd = getpwnam_alloc(NULL, pdb_get_username(sampass))) ) {
+ if ( !(result = make_server_info(NULL)) ) {
+ return NT_STATUS_NO_MEMORY;
+ }
+
+ if ( !(pwd = getpwnam_alloc(result, pdb_get_username(sampass))) ) {
DEBUG(1, (User %s in passdb, but getpwnam() fails!\n,
pdb_get_username(sampass)));
+ TALLOC_FREE(result);
return NT_STATUS_NO_SUCH_USER;
}
- if ( !(result = make_server_info(NULL)) ) {
- TALLOC_FREE(pwd);
- return NT_STATUS_NO_MEMORY;
- }
-
result-sam_account = sampass;
- result-unix_name = talloc_strdup(result, pwd-pw_name);
+ /* Ensure thaat the sampass will be freed with the result */
+ talloc_steal(result, sampass);
+ result-unix_name = pwd-pw_name;
+ /* Ensure that we keep pwd-pw_name, because we will free pwd below */
+ talloc_steal(result, pwd-pw_name);
result-gid = pwd-pw_gid;
result-uid = pwd-pw_uid;
Modified: branches/SAMBA_3_0_26/source/include/smb.h
===
--- branches/SAMBA_3_0_26/source/include/smb.h 2007-05-29 12:18:41 UTC (rev
23189)
+++ branches/SAMBA_3_0_26/source/include/smb.h 2007-05-29 12:53:42 UTC (rev
23190)
@@ -1757,9 +1757,9 @@
gid_t gid; /* gid of a validated user */
userdom_struct user;
- char *homedir;
- char *unix_homedir;
- char *logon_script;
+ const char *homedir;
+ const char *unix_homedir;
+ const char *logon_script;
BOOL guest;
Modified: branches/SAMBA_3_0_26/source/lib/util_pw.c
===
--- branches/SAMBA_3_0_26/source/lib/util_pw.c 2007-05-29 12:18:41 UTC (rev
23189)
+++ branches/SAMBA_3_0_26/source/lib/util_pw.c 2007-05-29 12:53:42 UTC (rev
23190)
@@ -74,7 +74,7 @@
if ((pwnam_cache[i] != NULL)
(strcmp(name, pwnam_cache[i]-pw_name) == 0)) {
DEBUG(10, (Got %s from pwnam_cache\n, name));
- return (struct passwd *)talloc_reference(mem_ctx,
pwnam_cache[i]);
+ return tcopy_passwd(mem_ctx, pwnam_cache[i]);
}
}
@@ -98,15 +98,15 @@
i = rand() % PWNAMCACHE_SIZE;
if (pwnam_cache[i] != NULL) {
- TALLOC_FREE(pwnam_cache[i]);
+ /* Remove this old cache entry, from the cache. We
+* use talloc_unlink here because we want to be very
+* clear which referece we are removing */
+ talloc_unlink(pwnam_cache, pwnam_cache[i]);
}
pwnam_cache[i] = tcopy_passwd(pwnam_cache, temp);
- if (pwnam_cache[i]!= NULL mem_ctx != NULL) {
- return (struct passwd *)talloc_reference(mem_ctx,
pwnam_cache[i]);
- }
- return tcopy_passwd(NULL, pwnam_cache[i]);
+ return tcopy_passwd(mem_ctx, temp);
}
struct passwd *getpwuid_alloc(TALLOC_CTX *mem_ctx, uid_t uid)
Modified: branches/SAMBA_3_0_26/source/smbd/password.c
Rev 392: samba3 needs ctdb_private.h installed to build in http://samba.org/~tridge/ctdb
revno: 392
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge
timestamp: Tue 2007-05-29 22:53:28 +1000
message:
samba3 needs ctdb_private.h installed to build
modified:
packaging/RHEL/ctdb.spec ctdb.spec-20070527204758-biuh7znabuwan3zn-3
=== modified file 'packaging/RHEL/ctdb.spec'
--- a/packaging/RHEL/ctdb.spec 2007-05-29 06:23:47 +
+++ b/packaging/RHEL/ctdb.spec 2007-05-29 12:53:28 +
@@ -67,6 +67,10 @@
install -m755 setup/ctdb.init $RPM_BUILD_ROOT%{initdir}/ctdb
install -m755 tools/events $RPM_BUILD_ROOT%{_sysconfdir}/ctdb/events
+# unfortunately samba3 needs ctdb_private.h too
+install -m644 include/ctdb_private.h %{_includedir}/ctdb_private.h
+
+
# Remove *.old files
find $RPM_BUILD_ROOT -name *.old -exec rm -f {} \;
@@ -103,3 +107,4 @@
%{_sbindir}/ctdbd
%{_bindir}/ctdb
%{_includedir}/ctdb.h
+%{_includedir}/ctdb_private.h
svn commit: samba r23191 - in branches/SAMBA_4_0/source/selftest: .
Author: abartlet
Date: 2007-05-29 13:06:08 + (Tue, 29 May 2007)
New Revision: 23191
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23191
Log:
Use the new provision-backend script to setup Fedora DS for make test.
OpenLDAP to follow once I get things working...
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/selftest/Samba4.pm
branches/SAMBA_4_0/source/selftest/selftest.pl
Changeset:
Modified: branches/SAMBA_4_0/source/selftest/Samba4.pm
===
--- branches/SAMBA_4_0/source/selftest/Samba4.pm2007-05-29 12:53:42 UTC
(rev 23190)
+++ branches/SAMBA_4_0/source/selftest/Samba4.pm2007-05-29 13:06:08 UTC
(rev 23191)
@@ -39,7 +39,7 @@
# running slapd in the background means it stays in the same process
group, so it can be
# killed by timelimit
- if ($self-{ldap} eq fedora) {
+ if ($self-{ldap} eq fedora-ds) {
system($ENV{FEDORA_DS_PREFIX}/sbin/ns-slapd -D
$env_vars-{FEDORA_DS_DIR} -d0 -i $env_vars-{FEDORA_DS_PIDFILE}
$env_vars-{LDAPDIR}/logs 21 );
} elsif ($self-{ldap} eq openldap) {
openldap_start($env_vars-{SLAPD_CONF}, $uri,
$env_vars-{LDAPDIR}/logs);
@@ -58,7 +58,7 @@
sub slapd_stop($$)
{
my ($self, $envvars) = @_;
- if ($self-{ldap} eq fedora) {
+ if ($self-{ldap} eq fedora-ds) {
system($envvars-{LDAPDIR}/slapd-samba4/stop-slapd);
} elsif ($self-{ldap} eq openldap) {
open(IN, $envvars-{OPENLDAP_PIDFILE}) or
@@ -177,54 +177,18 @@
);
}
-sub mk_fedora($$)
+sub mk_fedora_ds($$$)
{
- my ($self, $ldapdir, $basedn, $root, $password, $privatedir,
$configuration) = @_;
+ my ($self, $ldapdir, $configuration) = @_;
- mkdir($ldapdir, 0777);
-
my $fedora_ds_inf = $ldapdir/fedorads.inf;
- my $fedora_ds_initial_ldif = $ldapdir/fedorads-initial.ldif;
+ my $fedora_ds_extra_ldif = $ldapdir/fedorads-partitions.ldif;
#Make the subdirectory be as fedora DS would expect
my $fedora_ds_dir = $ldapdir/slapd-samba4;
my $pidfile = $fedora_ds_dir/logs/slapd-samba4.pid;
- open(CONF, $fedora_ds_inf);
- print CONF
-[General]
-SuiteSpotUserID = $root
-FullMachineName= localhost
-ServerRoot= $ldapdir
-
-[slapd]
-ldapifilepath=$ldapdir/ldapi
-Suffix= $basedn
-RootDN= cn=Manager,$basedn
-RootDNPwd= $password
-ServerIdentifier= samba4
-#InstallLdifFile=$fedora_ds_initial_ldif
-
-inst_dir= $fedora_ds_dir
-config_dir= $fedora_ds_dir
-schema_dir= $fedora_ds_dir/schema
-lock_dir= $fedora_ds_dir/lock
-log_dir= $fedora_ds_dir/logs
-run_dir= $fedora_ds_dir/logs
-db_dir= $fedora_ds_dir/db
-bak_dir= $fedora_ds_dir/bak
-tmp_dir= $fedora_ds_dir/tmp
-ldif_dir= $fedora_ds_dir/ldif
-cert_dir= $fedora_ds_dir
-
-start_server= 0
-install_full_schema= 0
-;
- close(CONF);
-
- open(LDIF, $fedora_ds_initial_ldif);
-
my $dir = getcwd();
chdir $ENV{FEDORA_DS_PREFIX}/bin || die;
if (system(perl $ENV{FEDORA_DS_PREFIX}/bin/ds_newinst.pl
$fedora_ds_inf 2) != 0) {
@@ -233,40 +197,10 @@
}
chdir $dir || die;
- open(LDIF, $fedora_ds_dir/dse.ldif);
- print LDIF dn: cn=\cn=Configuration,$basedn\,cn=mapping
tree,cn=config
-objectclass: top
-objectclass: extensibleObject
-objectclass: nsMappingTree
-nsslapd-state: backend
-nsslapd-backend: configData
-cn: cn=Configuration,$basedn
+ system(cat $fedora_ds_extra_ldif $fedora_ds_dir/dse.ldif);
-dn: cn=configData,cn=ldbm database,cn=plugins,cn=config
-objectclass: extensibleObject
-objectclass: nsBackendInstance
-nsslapd-suffix: cn=Configuration,$basedn
-cn: configData
+ system($self-{bindir}/ad2oLschema $configuration -H
$ldapdir/schema-tmp.ldb --option=convert:target=fedora-ds -I
$self-{setupdir}/schema-map-fedora-ds-1.0 -O $fedora_ds_dir/schema/99_ad.ldif
2) == 0 or die(schema conversion for Fedora DS failed);
-dn: cn=\cn=Schema,cn=Configuration,$basedn\,cn=mapping tree,cn=config
-objectclass: top
-objectclass: extensibleObject
-objectclass: nsMappingTree
-nsslapd-state: backend
-nsslapd-backend: schemaData
-cn: cn=Schema,cn=Configuration,$basedn
-
-dn: cn=schemaData,cn=ldbm database,cn=plugins,cn=config
-objectclass: extensibleObject
-objectclass: nsBackendInstance
-nsslapd-suffix: cn=Schema,cn=Configuration,$basedn
-cn: schemaData
-
-;
- close(LDIF);
-
- system($self-{bindir}/ad2oLschema $configuration -H
$privatedir/sam.ldb --option=convert:target=fedora-ds -I
$self-{setupdir}/schema-map-fedora-ds-1.0 -O $fedora_ds_dir/schema/99_ad.ldif
2) == 0 or die(schema conversion for Fedora DS failed);
-
return ($fedora_ds_dir, $pidfile);
}
@@ -425,8 +359,6 @@
system(slapadd -b cn=Configuration,$basedn -f $slapd_conf -l
$ldapdir/$dnsname-config.ldif /dev/null) == 0 or die(slapadd failed);
system(slapadd -b cn=Schema,cn=Configuration,$basedn -f $slapd_conf -l
svn commit: samba r23192 - in branches/SAMBA_3_0/source/passdb: .
Author: jerry
Date: 2007-05-29 13:18:57 + (Tue, 29 May 2007)
New Revision: 23192
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23192
Log:
Remove fallback to looking up group mappings by the
Unix name after discussion with Simo.
Modified:
branches/SAMBA_3_0/source/passdb/passdb.c
Changeset:
Modified: branches/SAMBA_3_0/source/passdb/passdb.c
===
--- branches/SAMBA_3_0/source/passdb/passdb.c 2007-05-29 13:06:08 UTC (rev
23191)
+++ branches/SAMBA_3_0/source/passdb/passdb.c 2007-05-29 13:18:57 UTC (rev
23192)
@@ -612,23 +612,7 @@
unbecome_root();
if (!ret) {
- /* try to see if we can lookup a mapped
-* group with the unix group name */
-
- struct group *grp;
-
- grp = getgrnam(name);
- if (!grp) {
- return False;
- }
-
- become_root();
- ret = pdb_getgrgid(map, grp-gr_gid);
- unbecome_root();
-
- if (!ret) {
- return False;
- }
+ return False;
}
/* BUILTIN groups are looked up elsewhere */
svn commit: samba r23193 - in branches/SAMBA_3_0_25/source: .
Author: gd Date: 2007-05-29 13:19:55 + (Tue, 29 May 2007) New Revision: 23193 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23193 Log: Fix nasty typo. Guenther Modified: branches/SAMBA_3_0_25/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0_25/source/Makefile.in === --- branches/SAMBA_3_0_25/source/Makefile.in2007-05-29 13:18:57 UTC (rev 23192) +++ branches/SAMBA_3_0_25/source/Makefile.in2007-05-29 13:19:55 UTC (rev 23193) @@ -750,7 +750,7 @@ $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ) $(SECRETS_OBJ) PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \ - pam_smbpass/pam_smb_acct.o pam_smbpass/support.o \ + pam_smbpass/pam_smb_acct.o pam_smbpass/support.o PAM_SMBPASS_OBJ = $(PAM_SMBPASS_OBJ_0) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \ $(SECRETS_OBJ) $(SMBLDAP_OBJ) $(LIBSAMBA_OBJ) \ $(RPC_PARSE_OBJ1) $(DOSERR_OBJ) $(ERRORMAP_OBJ)
svn commit: samba r23194 - in branches/SAMBA_3_0/source/passdb: .
Author: jerry
Date: 2007-05-29 13:20:40 + (Tue, 29 May 2007)
New Revision: 23194
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23194
Log:
cherry pick two fixes from SAMBA_3_0_26
* strptime() failure check
* make legcacy sid/uid/gid calls static
Modified:
branches/SAMBA_3_0/source/passdb/lookup_sid.c
branches/SAMBA_3_0/source/passdb/pdb_ldap.c
Changeset:
Modified: branches/SAMBA_3_0/source/passdb/lookup_sid.c
===
--- branches/SAMBA_3_0/source/passdb/lookup_sid.c 2007-05-29 13:19:55 UTC
(rev 23193)
+++ branches/SAMBA_3_0/source/passdb/lookup_sid.c 2007-05-29 13:20:40 UTC
(rev 23194)
@@ -1138,7 +1138,7 @@
*THE LEGACY* convert uid_t to SID function.
*/
-void legacy_uid_to_sid(DOM_SID *psid, uid_t uid)
+static void legacy_uid_to_sid(DOM_SID *psid, uid_t uid)
{
uint32 rid;
BOOL ret;
@@ -1172,7 +1172,7 @@
*THE LEGACY* convert gid_t to SID function.
*/
-void legacy_gid_to_sid(DOM_SID *psid, gid_t gid)
+static void legacy_gid_to_sid(DOM_SID *psid, gid_t gid)
{
BOOL ret;
@@ -1203,7 +1203,7 @@
*THE LEGACY* convert SID to uid function.
*/
-BOOL legacy_sid_to_uid(const DOM_SID *psid, uid_t *puid)
+static BOOL legacy_sid_to_uid(const DOM_SID *psid, uid_t *puid)
{
enum lsa_SidType type;
uint32 rid;
@@ -1246,7 +1246,7 @@
Group mapping is used for gids that maps to Wellknown SIDs
*/
-BOOL legacy_sid_to_gid(const DOM_SID *psid, gid_t *pgid)
+static BOOL legacy_sid_to_gid(const DOM_SID *psid, gid_t *pgid)
{
uint32 rid;
GROUP_MAP map;
Modified: branches/SAMBA_3_0/source/passdb/pdb_ldap.c
===
--- branches/SAMBA_3_0/source/passdb/pdb_ldap.c 2007-05-29 13:19:55 UTC (rev
23193)
+++ branches/SAMBA_3_0/source/passdb/pdb_ldap.c 2007-05-29 13:20:40 UTC (rev
23194)
@@ -1,7 +1,7 @@
/*
Unix SMB/CIFS implementation.
LDAP protocol helper functions for SAMBA
- Copyright (C) Jean Fran�ois Micouleau 1998
+ Copyright (C) Jean François Micouleau 1998
Copyright (C) Gerald Carter 2001-2003
Copyright (C) Shahms King 2001
Copyright (C) Andrew Bartlett 2002-2003
@@ -455,7 +455,11 @@
temp))
return (time_t) 0;
- strptime(temp, %Y%m%d%H%M%SZ, tm);
+ if ( !strptime(temp, %Y%m%d%H%M%SZ, tm)) {
+ DEBUG(2,(ldapsam_get_entry_timestamp: strptime failed on:
%s\n,
+ (char*)temp));
+ return (time_t) 0;
+ }
tzset();
return timegm(tm);
}
svn commit: samba r23195 - in branches: SAMBA_3_0/source/include SAMBA_3_0/source/locking SAMBA_3_0/source/torture SAMBA_3_0/source/utils SAMBA_3_0_26/source/include SAMBA_3_0_26/source/locking SAMBA_
Author: vlendec
Date: 2007-05-29 13:26:44 + (Tue, 29 May 2007)
New Revision: 23195
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23195
Log:
Add void *private_data to brl_forall
Modified:
branches/SAMBA_3_0/source/include/locking.h
branches/SAMBA_3_0/source/locking/brlock.c
branches/SAMBA_3_0/source/torture/locktest.c
branches/SAMBA_3_0/source/torture/locktest2.c
branches/SAMBA_3_0/source/utils/status.c
branches/SAMBA_3_0_26/source/include/locking.h
branches/SAMBA_3_0_26/source/locking/brlock.c
branches/SAMBA_3_0_26/source/torture/locktest.c
branches/SAMBA_3_0_26/source/torture/locktest2.c
branches/SAMBA_3_0_26/source/utils/status.c
Changeset:
Modified: branches/SAMBA_3_0/source/include/locking.h
===
--- branches/SAMBA_3_0/source/include/locking.h 2007-05-29 13:20:40 UTC (rev
23194)
+++ branches/SAMBA_3_0/source/include/locking.h 2007-05-29 13:26:44 UTC (rev
23195)
@@ -62,18 +62,6 @@
struct db_record *record;
};
-#define BRLOCK_FN_CAST() \
- void (*)(struct file_id id, struct server_id pid, \
-enum brl_type lock_type, \
-enum brl_flavour lock_flav, \
-br_off start, br_off size)
-
-#define BRLOCK_FN(fn) \
- void (*fn)(struct file_id id, struct server_id pid, \
-enum brl_type lock_type, \
-enum brl_flavour lock_flav, \
-br_off start, br_off size)
-
/* Internal structure in brlock.tdb.
The data in brlock records is an unsorted linear array of these
records. It is unnecessary to store the count as tdb provides the
Modified: branches/SAMBA_3_0/source/locking/brlock.c
===
--- branches/SAMBA_3_0/source/locking/brlock.c 2007-05-29 13:20:40 UTC (rev
23194)
+++ branches/SAMBA_3_0/source/locking/brlock.c 2007-05-29 13:26:44 UTC (rev
23195)
@@ -1447,6 +1447,15 @@
return True;
}
+struct brl_forall_cb {
+ void (*fn)(struct file_id id, struct server_id pid,
+ enum brl_type lock_type,
+ enum brl_flavour lock_flav,
+ br_off start, br_off size,
+ void *private_data);
+ void *private_data;
+};
+
/
Traverse the whole database with this function, calling traverse_callback
on each lock.
@@ -1454,14 +1463,13 @@
static int traverse_fn(struct db_record *rec, void *state)
{
+ struct brl_forall_cb *cb = (struct brl_forall_cb *)state;
struct lock_struct *locks;
struct file_id *key;
unsigned int i;
unsigned int num_locks = 0;
unsigned int orig_num_locks = 0;
- BRLOCK_FN(traverse_callback) = (BRLOCK_FN_CAST())state;
-
/* In a traverse function we must make a copy of
dbuf before modifying it. */
@@ -1493,12 +1501,13 @@
}
for ( i=0; inum_locks; i++) {
- traverse_callback(*key,
- locks[i].context.pid,
- locks[i].lock_type,
- locks[i].lock_flav,
- locks[i].start,
- locks[i].size);
+ cb-fn(*key,
+ locks[i].context.pid,
+ locks[i].lock_type,
+ locks[i].lock_flav,
+ locks[i].start,
+ locks[i].size,
+ cb-private_data);
}
SAFE_FREE(locks);
@@ -1509,12 +1518,21 @@
Call the specified function on each lock in the database.
/
-int brl_forall(BRLOCK_FN(fn))
+int brl_forall(void (*fn)(struct file_id id, struct server_id pid,
+ enum brl_type lock_type,
+ enum brl_flavour lock_flav,
+ br_off start, br_off size,
+ void *private_data),
+ void *private_data)
{
+ struct brl_forall_cb cb;
+
if (!brlock_db) {
return 0;
}
- return brlock_db-traverse(brlock_db, traverse_fn, (void *)fn);
+ cb.fn = fn;
+ cb.private_data = private_data;
+ return brlock_db-traverse(brlock_db, traverse_fn, cb);
}
/***
Modified: branches/SAMBA_3_0/source/torture/locktest.c
===
--- branches/SAMBA_3_0/source/torture/locktest.c2007-05-29 13:20:40 UTC
(rev 23194)
+++ branches/SAMBA_3_0/source/torture/locktest.c2007-05-29 13:26:44 UTC
(rev 23195)
@@ -121,7 +121,8 @@
svn commit: samba r23196 - in branches/SAMBA_3_0_26: examples/VFS examples/perfcounter source source/auth source/librpc/gen_ndr source/librpc/ndr source/libsmb source/nsswitch source/passdb source/pri
Author: jerry Date: 2007-05-29 14:05:25 + (Tue, 29 May 2007) New Revision: 23196 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23196 Log: Cherry pick patches from SAMBA_3_0: * Move aclocal.m4 and replace with m4 directory * Merge VL's require-membership-of changes to winbindd_pam.c and associated changes to token_util.c * Fix warnings from tdb_pack/unpack in printing.c * merge ndr fixes and wkssvc service * formating merges to decrease the diff between branches Added: branches/SAMBA_3_0_26/source/auth/token_util.c branches/SAMBA_3_0_26/source/m4/ Removed: branches/SAMBA_3_0_26/source/aclocal.m4 Modified: branches/SAMBA_3_0_26/examples/VFS/Makefile.in branches/SAMBA_3_0_26/examples/VFS/configure.in branches/SAMBA_3_0_26/examples/perfcounter/Makefile branches/SAMBA_3_0_26/examples/perfcounter/perf_writer_util.c branches/SAMBA_3_0_26/source/Makefile.in branches/SAMBA_3_0_26/source/auth/auth_util.c branches/SAMBA_3_0_26/source/autogen.sh branches/SAMBA_3_0_26/source/librpc/gen_ndr/cli_wkssvc.c branches/SAMBA_3_0_26/source/librpc/gen_ndr/ndr_wkssvc.c branches/SAMBA_3_0_26/source/librpc/gen_ndr/notify.h branches/SAMBA_3_0_26/source/librpc/gen_ndr/srvsvc.h branches/SAMBA_3_0_26/source/librpc/gen_ndr/svcctl.h branches/SAMBA_3_0_26/source/librpc/gen_ndr/wkssvc.h branches/SAMBA_3_0_26/source/librpc/ndr/libndr.h branches/SAMBA_3_0_26/source/librpc/ndr/ndr.c branches/SAMBA_3_0_26/source/librpc/ndr/ndr_basic.c branches/SAMBA_3_0_26/source/libsmb/trustdom_cache.c branches/SAMBA_3_0_26/source/nsswitch/idmap_cache.c branches/SAMBA_3_0_26/source/nsswitch/pam_winbind.c branches/SAMBA_3_0_26/source/nsswitch/winbindd_pam.c branches/SAMBA_3_0_26/source/nsswitch/winbindd_sid.c branches/SAMBA_3_0_26/source/passdb/lookup_sid.c branches/SAMBA_3_0_26/source/passdb/passdb.c branches/SAMBA_3_0_26/source/passdb/pdb_interface.c branches/SAMBA_3_0_26/source/printing/printing.c Changeset: Sorry, the patch is too large (2989 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23196
svn commit: samba r23197 - in branches/SAMBA_3_0_26/source: include libsmb
Author: jerry
Date: 2007-05-29 14:09:46 + (Tue, 29 May 2007)
New Revision: 23197
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23197
Log:
merge some libsmbclient changes (name changes and formatting only)
Modified:
branches/SAMBA_3_0_26/source/include/libsmbclient.h
branches/SAMBA_3_0_26/source/include/nterr.h
branches/SAMBA_3_0_26/source/libsmb/clitrans.c
Changeset:
Modified: branches/SAMBA_3_0_26/source/include/libsmbclient.h
===
--- branches/SAMBA_3_0_26/source/include/libsmbclient.h 2007-05-29 14:05:25 UTC
(rev 23196)
+++ branches/SAMBA_3_0_26/source/include/libsmbclient.h 2007-05-29 14:09:46 UTC
(rev 23197)
@@ -1242,14 +1242,16 @@
*/
int smbc_chmod(const char *url, mode_t mode);
-/[EMAIL PROTECTED] attribute
+/**
+ * @ingroup attribute
* Change the last modification time on a file
*
* @param url The smb url of the file or directory to change
* the modification time of
- *
- * @param tbuf A timeval structure which contains the desired
- * modification time. NOTE: Only the tv_sec field is
+ *
+ * @param tbuf An array of two timeval structures which contains,
+ * respectively, the desired access and modification times.
+ * NOTE: Only the tv_sec field off each timeval structure is
* used. The tv_usec (microseconds) portion is ignored.
*
* @return 0 on success, 0 on error with errno set:
@@ -1260,16 +1262,16 @@
int smbc_utimes(const char *url, struct timeval *tbuf);
#ifdef HAVE_UTIME_H
-/[EMAIL PROTECTED] attribute
+/**
+ * @ingroup attribute
* Change the last modification time on a file
*
* @param url The smb url of the file or directory to change
* the modification time of
- *
- * @param utbuf A utimebuf structure which contains the desired
- * modification time. NOTE: Although the structure contains
- * an access time as well, the access time value is ignored.
*
+ * @param utbuf A pointer to a utimebuf structure which contains the
+ * desired access and modification times.
+ *
* @return 0 on success, 0 on error with errno set:
* - EINVAL The client library is not properly initialized
* - ENOMEM No memory was available for internal needs
Modified: branches/SAMBA_3_0_26/source/include/nterr.h
===
--- branches/SAMBA_3_0_26/source/include/nterr.h2007-05-29 14:05:25 UTC
(rev 23196)
+++ branches/SAMBA_3_0_26/source/include/nterr.h2007-05-29 14:09:46 UTC
(rev 23197)
@@ -31,7 +31,7 @@
#define NT_STATUS_NO_MORE_ENTRIES NT_STATUS(0x801a)
/* Vista Status codes. */
-#define STATUS_INACCESSIBLE_SYSTEM_SHORTCUT NT_STATUS(0x802d)
+#define NT_STATUS_INACCESSIBLE_SYSTEM_SHORTCUT NT_STATUS(0x802d)
#define STATUS_MORE_ENTRIES NT_STATUS(0x0105)
#define STATUS_SOME_UNMAPPED NT_STATUS(0x0107)
Modified: branches/SAMBA_3_0_26/source/libsmb/clitrans.c
===
--- branches/SAMBA_3_0_26/source/libsmb/clitrans.c 2007-05-29 14:05:25 UTC
(rev 23196)
+++ branches/SAMBA_3_0_26/source/libsmb/clitrans.c 2007-05-29 14:09:46 UTC
(rev 23197)
@@ -194,13 +194,22 @@
* to a trans call. This is not an error and should not
* be treated as such. Note that STATUS_NO_MORE_FILES is
* returned when a trans2 findfirst/next finishes.
+* When setting up an encrypted transport we can also
+* see NT_STATUS_MORE_PROCESSING_REQUIRED here.
+ *
+ * Vista returns NT_STATUS_INACCESSIBLE_SYSTEM_SHORTCUT if the folder
+ * share/Users/All Users is enumerated. This is a special pseudo
+ * folder, and the response does not have parameters (nor a parameter
+ * length).
*/
status = cli_nt_error(cli);
- if (NT_STATUS_IS_ERR(status) ||
-NT_STATUS_EQUAL(status,STATUS_NO_MORE_FILES) ||
-NT_STATUS_EQUAL(status,STATUS_INACCESSIBLE_SYSTEM_SHORTCUT)) {
- goto out;
+ if (!NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+ if (NT_STATUS_IS_ERR(status) ||
+NT_STATUS_EQUAL(status,STATUS_NO_MORE_FILES) ||
+
NT_STATUS_EQUAL(status,NT_STATUS_INACCESSIBLE_SYSTEM_SHORTCUT)) {
+ goto out;
+ }
}
/* parse out the lengths */
@@ -305,8 +314,10 @@
CVAL(cli-inbuf,smb_com)));
goto out;
}
- if (NT_STATUS_IS_ERR(cli_nt_error(cli))) {
- goto out;
+ if (!NT_STATUS_EQUAL(status,
svn commit: samba r23198 - in branches/SAMBA_3_0_26/source: passdb registry utils
Author: jerry
Date: 2007-05-29 14:18:17 + (Tue, 29 May 2007)
New Revision: 23198
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23198
Log:
cherry pick more patches from SAMBA_3_0
Modified:
branches/SAMBA_3_0_26/source/passdb/machine_sid.c
branches/SAMBA_3_0_26/source/registry/reg_objects.c
branches/SAMBA_3_0_26/source/utils/net_ads.c
branches/SAMBA_3_0_26/source/utils/pdbedit.c
branches/SAMBA_3_0_26/source/utils/smbcacls.c
Changeset:
Modified: branches/SAMBA_3_0_26/source/passdb/machine_sid.c
===
--- branches/SAMBA_3_0_26/source/passdb/machine_sid.c 2007-05-29 14:09:46 UTC
(rev 23197)
+++ branches/SAMBA_3_0_26/source/passdb/machine_sid.c 2007-05-29 14:18:17 UTC
(rev 23198)
@@ -220,6 +220,5 @@
sid_copy(dom_sid, sid);
sid_split_rid(dom_sid, rid);
-
- return sid_equal(dom_sid, get_global_sam_sid());
+ return sid_check_is_domain(dom_sid);
}
Modified: branches/SAMBA_3_0_26/source/registry/reg_objects.c
===
--- branches/SAMBA_3_0_26/source/registry/reg_objects.c 2007-05-29 14:09:46 UTC
(rev 23197)
+++ branches/SAMBA_3_0_26/source/registry/reg_objects.c 2007-05-29 14:18:17 UTC
(rev 23198)
@@ -73,7 +73,7 @@
}
/***
- Add a new key to the array
+ Delete a key from the array
**/
int regsubkey_ctr_delkey( REGSUBKEY_CTR *ctr, const char *keyname )
Modified: branches/SAMBA_3_0_26/source/utils/net_ads.c
===
--- branches/SAMBA_3_0_26/source/utils/net_ads.c2007-05-29 14:09:46 UTC
(rev 23197)
+++ branches/SAMBA_3_0_26/source/utils/net_ads.c2007-05-29 14:18:17 UTC
(rev 23198)
@@ -1369,10 +1369,10 @@
status = ads_dns_lookup_ns( ctx, root_domain, nameservers,
ns_count );
if ( !NT_STATUS_IS_OK(status) || (ns_count == 0)) {
- DEBUG(3,(net_ads_join: Failed to find name server for the %s
+ DEBUG(3,(net_ads_join: Failed to find name server for
the %s
realm\n, ads-config.realm));
- goto done;
- }
+ goto done;
+ }
dnsdomain = root_domain;
Modified: branches/SAMBA_3_0_26/source/utils/pdbedit.c
===
--- branches/SAMBA_3_0_26/source/utils/pdbedit.c2007-05-29 14:09:46 UTC
(rev 23197)
+++ branches/SAMBA_3_0_26/source/utils/pdbedit.c2007-05-29 14:18:17 UTC
(rev 23198)
@@ -761,6 +761,7 @@
static char *pwd_time_format = NULL;
static BOOL pw_from_stdin = False;
struct pdb_methods *bin, *bout, *bdef;
+ char *configfile = NULL;
poptContext pc;
struct poptOption long_options[] = {
POPT_AUTOHELP
@@ -818,6 +819,9 @@
case 'C':
account_policy_value_set = True;
break;
+ case 's':
+ configfile = optarg;
+ break;
}
}
Modified: branches/SAMBA_3_0_26/source/utils/smbcacls.c
===
--- branches/SAMBA_3_0_26/source/utils/smbcacls.c 2007-05-29 14:09:46 UTC
(rev 23197)
+++ branches/SAMBA_3_0_26/source/utils/smbcacls.c 2007-05-29 14:18:17 UTC
(rev 23198)
@@ -381,7 +381,7 @@
fstring tok;
SEC_DESC *ret = NULL;
size_t sd_size;
- DOM_SID *group_sid=NULL, *owner_sid=NULL;
+ DOM_SID *grp_sid=NULL, *owner_sid=NULL;
SEC_ACL *dacl=NULL;
int revision=1;
@@ -407,13 +407,13 @@
}
if (strncmp(tok,GROUP:, 6) == 0) {
- if (group_sid) {
+ if (grp_sid) {
printf(Only specify group once\n);
goto done;
}
- group_sid = SMB_CALLOC_ARRAY(DOM_SID, 1);
- if (!group_sid ||
- !StringToSid(group_sid, tok+6)) {
+ grp_sid = SMB_CALLOC_ARRAY(DOM_SID, 1);
+ if (!grp_sid ||
+ !StringToSid(grp_sid, tok+6)) {
printf(Failed to parse group sid\n);
goto done;
}
@@ -436,11 +436,11 @@
goto done;
}
- ret = make_sec_desc(ctx,revision, SEC_DESC_SELF_RELATIVE, owner_sid,
group_sid,
+ ret = make_sec_desc(ctx,revision, SEC_DESC_SELF_RELATIVE, owner_sid,
grp_sid,
svn commit: samba r23199 - in branches/SAMBA_3_0_26/source/libads: .
Author: jerry Date: 2007-05-29 14:19:53 + (Tue, 29 May 2007) New Revision: 23199 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23199 Log: merge ldap_rename2_s() fix from SAMBA_3_0 Modified: branches/SAMBA_3_0_26/source/libads/ldap.c Changeset: Modified: branches/SAMBA_3_0_26/source/libads/ldap.c === --- branches/SAMBA_3_0_26/source/libads/ldap.c 2007-05-29 14:18:17 UTC (rev 23198) +++ branches/SAMBA_3_0_26/source/libads/ldap.c 2007-05-29 14:19:53 UTC (rev 23199) @@ -1754,7 +1754,8 @@ goto done; } - ldap_status = ldap_rename2_s(ads-ld, computer_dn, computer_rdn, org_unit, 1); + ldap_status = ldap_rename_s(ads-ld, computer_dn, computer_rdn, + org_unit, 1, NULL, NULL); rc = ADS_ERROR(ldap_status); done:
svn commit: samba r23200 - in branches/SAMBA_3_0_26/source: libads nmbd
Author: jerry
Date: 2007-05-29 14:26:27 + (Tue, 29 May 2007)
New Revision: 23200
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23200
Log:
More merge's:
* A little const
* Metze's fix for GSS-SPNEGO against Win2k3
Modified:
branches/SAMBA_3_0_26/source/libads/sasl.c
branches/SAMBA_3_0_26/source/nmbd/nmbd_lmhosts.c
Changeset:
Modified: branches/SAMBA_3_0_26/source/libads/sasl.c
===
--- branches/SAMBA_3_0_26/source/libads/sasl.c 2007-05-29 14:19:53 UTC (rev
23199)
+++ branches/SAMBA_3_0_26/source/libads/sasl.c 2007-05-29 14:26:27 UTC (rev
23200)
@@ -441,7 +441,8 @@
gss_release_buffer(minor_status, output_token);
- output_token.value = SMB_MALLOC(strlen(ads-config.bind_path) + 8);
+ output_token.length = 4;
+ output_token.value = SMB_MALLOC(output_token.length);
p = (uint8 *)output_token.value;
*p++ = 1; /* no sign seal selection */
@@ -449,11 +450,15 @@
*p++ = max_msg_size16;
*p++ = max_msg_size8;
*p++ = max_msg_size;
- snprintf((char *)p, strlen(ads-config.bind_path)+4, dn:%s,
ads-config.bind_path);
- p += strlen((const char *)p);
+ /*
+* we used to add sprintf(dn:%s, ads-config.bind_path) here.
+* but using ads-config.bind_path is the wrong! It should be
+* the DN of the user object!
+*
+* w2k3 gives an error when we send an incorrect DN, but sending nothing
+* is ok and matches the information flow used in GSS-SPNEGO.
+*/
- output_token.length = PTR_DIFF(p, output_token.value);
-
gss_rc = gss_wrap(minor_status, context_handle,0,GSS_C_QOP_DEFAULT,
output_token, (int *)conf_state,
input_token);
Modified: branches/SAMBA_3_0_26/source/nmbd/nmbd_lmhosts.c
===
--- branches/SAMBA_3_0_26/source/nmbd/nmbd_lmhosts.c2007-05-29 14:19:53 UTC
(rev 23199)
+++ branches/SAMBA_3_0_26/source/nmbd/nmbd_lmhosts.c2007-05-29 14:26:27 UTC
(rev 23200)
@@ -29,7 +29,7 @@
Load a lmhosts file.
/
-void load_lmhosts_file(char *fname)
+void load_lmhosts_file(const char *fname)
{
pstring name;
int name_type;
svn commit: samba r23201 - in branches/SAMBA_3_0_26/source: python/examples/tdbpack script script/tests
Author: jerry
Date: 2007-05-29 14:38:31 + (Tue, 29 May 2007)
New Revision: 23201
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23201
Log:
minor patches to make test and pythong examples from SAMBA-3_0
Modified:
branches/SAMBA_3_0_26/source/python/examples/tdbpack/tdbtimetrial.py
branches/SAMBA_3_0_26/source/python/examples/tdbpack/test_tdbpack.py
branches/SAMBA_3_0_26/source/script/mkversion.sh
branches/SAMBA_3_0_26/source/script/tests/selftest.sh
branches/SAMBA_3_0_26/source/script/tests/test_posix_s3.sh
Changeset:
Modified: branches/SAMBA_3_0_26/source/python/examples/tdbpack/tdbtimetrial.py
===
--- branches/SAMBA_3_0_26/source/python/examples/tdbpack/tdbtimetrial.py
2007-05-29 14:26:27 UTC (rev 23200)
+++ branches/SAMBA_3_0_26/source/python/examples/tdbpack/tdbtimetrial.py
2007-05-29 14:38:31 UTC (rev 23201)
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.2
+#! /usr/bin/python
def run_trial():
# import tdbutil
Modified: branches/SAMBA_3_0_26/source/python/examples/tdbpack/test_tdbpack.py
===
--- branches/SAMBA_3_0_26/source/python/examples/tdbpack/test_tdbpack.py
2007-05-29 14:26:27 UTC (rev 23200)
+++ branches/SAMBA_3_0_26/source/python/examples/tdbpack/test_tdbpack.py
2007-05-29 14:38:31 UTC (rev 23201)
@@ -1,4 +1,4 @@
-#! /usr/bin/env python2.2
+#! /usr/bin/env python
__doc__ = test case for samba.tdbpack functions
Modified: branches/SAMBA_3_0_26/source/script/mkversion.sh
===
--- branches/SAMBA_3_0_26/source/script/mkversion.sh2007-05-29 14:26:27 UTC
(rev 23200)
+++ branches/SAMBA_3_0_26/source/script/mkversion.sh2007-05-29 14:38:31 UTC
(rev 23201)
@@ -82,6 +82,13 @@
else
TMP_SVK_REVISION_STR=[EMAIL PROTECTED]
fi
+ if test x${HAVESVK} = xno;then
+ HAVEBZR=no
+ bzr revno /dev/null 21 HAVEBZR=yes
+ TMP_BZR_REVNO=`bzr revno 2 /dev/null`
+ TMP_BZR_NICK=`bzr nick 2 /dev/null`
+ TMP_BZR_REVISION_STR=${TMP_BZR_NICK}-${TMP_BZR_REVNO}
+ fi
fi
if test x${HAVESVN} = xyes;then
@@ -89,6 +96,8 @@
echo #define SAMBA_VERSION_SVN_REVISION ${TMP_REVISION}
$OUTPUT_FILE
elif test x${HAVESVK} = xyes;then
SAMBA_VERSION_STRING=${SAMBA_VERSION_STRING}-SVK-build-${TMP_SVK_REVISION_STR}
+elif test x${HAVEBZR} = xyes;then
+
SAMBA_VERSION_STRING=${SAMBA_VERSION_STRING}-BZR-build-${TMP_BZR_REVISION_STR}
else
SAMBA_VERSION_STRING=${SAMBA_VERSION_STRING}-SVN-build-UNKNOWN
fi
Modified: branches/SAMBA_3_0_26/source/script/tests/selftest.sh
===
--- branches/SAMBA_3_0_26/source/script/tests/selftest.sh 2007-05-29
14:26:27 UTC (rev 23200)
+++ branches/SAMBA_3_0_26/source/script/tests/selftest.sh 2007-05-29
14:38:31 UTC (rev 23201)
@@ -95,8 +95,6 @@
log file = $LOGDIR/log.%m
log level = 0
- passdb backend = tdbsam
-
name resolve order = bcast
EOF
@@ -108,6 +106,8 @@
interfaces = $TORTURE_INTERFACES
panic action = $SCRIPTDIR/gdb_backtrace %d %\$(MAKE_TEST_BINARY)
include = $COMMONCONFFILE
+
+ passdb backend = tdbsam
EOF
cat $SAMBA4CONFFILEEOF
@@ -126,11 +126,14 @@
panic action = $SCRIPTDIR/gdb_backtrace %d %\$(MAKE_TEST_BINARY)
include = $COMMONCONFFILE
+ passdb backend = tdbsam
+
; Necessary to add the build farm hacks
add user script = /bin/false
add machine script = /bin/false
kernel oplocks = no
+ kernel change notify = no
syslog = no
printing = bsd
@@ -212,7 +215,7 @@
(
# give time for nbt server to register its names
echo delaying for nbt name registration
- sleep 4
+ sleep 10
# This will return quickly when things are up, but be slow if we need to wait
for (eg) SSL init
bin/nmblookup $CONFIGURATION -U $SERVER_IP __SAMBA__
bin/nmblookup $CONFIGURATION __SAMBA__
Modified: branches/SAMBA_3_0_26/source/script/tests/test_posix_s3.sh
===
--- branches/SAMBA_3_0_26/source/script/tests/test_posix_s3.sh 2007-05-29
14:26:27 UTC (rev 23200)
+++ branches/SAMBA_3_0_26/source/script/tests/test_posix_s3.sh 2007-05-29
14:38:31 UTC (rev 23201)
@@ -49,8 +49,8 @@
skipped=BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-OPENATTR
BASE-TCONDEV
skipped=$skipped RAW-ACLS RAW-COMPOSITE RAW-CONTEXT RAW-EAS
-skipped=$skipped RAW-IOCTL RAW-MKDIR RAW-MUX RAW-NOTIFY RAW-OPEN
-skipped=$skipped RAW-QFILEINFO RAW-QFSINFO RAW-RENAME RAW-SEARCH
+skipped=$skipped RAW-IOCTL RAW-MUX
+skipped=$skipped RAW-QFILEINFO RAW-QFSINFO RAW-SEARCH
skipped=$skipped RAW-SFILEINFO RAW-STREAMS RAW-WRITE
echo
svn commit: samba r23202 - in branches/SAMBA_3_0_26/source/libsmb: .
Author: jerry
Date: 2007-05-29 14:44:18 + (Tue, 29 May 2007)
New Revision: 23202
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23202
Log:
fix compile error from missed merge
Modified:
branches/SAMBA_3_0_26/source/libsmb/clierror.c
Changeset:
Modified: branches/SAMBA_3_0_26/source/libsmb/clierror.c
===
--- branches/SAMBA_3_0_26/source/libsmb/clierror.c 2007-05-29 14:38:31 UTC
(rev 23201)
+++ branches/SAMBA_3_0_26/source/libsmb/clierror.c 2007-05-29 14:44:18 UTC
(rev 23202)
@@ -385,7 +385,7 @@
* byte isn't 0xc0, it doesn't match cli_is_nt_error() above.
*/
status = cli_nt_error(cli);
-if (NT_STATUS_V(status) ==
NT_STATUS_V(STATUS_INACCESSIBLE_SYSTEM_SHORTCUT)) {
+if (NT_STATUS_V(status) ==
NT_STATUS_V(NT_STATUS_INACCESSIBLE_SYSTEM_SHORTCUT)) {
return EACCES;
}
svn commit: samba r23203 - in branches/SAMBA_3_0_26/source/smbd: .
Author: jerry
Date: 2007-05-29 14:48:37 + (Tue, 29 May 2007)
New Revision: 23203
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23203
Log:
sync a few comments from SAMBA_3_0
Modified:
branches/SAMBA_3_0_26/source/smbd/nttrans.c
Changeset:
Modified: branches/SAMBA_3_0_26/source/smbd/nttrans.c
===
--- branches/SAMBA_3_0_26/source/smbd/nttrans.c 2007-05-29 14:44:18 UTC (rev
23202)
+++ branches/SAMBA_3_0_26/source/smbd/nttrans.c 2007-05-29 14:48:37 UTC (rev
23203)
@@ -353,7 +353,7 @@
return(ERROR_DOS(ERRSRV,ERRnofids));
}
- /* Add pipe to db */
+ /* TODO: Add pipe to db */
if ( !store_pipe_opendb( p ) ) {
DEBUG(3,(nt_open_pipe: failed to store %s pipe open.\n,
fname));
@@ -2284,7 +2284,7 @@
unsigned char objid[16];
/* This should return the object-id on this file.
-* I think I'll make this be the inode+dev. JRA.
+* I think I'll make this be the inode+dev. JRA.
*/
DEBUG(10,(FSCTL_CREATE_OR_GET_OBJECT_ID: called on
FID[0x%04X]\n,fidnum));
@@ -2293,7 +2293,7 @@
pdata = nttrans_realloc(ppdata, data_count);
if (pdata == NULL) {
return ERROR_NT(NT_STATUS_NO_MEMORY);
- }
+ }
push_file_id_16(pdata, fsp-file_id);
memcpy(pdata+16,create_volume_objectid(conn,objid),16);
push_file_id_16(pdata+32, fsp-file_id);
svn commit: samba r23204 - in branches: SAMBA_3_0/source/include SAMBA_3_0/source/lib SAMBA_3_0/source/locking SAMBA_3_0/source/smbd SAMBA_3_0/source/utils SAMBA_3_0_26/source/include SAMBA_3_0_26/sou
Author: vlendec
Date: 2007-05-29 14:49:19 + (Tue, 29 May 2007)
New Revision: 23204
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23204
Log:
Add MSG_SMB_BRL_VALIDATE. Tridge, this is a bit different from your bzr
branch, please check if it fulfils your needs.
Two changes: The validation is not done inside the brlock.c traverse_fn,
it's done as a separate routine.
Secondly, this patch does not call the checker routines in smbcontrol
directly but depends on a running smbd.
Modified:
branches/SAMBA_3_0/source/include/messages.h
branches/SAMBA_3_0/source/lib/messages.c
branches/SAMBA_3_0/source/locking/brlock.c
branches/SAMBA_3_0/source/smbd/server.c
branches/SAMBA_3_0/source/utils/smbcontrol.c
branches/SAMBA_3_0_26/source/include/messages.h
branches/SAMBA_3_0_26/source/lib/messages.c
branches/SAMBA_3_0_26/source/locking/brlock.c
branches/SAMBA_3_0_26/source/smbd/server.c
branches/SAMBA_3_0_26/source/utils/smbcontrol.c
Changeset:
Modified: branches/SAMBA_3_0/source/include/messages.h
===
--- branches/SAMBA_3_0/source/include/messages.h2007-05-29 14:48:37 UTC
(rev 23203)
+++ branches/SAMBA_3_0/source/include/messages.h2007-05-29 14:49:19 UTC
(rev 23204)
@@ -83,6 +83,11 @@
* Samba4 compatibility
*/
#define MSG_PVFS_NOTIFY0x0310
+/*
+ * cluster reconfigure events
+ */
+#define MSG_SMB_BRL_VALIDATE 0x0311
+#define MSG_SMB_RELEASE_IP 0x0312
/* winbind messages */
#define MSG_WINBIND_FINISHED 0x0401
Modified: branches/SAMBA_3_0/source/lib/messages.c
===
--- branches/SAMBA_3_0/source/lib/messages.c2007-05-29 14:48:37 UTC (rev
23203)
+++ branches/SAMBA_3_0/source/lib/messages.c2007-05-29 14:49:19 UTC (rev
23204)
@@ -199,7 +199,7 @@
status = messaging_tdb_init(ctx, ctx, ctx-local);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, (message_init failed: %s\n, nt_errstr(status)));
+ DEBUG(0, (messaging_tdb_init failed: %s\n,
nt_errstr(status)));
TALLOC_FREE(ctx);
}
Modified: branches/SAMBA_3_0/source/locking/brlock.c
===
--- branches/SAMBA_3_0/source/locking/brlock.c 2007-05-29 14:48:37 UTC (rev
23203)
+++ branches/SAMBA_3_0/source/locking/brlock.c 2007-05-29 14:49:19 UTC (rev
23204)
@@ -1686,3 +1686,109 @@
{
return brl_get_locks_internal(mem_ctx, fsp, True);
}
+
+struct brl_revalidate_state {
+ ssize_t array_size;
+ uint32 num_pids;
+ struct server_id *pids;
+};
+
+/*
+ * Collect PIDs of all processes with pending entries
+ */
+
+static void brl_revalidate_collect(struct file_id id, struct server_id pid,
+ enum brl_type lock_type,
+ enum brl_flavour lock_flav,
+ br_off start, br_off size,
+ void *private_data)
+{
+ struct brl_revalidate_state *state =
+ (struct brl_revalidate_state *)private_data;
+
+ if (!IS_PENDING_LOCK(lock_type)) {
+ return;
+ }
+
+ add_to_large_array(state, sizeof(pid), (void *)pid,
+ state-pids, state-num_pids,
+ state-array_size);
+}
+
+/*
+ * qsort callback to sort the processes
+ */
+
+static int compare_procids(const void *p1, const void *p2)
+{
+ const struct server_id *i1 = (struct server_id *)i1;
+ const struct server_id *i2 = (struct server_id *)i2;
+
+ if (i1-pid i2-pid) return -1;
+ if (i2-pid i2-pid) return 1;
+ return 0;
+}
+
+/*
+ * Send a MSG_SMB_UNLOCK message to all processes with pending byte range
+ * locks so that they retry. Mainly used in the cluster code after a node has
+ * died.
+ *
+ * Done in two steps to avoid double-sends: First we collect all entries in an
+ * array, then qsort that array and only send to non-dupes.
+ */
+
+static void brl_revalidate(struct messaging_context *msg_ctx,
+ void *private_data,
+ uint32_t msg_type,
+ struct server_id server_id,
+ DATA_BLOB *data)
+{
+ struct brl_revalidate_state *state;
+ uint32 i;
+ struct server_id last_pid;
+
+ if (!(state = TALLOC_ZERO_P(NULL, struct brl_revalidate_state))) {
+ DEBUG(0, (talloc failed\n));
+ return;
+ }
+
+ brl_forall(brl_revalidate_collect, state);
+
+ if (state-array_size == -1) {
+ DEBUG(0, (talloc failed\n));
+ goto done;
+ }
+
+ if (state-num_pids == 0) {
+ goto done;
+ }
+
+ qsort(state-pids, state-num_pids, sizeof(state-pids[0]),
+
svn commit: samba r23205 - in branches/SAMBA_4_0/source/setup: .
Author: metze Date: 2007-05-29 14:51:24 + (Tue, 29 May 2007) New Revision: 23205 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23205 Log: abartlet please commit the correct content ... this just fixes make install metze Added: branches/SAMBA_4_0/source/setup/DB_CONFIG Changeset: Added: branches/SAMBA_4_0/source/setup/DB_CONFIG ===
svn commit: samba r23207 - in branches/SAMBA_3_0/source/utils: .
Author: jerry
Date: 2007-05-29 14:53:46 + (Tue, 29 May 2007)
New Revision: 23207
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23207
Log:
merge net help test fix from SAMBA_3_0_26
Modified:
branches/SAMBA_3_0/source/utils/net_help.c
Changeset:
Modified: branches/SAMBA_3_0/source/utils/net_help.c
===
--- branches/SAMBA_3_0/source/utils/net_help.c 2007-05-29 14:53:13 UTC (rev
23206)
+++ branches/SAMBA_3_0/source/utils/net_help.c 2007-05-29 14:53:46 UTC (rev
23207)
@@ -220,6 +220,7 @@
static int net_usage(int argc, const char **argv)
{
d_printf( net time\t\tto view or set time information\n\
+ net lookup\t\tto lookup host name or ip address\n\
net user\t\tto manage users\n\
net group\t\tto manage groups\n\
net sam\t\tto edit the local user database directly\n\
svn commit: samba r23206 - in branches/SAMBA_3_0/source/smbd: .
Author: jerry
Date: 2007-05-29 14:53:13 + (Tue, 29 May 2007)
New Revision: 23206
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23206
Log:
remove unreachable code
Modified:
branches/SAMBA_3_0/source/smbd/nttrans.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/nttrans.c
===
--- branches/SAMBA_3_0/source/smbd/nttrans.c2007-05-29 14:51:24 UTC (rev
23205)
+++ branches/SAMBA_3_0/source/smbd/nttrans.c2007-05-29 14:53:13 UTC (rev
23206)
@@ -2307,7 +2307,6 @@
return -1;
}
-
case FSCTL_GET_REPARSE_POINT:
/* pretend this fail - my winXP does it like this
* --metze
@@ -2315,7 +2314,6 @@
DEBUG(10,(FSCTL_GET_REPARSE_POINT: called on FID[0x%04X](but
not implemented)\n,fidnum));
return ERROR_NT(NT_STATUS_NOT_A_REPARSE_POINT);
- return -1;
case FSCTL_SET_REPARSE_POINT:
/* pretend this fail - I'm assuming this because of the
FSCTL_GET_REPARSE_POINT case.
@@ -2324,7 +2322,6 @@
DEBUG(10,(FSCTL_SET_REPARSE_POINT: called on FID[0x%04X](but
not implemented)\n,fidnum));
return ERROR_NT(NT_STATUS_NOT_A_REPARSE_POINT);
- return -1;
case FSCTL_GET_SHADOW_COPY_DATA: /* don't know if this name is
right...*/
{
svn commit: samba r23208 - in branches/SAMBA_4_0/source/lib/replace: .
Author: metze
Date: 2007-05-29 15:18:20 + (Tue, 29 May 2007)
New Revision: 23208
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23208
Log:
on some HP-UX boxes dlfcn.h is available and use unsigned int flags
for dlopen but no library contains the function...
metze
Modified:
branches/SAMBA_4_0/source/lib/replace/dlfcn.c
branches/SAMBA_4_0/source/lib/replace/dlfcn.m4
branches/SAMBA_4_0/source/lib/replace/replace.h
Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/dlfcn.c
===
--- branches/SAMBA_4_0/source/lib/replace/dlfcn.c 2007-05-29 14:53:46 UTC
(rev 23207)
+++ branches/SAMBA_4_0/source/lib/replace/dlfcn.c 2007-05-29 15:18:20 UTC
(rev 23208)
@@ -26,7 +26,11 @@
#include replace.h
#ifndef HAVE_DLOPEN
+#ifdef DLOPEN_TAKES_UNSIGNED_FLAGS
+void *rep_dlopen(const char *name, unsigned int flags)
+#else
void *rep_dlopen(const char *name, int flags)
+#endif
{
return NULL;
}
Modified: branches/SAMBA_4_0/source/lib/replace/dlfcn.m4
===
--- branches/SAMBA_4_0/source/lib/replace/dlfcn.m4 2007-05-29 14:53:46 UTC
(rev 23207)
+++ branches/SAMBA_4_0/source/lib/replace/dlfcn.m4 2007-05-29 15:18:20 UTC
(rev 23208)
@@ -5,13 +5,18 @@
libreplace_cv_dlfcn=no
AC_SEARCH_LIBS(dlopen, dl)
-if test x${ac_cv_search_dlopen} = xno; then
- libreplace_cv_dlfcn=yes
-else
- AC_CHECK_HEADERS(dlfcn.h)
- AC_CHECK_FUNCS([dlopen dlsym dlerror
dlclose],[],[libreplace_cv_dlfcn=yes])
-fi
+AC_CHECK_HEADERS(dlfcn.h)
+AC_CHECK_FUNCS([dlopen dlsym dlerror dlclose],[],[libreplace_cv_dlfcn=yes])
+AC_VERIFY_C_PROTOTYPE([void *dlopen(const char* filename, unsigned int flags)],
+ [
+ return 0;
+ ],[
+ AC_DEFINE(DLOPEN_TAKES_UNSIGNED_FLAGS, 1, [Whether dlopen takes
unsinged int flags])
+ ],[],[
+ #include dlfcn.h
+ ])
+
if test x${libreplace_cv_dlfcn} = xyes;then
LIBREPLACEOBJ=${LIBREPLACEOBJ} dlfcn.o
fi
Modified: branches/SAMBA_4_0/source/lib/replace/replace.h
===
--- branches/SAMBA_4_0/source/lib/replace/replace.h 2007-05-29 14:53:46 UTC
(rev 23207)
+++ branches/SAMBA_4_0/source/lib/replace/replace.h 2007-05-29 15:18:20 UTC
(rev 23208)
@@ -228,8 +228,12 @@
#ifndef HAVE_DLOPEN
#define dlopen rep_dlopen
+#ifdef DLOPEN_TAKES_UNSIGNED_FLAGS
+void *rep_dlopen(const char *name, unsigned int flags);
+#else
void *rep_dlopen(const char *name, int flags);
#endif
+#endif
#ifndef HAVE_DLSYM
#define dlsym rep_dlsym
svn commit: samba r23209 - in branches/SAMBA_4_0/source: heimdal/lib/roken heimdal_build
Author: metze
Date: 2007-05-29 15:19:37 + (Tue, 29 May 2007)
New Revision: 23209
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23209
Log:
import getnameinfo.c, inet_ntop.c and inet_pton.c from
loikeet-heimdal
metze
Added:
branches/SAMBA_4_0/source/heimdal/lib/roken/getnameinfo.c
branches/SAMBA_4_0/source/heimdal/lib/roken/inet_ntop.c
branches/SAMBA_4_0/source/heimdal/lib/roken/inet_pton.c
Modified:
branches/SAMBA_4_0/source/heimdal_build/config.m4
branches/SAMBA_4_0/source/heimdal_build/config.mk
Changeset:
Added: branches/SAMBA_4_0/source/heimdal/lib/roken/getnameinfo.c
===
--- branches/SAMBA_4_0/source/heimdal/lib/roken/getnameinfo.c 2007-05-29
15:18:20 UTC (rev 23208)
+++ branches/SAMBA_4_0/source/heimdal/lib/roken/getnameinfo.c 2007-05-29
15:19:37 UTC (rev 23209)
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 1999 - 2001 Kungliga Tekniska H�gskolan
+ * (Royal Institute of Technology, Stockholm, Sweden).
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of the Institute nor the names of its contributors
+ *may be used to endorse or promote products derived from this software
+ *without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include config.h
+RCSID($Id: getnameinfo.c,v 1.6 2005/06/16 16:53:09 lha Exp $);
+#endif
+
+#include roken.h
+
+static int
+doit (int af,
+ const void *addr,
+ size_t addrlen,
+ int port,
+ char *host, size_t hostlen,
+ char *serv, size_t servlen,
+ int flags)
+{
+if (host != NULL) {
+ if (flags NI_NUMERICHOST) {
+ if (inet_ntop (af, addr, host, hostlen) == NULL)
+ return EAI_SYSTEM;
+ } else {
+ struct hostent *he = gethostbyaddr (addr,
+ addrlen,
+ af);
+ if (he != NULL) {
+ strlcpy (host, hostent_find_fqdn(he), hostlen);
+ if (flags NI_NOFQDN) {
+ char *dot = strchr (host, '.');
+ if (dot != NULL)
+ *dot = '\0';
+ }
+ } else if (flags NI_NAMEREQD) {
+ return EAI_NONAME;
+ } else if (inet_ntop (af, addr, host, hostlen) == NULL)
+ return EAI_SYSTEM;
+ }
+}
+
+if (serv != NULL) {
+ if (flags NI_NUMERICSERV) {
+ snprintf (serv, servlen, %u, ntohs(port));
+ } else {
+ const char *proto = tcp;
+ struct servent *se;
+
+ if (flags NI_DGRAM)
+ proto = udp;
+
+ se = getservbyport (port, proto);
+ if (se == NULL) {
+ snprintf (serv, servlen, %u, ntohs(port));
+ } else {
+ strlcpy (serv, se-s_name, servlen);
+ }
+ }
+}
+return 0;
+}
+
+/*
+ *
+ */
+
+int ROKEN_LIB_FUNCTION
+getnameinfo(const struct sockaddr *sa, socklen_t salen,
+ char *host, size_t hostlen,
+ char *serv, size_t servlen,
+ int flags)
+{
+switch (sa-sa_family) {
+#ifdef HAVE_IPV6
+case AF_INET6 : {
+ const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6 *)sa;
+
+ return doit (AF_INET6, sin6-sin6_addr, sizeof(sin6-sin6_addr),
+sin6-sin6_port,
+host, hostlen,
+serv, servlen,
+flags);
+}
+#endif
+case AF_INET : {
+ const struct sockaddr_in *sin4 = (const struct sockaddr_in *)sa;
+
+ return doit (AF_INET, sin4-sin_addr,
svn commit: samba r23210 - in branches: SAMBA_3_0/source/include SAMBA_3_0/source/nsswitch SAMBA_3_0/source/rpc_client SAMBA_3_0/source/rpc_parse SAMBA_3_0/source/rpcclient SAMBA_3_0_25/source/include
Author: gd Date: 2007-05-29 15:27:13 + (Tue, 29 May 2007) New Revision: 23210 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23210 Log: Very funny, we thought to use netr_GetDcName (e.g. in winbind) but were using netr_GetDcAnyName all the time (which is the correct thing to do). Fix the naming and opcode mixup in all branches. Guenther Modified: branches/SAMBA_3_0/source/include/rpc_netlogon.h branches/SAMBA_3_0/source/nsswitch/winbindd_cm.c branches/SAMBA_3_0/source/nsswitch/winbindd_misc.c branches/SAMBA_3_0/source/rpc_client/cli_netlogon.c branches/SAMBA_3_0/source/rpc_parse/parse_net.c branches/SAMBA_3_0/source/rpcclient/cmd_netlogon.c branches/SAMBA_3_0_25/source/include/rpc_netlogon.h branches/SAMBA_3_0_25/source/nsswitch/winbindd_cm.c branches/SAMBA_3_0_25/source/nsswitch/winbindd_misc.c branches/SAMBA_3_0_25/source/rpc_client/cli_netlogon.c branches/SAMBA_3_0_25/source/rpc_parse/parse_net.c branches/SAMBA_3_0_25/source/rpcclient/cmd_netlogon.c branches/SAMBA_3_0_26/source/include/rpc_netlogon.h branches/SAMBA_3_0_26/source/nsswitch/winbindd_cm.c branches/SAMBA_3_0_26/source/nsswitch/winbindd_misc.c branches/SAMBA_3_0_26/source/rpc_client/cli_netlogon.c branches/SAMBA_3_0_26/source/rpc_parse/parse_net.c branches/SAMBA_3_0_26/source/rpcclient/cmd_netlogon.c Changeset: Sorry, the patch is too large (977 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23210
Re: svn commit: samba r23189 - in branches/SAMBA_4_0/source: script scripting/libjs selftest setup
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Log: Work towards a totally scripted setup of LDAP backends, so others can easily try this out. I also intend to use this for the selftest, but I'm chasing issues with the OpenlDAP (but not Fedora DS) backend. Andrew Bartlett Modified: branches/SAMBA_4_0/source/script/installmisc.sh branches/SAMBA_4_0/source/scripting/libjs/provision.js branches/SAMBA_4_0/source/selftest/Samba4.pm branches/SAMBA_4_0/source/setup/fedorads-partitions.ldif branches/SAMBA_4_0/source/setup/fedorads.inf branches/SAMBA_4_0/source/setup/provision branches/SAMBA_4_0/source/setup/provision-backend branches/SAMBA_4_0/source/setup/slapd.conf Hi Andrew, please commit your version of setup/DB_CONFIG :-) metze -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.5 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org iD8DBQFGXEyxm70gjA5TCD8RAoOnAKCx77KInnxgWZgqI9+r/gn3Np59bgCfSS6v fUFZ0GkcFxTo9kPGGB7EfPQ= =qULD -END PGP SIGNATURE-
svn commit: samba r23211 - in branches/SAMBA_3_0_26/source: include lib libads libmsrpc libsmb printing python registry rpc_client rpc_parse rpc_server rpcclient
Author: jerry Date: 2007-05-29 16:26:38 + (Tue, 29 May 2007) New Revision: 23211 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23211 Log: merge security descriptor data structure changes from SAMBA_3_0 Modified: branches/SAMBA_3_0_26/source/include/rpc_secdes.h branches/SAMBA_3_0_26/source/include/smb.h branches/SAMBA_3_0_26/source/include/vfs.h branches/SAMBA_3_0_26/source/lib/secace.c branches/SAMBA_3_0_26/source/lib/secdesc.c branches/SAMBA_3_0_26/source/libads/disp_sec.c branches/SAMBA_3_0_26/source/libmsrpc/cac_winreg.c branches/SAMBA_3_0_26/source/libsmb/clisecdesc.c branches/SAMBA_3_0_26/source/printing/nt_printing.c branches/SAMBA_3_0_26/source/python/py_ntsec.c branches/SAMBA_3_0_26/source/python/py_spoolss_printers_conv.c branches/SAMBA_3_0_26/source/registry/reg_printing.c branches/SAMBA_3_0_26/source/rpc_client/cli_reg.c branches/SAMBA_3_0_26/source/rpc_parse/parse_reg.c branches/SAMBA_3_0_26/source/rpc_parse/parse_sec.c branches/SAMBA_3_0_26/source/rpc_parse/parse_spoolss.c branches/SAMBA_3_0_26/source/rpc_server/srv_samr_nt.c branches/SAMBA_3_0_26/source/rpc_server/srv_spoolss_nt.c branches/SAMBA_3_0_26/source/rpc_server/srv_srvsvc_nt.c branches/SAMBA_3_0_26/source/rpcclient/cmd_lsarpc.c branches/SAMBA_3_0_26/source/rpcclient/cmd_samr.c Changeset: Sorry, the patch is too large (1163 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23211
svn commit: samba r23212 - in branches/SAMBA_3_0_26/source/rpc_server: .
Author: jerry
Date: 2007-05-29 16:46:16 + (Tue, 29 May 2007)
New Revision: 23212
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23212
Log:
merge from SAMBA_3_0: Use pipe_user rather than global current_user
Modified:
branches/SAMBA_3_0_26/source/rpc_server/srv_spoolss_nt.c
Changeset:
Modified: branches/SAMBA_3_0_26/source/rpc_server/srv_spoolss_nt.c
===
--- branches/SAMBA_3_0_26/source/rpc_server/srv_spoolss_nt.c2007-05-29
16:26:38 UTC (rev 23211)
+++ branches/SAMBA_3_0_26/source/rpc_server/srv_spoolss_nt.c2007-05-29
16:46:16 UTC (rev 23212)
@@ -1534,7 +1534,6 @@
fstring name;
int snum;
- struct current_user user;
Printer_entry *Printer=NULL;
if ( !q_u-printername )
@@ -1558,8 +1557,6 @@
return WERR_INVALID_PRINTER_NAME;
}
- get_current_user(user, p);
-
/*
* First case: the user is opening the print server:
*
@@ -1624,12 +1621,12 @@
/* if the user is not root, doesn't have
SE_PRINT_OPERATOR privilege,
and not a printer admin, then fail */
- if ((user.ut.uid != 0)
- !user_has_privileges(user.nt_user_token,
+ if ((p-pipe_user.ut.uid != 0)
+ !user_has_privileges(p-pipe_user.nt_user_token,
se_printop )
!token_contains_name_in_list(
- uidtoname(user.ut.uid), NULL,
- user.nt_user_token,
+ uidtoname(p-pipe_user.ut.uid), NULL,
+ p-pipe_user.nt_user_token,
lp_printer_admin(snum))) {
close_printer_handle(p, handle);
return WERR_ACCESS_DENIED;
@@ -1682,9 +1679,9 @@
return WERR_ACCESS_DENIED;
}
- if (!user_ok_token(uidtoname(user.ut.uid), user.nt_user_token,
- snum) ||
- !print_access_check(user, snum,
+ if (!user_ok_token(uidtoname(p-pipe_user.ut.uid),
+ p-pipe_user.nt_user_token, snum) ||
+ !print_access_check(p-pipe_user, snum,
printer_default-access_required)) {
DEBUG(3, (access DENIED for printer open\n));
close_printer_handle(p, handle);
@@ -1978,20 +1975,17 @@
NT_PRINTER_DRIVER_INFO_LEVELinfo;
NT_PRINTER_DRIVER_INFO_LEVELinfo_win2k;
int version;
- struct current_user user;
WERROR status;
WERROR status_win2k = WERR_ACCESS_DENIED;
SE_PRIV se_printop = SE_PRINT_OPERATOR;
- get_current_user(user, p);
-
/* if the user is not root, doesn't have SE_PRINT_OPERATOR privilege,
and not a printer admin, then fail */
- if ( (user.ut.uid != 0)
-!user_has_privileges(user.nt_user_token, se_printop )
-!token_contains_name_in_list( uidtoname(user.ut.uid),
- NULL, user.nt_user_token, lp_printer_admin(-1)) )
+ if ( (p-pipe_user.ut.uid != 0)
+!user_has_privileges(p-pipe_user.nt_user_token, se_printop
)
+!token_contains_name_in_list(
uidtoname(p-pipe_user.ut.uid),
+ NULL, p-pipe_user.nt_user_token, lp_printer_admin(-1)) )
{
return WERR_ACCESS_DENIED;
}
@@ -2038,7 +2032,7 @@
/* if we get to here, we now have 2 driver info
structures to remove */
/* remove the Win2k driver first*/
- status_win2k = delete_printer_driver(info_win2k.info_3,
user, 3, False );
+ status_win2k = delete_printer_driver(info_win2k.info_3,
p-pipe_user, 3, False );
free_a_printer_driver( info_win2k, 3 );
/* this should not have failed---if it did, report to
client */
@@ -2050,7 +2044,7 @@
}
}
- status = delete_printer_driver(info.info_3, user, version, False);
+ status = delete_printer_driver(info.info_3, p-pipe_user, version,
False);
/* if at least one of the deletes succeeded return OK */
@@ -2076,20 +2070,17 @@
int version;
uint32 flags = q_u-delete_flags;
BOOLdelete_files;
-
svn commit: samba r23213 - in branches/SAMBA_3_0_26/source/rpc_server: .
Author: jerry
Date: 2007-05-29 16:54:01 + (Tue, 29 May 2007)
New Revision: 23213
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23213
Log:
Merge printer_info6 support from SAMBA_3_0
(TODO check svn annotate in SAMBA_3_0 for release notes)
Modified:
branches/SAMBA_3_0_26/source/rpc_server/srv_spoolss_nt.c
Changeset:
Modified: branches/SAMBA_3_0_26/source/rpc_server/srv_spoolss_nt.c
===
--- branches/SAMBA_3_0_26/source/rpc_server/srv_spoolss_nt.c2007-05-29
16:46:16 UTC (rev 23212)
+++ branches/SAMBA_3_0_26/source/rpc_server/srv_spoolss_nt.c2007-05-29
16:54:01 UTC (rev 23213)
@@ -4333,6 +4333,32 @@
}
/
+ * construct_printer_info_6
+ * fill a printer_info_6 struct
+ /
+
+static BOOL construct_printer_info_6(Printer_entry *print_hnd,
+PRINTER_INFO_6 *printer,
+int snum)
+{
+ NT_PRINTER_INFO_LEVEL *ntprinter = NULL;
+ int count;
+ print_status_struct status;
+
+ if (!W_ERROR_IS_OK(get_a_printer(print_hnd, ntprinter, 2,
+lp_const_servicename(snum
+ return False;
+
+ count = print_queue_length(snum, status);
+
+ printer-status = nt_printq_status(status.status);
+
+ free_a_printer(ntprinter, 2);
+
+ return True;
+}
+
+/
* construct_printer_info_7
* fill a printer_info_7 struct
/
@@ -4960,6 +4986,46 @@
return result;
}
+static WERROR getprinter_level_6(Printer_entry *print_hnd,
+int snum,
+RPC_BUFFER *buffer, uint32 offered,
+uint32 *needed)
+{
+ PRINTER_INFO_6 *printer;
+ WERROR result = WERR_OK;
+
+ if ((printer = SMB_MALLOC_P(PRINTER_INFO_6)) == NULL) {
+ return WERR_NOMEM;
+ }
+
+ if (!construct_printer_info_6(print_hnd, printer, snum)) {
+ free_printer_info_6(printer);
+ return WERR_NOMEM;
+ }
+
+ /* check the required size. */
+ *needed += spoolss_size_printer_info_6(printer);
+
+ if (*needed offered) {
+ result = WERR_INSUFFICIENT_BUFFER;
+ goto out;
+ }
+
+ if (!rpcbuf_alloc_size(buffer, *needed)) {
+ result = WERR_NOMEM;
+ goto out;
+ }
+
+ /* fill the buffer with the structures */
+ smb_io_printer_info_6(, buffer, printer, 0);
+
+out:
+ /* clear memory */
+ free_printer_info_6(printer);
+
+ return result;
+}
+
static WERROR getprinter_level_7(Printer_entry *print_hnd, int snum,
RPC_BUFFER *buffer, uint32 offered, uint32 *needed)
{
PRINTER_INFO_7 *printer=NULL;
@@ -5036,6 +5102,8 @@
return getprinter_level_4(Printer, snum, buffer, offered,
needed);
case 5:
return getprinter_level_5(Printer, snum, buffer, offered,
needed);
+ case 6:
+ return getprinter_level_6(Printer, snum, buffer, offered,
needed);
case 7:
return getprinter_level_7(Printer, snum, buffer, offered,
needed);
}
svn commit: samba r23214 - in branches/SAMBA_3_0_26/source/rpc_server: .
Author: jerry
Date: 2007-05-29 17:10:36 + (Tue, 29 May 2007)
New Revision: 23214
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23214
Log:
Merge signature change for get_printer_snum() from SAMBA_3_0.
Does not include change from snum to struct share_pararms.
Just decreases the diff.
Modified:
branches/SAMBA_3_0_26/source/rpc_server/srv_spoolss_nt.c
Changeset:
Modified: branches/SAMBA_3_0_26/source/rpc_server/srv_spoolss_nt.c
===
--- branches/SAMBA_3_0_26/source/rpc_server/srv_spoolss_nt.c2007-05-29
16:54:01 UTC (rev 23213)
+++ branches/SAMBA_3_0_26/source/rpc_server/srv_spoolss_nt.c2007-05-29
17:10:36 UTC (rev 23214)
@@ -375,7 +375,8 @@
Return the snum of a printer corresponding to an handle.
/
-static BOOL get_printer_snum(pipes_struct *p, POLICY_HND *hnd, int *number)
+static BOOL get_printer_snum(pipes_struct *p, POLICY_HND *hnd, int *number,
+struct share_params **params)
{
Printer_entry *Printer = find_printer_index_by_hnd(p, hnd);
@@ -1649,7 +1650,7 @@
/* NT doesn't let us connect to a printer if the connecting user
doesn't have print permission. */
- if (!get_printer_snum(p, handle, snum)) {
+ if (!get_printer_snum(p, handle, snum, NULL)) {
close_printer_handle(p, handle);
return WERR_BADFID;
}
@@ -1876,7 +1877,7 @@
return WERR_BADFID;
}
- if (!get_printer_snum(p, handle, snum))
+ if (!get_printer_snum(p, handle, snum, NULL))
return WERR_BADFID;
Printer-document_started=False;
@@ -2468,7 +2469,7 @@
status = getprinterdata_printer_server( p-mem_ctx, value,
type, data, needed, *out_size );
else
{
- if ( !get_printer_snum(p,handle, snum) ) {
+ if ( !get_printer_snum(p,handle, snum, NULL) ) {
status = WERR_BADFID;
goto done;
}
@@ -2687,7 +2688,7 @@
if ( Printer-printer_type == SPLHND_SERVER)
snum = -1;
else if ( (Printer-printer_type == SPLHND_PRINTER)
- !get_printer_snum(p, handle, snum) )
+ !get_printer_snum(p, handle, snum, NULL) )
return WERR_BADFID;
client_ip.s_addr = inet_addr(p-conn-client_address);
@@ -3827,7 +3828,7 @@
if ( !option )
return WERR_BADFID;
- get_printer_snum(p, hnd, snum);
+ get_printer_snum(p, hnd, snum, NULL);
for (i=0; ioption-count; i++) {
option_type=option-ctr.type[i];
@@ -5086,7 +5087,7 @@
*needed=0;
- if (!get_printer_snum(p, handle, snum))
+ if (!get_printer_snum(p, handle, snum, NULL))
return WERR_BADFID;
switch (level) {
@@ -5702,7 +5703,7 @@
fstrcpy(servername, get_server_name( printer ));
unistr2_to_ascii(architecture, uni_arch, sizeof(architecture)-1);
- if (!get_printer_snum(p, handle, snum))
+ if (!get_printer_snum(p, handle, snum, NULL))
return WERR_BADFID;
switch (level) {
@@ -5758,7 +5759,7 @@
return WERR_BADFID;
}
- if (!get_printer_snum(p, handle, snum))
+ if (!get_printer_snum(p, handle, snum, NULL))
return WERR_BADFID;
Printer-page_started=False;
@@ -5807,7 +5808,7 @@
}
/* get the share number of the printer */
- if (!get_printer_snum(p, handle, snum)) {
+ if (!get_printer_snum(p, handle, snum, NULL)) {
return WERR_BADFID;
}
@@ -5859,7 +5860,7 @@
return WERR_BADFID;
}
- if (!get_printer_snum(p, handle, snum))
+ if (!get_printer_snum(p, handle, snum, NULL))
return WERR_BADFID;
(*buffer_written) = (uint32)print_job_write(snum, Printer-jobid,
(const char *)buffer,
@@ -5895,7 +5896,7 @@
return WERR_BADFID;
}
- if (!get_printer_snum(p, handle, snum))
+ if (!get_printer_snum(p, handle, snum, NULL))
return WERR_BADFID;
switch (command) {
@@ -5940,7 +5941,7 @@
return WERR_BADFID;
}
- if (!get_printer_snum(p, handle, snum))
+ if (!get_printer_snum(p, handle, snum, NULL))
return WERR_BADFID;
print_job_delete( p-pipe_user, snum, Printer-jobid, errcode );
@@ -5963,7 +5964,7 @@
Printer_entry *Printer = find_printer_index_by_hnd(p, handle);
- if (!Printer || !get_printer_snum(p, handle, snum)) {
+ if (!Printer || !get_printer_snum(p, handle,
svn commit: samba r23215 - in branches/SAMBA_3_0_26/source/modules: .
Author: jerry
Date: 2007-05-29 17:12:08 + (Tue, 29 May 2007)
New Revision: 23215
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23215
Log:
missed merged for sec_desc changes
Modified:
branches/SAMBA_3_0_26/source/modules/vfs_cap.c
Changeset:
Modified: branches/SAMBA_3_0_26/source/modules/vfs_cap.c
===
--- branches/SAMBA_3_0_26/source/modules/vfs_cap.c 2007-05-29 17:10:36 UTC
(rev 23214)
+++ branches/SAMBA_3_0_26/source/modules/vfs_cap.c 2007-05-29 17:12:08 UTC
(rev 23215)
@@ -184,7 +184,7 @@
return SMB_VFS_NEXT_REALPATH(handle, path, resolved_path);
}
-static BOOL cap_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp, const
char *name, uint32 security_info_sent, struct security_descriptor_info *psd)
+static BOOL cap_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp, const
char *name, uint32 security_info_sent, struct security_descriptor *psd)
{
pstring capname;
capencode(capname, name);
svn commit: samba r23216 - in branches/SAMBA_3_0_26/source/rpc_server: .
Author: jerry
Date: 2007-05-29 17:41:55 + (Tue, 29 May 2007)
New Revision: 23216
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23216
Log:
sync comment with SAMBA_3_0
Modified:
branches/SAMBA_3_0_26/source/rpc_server/srv_pipe_hnd.c
Changeset:
Modified: branches/SAMBA_3_0_26/source/rpc_server/srv_pipe_hnd.c
===
--- branches/SAMBA_3_0_26/source/rpc_server/srv_pipe_hnd.c 2007-05-29
17:12:08 UTC (rev 23215)
+++ branches/SAMBA_3_0_26/source/rpc_server/srv_pipe_hnd.c 2007-05-29
17:41:55 UTC (rev 23216)
@@ -1170,7 +1170,7 @@
DLIST_REMOVE(Pipes, p);
- /* Remove from pipe open db */
+ /* TODO: Remove from pipe open db */
if ( !delete_pipe_opendb( p ) ) {
DEBUG(3,(close_rpc_pipe_hnd: failed to delete %s
svn commit: samba r23217 - in branches/SAMBA_3_0_26/source: include librpc/gen_ndr librpc/idl
Author: jerry
Date: 2007-05-29 17:51:45 + (Tue, 29 May 2007)
New Revision: 23217
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23217
Log:
Use the enum lsa_SidType declaration from the autogenerated lsa.h
Added:
branches/SAMBA_3_0_26/source/librpc/gen_ndr/lsa.h
branches/SAMBA_3_0_26/source/librpc/idl/lsa.idl
Modified:
branches/SAMBA_3_0_26/source/include/smb.h
Changeset:
Modified: branches/SAMBA_3_0_26/source/include/smb.h
===
--- branches/SAMBA_3_0_26/source/include/smb.h 2007-05-29 17:41:55 UTC (rev
23216)
+++ branches/SAMBA_3_0_26/source/include/smb.h 2007-05-29 17:51:45 UTC (rev
23217)
@@ -243,20 +243,6 @@
#define SID_MAX_SIZE ((size_t)(8+(MAXSUBAUTHS*4)))
-/* SID Types */
-enum lsa_SidType {
- SID_NAME_USE_NONE = 0,
- SID_NAME_USER= 1, /* user */
- SID_NAME_DOM_GRP, /* domain group */
- SID_NAME_DOMAIN, /* domain sid */
- SID_NAME_ALIAS, /* local group */
- SID_NAME_WKN_GRP, /* well-known group */
- SID_NAME_DELETED, /* deleted account: needed for c2 rating */
- SID_NAME_INVALID, /* invalid account */
- SID_NAME_UNKNOWN, /* unknown sid type */
- SID_NAME_COMPUTER /* sid for a computer */
-};
-
#define LOOKUP_NAME_ISOLATED 1 /* Look up unqualified names */
#define LOOKUP_NAME_REMOTE 2 /* Ask others */
#define LOOKUP_NAME_ALL (LOOKUP_NAME_ISOLATED|LOOKUP_NAME_REMOTE)
@@ -312,6 +298,7 @@
#include librpc/ndr/misc.h
#include librpc/ndr/security.h
#include librpc/ndr/libndr.h
+#include librpc/gen_ndr/lsa.h
#include librpc/gen_ndr/wkssvc.h
struct lsa_dom_info {
Copied: branches/SAMBA_3_0_26/source/librpc/gen_ndr/lsa.h (from rev 23215,
branches/SAMBA_3_0/source/librpc/gen_ndr/lsa.h)
Copied: branches/SAMBA_3_0_26/source/librpc/idl/lsa.idl (from rev 23216,
branches/SAMBA_3_0/source/librpc/idl/lsa.idl)
svn commit: samba r23218 - in branches/SAMBA_3_0_26/source/libsmb: .
Author: jerry
Date: 2007-05-29 17:56:57 + (Tue, 29 May 2007)
New Revision: 23218
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23218
Log:
merge a const warning
Modified:
branches/SAMBA_3_0_26/source/libsmb/namequery.c
Changeset:
Modified: branches/SAMBA_3_0_26/source/libsmb/namequery.c
===
--- branches/SAMBA_3_0_26/source/libsmb/namequery.c 2007-05-29 17:51:45 UTC
(rev 23217)
+++ branches/SAMBA_3_0_26/source/libsmb/namequery.c 2007-05-29 17:56:57 UTC
(rev 23218)
@@ -651,7 +651,7 @@
Start parsing the lmhosts file.
*/
-XFILE *startlmhosts(char *fname)
+XFILE *startlmhosts(const char *fname)
{
XFILE *fp = x_fopen(fname,O_RDONLY, 0);
if (!fp) {
svn commit: samba r23219 - in branches: SAMBA_3_0/source/rpc_client SAMBA_3_0/source/rpcclient SAMBA_3_0_26/source/rpc_client SAMBA_3_0_26/source/rpcclient
Author: vlendec
Date: 2007-05-29 17:57:52 + (Tue, 29 May 2007)
New Revision: 23219
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=23219
Log:
Two warnings
Modified:
branches/SAMBA_3_0/source/rpc_client/cli_netlogon.c
branches/SAMBA_3_0/source/rpcclient/cmd_netlogon.c
branches/SAMBA_3_0_26/source/rpc_client/cli_netlogon.c
branches/SAMBA_3_0_26/source/rpcclient/cmd_netlogon.c
Changeset:
Modified: branches/SAMBA_3_0/source/rpc_client/cli_netlogon.c
===
--- branches/SAMBA_3_0/source/rpc_client/cli_netlogon.c 2007-05-29 17:56:57 UTC
(rev 23218)
+++ branches/SAMBA_3_0/source/rpc_client/cli_netlogon.c 2007-05-29 17:57:52 UTC
(rev 23219)
@@ -501,7 +501,8 @@
info-domain_controller_address_type = r-dc_address_type;
- info-domain_guid = talloc_memdup(mem_ctx, r-domain_guid,
sizeof(struct GUID));
+ info-domain_guid = (struct GUID *)talloc_memdup(
+ mem_ctx, r-domain_guid, sizeof(struct GUID));
if (!info-domain_guid) {
return WERR_GENERAL_FAILURE;
}
Modified: branches/SAMBA_3_0/source/rpcclient/cmd_netlogon.c
===
--- branches/SAMBA_3_0/source/rpcclient/cmd_netlogon.c 2007-05-29 17:56:57 UTC
(rev 23218)
+++ branches/SAMBA_3_0/source/rpcclient/cmd_netlogon.c 2007-05-29 17:57:52 UTC
(rev 23219)
@@ -254,7 +254,7 @@
WERROR result;
uint32 flags = DS_RETURN_DNS_NAME;
const char *server_name = cli-cli-desthost;
- const char *domain_name;
+ const char *domain_name = NULL;
const char *client_account = NULL;
uint32 mask = 0;
const char *site_name = NULL;
Modified: branches/SAMBA_3_0_26/source/rpc_client/cli_netlogon.c
===
--- branches/SAMBA_3_0_26/source/rpc_client/cli_netlogon.c 2007-05-29
17:56:57 UTC (rev 23218)
+++ branches/SAMBA_3_0_26/source/rpc_client/cli_netlogon.c 2007-05-29
17:57:52 UTC (rev 23219)
@@ -463,7 +463,8 @@
info-domain_controller_address_type = r-dc_address_type;
- info-domain_guid = talloc_memdup(mem_ctx, r-domain_guid,
sizeof(struct GUID));
+ info-domain_guid = (struct GUID *)talloc_memdup(
+ mem_ctx, r-domain_guid, sizeof(struct GUID));
if (!info-domain_guid) {
return WERR_GENERAL_FAILURE;
}
Modified: branches/SAMBA_3_0_26/source/rpcclient/cmd_netlogon.c
===
--- branches/SAMBA_3_0_26/source/rpcclient/cmd_netlogon.c 2007-05-29
17:56:57 UTC (rev 23218)
+++ branches/SAMBA_3_0_26/source/rpcclient/cmd_netlogon.c 2007-05-29
17:57:52 UTC (rev 23219)
@@ -217,7 +217,7 @@
WERROR result;
uint32 flags = DS_RETURN_DNS_NAME;
const char *server_name = cli-cli-desthost;
- const char *domain_name;
+ const char *domain_name = NULL;
const char *client_account = NULL;
uint32 mask = 0;
const char *site_name = NULL;
