[Samba] How to repair corrupt ntprinters.tdb?
Hi, we are using samba 3.0.24 as a printspooler for 80 network printers with a 500kB ntprinters.tdb for some years now. When we recently restarted samba we noticed that the ntprinters.tdb automatically shrinked to 24kB and printing was no longer possible. tdbdump of the original tdb-file is impossible too: Failed to open ntprinters.tdb The strange thing about this: we can solve the problem temporarily if we copy the original 500kB tdb over the shrinked version while samba is already running! So samba seems to accept the tdb-files contents if it has been started with a clean tdb-file. Is there something like a tdb repair-tool? I would be lucky to find a way of getting all the settings out of this somehow corrupt tdb instead of rebuilding it from scratch... Any ideas? Thanks! Christoph -- 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 repair corrupt ntprinters.tdb?
On Thu, Dec 06, 2007 at 11:17:09AM +0100, Christoph Peus wrote: Hi, we are using samba 3.0.24 as a printspooler for 80 network printers with a 500kB ntprinters.tdb for some years now. When we recently restarted samba we noticed that the ntprinters.tdb automatically shrinked to 24kB and printing was no longer possible. tdbdump of the original tdb-file is impossible too: Failed to open ntprinters.tdb The strange thing about this: we can solve the problem temporarily if we copy the original 500kB tdb over the shrinked version while samba is already running! So samba seems to accept the tdb-files contents if it has been started with a clean tdb-file. Is there something like a tdb repair-tool? I would be lucky to find a way of getting all the settings out of this somehow corrupt tdb instead of rebuilding it from scratch... Any ideas? tdbbackup? Volker pgpstBoDUSn0a.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] Re: How to repair corrupt ntprinters.tdb?
Volker Lendecke wrote: On Thu, Dec 06, 2007 at 11:17:09AM +0100, Christoph Peus wrote: Hi, we are using samba 3.0.24 as a printspooler for 80 network printers with a 500kB ntprinters.tdb for some years now. When we recently restarted samba we noticed that the ntprinters.tdb automatically shrinked to 24kB and printing was no longer possible. tdbdump of the original tdb-file is impossible too: Failed to open ntprinters.tdb The strange thing about this: we can solve the problem temporarily if we copy the original 500kB tdb over the shrinked version while samba is already running! So samba seems to accept the tdb-files contents if it has been started with a clean tdb-file. Is there something like a tdb repair-tool? I would be lucky to find a way of getting all the settings out of this somehow corrupt tdb instead of rebuilding it from scratch... Any ideas? tdbbackup? Thanks, but no luck: lunkwill tmp # tdbbackup -v ntprinters.tdb restoring ntprinters.tdb ntprinters.tdb.bak: No such file or directory lunkwill tmp # tdbbackup ntprinters.tdb Failed to open ntprinters.tdb Regards Christoph -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] [POSIX ACLs] Only ACE rules from Samba Primary Group are applied.
Hi, I've a samba 3.0.24 server running in a debian alike OS with a (Open)LDAP backend and I'm having the following problem: I have LDAP users that belong to more than one (POSIX) group. For instance, I have a user2 that belongs to group users and grupo2 and I have a share with the following ACL settings: getfacl /home/shares/share1/ getfacl: Removing leading '/' from absolute path names # file: home/shares/share1 # owner: user1 # group: grupo1 user::rwx group::rwx group:grupo2:r-x group:users:rw- mask::rwx other::--- default:user::rwx default:group::rwx default:group:grupo2:r-x default:group:users:rw- default:mask::rwx default:other::--- user2 has group grupo2 in the sambaPrimaryGroupSID in LDAP. If I login with this user into share1 and try to create a file it will get Permission Denied. If I login as user2 in system and go to share1 folder I'm able to create files, so settings are OK. Also if I use the write list = @users I'm able to create files when I'm connected to the share. In the samba logs I can see that the ACL - UNIX convertion seems fine: gid_to_sid: local 100 - S-1-22-2-100 canonicalise_acl: Access ace entries before arrange : canon_ace index 0. Type = allow SID = S-1-1-0 other SMB_ACL_OTHER perms --- canon_ace index 1. Type = allow SID = S-1-22-2-100 gid 100 (users) SMB_ACL_GROUP perms rw- canon_ace index 2. Type = allow SID = S-1-22-2-1001 gid 1001 (grupo2) SMB_ACL_GROUP_OBJ perms r-x canon_ace index 3. Type = allow SID = S-1-5-21-822431398-922470320-1179183166-1666 uid 1666 (user2) SMB_ACL_USER_OBJ perms rwx print_canon_ace_list: canonicalise_acl: ace entries after arrange canon_ace index 0. Type = allow SID = S-1-5-21-822431398-922470320-1179183166-1666 uid 1666 (user2) SMB_ACL_USER_OBJ perms rwx canon_ace index 1. Type = allow SID = S-1-22-2-100 gid 100 (users) SMB_ACL_GROUP perms rw- canon_ace index 2. Type = allow SID = S-1-22-2-1001 gid 1001 (grupo2) SMB_ACL_GROUP_OBJ perms r-x canon_ace index 3. Type = allow SID = S-1-1-0 other SMB_ACL_OTHER perms --- map_canon_ace_perms: Mapped (UNIX) 1c0 to (NT) 1f01ff map_canon_ace_perms: Mapped (UNIX) 180 to (NT) 12019f map_canon_ace_perms: Mapped (UNIX) 140 to (NT) 1200a9 map_canon_ace_perms: Mapped (UNIX) 0 to (NT) 0 But when I try to create the file I get: New file New Text Document (2).txt unix_mode(New Text Document (2).txt) inheriting from . unix_mode(New Text Document (2).txt) inherit mode 42770 unix_mode(New Text Document.txt) returning 0760 open_file_ntcreate: fname=New Text Document.txt, dos_attrs=0x80 access_mask=0x2019f share_access=0x7 create_disposition = 0x2 create_options=0x40 unix mode=0760 oplock_request=3 open_file_ntcreate: fname=New Text Document.txt, after mapping access_mask=0x2019f allocated file structure 2723, fnum = 6819 (2 used) calling open_file with flags=0x2 flags2=0x80 mode=0777, access_mask = 0x2019f, open_access_mask = 0x2019f Permission denied opening New Text Document (2).txt If I use the write list = @users I get: New file New Briefcase [2007/12/06 13:54:04, 2] smbd/dosmode.c:unix_mode(96) unix_mode(New Briefcase) inheriting from . [2007/12/06 13:54:04, 2] smbd/dosmode.c:unix_mode(104) unix_mode(New Briefcase) inherit mode 42770 [2007/12/06 13:54:04, 3] smbd/dosmode.c:unix_mode(147) unix_mode(New Briefcase) returning 0760 [2007/12/06 13:54:04, 10] smbd/open.c:open_file_ntcreate(1144) open_file_ntcreate: fname=New Briefcase, dos_attrs=0x80 access_mask=0x2019f share_access=0x7 create_disposition = 0x2 create_options=0x40 unix mode=0760 oplock_request=3 [2007/12/06 13:54:04, 10] smbd/open.c:open_file_ntcreate(1306) open_file_ntcreate: fname=New Briefcase, after mapping access_mask=0x2019f [2007/12/06 13:54:04, 5] smbd/files.c:file_new(126) allocated file structure 5967, fnum = 10063 (2 used) [2007/12/06 13:54:04, 4] smbd/open.c:open_file_ntcreate(1545) calling open_file with flags=0x2 flags2=0xC0 mode=0777, access_mask = 0x2019f, open_access_mask = 0x2019f [2007/12/06 13:54:04, 10] smbd/open.c:fd_open(56) fd_open: name New Briefcase, flags = 0302 mode = 0777, fd = 26. [2007/12/06 13:54:04, 2] smbd/open.c:open_file(352) nelsonvale opened file New Briefcase read=Yes write=Yes (numopen=2) [2007/12/06 13:54:04, 3] smbd/sec_ctx.c:push_sec_ctx(208) push_sec_ctx(0, 1000) : sec_ctx_stack_ndx = 1 [2007/12/06 13:54:04, 3] smbd/uid.c:push_conn_ctx(345) push_conn_ctx(101) : conn_ctx_stack_ndx = 0 [2007/12/06 13:54:04, 3] smbd/sec_ctx.c:set_sec_ctx(241) setting sec ctx (0, 0) - sec_ctx_stack_ndx = 1 [2007/12/06 13:54:04, 5] auth/auth_util.c:debug_nt_user_token(448) NT user token: (NULL) What I've figured so far is that UNIX file access rules works fine, but for POSIX ACLs only Primary Group access rules are applied for ACL settings. The differences I see between the two cases are in flags2 variable in calling open_file FOR THE SAME SHARE, USER AND GROUP SETTINGS: ACLs only: calling open_file with flags=0x2 flags2=0x80 mode=0777, access_mask = 0x2019f, open_access_mask =
Re: [Samba] Re: How to repair corrupt ntprinters.tdb?
On Thu, Dec 06, 2007 at 12:52:15PM +0100, Christoph Peus wrote: lunkwill tmp # tdbbackup -v ntprinters.tdb restoring ntprinters.tdb ntprinters.tdb.bak: No such file or directory lunkwill tmp # tdbbackup ntprinters.tdb Failed to open ntprinters.tdb Ok, then you're basically screwed. You might want to look at it with tdbtool, but to get the data out of the tdb file and/or repair it you need to be quite familiar with the tdb format. Sorry, Volker -- SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen phone: +49-551-37-0, fax: +49-551-37-9 AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen pgpiQFQXX48tK.pgp Description: PGP signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Windows Vista file copying over openvpn
Hi all, I'm using openvpn to connect to a public server that has Samba v3.0.24 installed on Debian etch. The connection is over the internet (from a standard ADSL connection to a remote server on a 2Mbit LL). The problem is copying somewhat 'larger' files from the client to the server. Copying files of up to 2 megabyte goes well but larger files fail (4 MB, 6MB, or more). The error message I get is There is a problem accessing C:\myfile.doc - Make sure you are connected to the network and try again. Doing the same thing with windows XP works. My conclusion is that Vista is acting differently but why only with +2MB files... I have already tried the same on an internal samba server (100 Mbit) without OpenVPN, this works in Vista and XP. Any suggestions or hints on how to troubleshoot this? I have already applied MS KB932045 on the vista pc but without result. thanks in advance for any hints, stoffell -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Does anyone know why sometimes a PDC appears in the Network neigborhood, and sometimes it doesn't?
On Thursday 06 December 2007 00:42:43, Aaron J. Zirbes wrote: This is a Computer Browser issue. If your samba server is always on, make sure the Computer Browser service is turned off on all other machines. That should solve your problem... well, I do not know if there _are_ any services on Win98 and Win95 machines (and I run a lot of these in a volunteer job). However, I just found that the problem has simply vanished. Thanks for your advice, anyway. Still, this somehow does not feel right... Do cause and effect play any role in MS systems? -- J.J. Gerritse Mühlenstraße 11 D-47546 Kalkar-Wissel Duitsland +49-2824-971487 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] 3.0.27a, ubuntu server7.10 auth issues
The links below all say the same thing concerning this error message: the version of libnss_winbind.so running does not match the version of winbind that is running. http://lists.samba.org/archive/samba/2005-December/114975.html http://lists.samba.org/archive/samba/2006-February/117780.html http://threebit.net/mail-archive/samba/msg00562.html Dale Guillermo Gutierrez wrote: -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Shaun Marolf Sent: Wednesday, December 05, 2007 4:23 PM To: samba@lists.samba.org Subject: Re: [Samba] 3.0.27a, ubuntu server7.10 auth issues On Wednesday 05 December 2007 05:55:25 pm Guillermo Gutierrez wrote: Well, I tried it but no luck. Getent still won't display the AD users. Guillermo Gutierrez _ (818) 575-2017 (818) 324-0871 [EMAIL PROTECTED] -Original Message- From: Aaron J. Zirbes [mailto:[EMAIL PROTECTED] Sent: Wednesday, December 05, 2007 3:51 PM To: Guillermo Gutierrez Subject: Re: [Samba] 3.0.27a, ubuntu server7.10 auth issues Have winbindd, smbd, nmbd all been restarted? ... just a guess since winbindd is saying it's getting requests of a different size than expected, and I've seen that when I've restarted one daemon, but not the other. You could also try clearing out your tdb cache files I know I run the following command on FreeBSD. I'm not exactly sure what it would be on ubuntu though /usr/local/samba/bin/tdbbackup -v /usr/local/samba/var/locks/*.tdb perhapse? tdbbackup -v var/samba/locks/*.tdb -- Aaron Guillermo Gutierrez wrote: I don't have nscd installed Guillermo Gutierrez _ (818) 575-2017 (818) 324-0871 [EMAIL PROTECTED] -Original Message- From: Aaron J. Zirbes [mailto:[EMAIL PROTECTED] Sent: Wednesday, December 05, 2007 3:37 PM To: Guillermo Gutierrez Subject: Re: [Samba] 3.0.27a, ubuntu server7.10 auth issues Did you restart nscd? Guillermo Gutierrez wrote: I have upgraded to version 3.0.27a on ubuntu 7.10 server and now the getent command wont display the active directory users, but wbinfo will. It worked fine with 3.0.26a and I have not changed my configuration. I do however have this in my winbind log: [2007/12/04 13:39:01, 0] nsswitch/winbindd.c:request_len_recv(544) request_len_recv: Invalid request size received: 2084 (expected 2088) [2007/12/04 13:39:01, 0] nsswitch/winbindd.c:request_len_recv(544) request_len_recv: Invalid request size received: 2084 (expected 2088) [2007/12/04 13:44:09, 1] nsswitch/winbindd_ads.c:query_user_list(209) Not a user account? atype=0x3000 [2007/12/04 13:44:09, 1] nsswitch/winbindd_ads.c:query_user_list(209) Not a user account? atype=0x3000 [2007/12/04 13:44:09, 1] nsswitch/winbindd_ads.c:query_user_list(209) Not a user account? atype=0x3000 [2007/12/04 13:44:09, 1] nsswitch/winbindd_ads.c:query_user_list(209) Not a user account? atype=0x3000 [2007/12/04 13:44:09, 1] nsswitch/winbindd_ads.c:query_user_list(209) Not a user account? atype=0x3000 [2007/12/04 13:44:18, 0] nsswitch/winbindd.c:request_len_recv(544) request_len_recv: Invalid request size received: 2084 (expected 2088) [2007/12/04 13:44:18, 0] nsswitch/winbindd.c:request_len_recv(544) request_len_recv: Invalid request size received: 2084 (expected 2088) [2007/12/04 13:45:34, 0] nsswitch/winbindd.c:request_len_recv(544) request_len_recv: Invalid request size received: 2084 (expected 2088) [2007/12/04 13:45:34, 0] nsswitch/winbindd.c:request_len_recv(544) request_len_recv: Invalid request size received: 2084 (expected 2088) [2007/12/04 13:45:54, 0] nsswitch/winbindd.c:request_len_recv(544) request_len_recv: Invalid request size received: 2084 (expected 2088) [2007/12/04 13:46:19, 0] nsswitch/winbindd.c:request_len_recv(544) request_len_recv: Invalid request size received: 2084 (expected 2088) [2007/12/04 13:46:19, 0] nsswitch/winbindd.c:request_len_recv(544) request_len_recv: Invalid request size received: 2084 (expected 2088) [2007/12/04 13:46:19, 0] nsswitch/winbindd.c:request_len_recv(544) request_len_recv: Invalid request size received: 2084 (expected 2088) [2007/12/04 13:49:35, 1] nsswitch/winbindd_ads.c:query_user_list(209) Not a user account? atype=0x3000 [2007/12/04 13:49:35, 1] nsswitch/winbindd_ads.c:query_user_list(209) Not a user account? atype=0x3000 [2007/12/04 13:49:35, 1] nsswitch/winbindd_ads.c:query_user_list(209) Not a user account? atype=0x3000 [2007/12/04 13:49:35, 1] nsswitch/winbindd_ads.c:query_user_list(209) Not a user account? atype=0x3000 [2007/12/04 13:49:35, 1] nsswitch/winbindd_ads.c:query_user_list(209) Not a user account? atype=0x3000 [2007/12/04 13:49:42, 0]
Re: [Samba] 3.0.27a, ubuntu server7.10 auth issues
On Thursday 06 December 2007, Dale Schroeder wrote: The links below all say the same thing concerning this error message: the version of libnss_winbind.so running does not match the version of winbind that is running. In case it helps anyone: Whenever I upgrade Samba on the boxes that run winbindd I can not rely on the simple /etc/init.d/samba restart, as it leaves copies of the old winbindd running. I need to stop samba then manually kill all of the winbindd processes, then restart samba. -- Chris -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: How to make Add permission for folder in system with ntacl support? Part 2
Pawel Jaworski pisze: Hello. Sorry I didn't post it under the how to make... email - I didn't received it - I only found it in archives. But I think we both mean the same. All this below regards samba on debian etch: 3.0.24-6etch4 I have a share on partition mounted with acl (options=acl,...). As you know I can locally on server add another ACL entries on files in that folder. When I connect with windows 2000 to that share there are some ACEs in there (all visible with username, not sid). 1) When I try to add another user It asks for username again and then says The credentials supplied conflict with an existing set of credentials and it doesn't show any users which I could add. I cannot also add any username I know. 2) When I try to add another user in Windows XP it simply asks me for username and then doesn't allow any username to be added to ACL (the same as in 2K) 3) When I run under linux net rpc users -Uusername - it shows me ALL users from server 4) Finally when I run windows on my other machine (where I never intended to use acls) which is debian sarge (samba 3.0.14a-3sarge) it ALL WORKS. I can add users, chose them from list (it was only tested under windows 2000) 5) I tried to install pure samba sarge on clean vm (with etch) and it also didn't work. It appears to me that windows somehow cannot get userlist from samba server, but I don't know why, because net rpc does it well. I also tried to copy whole smb.conf from that server where all is working - it didn't help. Many tries I've done with no result. Please - anybody has it configured? It would be my salvation (in terms of job and servers and administration also ;) )... It would solve half of my problems. Help meee! Pawel I've just read here: http://techxworld.com/community/blogs/features/archive/2007/05/21/acls-on-samba.aspx that samba can be somewhat problematic when it comes to standalone server, not connected to any domain - with fetching users list. But one my server alredy does it well. And in my work there is no possibility to connect the server to PDC because there is no PDC (we only have 2 windowses). Have anybody met such problem? Have anybody overcome it? Pawel Jaworski -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] time server = yes
I want my XP clients to update their clocks from my samba server. I have time server = yes in smb.conf, and running ntpd on the server, but my clients aren't updating their clocks. I tried running the command manually logged in as a domain user: net time /setsntp:10.8.2.3 but it just says System error 5 has occurred. Access is denied. Any ideas? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] time server = yes
On Thu, 2007-12-06 at 10:34 -0600, Adam Williams wrote: I want my XP clients to update their clocks from my samba server. I have time server = yes in smb.conf, and running ntpd on the server, but my clients aren't updating their clocks. I tried running the command manually logged in as a domain user: net time /setsntp:10.8.2.3 but it just says System error 5 has occurred. Access is denied. Any ideas? Setting the clock is generally a privileged operation. You can manually set it only if you have the right privileges locally on the machine (admin has them but there are registry settings somewhere to relax the constraint for normal users iirc). Simo. -- Simo Sorce Samba Team GPL Compliance Officer [EMAIL PROTECTED] Senior Software Engineer at Red Hat Inc. [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] time server = yes
Thu, Dec 06, 2007 at 10:34:51AM -0600, Adam Williams napsal(a): I want my XP clients to update their clocks from my samba server. I have time server = yes in smb.conf, and running ntpd on the server, but my clients aren't updating their clocks. I tried running the command manually logged in as a domain user: net time /setsntp:10.8.2.3 but it just says System error 5 has occurred. Access is denied. Domain user isn't allowed to change w32time service. I'm not sure if time server mean ntp time server ... I have to change more settings on client side in w32time service. (e.g. start the service ;o) ) But still if the time differ for more than X minutes/hours it fails. So I have to add net time /set command to windows XP startup. Regards, Luf -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] time server = yes
Hallo, Adam, Du (awilliam) meintest am 06.12.07: I want my XP clients to update their clocks from my samba server. I have time server = yes in smb.conf, and running ntpd on the server, but my clients aren't updating their clocks. I tried running the command manually logged in as a domain user: net time /setsntp:10.8.2.3 but it just says System error 5 has occurred. Access is denied. http://arktur.de/FAQ/28_42_de.html You may allow nonprivileged users changing the system time via gpedit.msc. Viele Gruesse! Helmut -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] time server = yes
Hi Adam, According to http://blogs.msdn.com/aaron_margosis/archive/2005/02/11/371474.aspx , the INTERACTIVE group can be given permissions to change system time (through secpol.msc). Of course, logged users are included and can do it too (at their own peril ;)). Cheers, Ari Constancio On Dec 6, 2007 4:38 PM, simo [EMAIL PROTECTED] wrote: On Thu, 2007-12-06 at 10:34 -0600, Adam Williams wrote: I want my XP clients to update their clocks from my samba server. I have time server = yes in smb.conf, and running ntpd on the server, but my clients aren't updating their clocks. I tried running the command manually logged in as a domain user: net time /setsntp:10.8.2.3 but it just says System error 5 has occurred. Access is denied. Any ideas? Setting the clock is generally a privileged operation. You can manually set it only if you have the right privileges locally on the machine (admin has them but there are registry settings somewhere to relax the constraint for normal users iirc). Simo. -- Simo Sorce Samba Team GPL Compliance Officer [EMAIL PROTECTED] Senior Software Engineer at Red Hat Inc. [EMAIL PROTECTED] -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] time server = yes
Adam Williams wrote: I want my XP clients to update their clocks from my samba server. I have time server = yes in smb.conf, and running ntpd on the server, but my clients aren't updating their clocks. I tried running the command manually logged in as a domain user: net time /setsntp:10.8.2.3 but it just says System error 5 has occurred. Access is denied. Any ideas? The relationship of net time and a real ntp server seems to be a one time sync only anyway. However, you can have the PC really use ntp: :: setup ntp client :: need to be an admin - one time setup sc stop w32time w32tm /unregister w32tm /register net time /setsntp:ntpd-server sc config w32time start= auto sc start w32time w32tm /resync w32tm /stripchart /computer:ntpd-server /samples:1 Could instead use a real Policy or manually jam it into the registry: :: setup ntp client :: need to be an admin - one time setup reg add HKLM\SOFTWARE\Policies\microsoft\w32time /f reg add HKLM\SOFTWARE\Policies\microsoft\w32time\Parameters /f reg add HKLM\SOFTWARE\Policies\microsoft\w32time\TimeProviders /f reg add HKLM\SOFTWARE\Policies\microsoft\w32time\TimeProviders\NtpClient /f reg add HKLM\SOFTWARE\Policies\microsoft\w32time\Parameters /v NtpServer /d ntpd-server /f reg add HKLM\SOFTWARE\Policies\microsoft\w32time\Parameters /v Type /d NTP /f reg add HKLM\SOFTWARE\Policies\microsoft\w32time\TimeProviders\NtpClient /v Enabled /t REG_DWORD /d 0x1 /f reg add HKLM\SOFTWARE\Policies\microsoft\w32time\TimeProviders\NtpClient /v CrossSiteSyncFlags /t REG_DWORD /d 0x2 reg add HKLM\SOFTWARE\Policies\microsoft\w32time\TimeProviders\NtpClient /v ResolvePeerBackoffMinutes /t REG_DWORD /d 0xf reg add HKLM\SOFTWARE\Policies\microsoft\w32time\TimeProviders\NtpClient /v ResolvePeerBackoffMaxTimes /t REG_DWORD /d 0x7 reg add HKLM\SOFTWARE\Policies\microsoft\w32time\TimeProviders\NtpClient /v SpecialPollInterval /t REG_DWORD /d 0xe10 reg add HKLM\SOFTWARE\Policies\microsoft\w32time\TimeProviders\NtpClient /v EventLogFlags /t REG_DWORD /d 0x0 gpudate /target:computer /force -- Toby Bluhm Midwest Instruments Inc. 30825 Aurora Road Suite 100 Solon Ohio 44139 440-424-2240 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] time server = yes
but it just says System error 5 has occurred. Access is denied. Any ideas? Yep. As far as I know, regular users do not have the right to change the time. You need to have admin rights. (or at least power user, I'm not sure) What I do: I use tardis K9 (http://www.kaska.demon.co.uk/) on workstations to listen for ntp broadcasts from my pdc. K9 then corrects the time on the workstation. K9 is _very_ small and light, ands runs as a service. I like it. Only don't forget to add K9 to your windows firewall exceptions. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] 3.0.27a, ubuntu server7.10 auth issues
I tried this, but only the smbd and nmbd processes were still running, not winbind. I killed the smbd and nmbd then restarted but getent will still not show active directory domain users. Guillermo Gutierrez _ (818) 575-2017 (818) 324-0871 [EMAIL PROTECTED] -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Chris Smith Sent: Thursday, December 06, 2007 8:14 AM To: samba@lists.samba.org Subject: Re: [Samba] 3.0.27a, ubuntu server7.10 auth issues On Thursday 06 December 2007, Dale Schroeder wrote: The links below all say the same thing concerning this error message: the version of libnss_winbind.so running does not match the version of winbind that is running. In case it helps anyone: Whenever I upgrade Samba on the boxes that run winbindd I can not rely on the simple /etc/init.d/samba restart, as it leaves copies of the old winbindd running. I need to stop samba then manually kill all of the winbindd processes, then restart samba. -- Chris -- 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] 3.0.27a, ubuntu server7.10 auth issues
Hmmm….how do I go about upgrading libnss_winbind.so? Guillermo Gutierrez _ (818) 575-2017 (818) 324-0871 [EMAIL PROTECTED] From: Dale Schroeder [mailto:[EMAIL PROTECTED] Sent: Thursday, December 06, 2007 6:32 AM To: Guillermo Gutierrez; samba@lists.samba.org Subject: Re: [Samba] 3.0.27a, ubuntu server7.10 auth issues The links below all say the same thing concerning this error message: the version of libnss_winbind.so running does not match the version of winbind that is running. http://lists.samba.org/archive/samba/2005-December/114975.html http://lists.samba.org/archive/samba/2006-February/117780.html http://threebit.net/mail-archive/samba/msg00562.html Dale Guillermo Gutierrez wrote: -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Shaun Marolf Sent: Wednesday, December 05, 2007 4:23 PM To: samba@lists.samba.org Subject: Re: [Samba] 3.0.27a, ubuntu server7.10 auth issues On Wednesday 05 December 2007 05:55:25 pm Guillermo Gutierrez wrote: Well, I tried it but no luck. Getent still won't display the AD users. Guillermo Gutierrez _ (818) 575-2017 (818) 324-0871 [EMAIL PROTECTED] -Original Message- From: Aaron J. Zirbes [mailto:[EMAIL PROTECTED] Sent: Wednesday, December 05, 2007 3:51 PM To: Guillermo Gutierrez Subject: Re: [Samba] 3.0.27a, ubuntu server7.10 auth issues Have winbindd, smbd, nmbd all been restarted? ... just a guess since winbindd is saying it's getting requests of a different size than expected, and I've seen that when I've restarted one daemon, but not the other. You could also try clearing out your tdb cache files I know I run the following command on FreeBSD. I'm not exactly sure what it would be on ubuntu though /usr/local/samba/bin/tdbbackup -v /usr/local/samba/var/locks/*.tdb perhapse? tdbbackup -v var/samba/locks/*.tdb -- Aaron Guillermo Gutierrez wrote: I don't have nscd installed Guillermo Gutierrez _ (818) 575-2017 (818) 324-0871 [EMAIL PROTECTED] -Original Message- From: Aaron J. Zirbes [mailto:[EMAIL PROTECTED] Sent: Wednesday, December 05, 2007 3:37 PM To: Guillermo Gutierrez Subject: Re: [Samba] 3.0.27a, ubuntu server7.10 auth issues Did you restart nscd? Guillermo Gutierrez wrote: I have upgraded to version 3.0.27a on ubuntu 7.10 server and now the getent command wont display the active directory users, but wbinfo will. It worked fine with 3.0.26a and I have not changed my configuration. I do however have this in my winbind log: [2007/12/04 13:39:01, 0] nsswitch/winbindd.c:request_len_recv(544) request_len_recv: Invalid request size received: 2084 (expected 2088) [2007/12/04 13:39:01, 0] nsswitch/winbindd.c:request_len_recv(544) request_len_recv: Invalid request size received: 2084 (expected 2088) [2007/12/04 13:44:09, 1] nsswitch/winbindd_ads.c:query_user_list(209) Not a user account? atype=0x3000 [2007/12/04 13:44:09, 1] nsswitch/winbindd_ads.c:query_user_list(209) Not a user account? atype=0x3000 [2007/12/04 13:44:09, 1] nsswitch/winbindd_ads.c:query_user_list(209) Not a user account? atype=0x3000 [2007/12/04 13:44:09, 1] nsswitch/winbindd_ads.c:query_user_list(209) Not a user account? atype=0x3000
Re: [Samba] time server = yes
Hi Adam, try this: How to configure an authoritative time server in Windows XP: Configuring the Windows Time service to use an external time source http://support.microsoft.com/kb/314054/EN-US/#EXTERNAL or http://support.microsoft.com/kb/314054/EN-US I had the same problem some months ago. Trying to set the client´s time in the user´s logon scripts always brought me an access denied error for the already given reasons. If I remember right, it was this article that finally helped me out. This way the system time is set but the users are prevented from changing the time themselves. Greetings, Petri On Thu, 06 Dec 2007 10:34:51 -0600, Adam Williams [EMAIL PROTECTED] wrote: I want my XP clients to update their clocks from my samba server. I have time server = yes in smb.conf, and running ntpd on the server, but my clients aren't updating their clocks. I tried running the command manually logged in as a domain user: net time /setsntp:10.8.2.3 but it just says System error 5 has occurred. Access is denied. Any ideas? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] security = user, LDAP, and adding users to ACLs
Hi, Problem: I seem to be able to add users to ACLs from windows due to an Name Not Found error when looking up a username. According to what I have been able to find, you cannot browse users on a samba server from windows without winbind and security = domain/ads. However, winbind does not have any place in my environment aside from remedying this problem. Is there some alternative to enable this feature, or method of setting up winbind that is innocuous in my environment while maintaining security = user? Background on the Environment: I am running Samba 3.0.25c on Solaris 10u4 with security = user.I am using the vfs object zfsacl to enable ACL support on my zfs filesystem. We use LDAP as a password backend, which also stores sambaSIDs for every user. SIDs and unix UIDs are synchronized across all the samba servers because they all use the same LDAP backend. Thanks in advance! -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] 3.0.27a, ubuntu server7.10 auth issues
Thank you so much, you copy of libnss_winbind.so.2 worked for me. For the future, how do I go about generating or building the file? Guillermo Gutierrez _ (818) 575-2017 (818) 324-0871 [EMAIL PROTECTED] From: Dale Schroeder [mailto:[EMAIL PROTECTED] Sent: Thursday, December 06, 2007 11:12 AM To: Guillermo Gutierrez Subject: Re: [Samba] 3.0.27a, ubuntu server7.10 auth issues If you used an Ubuntu or Debian package, it should have done so automatically. If you compiled from source, the links indicate you'll have to create it; and I don't know how to do that. Looking in my /lib directory, I see libnss_winbind.so.2, dated 2007-11-24. I'll attach it to see if a simple copy will work for you. Good luck, Dale Guillermo Gutierrez wrote: Hmmm….how do I go about upgrading libnss_winbind.so? Guillermo Gutierrez _ (818) 575-2017 (818) 324-0871 [EMAIL PROTECTED] From: Dale Schroeder [mailto:[EMAIL PROTECTED] Sent: Thursday, December 06, 2007 6:32 AM To: Guillermo Gutierrez; samba@lists.samba.org Subject: Re: [Samba] 3.0.27a, ubuntu server7.10 auth issues The links below all say the same thing concerning this error message: the version of libnss_winbind.so running does not match the version of winbind that is running. http://lists.samba.org/archive/samba/2005-December/114975.html http://lists.samba.org/archive/samba/2006-February/117780.html http://threebit.net/mail-archive/samba/msg00562.html Dale Guillermo Gutierrez wrote: -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Shaun Marolf Sent: Wednesday, December 05, 2007 4:23 PM To: samba@lists.samba.org Subject: Re: [Samba] 3.0.27a, ubuntu server7.10 auth issues On Wednesday 05 December 2007 05:55:25 pm Guillermo Gutierrez wrote: Well, I tried it but no luck. Getent still won't display the AD users. Guillermo Gutierrez _ (818) 575-2017 (818) 324-0871 [EMAIL PROTECTED] -Original Message- From: Aaron J. Zirbes [mailto:[EMAIL PROTECTED] Sent: Wednesday, December 05, 2007 3:51 PM To: Guillermo Gutierrez Subject: Re: [Samba] 3.0.27a, ubuntu server7.10 auth issues Have winbindd, smbd, nmbd all been restarted? ... just a guess since winbindd is saying it's getting requests of a different size than expected, and I've seen that when I've restarted one daemon, but not the other. You could also try clearing out your tdb cache files I know I run the following command on FreeBSD. I'm not exactly sure what it would be on ubuntu though /usr/local/samba/bin/tdbbackup -v /usr/local/samba/var/locks/*.tdb perhapse? tdbbackup -v var/samba/locks/*.tdb -- Aaron Guillermo Gutierrez wrote: I don't have nscd installed Guillermo Gutierrez _ (818) 575-2017 (818) 324-0871 [EMAIL PROTECTED] -Original Message- From: Aaron J. Zirbes [mailto:[EMAIL PROTECTED] Sent: Wednesday, December 05, 2007 3:37 PM To: Guillermo Gutierrez Subject: Re: [Samba] 3.0.27a, ubuntu server7.10 auth issues Did you restart nscd? Guillermo Gutierrez wrote: I have upgraded to version 3.0.27a on ubuntu 7.10 server and now the getent command wont display the active directory users, but wbinfo will. It worked fine with 3.0.26a and I have not changed my configuration. I do however have this in my winbind log: [2007/12/04 13:39:01, 0] nsswitch/winbindd.c:request_len_recv(544) request_len_recv: Invalid request size received: 2084 (expected 2088) [2007/12/04 13:39:01, 0] nsswitch/winbindd.c:request_len_recv(544) request_len_recv: Invalid request size received: 2084 (expected 2088) [2007/12/04 13:44:09, 1]
Re: [Samba] security = user, LDAP, and adding users to ACLs
If your Samba is running as a PDC, and you are logged in the samba domain, you are able to list the LDAP users in the shares or files security tab, and you don't need winbind. All you need is nsswitch.conf configured with: # /etc/nsswitch.conf # passwd: files ldap group: files ldap shadow: files ldap Plus ldap.conf like: bindpw binddn xxx uri ldap://xxx.xxx.xxx.xxx base dc=local,dc=loc rootbinddn x host 127.0.0.1 ldap_version 3 scope one ssl no pam_login_attribute uid pam_member_attribute gid pam_password md5 nss_base_passwd dc=local,dc=loc?sub nss_base_shadow dc=local,dc=loc?sub nss_base_group ou=Groups,dc=local,dc=loc?one In smb.conf you need to put something like: ldap user suffix = ou=People ldap machine suffix = ou=Computers ldap group suffix = ou=Groups ldap suffix = dc=local,dc=loc ldap admin dn = cn=xx ldap idmap suffix = ou=Idmap Your LDAP must also have the default samba Domain Groups. Em Thursday 06 December 2007 20:29, o Shammah Chancellor escreveu: Hi, Problem: I seem to be able to add users to ACLs from windows due to an Name Not Found error when looking up a username. According to what I have been able to find, you cannot browse users on a samba server from windows without winbind and security = domain/ads. However, winbind does not have any place in my environment aside from remedying this problem. Is there some alternative to enable this feature, or method of setting up winbind that is innocuous in my environment while maintaining security = user? Background on the Environment: I am running Samba 3.0.25c on Solaris 10u4 with security = user.I am using the vfs object zfsacl to enable ACL support on my zfs filesystem. We use LDAP as a password backend, which also stores sambaSIDs for every user. SIDs and unix UIDs are synchronized across all the samba servers because they all use the same LDAP backend. Thanks in advance! -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: missing packaging/Fedora/makerpms.sh
Ray Anderson wrote: Mark Nienberg wrote: I downloaded the tar.gz file for 3.0.27a and I noticed there is not a Fedora directory inside the packaging directory. I'm fairly certain there used to be one in older versions. I'm groping now to figure out how to build rpms for Fedora 4, which I know is a little old but I don't have resources to upgrade the OS now. Was it intentionally removed? Mark For my Fedora 3 and 4 machines out in the wild, I simply removed the rpms altogether and installed from source. It was a painless procedure, even including the vscan vfs objects. Symlink the config files to the /usr/local/samba/lib directory and it should work just fine. Sure makes upgrading to later versions easier. :) If you set a few of the compile options correctly then you could get it to install into the same places as the rpm does so you wouldn't need symlinks. Oh wait, that is what the makerpms.sh script was for! :) Mark -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Re: missing packaging/Fedora/makerpms.sh
Mark Nienberg wrote: Ray Anderson wrote: Mark Nienberg wrote: I downloaded the tar.gz file for 3.0.27a and I noticed there is not a Fedora directory inside the packaging directory. I'm fairly certain there used to be one in older versions. I'm groping now to figure out how to build rpms for Fedora 4, which I know is a little old but I don't have resources to upgrade the OS now. Was it intentionally removed? Mark For my Fedora 3 and 4 machines out in the wild, I simply removed the rpms altogether and installed from source. It was a painless procedure, even including the vscan vfs objects. Symlink the config files to the /usr/local/samba/lib directory and it should work just fine. Sure makes upgrading to later versions easier. :) If you set a few of the compile options correctly then you could get it to install into the same places as the rpm does so you wouldn't need symlinks. Oh wait, that is what the makerpms.sh script was for! :) Mark My point exactly. Just leave the raw stuff where the raw stuff wants to go, that way if some helper script goes away you're still ok, i.e. the dropping of update support for FC3, 4, 5, 6, etc. -=R -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] time server = yes
Helge wrote: Hi Adam, try this: How to configure an authoritative time server in Windows XP: Configuring the Windows Time service to use an external time source http://support.microsoft.com/kb/314054/EN-US/#EXTERNAL or http://support.microsoft.com/kb/314054/EN-US I had the same problem some months ago. Trying to set the client´s time in the user´s logon scripts always brought me an access denied error for the already given reasons. If I remember right, it was this article that finally helped me out. This way the system time is set but the users are prevented from changing the time themselves. Greetings, Petri Thanks for your and everyone else's replies. Unfortunately, the registry edits would require me to go to all 150 computers here and log in as local administrator to make the registry changes, which just really isn't an option. Luckily, I have WPKG installed on all 150 computers to handle automatic deploying of software, and it runs as local administrator on computer start up. So, I will see if I can use K9 or another free NTP program to handle time synchronization, or have WPKG execute a .bat with net time /set /yes \\server upon system start up. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] time server = yes
Adam Williams wrote: I want my XP clients to update their clocks from my samba server. I have time server = yes in smb.conf, and running ntpd on the server, but my clients aren't updating their clocks. I tried running the command manually logged in as a domain user: net time /setsntp:10.8.2.3 but it just says System error 5 has occurred. Access is denied. Any ideas? As an admin user, from the command prompt in windows try: net time \\server /set /yes It has worked for me for years. -- David C. Rankin, J.D., P.E. Rankin Law Firm, PLLC 510 Ochiltree Street Nacogdoches, Texas 75961 Telephone: (936) 715-9333 Facsimile: (936) 715-9339 www.rankinlawfirm.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Good idea, but no reply: what to do.
Hello, since some time I've created a construction which: - automatically detects all the smb hosts and their shares (with nbtscan and smbclient) - creates a directory in the homemap of the users logged in which represents the windows networkneighbourhoud. - when entering a share, it is automatically mounted (with autofs and cifs and or smbfs) It works very good, and now I've published it on HowtoForge: http://www.howtoforge.com/automatic_discovery_mounting_smb_networkshares I've asked the maintainer of howtoforge Falko Timme he would want to ask the people of LinuxToday to make a link/shortcut to this howto, but sofar the did not publish it. The reason for it is not known to me. I can only gues. Too technical? I'm a bit desparate about it. I know it's a very good construction, which has potential. It lets you browse the networkneighbourhood, which is detected automatically, no mather where you are, and you can enter the shares whenever you want. This is done using automount and cifs. The latest is making sure that the properties on files are represented properly and ATTR/ACL's, links and inotify are supported. which is not the case with other sollutions I know like the kio slaves and Fusesmb. Futher this sollution is also usable in a netware environment (using other utilities and of cource another mountprogram). Now I would like to ask for advice. What can I do? Any suggestion appreciated. Stef Bon -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-508-g178afff
The branch, v3-2-test has been updated
via 178afff8791992aee78869f17458dca0956bc116 (commit)
via b55b19190d9c1199be13727a75a5936d6f5f15a8 (commit)
from cd43b93d405bf892d1d8941b2d1e64d7d53adf69 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 178afff8791992aee78869f17458dca0956bc116
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Thu Dec 6 09:55:32 2007 +0100
printing: remove emtpy print_test.c
metze
commit b55b19190d9c1199be13727a75a5936d6f5f15a8
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Thu Dec 6 09:53:42 2007 +0100
libads: fix typo
metze
---
Summary of changes:
source/libads/sasl.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
delete mode 100644 source/printing/print_test.c
Changeset truncated at 500 lines:
diff --git a/source/libads/sasl.c b/source/libads/sasl.c
index 3b3838e..798d0b4 100644
--- a/source/libads/sasl.c
+++ b/source/libads/sasl.c
@@ -329,7 +329,7 @@ static ADS_STATUS ads_sasl_gssapi_unwrap(ADS_STRUCT *ads)
return ADS_ERROR_NT(NT_STATUS_ACCESS_DENIED);
}
- if (wrapped.length wrapped.length) {
+ if (wrapped.length unwrapped.length) {
return ADS_ERROR_NT(NT_STATUS_INTERNAL_ERROR);
}
diff --git a/source/printing/print_test.c b/source/printing/print_test.c
deleted file mode 100644
index e69de29..000
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-509-ga9b686b
The branch, v3-2-test has been updated
via a9b686bfdcf993d5423875543f154607836ac143 (commit)
from 178afff8791992aee78869f17458dca0956bc116 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit a9b686bfdcf993d5423875543f154607836ac143
Author: Andreas Schneider [EMAIL PROTECTED]
Date: Thu Dec 6 12:29:52 2007 +0100
Remove trailing slashes from service name
---
Summary of changes:
source/client/client.c |7 +++
1 files changed, 7 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/client/client.c b/source/client/client.c
index a65906c..ed33d42 100644
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -3937,6 +3937,7 @@ static int do_message_op(void)
int main(int argc,char *argv[])
{
pstring base_directory;
+ int len = 0;
int opt;
pstring query_host;
bool message = False;
@@ -4149,6 +4150,12 @@ static int do_message_op(void)
poptPrintUsage(pc, stderr, 0);
exit(1);
}
+ /* Remove trailing slashes */
+ len = strlen(service);
+ while(len 0 service[len - 1] == '\\') {
+ --len;
+ service[len] = '\0';
+ }
}
if ( strlen(new_workgroup) != 0 )
--
Samba Shared Repository
svn commit: samba-docs r1213 - in trunk/manpages-3: .
Author: kseeger Date: 2007-12-06 11:43:08 + (Thu, 06 Dec 2007) New Revision: 1213 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=1213 Log: -Add section about net getdomain and setdomainsid -Discern between local SIDs and domain SIDs -Unify spelling of SID Karolin Modified: trunk/manpages-3/net.8.xml Changeset: Modified: trunk/manpages-3/net.8.xml === --- trunk/manpages-3/net.8.xml 2007-11-27 15:50:28 UTC (rev 1212) +++ trunk/manpages-3/net.8.xml 2007-12-06 11:43:08 UTC (rev 1213) @@ -604,19 +604,34 @@ refsect2 titleGETLOCALSID [DOMAIN]/title -paraPrint the SID of the specified domain, or if the parameter is -omitted, the SID of the domain the local server is in./para +paraPrints the SID of the specified domain, or if the parameter is +omitted, the SID of the local server./para /refsect2 refsect2 titleSETLOCALSID S-1-5-21-x-y-z/title -paraSets domain sid for the local server to the specified SID./para +paraSets SID for the local server to the specified SID./para /refsect2 refsect2 +titleGETDOMAINSID/title + +paraPrints the local machine SID and the SID of the current +domain./para + +/refsect2 + +refsect2 +titleSETDOMAINSID/title + +paraSets the SID of the current domain./para + +/refsect2 + +refsect2 titleGROUPMAP/title paraManage the mappings between Windows group SIDs and UNIX groups.
svn commit: samba r26306 - in branches/SAMBA_4_0/source/torture/basic: .
Author: metze
Date: 2007-12-06 13:17:34 + (Thu, 06 Dec 2007)
New Revision: 26306
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26306
Log:
BASE-DELAYWRITE: print access time stamps and test fileinfo and pathinfo match
metze
Modified:
branches/SAMBA_4_0/source/torture/basic/delaywrite.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/basic/delaywrite.c
===
--- branches/SAMBA_4_0/source/torture/basic/delaywrite.c2007-12-05
04:26:28 UTC (rev 26305)
+++ branches/SAMBA_4_0/source/torture/basic/delaywrite.c2007-12-06
13:17:34 UTC (rev 26306)
@@ -629,6 +629,37 @@
#define COMPARE_WRITE_TIME_LESS(given,correct) \
COMPARE_WRITE_TIME_CMP(given,correct,=)
+#define COMPARE_ACCESS_TIME_CMP(given, correct, cmp) do { \
+ NTTIME g = (given).basic_info.out.access_time; \
+ NTTIME c = (correct).basic_info.out.access_time; \
+ if (g cmp c) { \
+ torture_result(tctx, TORTURE_FAIL, __location__: wrong
access_time (%s)%s %s (%s)%s, \
+ #given, nt_time_string(tctx, g), \
+ #cmp, #correct, nt_time_string(tctx, c)); \
+ ret = false; \
+ goto done; \
+ } \
+} while (0)
+#define COMPARE_ACCESS_TIME_EQUAL(given,correct) \
+ COMPARE_ACCESS_TIME_CMP(given,correct,!=)
+#define COMPARE_ACCESS_TIME_GREATER(given,correct) \
+ COMPARE_ACCESS_TIME_CMP(given,correct,=)
+#define COMPARE_ACCESS_TIME_LESS(given,correct) \
+ COMPARE_ACCESS_TIME_CMP(given,correct,=)
+
+#define COMPARE_BOTH_TIMES_EQUAL(given,correct) do { \
+ COMPARE_ACCESS_TIME_EQUAL(given,correct); \
+ COMPARE_WRITE_TIME_EQUAL(given,correct); \
+} while (0)
+#define COMPARE_BOTH_TIMES_GEATER(given,correct) do { \
+ COMPARE_ACCESS_TIME_GREATER(given,correct); \
+ COMPARE_WRITE_TIME_GREATER(given,correct); \
+} while (0)
+#define COMPARE_BOTH_TIMES_LESS(given,correct) do { \
+ COMPARE_ACCESS_TIME_LESS(given,correct); \
+ COMPARE_WRITE_TIME_LESS(given,correct); \
+} while (0)
+
#define GET_INFO_FILE(finfo) do { \
NTSTATUS _status; \
_status = smb_raw_fileinfo(cli-tree, tctx, finfo); \
@@ -638,7 +669,8 @@
nt_errstr(_status)); \
goto done; \
} \
- torture_comment(tctx, fileinfo: Write time (%s)\n, \
+ torture_comment(tctx, fileinfo: Access(%s) Write(%s)\n, \
+ nt_time_string(tctx, finfo.basic_info.out.access_time),
\
nt_time_string(tctx, finfo.basic_info.out.write_time));
\
} while (0)
#define GET_INFO_PATH(pinfo) do { \
@@ -650,13 +682,14 @@
ret = false; \
goto done; \
} \
- torture_comment(tctx, pathinfo: Write time (%s)\n, \
+ torture_comment(tctx, pathinfo: Access(%s) Write(%s)\n, \
+ nt_time_string(tctx, pinfo.basic_info.out.access_time),
\
nt_time_string(tctx, pinfo.basic_info.out.write_time));
\
} while (0)
#define GET_INFO_BOTH(finfo,pinfo) do { \
GET_INFO_FILE(finfo); \
GET_INFO_PATH(pinfo); \
- COMPARE_WRITE_TIME_EQUAL(finfo,pinfo); \
+ COMPARE_BOTH_TIMES_EQUAL(finfo,pinfo); \
} while (0)
#define SET_INFO_FILE_EX(finfo, wrtime, tree, tfnum) do { \
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-510-g1000c98
The branch, v3-2-test has been updated via 1000c98eae0886dbdf60beb1fe64d66ec009746b (commit) from a9b686bfdcf993d5423875543f154607836ac143 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 1000c98eae0886dbdf60beb1fe64d66ec009746b Author: Michael Adam [EMAIL PROTECTED] Date: Thu Dec 6 13:51:25 2007 +0100 Remove an incredible amount of whitespace. Sorry - could not resist. Michael --- Summary of changes: source/libads/ldap.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/libads/ldap.c b/source/libads/ldap.c index a4ba376..da4227b 100644 --- a/source/libads/ldap.c +++ b/source/libads/ldap.c @@ -42,7 +42,7 @@ #define LDAP_SERVER_TREE_DELETE_OID1.2.840.113556.1.4.805 static SIG_ATOMIC_T gotalarm; - + /*** Signal function to tell us we timed out. / -- Samba Shared Repository
svn commit: samba r26307 - in branches/SAMBA_4_0/source/torture/basic: .
Author: metze
Date: 2007-12-06 15:06:36 + (Thu, 06 Dec 2007)
New Revision: 26307
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26307
Log:
BASE-DELAYWRITE: only set the write time
metze
Modified:
branches/SAMBA_4_0/source/torture/basic/delaywrite.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/basic/delaywrite.c
===
--- branches/SAMBA_4_0/source/torture/basic/delaywrite.c2007-12-06
13:17:34 UTC (rev 26306)
+++ branches/SAMBA_4_0/source/torture/basic/delaywrite.c2007-12-06
15:06:36 UTC (rev 26307)
@@ -697,10 +697,10 @@
union smb_setfileinfo sfinfo; \
sfinfo.basic_info.level = RAW_SFILEINFO_BASIC_INFO; \
sfinfo.basic_info.in.file.fnum = tfnum; \
- sfinfo.basic_info.in.create_time = (finfo).basic_info.out.create_time; \
- sfinfo.basic_info.in.access_time = (finfo).basic_info.out.access_time; \
+ sfinfo.basic_info.in.create_time = 0; \
+ sfinfo.basic_info.in.access_time = 0; \
unix_to_nt_time(sfinfo.basic_info.in.write_time, (wrtime)); \
- sfinfo.basic_info.in.change_time = finfo1.basic_info.out.change_time; \
+ sfinfo.basic_info.in.change_time = 0; \
sfinfo.basic_info.in.attrib = finfo1.basic_info.out.attrib; \
_status = smb_raw_setfileinfo(tree, sfinfo); \
if (!NT_STATUS_IS_OK(_status)) { \
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-511-gcb3a2df
The branch, v3-2-test has been updated
via cb3a2dfeb047d45bb9eec8cb97d3ba288f21887e (commit)
from 1000c98eae0886dbdf60beb1fe64d66ec009746b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit cb3a2dfeb047d45bb9eec8cb97d3ba288f21887e
Author: Karolin Seeger [EMAIL PROTECTED]
Date: Thu Dec 6 13:54:45 2007 +0100
Make output of net getdomainsid more meaningful. Unify spelling of SID.
Display usage if superfluous arguments are given.
Karolin
---
Summary of changes:
source/utils/net.c | 11 ---
1 files changed, 8 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/utils/net.c b/source/utils/net.c
index dc4c9da..e8fb2c4 100644
--- a/source/utils/net.c
+++ b/source/utils/net.c
@@ -715,10 +715,15 @@ static int net_getdomainsid(int argc, const char **argv)
DOM_SID domain_sid;
fstring sid_str;
+ if (argc 0) {
+ d_printf(usage: net getdomainsid\n);
+ return 1;
+ }
+
if(!initialize_password_db(False, NULL)) {
- DEBUG(0, (WARNING: Could not open passdb - domain sid may
+ DEBUG(0, (WARNING: Could not open passdb - domain SID may
not reflect passdb\n
- backend knowledge (such as the sid stored in
+ backend knowledge (such as the SID stored in
LDAP)\n));
}
@@ -739,7 +744,7 @@ static int net_getdomainsid(int argc, const char **argv)
return 1;
}
sid_to_string(sid_str, domain_sid);
- d_printf(SID for domain %s is: %s\n, global_myname(), sid_str);
+ d_printf(SID for local machine %s is: %s\n, global_myname(), sid_str);
if (!secrets_fetch_domain_sid(opt_workgroup, domain_sid)) {
d_fprintf(stderr, Could not fetch domain SID\n);
--
Samba Shared Repository
svn commit: samba r26308 - in branches/SAMBA_4_0: . source/lib/cmdline
Author: jelmer
Date: 2007-12-06 16:01:15 + (Thu, 06 Dec 2007)
New Revision: 26308
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26308
Log:
Split up big popt common callback function.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/lib/cmdline/popt_common.c
branches/SAMBA_4_0/source/lib/cmdline/popt_credentials.c
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/lib/cmdline/popt_common.c
===
--- branches/SAMBA_4_0/source/lib/cmdline/popt_common.c 2007-12-06 15:06:36 UTC
(rev 26307)
+++ branches/SAMBA_4_0/source/lib/cmdline/popt_common.c 2007-12-06 16:01:15 UTC
(rev 26308)
@@ -41,11 +41,23 @@
struct cli_credentials *cmdline_credentials = NULL;
-static void popt_common_callback(poptContext con,
+static void popt_version_callback(poptContext con,
enum poptCallbackReason reason,
const struct poptOption *opt,
const char *arg, const void *data)
{
+ switch(opt-val) {
+ case 'V':
+ printf(Version %s\n, SAMBA_VERSION_STRING );
+ exit(0);
+ }
+}
+
+static void popt_samba_callback(poptContext con,
+ enum poptCallbackReason reason,
+ const struct poptOption *opt,
+ const char *arg, const void *data)
+{
const char *pname;
struct loadparm_context *lp_ctx = global_loadparm; /* FIXME: allow
overriding */
@@ -70,6 +82,7 @@
pname++;
if (reason == POPT_CALLBACK_REASON_PRE) {
+
/* Hook for 'almost the first thing to do in a samba program'
here */
/* setup for panics */
fault_setup(poptGetInvocationName(con));
@@ -81,6 +94,22 @@
}
switch(opt-val) {
+
+ case OPT_LEAK_REPORT:
+ talloc_enable_leak_report();
+ break;
+
+ case OPT_LEAK_REPORT_FULL:
+ talloc_enable_leak_report_full();
+ break;
+
+ case OPT_OPTION:
+ if (!lp_set_option(lp_ctx, arg)) {
+ fprintf(stderr, Error setting option '%s'\n, arg);
+ exit(1);
+ }
+ break;
+
case 'd':
lp_set_cmdline(lp_ctx, log level, arg);
break;
@@ -89,16 +118,6 @@
setup_logging(pname, DEBUG_STDERR);
break;
- case 'V':
- printf(Version %s\n, SAMBA_VERSION_STRING );
- exit(0);
-
- case 'O':
- if (arg) {
- lp_set_cmdline(lp_ctx, socket options, arg);
- }
- break;
-
case 's':
if (arg) {
lp_load(arg, NULL);
@@ -112,7 +131,27 @@
talloc_free(new_logfile);
}
break;
-
+
+
+ }
+
+}
+
+
+static void popt_common_callback(poptContext con,
+ enum poptCallbackReason reason,
+ const struct poptOption *opt,
+ const char *arg, const void *data)
+{
+ struct loadparm_context *lp_ctx = global_loadparm; /* FIXME: allow
overriding */
+
+ switch(opt-val) {
+ case 'O':
+ if (arg) {
+ lp_set_cmdline(lp_ctx, socket options, arg);
+ }
+ break;
+
case 'W':
lp_set_cmdline(lp_ctx, workgroup, arg);
break;
@@ -137,21 +176,10 @@
lp_set_cmdline(lp_ctx, name resolve order, arg);
break;
- case OPT_OPTION:
- if (!lp_set_option(lp_ctx, arg)) {
- fprintf(stderr, Error setting option '%s'\n, arg);
- exit(1);
- }
+ case 'S':
+ lp_set_cmdline(lp_ctx, client signing, arg);
break;
- case OPT_LEAK_REPORT:
- talloc_enable_leak_report();
- break;
-
- case OPT_LEAK_REPORT_FULL:
- talloc_enable_leak_report_full();
- break;
-
}
}
@@ -160,6 +188,7 @@
{ name-resolve, 'R', POPT_ARG_STRING, NULL, 'R', Use these name
resolution services only, NAME-RESOLVE-ORDER },
{ socket-options, 'O', POPT_ARG_STRING, NULL, 'O', socket options to
use, SOCKETOPTIONS },
{ netbiosname, 'n', POPT_ARG_STRING, NULL, 'n', Primary netbios
name, NETBIOSNAME },
+ { signing, 'S', POPT_ARG_STRING, NULL, 'S', Set the client signing
state, on|off|required },
{ workgroup, 'W', POPT_ARG_STRING, NULL, 'W', Set the workgroup
name,
svn commit: samba r26309 - in branches/SAMBA_4_0: . source/libcli/nbt source/libcli/resolve source/nbt_server/wins source/torture/nbt source/utils
Author: jelmer
Date: 2007-12-06 16:26:56 + (Thu, 06 Dec 2007)
New Revision: 26309
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26309
Log:
Move specification of port higher up the all stack.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/libcli/nbt/libnbt.h
branches/SAMBA_4_0/source/libcli/nbt/namequery.c
branches/SAMBA_4_0/source/libcli/resolve/nbtlist.c
branches/SAMBA_4_0/source/nbt_server/wins/winswack.c
branches/SAMBA_4_0/source/torture/nbt/query.c
branches/SAMBA_4_0/source/torture/nbt/wins.c
branches/SAMBA_4_0/source/torture/nbt/winsbench.c
branches/SAMBA_4_0/source/utils/nmblookup.c
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/libcli/nbt/libnbt.h
===
--- branches/SAMBA_4_0/source/libcli/nbt/libnbt.h 2007-12-06 16:01:15 UTC
(rev 26308)
+++ branches/SAMBA_4_0/source/libcli/nbt/libnbt.h 2007-12-06 16:26:56 UTC
(rev 26309)
@@ -128,6 +128,7 @@
struct {
struct nbt_name name;
const char *dest_addr;
+ uint16_t dest_port;
bool broadcast;
bool wins_lookup;
int timeout; /* in seconds */
Modified: branches/SAMBA_4_0/source/libcli/nbt/namequery.c
===
--- branches/SAMBA_4_0/source/libcli/nbt/namequery.c2007-12-06 16:01:15 UTC
(rev 26308)
+++ branches/SAMBA_4_0/source/libcli/nbt/namequery.c2007-12-06 16:26:56 UTC
(rev 26309)
@@ -54,7 +54,7 @@
packet-questions[0].question_class = NBT_QCLASS_IP;
dest = socket_address_from_strings(packet, nbtsock-sock-backend_name,
- io-in.dest_addr,
lp_nbt_port(global_loadparm));
+ io-in.dest_addr, io-in.dest_port);
if (dest == NULL) goto failed;
req = nbt_name_request_send(nbtsock, dest, packet,
io-in.timeout, io-in.retries, false);
Modified: branches/SAMBA_4_0/source/libcli/resolve/nbtlist.c
===
--- branches/SAMBA_4_0/source/libcli/resolve/nbtlist.c 2007-12-06 16:01:15 UTC
(rev 26308)
+++ branches/SAMBA_4_0/source/libcli/resolve/nbtlist.c 2007-12-06 16:26:56 UTC
(rev 26309)
@@ -151,6 +151,7 @@
for (i=0;istate-num_queries;i++) {
state-io_queries[i].in.name= state-name;
state-io_queries[i].in.dest_addr =
talloc_strdup(state-io_queries, address_list[i]);
+ state-io_queries[i].in.dest_port =
lp_nbt_port(global_loadparm);
if (composite_nomem(state-io_queries[i].in.dest_addr, c))
return c;
state-io_queries[i].in.broadcast = broadcast;
Modified: branches/SAMBA_4_0/source/nbt_server/wins/winswack.c
===
--- branches/SAMBA_4_0/source/nbt_server/wins/winswack.c2007-12-06
16:01:15 UTC (rev 26308)
+++ branches/SAMBA_4_0/source/nbt_server/wins/winswack.c2007-12-06
16:26:56 UTC (rev 26309)
@@ -26,6 +26,7 @@
#include nbt_server/wins/winsserver.h
#include system/time.h
#include libcli/composite/composite.h
+#include param/param.h
struct wins_challenge_state {
struct wins_challenge_io *io;
@@ -46,6 +47,7 @@
if (state-current_address state-io-in.num_addresses) {
struct nbtd_interface *iface;
+ state-query.in.dest_port =
lp_nbt_port(global_loadparm);
state-query.in.dest_addr =
state-io-in.addresses[state-current_address];
iface =
nbtd_find_request_iface(state-io-in.nbtd_server, state-query.in.dest_addr,
true);
@@ -103,6 +105,7 @@
/* setup a name query to the first address */
state-query.in.name= *state-io-in.name;
+ state-query.in.dest_port = lp_nbt_port(global_loadparm);
state-query.in.dest_addr =
state-io-in.addresses[state-current_address];
state-query.in.broadcast = false;
state-query.in.wins_lookup = true;
Modified: branches/SAMBA_4_0/source/torture/nbt/query.c
===
--- branches/SAMBA_4_0/source/torture/nbt/query.c 2007-12-06 16:01:15 UTC
(rev 26308)
+++ branches/SAMBA_4_0/source/torture/nbt/query.c 2007-12-06 16:26:56 UTC
(rev 26309)
@@ -24,6 +24,7 @@
#include libcli/resolve/resolve.h
#include torture/torture.h
#include torture/nbt/proto.h
+#include param/param.h
struct result_struct {
int num_pass;
@@ -61,6 +62,7 @@
io.in.name = name;
io.in.dest_addr =
svn commit: samba r26310 - in branches/SAMBA_4_0: . source/heimdal/lib/asn1 source/libcli/dgram source/nbt_server/dgram source/rpc_server source/rpc_server/common source/rpc_server/netlogon source/tor
Author: jelmer
Date: 2007-12-06 16:36:54 + (Thu, 06 Dec 2007)
New Revision: 26310
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26310
Log:
Remove more uses of global_loadparm.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/heimdal/lib/asn1/lex.c
branches/SAMBA_4_0/source/libcli/dgram/libdgram.h
branches/SAMBA_4_0/source/libcli/dgram/netlogon.c
branches/SAMBA_4_0/source/libcli/dgram/ntlogon.c
branches/SAMBA_4_0/source/nbt_server/dgram/netlogon.c
branches/SAMBA_4_0/source/nbt_server/dgram/ntlogon.c
branches/SAMBA_4_0/source/rpc_server/common/server_info.c
branches/SAMBA_4_0/source/rpc_server/dcerpc_server.c
branches/SAMBA_4_0/source/rpc_server/netlogon/dcerpc_netlogon.c
branches/SAMBA_4_0/source/torture/nbt/query.c
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/heimdal/lib/asn1/lex.c
===
--- branches/SAMBA_4_0/source/heimdal/lib/asn1/lex.c2007-12-06 16:26:56 UTC
(rev 26309)
+++ branches/SAMBA_4_0/source/heimdal/lib/asn1/lex.c2007-12-06 16:36:54 UTC
(rev 26310)
@@ -343,6 +343,9 @@
typedef int yy_state_type;
extern int yylineno;
+
+int yylineno = 1;
+
extern char *yytext;
#define yytext_ptr yytext
@@ -849,7 +852,7 @@
static void unterminated(const char *, unsigned);
/* This is for broken old lexes (solaris 10 and hpux) */
-#line 852 heimdal/lib/asn1/lex.c
+#line 855 heimdal/lib/asn1/lex.c
#define INITIAL 0
@@ -1004,7 +1007,7 @@
#line 68 lex.l
-#line 1007 heimdal/lib/asn1/lex.c
+#line 1010 heimdal/lib/asn1/lex.c
if ( !(yy_init) )
{
@@ -1673,7 +1676,7 @@
#line 274 lex.l
ECHO;
YY_BREAK
-#line 1676 heimdal/lib/asn1/lex.c
+#line 1679 heimdal/lib/asn1/lex.c
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -1904,7 +1907,7 @@
/* Read in more data. */
YY_INPUT(
(YY_CURRENT_BUFFER_LVALUE-yy_ch_buf[number_to_move]),
- (yy_n_chars), num_to_read );
+ (yy_n_chars), (size_t) num_to_read );
YY_CURRENT_BUFFER_LVALUE-yy_n_chars = (yy_n_chars);
}
@@ -2405,7 +2408,7 @@
/** Setup the input buffer state to scan a string. The next call to yylex()
will
* scan from a @e copy of @a str.
- * @param str a NUL-terminated string to scan
+ * @param yystr a NUL-terminated string to scan
*
* @return the newly allocated buffer state object.
* @note If you want to scan bytes that may contain NUL values, then use
@@ -2483,6 +2486,15 @@
/* Accessor methods (get/set functions) to struct members. */
+/** Get the current line number.
+ *
+ */
+int yyget_lineno (void)
+{
+
+return yylineno;
+}
+
/** Get the input stream.
*
*/
@@ -2516,6 +2528,16 @@
return yytext;
}
+/** Set the current line number.
+ * @param line_number
+ *
+ */
+void yyset_lineno (int line_number )
+{
+
+yylineno = line_number;
+}
+
/** Set the input stream. This does not discard the current
* input buffer.
* @param in_str A readable stream.
Modified: branches/SAMBA_4_0/source/libcli/dgram/libdgram.h
===
--- branches/SAMBA_4_0/source/libcli/dgram/libdgram.h 2007-12-06 16:26:56 UTC
(rev 26309)
+++ branches/SAMBA_4_0/source/libcli/dgram/libdgram.h 2007-12-06 16:36:54 UTC
(rev 26310)
@@ -123,6 +123,7 @@
struct nbt_netlogon_packet *request);
NTSTATUS dgram_mailslot_netlogon_reply(struct nbt_dgram_socket *dgmsock,
struct nbt_dgram_packet *request,
+ const char *my_netbios_name,
const char *mailslot_name,
struct nbt_netlogon_packet *reply);
NTSTATUS dgram_mailslot_netlogon_parse(struct dgram_mailslot_handler *dgmslot,
@@ -138,6 +139,7 @@
struct nbt_ntlogon_packet *request);
NTSTATUS dgram_mailslot_ntlogon_reply(struct nbt_dgram_socket *dgmsock,
struct nbt_dgram_packet *request,
+ const char *my_netbios_name,
const char *mailslot_name,
struct nbt_ntlogon_packet *reply);
NTSTATUS dgram_mailslot_ntlogon_parse(struct dgram_mailslot_handler *dgmslot,
Modified: branches/SAMBA_4_0/source/libcli/dgram/netlogon.c
===
--- branches/SAMBA_4_0/source/libcli/dgram/netlogon.c 2007-12-06 16:26:56 UTC
(rev 26309)
+++ branches/SAMBA_4_0/source/libcli/dgram/netlogon.c 2007-12-06 16:36:54 UTC
(rev
svn commit: samba r26311 - in branches/SAMBA_4_0: . source/libcli/dgram source/torture/nbt
Author: jelmer
Date: 2007-12-06 16:41:53 + (Thu, 06 Dec 2007)
New Revision: 26311
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26311
Log:
Move port number specification higher up the call stack.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/libcli/dgram/mailslot.c
branches/SAMBA_4_0/source/torture/nbt/dgram.c
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/libcli/dgram/mailslot.c
===
--- branches/SAMBA_4_0/source/libcli/dgram/mailslot.c 2007-12-06 16:36:54 UTC
(rev 26310)
+++ branches/SAMBA_4_0/source/libcli/dgram/mailslot.c 2007-12-06 16:41:53 UTC
(rev 26311)
@@ -150,28 +150,21 @@
enum dgram_msg_type msg_type,
const char *mailslot_name,
struct nbt_name *dest_name,
-struct socket_address *_dest,
+struct socket_address *dest,
struct nbt_name *src_name,
DATA_BLOB *request)
{
TALLOC_CTX *tmp_ctx = talloc_new(dgmsock);
struct nbt_dgram_packet packet;
- struct socket_address *dest;
struct dgram_message *msg;
struct dgram_smb_packet *smb;
struct smb_trans_body *trans;
struct socket_address *src;
NTSTATUS status;
- if (_dest-port == 0) {
- dest = socket_address_from_strings(tmp_ctx, _dest-family,
- _dest-addr,
lp_dgram_port(global_loadparm));
- } else {
- dest = _dest;
+ if (dest-port == 0) {
+ return NT_STATUS_INVALID_PARAMETER;
}
- if (!dest) {
- return NT_STATUS_NO_MEMORY;
- }
ZERO_STRUCT(packet);
packet.msg_type = msg_type;
Modified: branches/SAMBA_4_0/source/torture/nbt/dgram.c
===
--- branches/SAMBA_4_0/source/torture/nbt/dgram.c 2007-12-06 16:36:54 UTC
(rev 26310)
+++ branches/SAMBA_4_0/source/torture/nbt/dgram.c 2007-12-06 16:41:53 UTC
(rev 26311)
@@ -124,7 +124,7 @@
make_nbt_name_client(myname, TEST_NAME);
dest = socket_address_from_strings(dgmsock,
dgmsock-sock-backend_name,
- address, 0);
+ address,
lp_dgram_port(tctx-lp_ctx));
torture_assert(tctx, dest != NULL, Error getting address);
status = dgram_mailslot_netlogon_send(dgmsock, name, dest,
@@ -204,7 +204,7 @@
make_nbt_name_client(myname, TEST_NAME);
dest = socket_address_from_strings(dgmsock,
dgmsock-sock-backend_name,
- address, 0);
+ address,
lp_dgram_port(tctx-lp_ctx));
torture_assert(tctx, dest != NULL, Error getting address);
status = dgram_mailslot_netlogon_send(dgmsock, name, dest,
@@ -323,7 +323,7 @@
make_nbt_name_client(myname, TEST_NAME);
dest = socket_address_from_strings(dgmsock,
dgmsock-sock-backend_name,
- address, 0);
+ address,
lp_dgram_port(tctx-lp_ctx));
torture_assert(tctx, dest != NULL, Error getting address);
status = dgram_mailslot_ntlogon_send(dgmsock, DGRAM_DIRECT_UNIQUE,
name, dest, myname, logon);
svn commit: samba r26312 - in branches/SAMBA_4_0: . source/utils
Author: jelmer
Date: 2007-12-06 16:46:02 + (Thu, 06 Dec 2007)
New Revision: 26312
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26312
Log:
Move specification of port higher up the call stack.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/utils/nmblookup.c
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:ancestry:v3-trunk0
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/utils/nmblookup.c
===
--- branches/SAMBA_4_0/source/utils/nmblookup.c 2007-12-06 16:41:53 UTC (rev
26311)
+++ branches/SAMBA_4_0/source/utils/nmblookup.c 2007-12-06 16:46:02 UTC (rev
26312)
@@ -179,7 +179,7 @@
}
-static bool process_one(const char *name)
+static bool process_one(const char *name, int nbt_port)
{
TALLOC_CTX *tmp_ctx = talloc_new(NULL);
enum nbt_name_type node_type = NBT_NAME_CLIENT;
@@ -235,17 +235,17 @@
}
if (options.broadcast_address) {
- status = do_node_query(nbtsock, options.broadcast_address,
lp_nbt_port(global_loadparm),
+ status = do_node_query(nbtsock, options.broadcast_address,
nbt_port,
node_name, node_type, true);
} else if (options.unicast_address) {
status = do_node_query(nbtsock, options.unicast_address,
- lp_nbt_port(global_loadparm), node_name,
node_type, false);
+ nbt_port, node_name, node_type, false);
} else {
int i, num_interfaces = iface_count();
for (i=0;inum_interfaces;i++) {
const char *bcast = iface_n_bcast(i);
if (bcast == NULL) continue;
- status = do_node_query(nbtsock, bcast,
lp_nbt_port(global_loadparm),
+ status = do_node_query(nbtsock, bcast, nbt_port,
node_name, node_type, true);
if (NT_STATUS_IS_OK(status)) break;
}
@@ -353,7 +353,7 @@
while (poptPeekArg(pc)) {
const char *name = poptGetArg(pc);
- ret = process_one(name);
+ ret = process_one(name, lp_nbt_port(global_loadparm));
}
poptFreeContext(pc);
svn commit: samba r26313 - in branches/SAMBA_4_0: . source/kdc source/ldap_server source/lib/socket source/librpc/rpc source/nbt_server source/nbt_server/dgram source/nbt_server/wins source/ntptr/simp
Author: jelmer Date: 2007-12-06 16:54:34 + (Thu, 06 Dec 2007) New Revision: 26313 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26313 Log: Fix more uses of static loadparm. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/kdc/kdc.c branches/SAMBA_4_0/source/ldap_server/ldap_server.c branches/SAMBA_4_0/source/lib/socket/interface.c branches/SAMBA_4_0/source/librpc/rpc/dcerpc_connect.c branches/SAMBA_4_0/source/librpc/rpc/dcerpc_secondary.c branches/SAMBA_4_0/source/librpc/rpc/dcerpc_sock.c branches/SAMBA_4_0/source/nbt_server/dgram/netlogon.c branches/SAMBA_4_0/source/nbt_server/dgram/ntlogon.c branches/SAMBA_4_0/source/nbt_server/dgram/request.c branches/SAMBA_4_0/source/nbt_server/nbt_server.c branches/SAMBA_4_0/source/nbt_server/packet.c branches/SAMBA_4_0/source/nbt_server/query.c branches/SAMBA_4_0/source/nbt_server/register.c branches/SAMBA_4_0/source/nbt_server/wins/wins_hook.c branches/SAMBA_4_0/source/nbt_server/wins/winsclient.c branches/SAMBA_4_0/source/nbt_server/wins/winsdb.c branches/SAMBA_4_0/source/nbt_server/wins/winsdb.h branches/SAMBA_4_0/source/nbt_server/wins/winsserver.c branches/SAMBA_4_0/source/ntptr/simple_ldb/ntptr_simple_ldb.c branches/SAMBA_4_0/source/rpc_server/common/server_info.c branches/SAMBA_4_0/source/rpc_server/lsa/lsa_lookup.c branches/SAMBA_4_0/source/rpc_server/netlogon/dcerpc_netlogon.c branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c branches/SAMBA_4_0/source/rpc_server/service_rpc.c branches/SAMBA_4_0/source/rpc_server/srvsvc/dcesrv_srvsvc.c branches/SAMBA_4_0/source/rpc_server/wkssvc/dcesrv_wkssvc.c branches/SAMBA_4_0/source/smb_server/smb_server.c branches/SAMBA_4_0/source/smbd/service_stream.c branches/SAMBA_4_0/source/web_server/web_server.c branches/SAMBA_4_0/source/winbind/wb_server.c branches/SAMBA_4_0/source/wrepl_server/wrepl_in_connection.c branches/SAMBA_4_0/source/wrepl_server/wrepl_server.c Changeset: Sorry, the patch is too large (1226 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26313
svn commit: samba r26314 - in branches/SAMBA_4_0: . source/kdc
Author: jelmer
Date: 2007-12-06 17:04:11 + (Thu, 06 Dec 2007)
New Revision: 26314
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26314
Log:
Eliminate use of global_loadparm.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/kdc/hdb-ldb.c
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/kdc/hdb-ldb.c
===
--- branches/SAMBA_4_0/source/kdc/hdb-ldb.c 2007-12-06 16:54:34 UTC (rev
26313)
+++ branches/SAMBA_4_0/source/kdc/hdb-ldb.c 2007-12-06 17:04:11 UTC (rev
26314)
@@ -1117,7 +1117,7 @@
(*db)-hdb_master_key_set = 0;
(*db)-hdb_db = NULL;
- nt_status = auth_system_session_info(*db, global_loadparm,
session_info);
+ nt_status = auth_system_session_info(*db, lp_ctx, session_info);
if (!NT_STATUS_IS_OK(nt_status)) {
return nt_status;
}
svn commit: samba r26315 - in branches/SAMBA_4_0: . source/lib/charset source/lib/charset/tests source/param source/torture
Author: jelmer
Date: 2007-12-06 17:16:40 + (Thu, 06 Dec 2007)
New Revision: 26315
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26315
Log:
Avoid using lp_ functions in libcharset.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/lib/charset/charcnv.c
branches/SAMBA_4_0/source/lib/charset/iconv.c
branches/SAMBA_4_0/source/lib/charset/tests/iconv.c
branches/SAMBA_4_0/source/param/param.h
branches/SAMBA_4_0/source/param/util.c
branches/SAMBA_4_0/source/torture/smbiconv.c
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/lib/charset/charcnv.c
===
--- branches/SAMBA_4_0/source/lib/charset/charcnv.c 2007-12-06 17:04:11 UTC
(rev 26314)
+++ branches/SAMBA_4_0/source/lib/charset/charcnv.c 2007-12-06 17:16:40 UTC
(rev 26315)
@@ -42,12 +42,11 @@
const char *unix_charset;
const char *dos_charset;
const char *display_charset;
+ bool native_iconv;
smb_iconv_t conv_handles[NUM_CHARSETS][NUM_CHARSETS];
};
-static struct smb_iconv_convenience *global_smb_iconv_convenience = NULL;
-
/**
* Return the name of a charset to give to iconv().
**/
@@ -86,32 +85,28 @@
}
struct smb_iconv_convenience *smb_iconv_convenience_init(TALLOC_CTX *mem_ctx,
-struct
loadparm_context *lp_ctx)
+const char
*dos_charset,
+const char
*unix_charset,
+const char
*display_charset,
+bool native_iconv)
{
struct smb_iconv_convenience *ret = talloc_zero(mem_ctx,
- struct
smb_iconv_convenience);
+ struct smb_iconv_convenience);
+ if (ret == NULL) {
+ return NULL;
+ }
+
talloc_set_destructor(ret, close_iconv);
- ret-display_charset = talloc_strdup(ret, lp_display_charset(lp_ctx));
- ret-dos_charset = talloc_strdup(ret, lp_dos_charset(lp_ctx));
- ret-unix_charset = talloc_strdup(ret, lp_unix_charset(lp_ctx));
+ ret-dos_charset = talloc_strdup(ret, dos_charset);
+ ret-unix_charset = talloc_strdup(ret, unix_charset);
+ ret-display_charset = talloc_strdup(ret, display_charset);
+ ret-native_iconv = native_iconv;
return ret;
}
-
-_PUBLIC_ void reload_charcnv(void)
-{
- talloc_free(global_smb_iconv_convenience);
- global_smb_iconv_convenience =
smb_iconv_convenience_init(talloc_autofree_context(), global_loadparm);
-}
-
-static void free_global_smb_iconv_convenience(void)
-{
- talloc_free(global_smb_iconv_convenience);
-}
-
/*
on-demand initialisation of conversion handles
*/
@@ -120,8 +115,7 @@
{
const char *n1, *n2;
static int initialised;
- /* auto-free iconv memory on exit so valgrind reports are easier
- to look at */
+
if (initialised == 0) {
initialised = 1;
@@ -134,7 +128,6 @@
*/
setlocale(LC_ALL, C);
#endif
- atexit(free_global_smb_iconv_convenience);
}
if (ic-conv_handles[from][to]) {
@@ -144,7 +137,7 @@
n1 = charset_name(ic, from);
n2 = charset_name(ic, to);
- ic-conv_handles[from][to] = smb_iconv_open(n2,n1);
+ ic-conv_handles[from][to] = smb_iconv_open(n2, n1, ic-native_iconv);
if (ic-conv_handles[from][to] == (smb_iconv_t)-1) {
if ((from == CH_DOS || to == CH_DOS)
@@ -156,7 +149,8 @@
n1 = charset_name(ic, from);
n2 = charset_name(ic, to);
- ic-conv_handles[from][to] = smb_iconv_open(n2,n1);
+ ic-conv_handles[from][to] = smb_iconv_open(n2, n1,
+ ic-native_iconv);
}
}
Modified: branches/SAMBA_4_0/source/lib/charset/iconv.c
===
--- branches/SAMBA_4_0/source/lib/charset/iconv.c 2007-12-06 17:04:11 UTC
(rev 26314)
+++ branches/SAMBA_4_0/source/lib/charset/iconv.c 2007-12-06 17:16:40 UTC
(rev 26315)
@@ -157,7 +157,8 @@
/*
simple iconv_open() wrapper
*/
-smb_iconv_t smb_iconv_open(const char *tocode, const char *fromcode)
+smb_iconv_t smb_iconv_open(const char *tocode, const char *fromcode,
+ bool native_iconv)
{
smb_iconv_t ret;
const struct charset_functions *from=NULL, *to=NULL;
@@ -199,7
Re: [SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-509-ga9b686b
On Thu, Dec 06, 2007 at 05:38:23AM -0600, Volker Lendecke wrote: The branch, v3-2-test has been updated via a9b686bfdcf993d5423875543f154607836ac143 (commit) from 178afff8791992aee78869f17458dca0956bc116 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit a9b686bfdcf993d5423875543f154607836ac143 Author: Andreas Schneider [EMAIL PROTECTED] Date: Thu Dec 6 12:29:52 2007 +0100 Remove trailing slashes from service name Please don't make any more changes to client. It's being rewritten right now :-). Jeremy.
svn commit: samba r26316 - in branches/SAMBA_4_0: . source/auth source/auth/ntlmssp source/dsdb/schema source/kdc source/lib/charset source/lib/charset/tests source/lib/policy source/lib/registry sour
Author: jelmer Date: 2007-12-06 17:52:23 + (Thu, 06 Dec 2007) New Revision: 26316 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26316 Log: Use contexts for conversion functions. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/auth/ntlm_check.c branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_parse.c branches/SAMBA_4_0/source/dsdb/schema/schema_init.c branches/SAMBA_4_0/source/dsdb/schema/schema_syntax.c branches/SAMBA_4_0/source/kdc/kpasswdd.c branches/SAMBA_4_0/source/lib/charset/charcnv.c branches/SAMBA_4_0/source/lib/charset/charset.h branches/SAMBA_4_0/source/lib/charset/tests/iconv.c branches/SAMBA_4_0/source/lib/charset/util_unistr.c branches/SAMBA_4_0/source/lib/policy/lex.c branches/SAMBA_4_0/source/lib/registry/ldb.c branches/SAMBA_4_0/source/lib/registry/patchfile_preg.c branches/SAMBA_4_0/source/lib/registry/tests/generic.c branches/SAMBA_4_0/source/lib/registry/util.c branches/SAMBA_4_0/source/lib/tdr/tdr.c branches/SAMBA_4_0/source/lib/util/dprintf.c branches/SAMBA_4_0/source/lib/util/ms_fnmatch.c branches/SAMBA_4_0/source/libcli/auth/smbencrypt.c branches/SAMBA_4_0/source/libcli/raw/rawfileinfo.c branches/SAMBA_4_0/source/libcli/raw/rawrequest.c branches/SAMBA_4_0/source/libcli/smb2/request.c branches/SAMBA_4_0/source/libnet/libnet_samdump.c branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c branches/SAMBA_4_0/source/ntvfs/posix/pvfs_rename.c branches/SAMBA_4_0/source/ntvfs/posix/pvfs_resolve.c branches/SAMBA_4_0/source/ntvfs/posix/pvfs_shortname.c branches/SAMBA_4_0/source/ntvfs/posix/pvfs_util.c branches/SAMBA_4_0/source/ntvfs/print/vfs_print.c branches/SAMBA_4_0/source/param/param.h branches/SAMBA_4_0/source/scripting/ejs/smbcalls_data.c branches/SAMBA_4_0/source/smb_server/blob.c branches/SAMBA_4_0/source/smb_server/smb/nttrans.c branches/SAMBA_4_0/source/smb_server/smb/request.c branches/SAMBA_4_0/source/smb_server/smb2/fileio.c branches/SAMBA_4_0/source/torture/basic/charset.c branches/SAMBA_4_0/source/torture/basic/scanner.c branches/SAMBA_4_0/source/torture/basic/utable.c branches/SAMBA_4_0/source/torture/rap/rap.c branches/SAMBA_4_0/source/torture/rpc/samba3rpc.c branches/SAMBA_4_0/source/torture/rpc/samlogon.c branches/SAMBA_4_0/source/torture/rpc/wkssvc.c Changeset: Sorry, the patch is too large (1619 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26316
[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-27a-15-gf62fe6e
The branch, v3-0-test has been updated
via f62fe6ed60f1b9806d58c19df809ce85d596933f (commit)
from 040db1ce851909704d093538ba063863fa11f73e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test
- Log -
commit f62fe6ed60f1b9806d58c19df809ce85d596933f
Author: Andreas Schneider [EMAIL PROTECTED]
Date: Thu Dec 6 12:29:52 2007 +0100
Remove trailing slashes from service name
---
Summary of changes:
source/client/client.c |7 +++
1 files changed, 7 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/client/client.c b/source/client/client.c
index 0cc1433..0fadd54 100644
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -3857,6 +3857,7 @@ static int do_message_op(void)
int main(int argc,char *argv[])
{
pstring base_directory;
+ int len = 0;
int opt;
pstring query_host;
BOOL message = False;
@@ -4068,6 +4069,12 @@ static int do_message_op(void)
poptPrintUsage(pc, stderr, 0);
exit(1);
}
+ /* Remove trailing slashes */
+ len = strlen(service);
+ while(len 0 service[len - 1] == '\\') {
+ --len;
+ service[len] = '\0';
+ }
}
if ( strlen(new_workgroup) != 0 )
--
Samba Shared Repository
Re: [SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-27a-15-gf62fe6e
On Thu, Dec 06, 2007 at 12:34:20PM -0600, Jim McDonough wrote: The branch, v3-0-test has been updated via f62fe6ed60f1b9806d58c19df809ce85d596933f (commit) from 040db1ce851909704d093538ba063863fa11f73e (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test - Log - commit f62fe6ed60f1b9806d58c19df809ce85d596933f Author: Andreas Schneider [EMAIL PROTECTED] Date: Thu Dec 6 12:29:52 2007 +0100 Remove trailing slashes from service name Never mind, my bad. Different branch. Jeremy.
Re: [SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-27a-15-gf62fe6e
On Thu, Dec 06, 2007 at 12:34:20PM -0600, Jim McDonough wrote: The branch, v3-0-test has been updated via f62fe6ed60f1b9806d58c19df809ce85d596933f (commit) from 040db1ce851909704d093538ba063863fa11f73e (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test - Log - commit f62fe6ed60f1b9806d58c19df809ce85d596933f Author: Andreas Schneider [EMAIL PROTECTED] Date: Thu Dec 6 12:29:52 2007 +0100 Remove trailing slashes from service name Please stop changing client.c whilst I'm re-writing it Thanks ! Jeremy.
svn commit: samba r26317 - in branches/SAMBA_4_0: . source/scripting/libjs
Author: jelmer Date: 2007-12-06 21:10:24 + (Thu, 06 Dec 2007) New Revision: 26317 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26317 Log: Fix typos. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/scripting/libjs/provision.js Changeset: Property changes on: branches/SAMBA_4_0 ___ Name: bzr:revision-info ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js === --- branches/SAMBA_4_0/source/scripting/libjs/provision.js 2007-12-06 17:52:23 UTC (rev 26316) +++ branches/SAMBA_4_0/source/scripting/libjs/provision.js 2007-12-06 21:10:24 UTC (rev 26317) @@ -534,7 +534,7 @@ info.message = message; info.session_info = session_info; - message(Setting up teplates into + paths.templates + \n); + message(Setting up templates into + paths.templates + \n); setup_ldb(provision_templates.ldif, info, paths.templates); /* Also wipes the database */ @@ -667,7 +667,7 @@ var reg = reg_open(); reg.apply_patchfile(lp.get(setup directory) + /provision.reg) - message(Setting up teplates into + paths.templates + \n); + message(Setting up templates into + paths.templates + \n); setup_ldb(provision_templates.ldif, info, paths.templates); message(Setting up sam.ldb partitions\n);
svn commit: samba r26318 - in branches/SAMBA_4_0: . source/param
Author: jelmer
Date: 2007-12-06 21:16:40 + (Thu, 06 Dec 2007)
New Revision: 26318
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26318
Log:
Don't rely on SAMDB functions in secrets database.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/param/secrets.c
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/param/secrets.c
===
--- branches/SAMBA_4_0/source/param/secrets.c 2007-12-06 21:10:24 UTC (rev
26317)
+++ branches/SAMBA_4_0/source/param/secrets.c 2007-12-06 21:16:40 UTC (rev
26318)
@@ -30,7 +30,7 @@
#include lib/tdb/include/tdb.h
#include lib/util/util_tdb.h
#include lib/util/util_ldb.h
-#include dsdb/samdb/samdb.h
+#include librpc/gen_ndr/ndr_security.h
static struct tdb_wrap *tdb;
@@ -148,6 +148,8 @@
int ldb_ret;
const char *attrs[] = { objectSid, NULL };
struct dom_sid *result = NULL;
+ const struct ldb_val *v;
+ enum ndr_err_code ndr_err;
ldb = secrets_db_connect(mem_ctx, lp_ctx);
if (ldb == NULL) {
@@ -180,13 +182,25 @@
return NULL;
}
- result = samdb_result_dom_sid(mem_ctx, msgs[0], objectSid);
- if (result == NULL) {
+ v = ldb_msg_find_ldb_val(msgs[0], objectSid);
+ if (v == NULL) {
DEBUG(0, (Domain object for %s does not contain a SID!\n,
domain));
+ return NULL;
+ }
+ result = talloc(mem_ctx, struct dom_sid);
+ if (result == NULL) {
talloc_free(ldb);
return NULL;
}
+ ndr_err = ndr_pull_struct_blob(v, result, result,
+ (ndr_pull_flags_fn_t)ndr_pull_dom_sid);
+ if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+ talloc_free(result);
+ talloc_free(ldb);
+ return NULL;
+ }
+
return result;
}
svn commit: samba r26319 - in branches/SAMBA_4_0: . source/auth source/cldap_server source/dsdb source/dsdb/common source/dsdb/samdb source/dsdb/samdb/ldb_modules source/libcli/cldap source/libcli/lda
Author: jelmer Date: 2007-12-06 21:39:49 + (Thu, 06 Dec 2007) New Revision: 26319 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26319 Log: Split encoding functions out of libcli_ldap. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/auth/auth_sam.c branches/SAMBA_4_0/source/auth/config.mk branches/SAMBA_4_0/source/cldap_server/netlogon.c branches/SAMBA_4_0/source/dsdb/common/sidmap.c branches/SAMBA_4_0/source/dsdb/config.mk branches/SAMBA_4_0/source/dsdb/samdb/cracknames.c branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/config.mk branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samldb.c branches/SAMBA_4_0/source/dsdb/samdb/samdb.c branches/SAMBA_4_0/source/dsdb/samdb/samdb_privilege.c branches/SAMBA_4_0/source/libcli/cldap/cldap.c branches/SAMBA_4_0/source/libcli/ldap/config.mk branches/SAMBA_4_0/source/libnet/libnet_samsync_ldb.c branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c branches/SAMBA_4_0/source/rpc_server/lsa/lsa.h branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c Changeset: Property changes on: branches/SAMBA_4_0 ___ Name: bzr:revision-info ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/source/auth/auth_sam.c === --- branches/SAMBA_4_0/source/auth/auth_sam.c 2007-12-06 21:16:40 UTC (rev 26318) +++ branches/SAMBA_4_0/source/auth/auth_sam.c 2007-12-06 21:39:49 UTC (rev 26319) @@ -28,7 +28,7 @@ #include auth/auth_sam.h #include dsdb/samdb/samdb.h #include libcli/security/security.h -#include libcli/ldap/ldap.h +#include libcli/ldap/ldap_ndr.h #include param/param.h extern const char *user_attrs[]; Modified: branches/SAMBA_4_0/source/auth/config.mk === --- branches/SAMBA_4_0/source/auth/config.mk2007-12-06 21:16:40 UTC (rev 26318) +++ branches/SAMBA_4_0/source/auth/config.mk2007-12-06 21:39:49 UTC (rev 26319) @@ -17,6 +17,7 @@ PRIVATE_PROTO_HEADER = auth_sam.h OBJ_FILES = sam.o auth_sam_reply.o ntlm_check.o PUBLIC_DEPENDENCIES = SAMDB UTIL_LDB +PRIVATE_DEPENDENCIES = LDAP_ENCODE ### # Start MODULE auth_sam Modified: branches/SAMBA_4_0/source/cldap_server/netlogon.c === --- branches/SAMBA_4_0/source/cldap_server/netlogon.c 2007-12-06 21:16:40 UTC (rev 26318) +++ branches/SAMBA_4_0/source/cldap_server/netlogon.c 2007-12-06 21:39:49 UTC (rev 26319) @@ -20,7 +20,7 @@ */ #include includes.h -#include libcli/ldap/ldap.h +#include libcli/ldap/ldap_ndr.h #include lib/ldb/include/ldb.h #include lib/ldb/include/ldb_errors.h #include lib/events/events.h Modified: branches/SAMBA_4_0/source/dsdb/common/sidmap.c === --- branches/SAMBA_4_0/source/dsdb/common/sidmap.c 2007-12-06 21:16:40 UTC (rev 26318) +++ branches/SAMBA_4_0/source/dsdb/common/sidmap.c 2007-12-06 21:39:49 UTC (rev 26319) @@ -24,7 +24,8 @@ #include dsdb/common/flags.h #include dsdb/samdb/samdb.h #include auth/auth.h -#include libcli/ldap/ldap.h +#include libcli/ldap/ldap_ndr.h +#include ldb.h #include util/util_ldb.h #include libcli/security/security.h #include param/param.h Modified: branches/SAMBA_4_0/source/dsdb/config.mk === --- branches/SAMBA_4_0/source/dsdb/config.mk2007-12-06 21:16:40 UTC (rev 26318) +++ branches/SAMBA_4_0/source/dsdb/config.mk2007-12-06 21:39:49 UTC (rev 26319) @@ -7,9 +7,9 @@ [SUBSYSTEM::SAMDB] PUBLIC_PROTO_HEADER = samdb/samdb_proto.h PUBLIC_HEADERS = samdb/samdb.h -PUBLIC_DEPENDENCIES = LIBCLI_LDAP HEIMDAL_KRB5 +PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 PRIVATE_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI NDR_DRSBLOBS NSS_WRAPPER \ - auth_system_session + auth_system_session LDAP_ENCODE OBJ_FILES = \ samdb/samdb.o \ samdb/samdb_privilege.o \ Modified: branches/SAMBA_4_0/source/dsdb/samdb/cracknames.c === --- branches/SAMBA_4_0/source/dsdb/samdb/cracknames.c 2007-12-06 21:16:40 UTC (rev 26318) +++ branches/SAMBA_4_0/source/dsdb/samdb/cracknames.c 2007-12-06 21:39:49 UTC (rev 26319) @@ -27,10 +27,11 @@ #include lib/ldb/include/ldb_errors.h #include system/kerberos.h #include auth/kerberos/kerberos.h -#include libcli/ldap/ldap.h +#include libcli/ldap/ldap_ndr.h #include libcli/security/security.h #include librpc/gen_ndr/ndr_misc.h #include auth/auth.h +#include ldb.h #include util/util_ldb.h #include dsdb/samdb/samdb.h #include param/param.h
svn commit: samba r26320 - in branches/SAMBA_4_0: . source/auth/credentials
Author: jelmer
Date: 2007-12-06 21:39:56 + (Thu, 06 Dec 2007)
New Revision: 26320
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26320
Log:
Clean up properly after error.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/auth/credentials/credentials.i
branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.c
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/auth/credentials/credentials.i
===
--- branches/SAMBA_4_0/source/auth/credentials/credentials.i2007-12-06
21:39:49 UTC (rev 26319)
+++ branches/SAMBA_4_0/source/auth/credentials/credentials.i2007-12-06
21:39:56 UTC (rev 26320)
@@ -50,9 +50,7 @@
cli_credentials() {
return cli_credentials_init(NULL);
}
-~cli_credentials() {
-talloc_free($self);
-}
+~cli_credentials() { talloc_free($self); }
/* username */
const char *get_username(void);
bool set_username(const char *value,
Modified: branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.c
===
--- branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.c
2007-12-06 21:39:49 UTC (rev 26319)
+++ branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.c
2007-12-06 21:39:56 UTC (rev 26320)
@@ -41,6 +41,7 @@
ret = smb_krb5_init_context(cred,
cli_credentials_get_event_context(cred),
lp_ctx, cred-smb_krb5_context);
if (ret) {
+ cred-smb_krb5_context = NULL;
return ret;
}
*smb_krb5_context = cred-smb_krb5_context;
svn commit: samba r26321 - in branches/SAMBA_4_0: . source/auth/credentials/tests
Author: jelmer Date: 2007-12-06 21:40:00 + (Thu, 06 Dec 2007) New Revision: 26321 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26321 Log: Fix python tests. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/auth/credentials/tests/bindings.py Changeset: Property changes on: branches/SAMBA_4_0 ___ Name: bzr:revision-info ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/source/auth/credentials/tests/bindings.py === --- branches/SAMBA_4_0/source/auth/credentials/tests/bindings.py 2007-12-06 21:39:56 UTC (rev 26320) +++ branches/SAMBA_4_0/source/auth/credentials/tests/bindings.py 2007-12-06 21:40:00 UTC (rev 26321) @@ -84,9 +84,10 @@ self.creds.guess() def test_authentication_requested(self): +self.creds.set_username() self.assertFalse(self.creds.authentication_requested()) +self.creds.set_username(somebody) +self.assertTrue(self.creds.authentication_requested()) def test_wrong_password(self): -self.assertTrue(self.creds.wrong_password()) -self.assertTrue(self.creds.wrong_password()) self.assertFalse(self.creds.wrong_password())
svn commit: samba r26322 - in branches/SAMBA_4_0: . source/smbd
Author: jelmer Date: 2007-12-06 22:34:56 + (Thu, 06 Dec 2007) New Revision: 26322 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26322 Log: Fix include Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/smbd/process_standard.c Changeset: Property changes on: branches/SAMBA_4_0 ___ Name: bzr:revision-info ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/source/smbd/process_standard.c === --- branches/SAMBA_4_0/source/smbd/process_standard.c 2007-12-06 21:40:00 UTC (rev 26321) +++ branches/SAMBA_4_0/source/smbd/process_standard.c 2007-12-06 22:34:56 UTC (rev 26322) @@ -29,6 +29,7 @@ #include param/secrets.h #include system/filesys.h #include cluster/cluster.h +#include param/param.h #ifdef HAVE_SETPROCTITLE #ifdef HAVE_SETPROCTITLE_H
svn commit: samba r26323 - in branches/SAMBA_4_0: . source/auth/credentials
Author: jelmer
Date: 2007-12-06 22:39:44 + (Thu, 06 Dec 2007)
New Revision: 26323
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26323
Log:
Regenerated credentials SWIG.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/auth/credentials/credentials_wrap.c
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/auth/credentials/credentials_wrap.c
===
--- branches/SAMBA_4_0/source/auth/credentials/credentials_wrap.c
2007-12-06 22:34:56 UTC (rev 26322)
+++ branches/SAMBA_4_0/source/auth/credentials/credentials_wrap.c
2007-12-06 22:39:44 UTC (rev 26323)
@@ -2503,9 +2503,7 @@
SWIGINTERN cli_credentials *new_cli_credentials(){
return cli_credentials_init(NULL);
}
-SWIGINTERN void delete_cli_credentials(cli_credentials *self){
-talloc_free(self);
-}
+SWIGINTERN void delete_cli_credentials(cli_credentials *self){
talloc_free(self); }
SWIGINTERN swig_type_info*
SWIG_pchar_descriptor(void)
svn commit: samba r26324 - in branches/SAMBA_4_0/source/dsdb: common samdb
Author: abartlet Date: 2007-12-06 23:15:37 + (Thu, 06 Dec 2007) New Revision: 26324 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26324 Log: Fix includes for Jelmer. Andrew Bartlett Modified: branches/SAMBA_4_0/source/dsdb/common/sidmap.c branches/SAMBA_4_0/source/dsdb/samdb/cracknames.c Changeset: Modified: branches/SAMBA_4_0/source/dsdb/common/sidmap.c === --- branches/SAMBA_4_0/source/dsdb/common/sidmap.c 2007-12-06 22:39:44 UTC (rev 26323) +++ branches/SAMBA_4_0/source/dsdb/common/sidmap.c 2007-12-06 23:15:37 UTC (rev 26324) @@ -25,7 +25,7 @@ #include dsdb/samdb/samdb.h #include auth/auth.h #include libcli/ldap/ldap_ndr.h -#include ldb.h +#include lib/ldb/include/ldb.h #include util/util_ldb.h #include libcli/security/security.h #include param/param.h Modified: branches/SAMBA_4_0/source/dsdb/samdb/cracknames.c === --- branches/SAMBA_4_0/source/dsdb/samdb/cracknames.c 2007-12-06 22:39:44 UTC (rev 26323) +++ branches/SAMBA_4_0/source/dsdb/samdb/cracknames.c 2007-12-06 23:15:37 UTC (rev 26324) @@ -24,6 +24,7 @@ #include includes.h #include librpc/gen_ndr/drsuapi.h #include rpc_server/common/common.h +#include lib/ldb/include/ldb.h #include lib/ldb/include/ldb_errors.h #include system/kerberos.h #include auth/kerberos/kerberos.h @@ -31,7 +32,6 @@ #include libcli/security/security.h #include librpc/gen_ndr/ndr_misc.h #include auth/auth.h -#include ldb.h #include util/util_ldb.h #include dsdb/samdb/samdb.h #include param/param.h
svn commit: samba r26325 - in branches/SAMBA_4_0: . source/cldap_server source/heimdal_build source/kdc source/ldap_server source/lib/socket source/libcli/resolve source/libcli/wrepl source/nbt_server
Author: jelmer Date: 2007-12-06 23:57:22 + (Thu, 06 Dec 2007) New Revision: 26325 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26325 Log: Remove use of global_loadparm in netif. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/.bzrignore branches/SAMBA_4_0/source/cldap_server/cldap_server.c branches/SAMBA_4_0/source/cldap_server/netlogon.c branches/SAMBA_4_0/source/heimdal_build/glue.c branches/SAMBA_4_0/source/kdc/kdc.c branches/SAMBA_4_0/source/ldap_server/ldap_server.c branches/SAMBA_4_0/source/lib/socket/interface.c branches/SAMBA_4_0/source/lib/socket/testsuite.c branches/SAMBA_4_0/source/libcli/resolve/bcast.c branches/SAMBA_4_0/source/libcli/resolve/nbtlist.c branches/SAMBA_4_0/source/libcli/wrepl/winsrepl.c branches/SAMBA_4_0/source/nbt_server/interfaces.c branches/SAMBA_4_0/source/nbt_server/nbt_server.c branches/SAMBA_4_0/source/nbt_server/wins/wins_ldb.c branches/SAMBA_4_0/source/nbt_server/wins/winsdb.c branches/SAMBA_4_0/source/rpc_server/service_rpc.c branches/SAMBA_4_0/source/scripting/ejs/smbcalls_sys.c branches/SAMBA_4_0/source/smb_server/smb_server.c branches/SAMBA_4_0/source/torture/nbt/dgram.c branches/SAMBA_4_0/source/torture/nbt/register.c branches/SAMBA_4_0/source/torture/nbt/wins.c branches/SAMBA_4_0/source/torture/nbt/winsbench.c branches/SAMBA_4_0/source/torture/nbt/winsreplication.c branches/SAMBA_4_0/source/torture/rpc/spoolss_notify.c branches/SAMBA_4_0/source/utils/nmblookup.c branches/SAMBA_4_0/source/web_server/web_server.c branches/SAMBA_4_0/source/wrepl_server/wrepl_in_connection.c Changeset: Sorry, the patch is too large (705 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26325
Build status as of Fri Dec 7 00:00:02 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-12-06 00:01:03.0 + +++ /home/build/master/cache/broken_results.txt 2007-12-07 00:00:54.0 + @@ -1,25 +1,25 @@ -Build status as of Thu Dec 6 00:00:02 2007 +Build status as of Fri Dec 7 00:00:02 2007 Build counts: Tree Total Broken Panic SOC 0 0 0 build_farm 0 0 0 -ccache 29 9 0 +ccache 28 9 0 ctdb 0 0 0 distcc 1 0 0 -ldb 29 12 0 -libreplace 28 10 0 -lorikeet-heimdal 25 15 0 +ldb 28 12 0 +libreplace 27 10 0 +lorikeet-heimdal 24 14 0 pidl 18 5 0 -ppp 12 9 0 +ppp 11 8 0 python 0 0 0 -rsync29 12 0 +rsync28 12 0 samba-docs 0 0 0 samba-gtk4 4 0 -samba4 26 20 0 +samba4 25 24 1 samba_3_20 0 0 -samba_3_2_test 28 16 0 -smb-build28 27 0 -talloc 29 8 0 -tdb 29 5 0 +samba_3_2_test 27 16 0 +smb-build27 26 0 +talloc 28 8 0 +tdb 28 5 0
svn commit: samba r26328 - in branches/SAMBA_4_0: . source/lib/messaging/tests source/libnet source/rpc_server/samr
Author: jelmer
Date: 2007-12-07 02:37:13 + (Fri, 07 Dec 2007)
New Revision: 26328
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26328
Log:
remove more uses of global_loadparm.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/lib/messaging/tests/irpc.c
branches/SAMBA_4_0/source/libnet/libnet.c
branches/SAMBA_4_0/source/libnet/libnet_become_dc.c
branches/SAMBA_4_0/source/libnet/libnet_join.c
branches/SAMBA_4_0/source/libnet/libnet_lookup.c
branches/SAMBA_4_0/source/libnet/libnet_samdump.c
branches/SAMBA_4_0/source/libnet/libnet_samsync_ldb.c
branches/SAMBA_4_0/source/libnet/libnet_unbecome_dc.c
branches/SAMBA_4_0/source/libnet/libnet_vampire.c
branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.c
branches/SAMBA_4_0/source/rpc_server/samr/dcesrv_samr.h
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/lib/messaging/tests/irpc.c
===
--- branches/SAMBA_4_0/source/lib/messaging/tests/irpc.c2007-12-07
02:37:04 UTC (rev 26327)
+++ branches/SAMBA_4_0/source/lib/messaging/tests/irpc.c2007-12-07
02:37:13 UTC (rev 26328)
@@ -226,7 +226,7 @@
torture_assert(tctx, data-msg_ctx2 =
messaging_init(tctx,
- lp_messaging_path(tctx, global_loadparm),
+ lp_messaging_path(tctx, tctx-lp_ctx),
cluster_id(MSG_ID2), data-ev),
Failed to init second messaging context);
Modified: branches/SAMBA_4_0/source/libnet/libnet.c
===
--- branches/SAMBA_4_0/source/libnet/libnet.c 2007-12-07 02:37:04 UTC (rev
26327)
+++ branches/SAMBA_4_0/source/libnet/libnet.c 2007-12-07 02:37:13 UTC (rev
26328)
@@ -45,7 +45,7 @@
ctx-lp_ctx = lp_ctx;
/* name resolution methods */
- ctx-name_res_methods = str_list_copy(ctx,
lp_name_resolve_order(global_loadparm));
+ ctx-name_res_methods = str_list_copy(ctx,
lp_name_resolve_order(lp_ctx));
/* connected services' params */
ZERO_STRUCT(ctx-samr);
Modified: branches/SAMBA_4_0/source/libnet/libnet_become_dc.c
===
--- branches/SAMBA_4_0/source/libnet/libnet_become_dc.c 2007-12-07 02:37:04 UTC
(rev 26327)
+++ branches/SAMBA_4_0/source/libnet/libnet_become_dc.c 2007-12-07 02:37:13 UTC
(rev 26328)
@@ -738,7 +738,7 @@
struct cldap_request *req;
s-cldap.io.in.dest_address = s-source_dsa.address;
- s-cldap.io.in.dest_port= lp_cldap_port(global_loadparm);
+ s-cldap.io.in.dest_port= lp_cldap_port(s-libnet-lp_ctx);
s-cldap.io.in.realm= s-domain.dns_name;
s-cldap.io.in.host = s-dest_dsa.netbios_name;
s-cldap.io.in.user = NULL;
@@ -792,7 +792,7 @@
url = talloc_asprintf(s, ldap://%s/;, s-source_dsa.dns_name);
NT_STATUS_HAVE_NO_MEMORY(url);
- ldap-ldb = ldb_wrap_connect(s, global_loadparm, url,
+ ldap-ldb = ldb_wrap_connect(s, s-libnet-lp_ctx, url,
NULL,
s-libnet-cred,
0, NULL);
@@ -1513,7 +1513,7 @@
drsuapi-s = s;
if (!drsuapi-binding) {
- if (lp_parm_bool(global_loadparm, NULL, become_dc, print,
false)) {
+ if (lp_parm_bool(s-libnet-lp_ctx, NULL, become_dc, print,
false)) {
binding_str = talloc_asprintf(s,
ncacn_ip_tcp:%s[krb5,print,seal], s-source_dsa.dns_name);
if (composite_nomem(binding_str, c)) return;
} else {
Modified: branches/SAMBA_4_0/source/libnet/libnet_join.c
===
--- branches/SAMBA_4_0/source/libnet/libnet_join.c 2007-12-07 02:37:04 UTC
(rev 26327)
+++ branches/SAMBA_4_0/source/libnet/libnet_join.c 2007-12-07 02:37:13 UTC
(rev 26328)
@@ -230,7 +230,7 @@
return NT_STATUS_NO_MEMORY;
}
- remote_ldb = ldb_wrap_connect(tmp_ctx, global_loadparm,
+ remote_ldb = ldb_wrap_connect(tmp_ctx, ctx-lp_ctx,
remote_ldb_url,
NULL, ctx-cred, 0, NULL);
if (!remote_ldb) {
@@ -538,8 +538,8 @@
connect_with_info-out.domain_name =
talloc_strdup(tmp_ctx, r-in.domain_name);
} else {
/* Bugger, we just lost our way to automaticly find the
domain name */
- connect_with_info-out.domain_name =
svn commit: samba r26327 - in branches/SAMBA_4_0: . source/client source/dsdb/repl source/lib/registry source/lib/registry/tools source/libnet source/librpc/rpc source/rpc_server/remote source/rpc_ser
Author: jelmer Date: 2007-12-07 02:37:04 + (Fri, 07 Dec 2007) New Revision: 26327 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26327 Log: Explicit loadparm_context for RPC client functions. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/client/client.c branches/SAMBA_4_0/source/dsdb/repl/drepl_out_helpers.c branches/SAMBA_4_0/source/lib/registry/registry.h branches/SAMBA_4_0/source/lib/registry/rpc.c branches/SAMBA_4_0/source/lib/registry/tools/regdiff.c branches/SAMBA_4_0/source/libnet/libnet.c branches/SAMBA_4_0/source/libnet/libnet.h branches/SAMBA_4_0/source/libnet/libnet_become_dc.c branches/SAMBA_4_0/source/libnet/libnet_join.c branches/SAMBA_4_0/source/libnet/libnet_rpc.c branches/SAMBA_4_0/source/libnet/libnet_unbecome_dc.c branches/SAMBA_4_0/source/libnet/libnet_vampire.c branches/SAMBA_4_0/source/librpc/rpc/dcerpc.i branches/SAMBA_4_0/source/librpc/rpc/dcerpc_auth.c branches/SAMBA_4_0/source/librpc/rpc/dcerpc_connect.c branches/SAMBA_4_0/source/librpc/rpc/dcerpc_schannel.c branches/SAMBA_4_0/source/librpc/rpc/dcerpc_secondary.c branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c branches/SAMBA_4_0/source/librpc/rpc/dcerpc_wrap.c branches/SAMBA_4_0/source/rpc_server/remote/dcesrv_remote.c branches/SAMBA_4_0/source/rpc_server/spoolss/dcesrv_spoolss.c branches/SAMBA_4_0/source/scripting/ejs/ejsnet/net_ctx.c branches/SAMBA_4_0/source/scripting/ejs/smbcalls_rpc.c branches/SAMBA_4_0/source/torture/libnet/domain.c branches/SAMBA_4_0/source/torture/libnet/libnet_BecomeDC.c branches/SAMBA_4_0/source/torture/libnet/libnet_domain.c branches/SAMBA_4_0/source/torture/libnet/libnet_group.c branches/SAMBA_4_0/source/torture/libnet/libnet_lookup.c branches/SAMBA_4_0/source/torture/libnet/libnet_rpc.c branches/SAMBA_4_0/source/torture/libnet/libnet_share.c branches/SAMBA_4_0/source/torture/libnet/libnet_user.c branches/SAMBA_4_0/source/torture/rpc/async_bind.c branches/SAMBA_4_0/source/torture/rpc/bind.c branches/SAMBA_4_0/source/torture/rpc/dfs.c branches/SAMBA_4_0/source/torture/rpc/dssync.c branches/SAMBA_4_0/source/torture/rpc/mgmt.c branches/SAMBA_4_0/source/torture/rpc/rpc.c branches/SAMBA_4_0/source/torture/rpc/samba3rpc.c branches/SAMBA_4_0/source/torture/rpc/samlogon.c branches/SAMBA_4_0/source/torture/rpc/samr_accessmask.c branches/SAMBA_4_0/source/torture/rpc/samsync.c branches/SAMBA_4_0/source/torture/rpc/scanner.c branches/SAMBA_4_0/source/torture/rpc/schannel.c branches/SAMBA_4_0/source/torture/rpc/session_key.c branches/SAMBA_4_0/source/torture/rpc/testjoin.c branches/SAMBA_4_0/source/utils/net/net_join.c branches/SAMBA_4_0/source/utils/net/net_password.c branches/SAMBA_4_0/source/utils/net/net_time.c branches/SAMBA_4_0/source/utils/net/net_user.c branches/SAMBA_4_0/source/utils/net/net_vampire.c branches/SAMBA_4_0/source/winbind/wb_connect_sam.c branches/SAMBA_4_0/source/winbind/wb_init_domain.c Changeset: Sorry, the patch is too large (1811 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26327
svn commit: samba r26329 - in branches/SAMBA_4_0: . source/dsdb/samdb/ldb_modules source/lib/registry/tools source/librpc/rpc source/torture source/torture/nbt
Author: jelmer
Date: 2007-12-07 03:01:41 + (Fri, 07 Dec 2007)
New Revision: 26329
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26329
Log:
Fix more loadparm_context references. Only about a 100 left now.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/proxy.c
branches/SAMBA_4_0/source/lib/registry/tools/common.c
branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c
branches/SAMBA_4_0/source/lib/registry/tools/regshell.c
branches/SAMBA_4_0/source/lib/registry/tools/regtree.c
branches/SAMBA_4_0/source/librpc/rpc/dcerpc_schannel.c
branches/SAMBA_4_0/source/torture/locktest.c
branches/SAMBA_4_0/source/torture/nbt/winsbench.c
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/proxy.c
===
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/proxy.c2007-12-07
02:37:13 UTC (rev 26328)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/proxy.c2007-12-07
03:01:41 UTC (rev 26329)
@@ -129,7 +129,7 @@
ldb_oom(module-ldb);
goto failed;
}
- cli_credentials_guess(creds, global_loadparm);
+ cli_credentials_guess(creds, ldb_get_opaque(module-ldb, loadparm));
cli_credentials_set_username(creds, username, CRED_SPECIFIED);
cli_credentials_set_password(creds, password, CRED_SPECIFIED);
Modified: branches/SAMBA_4_0/source/lib/registry/tools/common.c
===
--- branches/SAMBA_4_0/source/lib/registry/tools/common.c 2007-12-07
02:37:13 UTC (rev 26328)
+++ branches/SAMBA_4_0/source/lib/registry/tools/common.c 2007-12-07
03:01:41 UTC (rev 26329)
@@ -24,12 +24,13 @@
#include lib/registry/tools/common.h
struct registry_context *reg_common_open_remote(const char *remote,
+ struct loadparm_context *lp_ctx,
struct cli_credentials *creds)
{
struct registry_context *h;
WERROR error;
- error = reg_open_remote(h, NULL, creds, remote, NULL);
+ error = reg_open_remote(h, NULL, creds, lp_ctx, remote, NULL);
if (!W_ERROR_IS_OK(error)) {
fprintf(stderr, Unable to open remote registry at %s:%s \n,
Modified: branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c
===
--- branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c 2007-12-07
02:37:13 UTC (rev 26328)
+++ branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c 2007-12-07
03:01:41 UTC (rev 26329)
@@ -49,7 +49,7 @@
}
if (remote) {
- h = reg_common_open_remote (remote, cmdline_credentials);
+ h = reg_common_open_remote (remote, global_loadparm,
cmdline_credentials);
} else {
h = reg_common_open_local (cmdline_credentials,
global_loadparm);
}
Modified: branches/SAMBA_4_0/source/lib/registry/tools/regshell.c
===
--- branches/SAMBA_4_0/source/lib/registry/tools/regshell.c 2007-12-07
02:37:13 UTC (rev 26328)
+++ branches/SAMBA_4_0/source/lib/registry/tools/regshell.c 2007-12-07
03:01:41 UTC (rev 26329)
@@ -497,7 +497,7 @@
ctx = talloc_zero(NULL, struct regshell_context);
if (remote != NULL) {
- ctx-registry = reg_common_open_remote(remote,
+ ctx-registry = reg_common_open_remote(remote, global_loadparm,
cmdline_credentials);
} else if (file != NULL) {
ctx-current = reg_common_open_file(file, cmdline_credentials);
Modified: branches/SAMBA_4_0/source/lib/registry/tools/regtree.c
===
--- branches/SAMBA_4_0/source/lib/registry/tools/regtree.c 2007-12-07
02:37:13 UTC (rev 26328)
+++ branches/SAMBA_4_0/source/lib/registry/tools/regtree.c 2007-12-07
03:01:41 UTC (rev 26329)
@@ -129,7 +129,7 @@
}
if (remote != NULL) {
- h = reg_common_open_remote(remote, cmdline_credentials);
+ h = reg_common_open_remote(remote, global_loadparm,
cmdline_credentials);
} else if (file != NULL) {
start_key = reg_common_open_file(file, cmdline_credentials);
} else {
Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_schannel.c
===
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc_schannel.c 2007-12-07
02:37:13 UTC (rev 26328)
+++
svn commit: samba r26326 - in branches/SAMBA_4_0: . source/torture/libnet
Author: jelmer
Date: 2007-12-07 01:16:50 + (Fri, 07 Dec 2007)
New Revision: 26326
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26326
Log:
Remove more uses of global_loadparm.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/torture/libnet/libnet_BecomeDC.c
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/torture/libnet/libnet_BecomeDC.c
===
--- branches/SAMBA_4_0/source/torture/libnet/libnet_BecomeDC.c 2007-12-06
23:57:22 UTC (rev 26325)
+++ branches/SAMBA_4_0/source/torture/libnet/libnet_BecomeDC.c 2007-12-07
01:16:50 UTC (rev 26326)
@@ -95,6 +95,7 @@
struct test_become_dc_state {
struct libnet_context *ctx;
+ struct torture_context *tctx;
const char *netbios_name;
struct test_join *tj;
struct cli_credentials *machine_account;
@@ -163,7 +164,7 @@
DEBUG(0,(Pathes under PRIVATEDIR[%s]\n
SAMDB[%s] SECRETS[%s] KEYTAB[%s]\n,
- lp_private_dir(global_loadparm),
+ lp_private_dir(s-tctx-lp_ctx),
s-path.samdb_ldb,
s-path.secrets_ldb,
s-path.secrets_keytab));
@@ -443,7 +444,7 @@
return werror_to_ntstatus(status);
}
- if (lp_parm_bool(global_loadparm, NULL, become dc, dump objects,
false)) {
+ if (lp_parm_bool(s-tctx-lp_ctx, NULL, become dc, dump objects,
false)) {
for (i=0; i objs-num_objects; i++) {
struct ldb_ldif ldif;
fprintf(stdout, #\n);
@@ -485,8 +486,8 @@
s-schema = NULL;
DEBUG(0,(Reopen the SAM LDB with system credentials and a already
stored schema: %s\n, s-path.samdb_ldb));
- s-ldb = ldb_wrap_connect(s, global_loadparm, s-path.samdb_ldb,
- system_session(s, global_loadparm),
+ s-ldb = ldb_wrap_connect(s, s-tctx-lp_ctx, s-path.samdb_ldb,
+ system_session(s, s-tctx-lp_ctx),
NULL, 0, NULL);
if (!s-ldb) {
DEBUG(0,(Failed to open '%s'\n,
@@ -671,7 +672,7 @@
return werror_to_ntstatus(status);
}
- if (lp_parm_bool(global_loadparm, NULL, become dc, dump objects,
false)) {
+ if (lp_parm_bool(s-tctx-lp_ctx, NULL, become dc, dump objects,
false)) {
for (i=0; i objs-num_objects; i++) {
struct ldb_ldif ldif;
fprintf(stdout, #\n);
@@ -701,7 +702,7 @@
return NT_STATUS_FOOBAR;
}
- if (lp_parm_bool(global_loadparm, NULL, become dc, dump
objects, false)) {
+ if (lp_parm_bool(s-tctx-lp_ctx, NULL, become dc, dump
objects, false)) {
DEBUG(0,(# %s\n, sa-lDAPDisplayName));
NDR_PRINT_DEBUG(drsuapi_DsReplicaLinkedAttribute,
linked_attributes[i]);
dump_data(0,
@@ -727,6 +728,8 @@
s = talloc_zero(torture, struct test_become_dc_state);
if (!s) return false;
+ s-tctx = torture;
+
s-netbios_name = lp_parm_string(torture-lp_ctx, NULL, become dc,
smbtorture dc);
if (!s-netbios_name || !s-netbios_name[0]) {
s-netbios_name = smbtorturedc;
svn commit: samba r26330 - in branches/SAMBA_4_0: . source
Author: jelmer Date: 2007-12-07 03:18:12 + (Fri, 07 Dec 2007) New Revision: 26330 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26330 Log: Fix header installation. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/headermap.txt Changeset: Property changes on: branches/SAMBA_4_0 ___ Name: bzr:revision-info ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/source/headermap.txt === --- branches/SAMBA_4_0/source/headermap.txt 2007-12-07 03:01:41 UTC (rev 26329) +++ branches/SAMBA_4_0/source/headermap.txt 2007-12-07 03:18:12 UTC (rev 26330) @@ -116,3 +116,4 @@ lib/util/wrap_xattr.h: wrap_xattr.h lib/events/events.h: events/events.h lib/events/events_internal.h: events/events_internal.h +libcli/ldap/ldap_ndr.h: ldb/ldap_ndr.h
