[Samba] modify only, not deletable
Hi folks, I have a samba file server joining a Windows 2k AD as member server. I wonder how I can setup the files on the samba share to be modifiable by users, but no one can delete them. Is it possible? linux chattr command doesn't seems to help, and I can only setup windows share permission (full control, read,write) for the samba files from windows interface, not NTFS detailed permissions. Any idea? Cheers Joshua -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] DFS in Vista
Yes, I applied the patch for BUG 4356. It still not worked. The DFS tab of the properties from Vista client is correct (\\ip\share). Thanks, Latrell. -Original Message- From: Gerald (Jerry) Carter [mailto:[EMAIL PROTECTED] Sent: Monday, February 12, 2007 9:06 PM To: Latrell Wang 王獻綱 Cc: samba@lists.samba.org Subject: Re: [Samba] DFS in Vista -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Latrell Wang 王獻綱 wrote: Can anyone duplicate my problem? Have you applied DFS patch for 3.0.24 listed at http://www.samba.org/samba/patches/? cheers, jerry = Samba--- http://www.samba.org Centeris --- http://www.centeris.com What man is a man who does not make the world better? --Balian -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.3 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFF0GY8IR7qMdg1EfYRAtdQAJ9IMKmlR2skx1skMG6iR3uO/FAErwCfW+Yy Y+qk3OrxA+Afy3cMKgeClBo= =zVKn -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Samba 3.0.24 + Winbind + Active Directory 2003 on RedHat AS 4.0
Hello all, I have compiled the latest samba release (3.0.249 on a RedHat AS 4.0 platform with the following options : ./configure #8722;#8722;with#8722;smbwrapper #8722;#8722;with#8722;dce#8722;dfs #8722;#8722;with#8722;smbmount #8722;#8722;with#8722;pam #8722;#8722;with#8722;pam_smbpass #8722;#8722;with#8722;syslog #8722;#8722;with#8722;quotas #8722;#8722;with#8722;libsmbclient #8722;#8722;with#8722;acl#8722;support #8722;#8722;with#8722;winbind #8722;#8722;with#8722;winbind#8722;auth#8722;challenge I have modified the smb startup script so that winbind starts with smb. The libnss_winbind.so and libnss_wins.so have been copied in the appropriate directory DNS is properly setup. Here is my smb.conf file : workgroup = WKG server string = server_name netbios name = server security = ADS password server = dc.wkg.ch realm = WKG.CH encrypt passwords = yes winbind separator = + idmap uid = 1-2 idmap gid = 1-2 winbind enum users = yes winbind enum groups = yes template homedir = /home/winnt/%D/%U template shell = /bin/bash winbind use default domain = no wins server = IP address client use spnego = no socket options = TCP_NODELAY IPTOS_LOWDELAY SO_RCVBUF=16384 SO_SNDBUF=16384 map acl inherit = yes nt acl support = yes allow trusted domains = no winbind use default domain = no obey pam restrictions = no My /etc/pam.d/login looks like the following : authrequiredpam_securetty.so authsufficient pam_winbind.so authsufficient pam_unix.so use_first_pass authrequiredpam_stack.so service=system-auth authrequiredpam_nologin.so account sufficient pam_winbind.so account requiredpam_stack.so service=system-auth password required pam_stack.so service=system-auth session requiredpam_stack.so service=system-auth session optionalpam_console.so My /etc/pam.d/samba looks like the following : authsufficient pam_winbind.so authrequiredpam_unix.so nullok account sufficient pam_winbind.so account requiredpam_unix.so session requiredpam_unix.so passwordrequiredpam_unix.so My Samba server has successfully joined the domain with the net ads command. wbinfo u and wbinfo g commands the list of users and groups from the main and the trusted domain (though I would like to get only the main domain info). I have set the winbind authentication user with the wbinfo set-auth-user command. I can see the Samba server in my Windows XPs network neighbourhood but not in the WKG domain. I cannot browse the shares I have created. Here are the last lines of my winbindd.log file : [2007/02/13 10:01:14, 1] nsswitch/winbindd_ads.c:query_user_list(218) Not a user account? atype=0x3000 Any idea ? Many thanks, PO - Découvrez une nouvelle façon d'obtenir des réponses à toutes vos questions ! Profitez des connaissances, des opinions et des expériences des internautes sur Yahoo! Questions/Réponses. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] modify only, not deletable
On Tuesday 13 February 2007 14:30, Joshua, C.S. Chen wrote: Hi folks, I have a samba file server joining a Windows 2k AD as member server. I wonder how I can setup the files on the samba share to be modifiable by users, but no one can delete them. Is it possible? linux chattr command doesn't seems to help, and I can only setup windows share permission (full control, read,write) for the samba files from windows interface, not NTFS detailed permissions. Any idea? When you are under FreeBSD, it has chflags command to set undeletable flag. I think, trying to delete flagged file should lead to access denied message. -- With Best Regards. Rashid N. Achilov (RNA1-RIPE), Web: http://www.askd.ru/~shelton OOO ACK telecommunications administrator, e-mail: achilov-rn [at] askd.ru PGP: 83 CD E2 A7 37 4A D5 81 D6 D6 52 BF C9 2F 85 AF 97 BE CB 0A -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] modify only, not deletable
Rashid N. Achilov wrote: On Tuesday 13 February 2007 14:30, Joshua, C.S. Chen wrote: Hi folks, I have a samba file server joining a Windows 2k AD as member server. I wonder how I can setup the files on the samba share to be modifiable by users, but no one can delete them. Is it possible? linux chattr command doesn't seems to help, and I can only setup windows share permission (full control, read,write) for the samba files from windows interface, not NTFS detailed permissions. Any idea? When you are under FreeBSD, it has chflags command to set undeletable flag. I think, trying to delete flagged file should lead to access denied message. Thanks for the info. now samba is running on a linux CentOS 4.4, is it possible to do the same thing? Cheers Joshua -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Server string cached somewhere ?
Hi all, I set the server string to : (%U/%m - %T) on the global section. When connecting to the samba server, the server string shown is ok. But when I'm opening one of the shares (like [homes]), the old server string is displaying on the top of my window (the title). I restart many times the samba service and the server rebooted many times too. How can I apply the server string set up on the global section to all of my shares ? Soz' for my english, I'm french :o) 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] WINS initiated dns queries fail after some time
Hello samba-list, we have a problems with WINS resolved hosts, which were added to the WINS cache on the first query with TTL=7200 (2 hours). Exactly after 2h entries are deleted and all following queries fail. This behaviour occurs only for hosts in other subnets than our PDC, e.g. some other linux machines. Joined workstations, even in other subnets, are fully resolvable. We have configured our PDC as the only WINS server and set dns proxy = yes because we have a permanent connection to our dns server and it works well, but only for the first query and all following in 2h, after 2h all queries fail. It seems that the dns query dies after some time, but the dns server is still online and responses to queries. Wenn we restart nmbd it works well for another 2h. Can anybody explain why after some time dns queries froms wins fails? Samba 3.0.24 on Gentoo (stable) /etc/samba/smb.conf [global] wins support = yes name resolve order = lmhosts wins dns proxy = yes max ttl = 518400# 6 days max wins ttl = 1036800 # 12 days min wins ttl = 172800 # 2 days $ less /var/log/samba/ ... [2007/02/13 00:58:07, 3] nmbd/nmbd_winsserver.c:wins_process_name_query_request(1892) wins_process_name_query: name query for name FILESERVER00 from IP 192.168.1.10 [2007/02/13 00:58:07, 3] nmbd/nmbd_winsserver.c:wins_process_name_query_request(1956) wins_process_name_query: name query for name FILESERVER00 not found - doing dns lookup. [2007/02/13 00:58:07, 3] nmbd/asyncdns.c:queue_dns_query(310) added DNS query for FILESERVER00 [2007/02/13 00:58:07, 3] nmbd/asyncdns.c:add_dns_result(43) add_dns_result: DNS gave answer for FILESERVER of 192.168.40.100 [2007/02/13 00:58:07, 3] nmbd/nmbd_namelistdb.c:add_name_to_subnet(247) add_name_to_subnet: Added netbios name FILESERVER00 with first IP 192.168.40.100 ttl=7200 nb_flags= 4 to subnet WINS_SERVER_SUBNET [2007/02/13 00:58:07, 3] nmbd/asyncdns.c:run_dns_queue(227) DNS calling send_wins_name_query_response ... [2007/02/13 02:58:11, 3] nmbd/nmbd_winsserver.c:wins_processing_traverse_fn(2136) wins_processing_traverse_fn: deleting timed out DNS name FILESERVER00 ... wins_process_name_query: name query for name FILESERVER00 from IP 192.168.1.10 [2007/02/13 02:58:25, 3] nmbd/nmbd_winsserver.c:wins_process_name_query_request(1956) wins_process_name_query: name query for name FILESERVER00 not found - doing dns lookup. [2007/02/13 02:58:25, 3] nmbd/asyncdns.c:queue_dns_query(310) added DNS query for FILESERVER00 ... [2007/02/13 02:58:29, 3] nmbd/nmbd_winsserver.c:wins_process_name_query_request(1892) wins_process_name_query: name query for name FILESERVER00 from IP 192.168.1.10 [2007/02/13 02:58:29, 3] nmbd/nmbd_winsserver.c:wins_process_name_query_request(1956) wins_process_name_query: name query for name FILESERVER00 not found - doing dns lookup. [2007/02/13 02:58:29, 3] nmbd/asyncdns.c:queue_dns_query(310) added DNS query for FILESERVER00 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] modify only, not deletable
On Tuesday 13 February 2007 4:49:32 am Joshua, C.S. Chen wrote: Rashid N. Achilov wrote: On Tuesday 13 February 2007 14:30, Joshua, C.S. Chen wrote: Hi folks, I have a samba file server joining a Windows 2k AD as member server. I wonder how I can setup the files on the samba share to be modifiable by users, but no one can delete them. Is it possible? linux chattr command doesn't seems to help, and I can only setup windows share permission (full control, read,write) for the samba files from windows interface, not NTFS detailed permissions. Any idea? When you are under FreeBSD, it has chflags command to set undeletable flag. I think, trying to delete flagged file should lead to access denied message. Thanks for the info. now samba is running on a linux CentOS 4.4, is it possible to do the same thing? Perhaps through the use of the sticky bit on the directory... from 'man chmod': STICKY DIRECTORIES When the sticky bit is set on a directory, files in that directory may be unlinked or renamed only by root or their owner. Without the sticky bit, anyone able to write to the directory can delete or rename files. The sticky bit is commonly found on directories, such as /tmp, that are world-writable. Look at using something like create mask = 0664 force directory mode = 01775 in your smb.conf file. HTH, Tim -- Fedora Core release 6 (Zod), Linux 2.6.19-1.2895.fc6 14:15:58 up 4 days, 20:04, 0 users, load average: 0.15, 0.10, 0.09 MP3/OGG archive Total playlength : 14 days, 21 hours, 52 mins 42 seconds It's what you learn after you know it all that counts John Wooden pgpAELwjZudfz.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] Any chance to make Samba pass full path into external dfree instead of ./?
Hi list, At the moment I'm struggling with a problem when Samba returns 0 free space for share which is in fact a reexported NFS automount point (in fact df also returns zero here, so that's not a Samba fault, just a configuration specifics). One way around is usage of external dfree routine, which is mentioned in manuals. I've almost managed this config to work by developing some script which devises the full path using PID of smbd instance it is called by and smbstatus utility, but there's a fundamental problem - one smbd can have several files opened in different shares. Using my approach it is impossible to find out which share is being accessed at each particular moment. Therefore I'm trying other possibilities and this is one of them - can I somehow tune the sourcecode in order to get full path passed to external dfree? I've undertaken a short dig into sources and it seems to me possible, but it would be great to get an answer from Samba developers - in order for me not to waste the time just to come up to the fact it is impossible... So, any comments and suggestions on how to do that are welcome. I'm open to provide any additional details which may help. Regards, Alexander -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Terminal+Samba+Removable media
Hi, everyone. There is a Win2003 with AD and Mandriva 2007 workstations. All the workers are using RDP Windows terminal and working in windows environment. The task is to make it possible to exchange data with removable media (CD, floppy, usb-flash) connected to their workstations. I suppose the tasks are: -to tune automatic mounting in a specific mount point (e.g. /mnt/flash, /mnt/cdrom, /mnt/floppy). -to make a share in samba and enable read/write access -to unmount the filesystems correctly without finishing a windows session Any ideas? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Installing Windows XP printer drivers onto Samba 3.0.24
dear samba users I have been searching the online documents, howtos and such yet I did not find an answer to my question/problem, so if you have any hints for me that would be much appreciated: We are trying since two days to install Windows XP printer drivers from the Add Printer Wizzard in Windows onto a Samba 3.0.24 installation. We created the [print$] share as recommended, created a user that is in the printer admin list in smb.conf (and that has write access to the driver store). When installing a driver, we get an obscure error message that a printer driver can not be added because some permission is denied. In the samba machine, the Windows machine created some directories in the driver store area named __SKIP... This drives me slowly, but surely, nuts... - Marc Balmer -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Installing Windows XP printer drivers onto Samba 3.0.24
On 2/13/07, Marc Balmer [EMAIL PROTECTED] wrote: dear samba users I have been searching the online documents, howtos and such yet I did not find an answer to my question/problem, so if you have any hints for me that would be much appreciated: This was discussed here last week and there is some good troubleshooting here: http://lists.samba.org/archive/samba/2007-February/129326.html I have also spent at least 2 days with this and I do not have Point and Print working. For me the drivers install but when I go to associate them to the to the printer I get access denied in windows and a similar error in linux. John -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Kerberos+Ldap+Samba+Cups
Hi all, I installed a Linux box to enter in NT domain. I installed Kerberos5, cups 1.1.23 and samba 3.0.24. I'm trying to integrate my box to print in a shared printer in a Windows Server, using a kerberos ticket. I put a URI: smb://192.168.0.3/printer?k=true in cups admin config, but this not work. I get a error when restart in log.smbd: [2007/02/09 15:58:55, 3] libsmb/clikrb5.c:ads_krb5_mk_req(552) ads_krb5_mk_req: krb5_cc_get_principal failed (No credentials cache found) [2007/02/09 15:58:55, 3] printing/nt_printing.c:check_published_printers(3228) ads_connect failed: Cannot read password [2007/02/09 15:58:55, 0] printing/nt_printing.c:nt_printing_init(649) nt_printing_init: error checking published printers: WERR_ACCESS_DENIED And that error in error.log in cups: E [13/Feb/2007:11:36:35 -0300] [Job 11] Session setup failed: SUCCESS - 0 E [13/Feb/2007:11:36:35 -0300] [Job 11] Session setup failed: NT_STATUS_LOGON_FAILURE E [13/Feb/2007:11:36:36 -0300] [Job 11] Tree connect failed (NT_STATUS_BAD_NETWORK_NAME) E [13/Feb/2007:11:36:36 -0300] [Job 11] Unable to connect to CIFS host, will retry in 60 seconds... So, what can to be happening??? With URI: smb://username:[EMAIL PROTECTED]/printer i can print normally... -- Kessia Pinheiro Gmail+GTalk/Email: kessiapinheiro [at] gmail [dot] com Linux Counter User #389695 [http://counter.li.org] -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] modify only, not deletable
I sent this to Tim. My mistake. PD: Sorry Tim. -- Forwarded message -- From: Sebastian Abate [EMAIL PROTECTED] Date: Feb 13, 2007 11:26 AM Subject: Re: [Samba] modify only, not deletable To: Tim Wunder [EMAIL PROTECTED] Be careful with this option, because when you edit a file some applications (Microsoft Office Suite is the perfect example) create a new temporary copy of that file, then when you save your work, the original file is deleted, and the temporary one is renamed to the original name. With this option set, the save process fail when the application try to delete the original file. Sebastián PD: Sorry for my english On 2/13/07, Tim Wunder [EMAIL PROTECTED] wrote: On Tuesday 13 February 2007 4:49:32 am Joshua, C.S. Chen wrote: Rashid N. Achilov wrote: On Tuesday 13 February 2007 14:30, Joshua, C.S. Chen wrote: Hi folks, I have a samba file server joining a Windows 2k AD as member server. I wonder how I can setup the files on the samba share to be modifiable by users, but no one can delete them. Is it possible? linux chattr command doesn't seems to help, and I can only setup windows share permission (full control, read,write) for the samba files from windows interface, not NTFS detailed permissions. Any idea? When you are under FreeBSD, it has chflags command to set undeletable flag. I think, trying to delete flagged file should lead to access denied message. Thanks for the info. now samba is running on a linux CentOS 4.4, is it possible to do the same thing? Perhaps through the use of the sticky bit on the directory... from 'man chmod': STICKY DIRECTORIES When the sticky bit is set on a directory, files in that directory may be unlinked or renamed only by root or their owner. Without the sticky bit, anyone able to write to the directory can delete or rename files. The sticky bit is commonly found on directories, such as /tmp, that are world-writable. Look at using something like create mask = 0664 force directory mode = 01775 in your smb.conf file. HTH, Tim -- Fedora Core release 6 (Zod), Linux 2.6.19-1.2895.fc6 14:15:58 up 4 days, 20:04, 0 users, load average: 0.15, 0.10, 0.09 MP3/OGG archive Total playlength : 14 days, 21 hours, 52 mins 42 seconds It's what you learn after you know it all that counts John Wooden -- 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] Installing Windows XP printer drivers onto Samba 3.0.24
John Drescher wrote: On 2/13/07, Marc Balmer [EMAIL PROTECTED] wrote: dear samba users I have been searching the online documents, howtos and such yet I did not find an answer to my question/problem, so if you have any hints for me that would be much appreciated: This was discussed here last week and there is some good troubleshooting here: http://lists.samba.org/archive/samba/2007-February/129326.html I have also spent at least 2 days with this and I do not have Point and Print working. For me the drivers install but when I go to associate them to the to the printer I get access denied in windows and a similar error in linux. we just found the all to stupid problem... net -U root rpc grant 'DOM\user' SePrintOperatorPrivilege did the job. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Installing Windows XP printer drivers onto Samba 3.0.24
Thanks for posting back. we just found the all to stupid problem... net -U root rpc grant 'DOM\user' SePrintOperatorPrivilege did the job. I tried that a couple of times for different users with and without the domain name and it did not help. Are you using ldap? Is your security domain? Is this printing box also the domain controller? My answers to these questions are: yes, yes and no. Thanks, John -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Migrating from 3.0.7 to 3.0.23c problems
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 02/12/2007 06:01 PM, Gary Martin wrote: The samba logs didn't contain anything interesting or pertinent. Here is my smb.conf: [global] [...] admin users = +groupname Are you aware of WHATSNEW changes about the way groups are handled? Kind regards, - -- Felipe Augusto van de Wiel [EMAIL PROTECTED] Coordenadoria de Tecnologia da Informação (CTI) - SEDU/PARANACIDADE http://www.paranacidade.org.br/ Phone: (+55 41 3350 3300) -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFF0eMWCj65ZxU4gPQRAh8dAKCLnOlST7EqDhZjkpNAZUXS8GOnegCgxl5g hAFlkJ87JQCn7i0dYoBLqpg= =Q04j -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] winbindd panic 3.0.24
Hi Samba team!
I tried with 3.0.22 and now with 2.0.24 and I got the same error.
When I try to connect to my file server using a user from a trusted domain
(DOMAIN2) my winbindd dies:
[2007/02/12 15:14:26, 3] nsswitch/winbindd_user.c:winbindd_getpwnam(328)
[0]: getpwnam domain2+asspw
[2007/02/12 15:14:26, 3] libsmb/namequery.c:resolve_lmhosts(962)
resolve_lmhosts: Attempting lmhosts lookup for name server02.domain2.biz0x20
[2007/02/12 15:14:26, 3] libsmb/namequery.c:resolve_wins(859)
resolve_wins: Attempting wins lookup for name server02.domain2.biz0x20
[2007/02/12 15:14:26, 3] libsmb/namequery.c:resolve_wins(862)
resolve_wins: WINS server resolution selected and no WINS servers listed.
[2007/02/12 15:14:26, 3] libsmb/namequery.c:resolve_hosts(1025)
resolve_hosts: Attempting host lookup for name server02.domain2.biz0x20
[2007/02/12 15:14:26, 3] nsswitch/winbindd_cm.c:cm_get_ipc_userpass(508)
cm_get_ipc_userpass: Retrieved auth-user from secrets.tdb [DOMAIN1\myuser]
[2007/02/12 15:14:26, 3] libsmb/cliconnect.c:cli_session_setup_spnego(722)
Doing spnego session setup (blob length=114)
[2007/02/12 15:14:26, 3] libsmb/cliconnect.c:cli_session_setup_spnego(747)
got OID=1 2 840 48018 1 2 2
[2007/02/12 15:14:26, 3] libsmb/cliconnect.c:cli_session_setup_spnego(747)
got OID=1 2 840 113554 1 2 2
[2007/02/12 15:14:26, 3] libsmb/cliconnect.c:cli_session_setup_spnego(747)
got OID=1 2 840 113554 1 2 2 3
[2007/02/12 15:14:26, 3] libsmb/cliconnect.c:cli_session_setup_spnego(747)
got OID=1 3 6 1 4 1 311 2 2 10
[2007/02/12 15:14:26, 3] libsmb/cliconnect.c:cli_session_setup_spnego(755)
got [EMAIL PROTECTED]
[2007/02/12 15:14:26, 2] libsmb/cliconnect.c:cli_session_setup_kerberos(546)
Doing kerberos session setup
[2007/02/12 15:14:27, 0] lib/fault.c:fault_report(41)
===
[2007/02/12 15:14:27, 0] lib/fault.c:fault_report(42)
INTERNAL ERROR: Signal 11 in pid 2992 (3.0.24-0.1.49-1172-SUSE-CODE10)
Please read the Trouble-Shooting section of the Samba3-HOWTO
[2007/02/12 15:14:27, 0] lib/fault.c:fault_report(44)
From: http://www.samba.org/samba/docs/Samba3-HOWTO.pdf
[2007/02/12 15:14:27, 0] lib/fault.c:fault_report(45)
===
[2007/02/12 15:14:27, 0] lib/util.c:smb_panic(1599)
PANIC (pid 2992): internal error
[2007/02/12 15:14:27, 0] lib/util.c:log_stack_trace(1706)
BACKTRACE: 22 stack frames:
#0 /usr/sbin/winbindd(log_stack_trace+0x2d) [0x800c5c5d]
#1 /usr/sbin/winbindd(smb_panic+0x5d) [0x800c5d8d]
#2 /usr/sbin/winbindd [0x800b1b6a]
#3 [0xe420]
#4 /usr/lib/libkrb5.so.3(krb5_free_principal+0x76) [0xb7edee46]
#5 /usr/lib/libkrb5.so.3(krb5_free_cred_contents+0x2d) [0xb7ee015d]
#6 /usr/lib/libkrb5.so.3(krb5_free_creds+0x29) [0xb7ee0249]
#7 /usr/lib/libkrb5.so.3(krb5_free_tgt_creds+0x2e) [0xb7ee028e]
#8 /usr/lib/libkrb5.so.3(krb5_get_credentials+0x1dc) [0xb7edac9c]
#9 /usr/sbin/winbindd(cli_krb5_get_ticket+0x4b9) [0x800ee7e9]
#10 /usr/sbin/winbindd(spnego_gen_negTokenTarg+0x62) [0x800ef802]
#11 /usr/sbin/winbindd(cli_session_setup_spnego+0x6c5) [0x800e7055]
#12 /usr/sbin/winbindd [0x80057cc4]
#13 /usr/sbin/winbindd [0x80057e34]
#14 /usr/sbin/winbindd(init_dc_connection+0x29) [0x80057e89]
#15 /usr/sbin/winbindd(find_domain_from_name+0x4f) [0x8004274f]
#16 /usr/sbin/winbindd(winbindd_getpwnam+0x14e) [0x8003b9ee]
#17 /usr/sbin/winbindd [0x80037ff7]
#18 /usr/sbin/winbindd [0x80039718]
#19 /usr/sbin/winbindd(main+0x94d) [0x80038bad]
#20 /lib/libc.so.6(__libc_start_main+0xdc) [0xb7d2387c]
#21 /usr/sbin/winbindd [0x80037211]
[2007/02/12 15:14:27, 0] lib/fault.c:dump_core(173)
dumping core in /var/log/samba/cores/winbindd
[2007/02/12 15:14:27, 1] smbd/sesssetup.c:reply_spnego_kerberos(310)
Username DOMAIN2+asspw is invalid on this system
My smb.conf:
[global]
workgroup = DOMAIN1
security = ads
realm = DOMAIN1
password server = x.x.x.x,x.x.x.x,x.x.x.x
enable privileges = yes
deadtime = 5
idmap uid = 1000-10
idmap gid = 1000-10
winbind cache time = 43200
winbind enum users = no
winbind enum groups = no
allow trusted domains = yes
winbind separator = +
printing = cups
cups options = raw
load printers = yes
show add printer wizard = no
printcap cache time = 0
guest only = yes
lpq cache time = 60
[printers]
comment = All Printers
path = /var/tmp
printable = Yes
create mask = 0600
browseable = No
guest ok = yes
My kerberos files (kinit works fine with both):
# cat /var/lib/samba/smb_krb5/krb5.conf.DOMAIN1
[libdefaults]
default_realm = DOMAIN1.BIZ
[realms]
DOMAIN1.BIZ = {
kdc = x.x.x.x
kdc = x.x.x.x
}
# cat /var/lib/samba/smb_krb5/krb5.conf.DOMAIN2
Re: [Samba] Installing Windows XP printer drivers onto Samba 3.0.24
John Drescher wrote: Thanks for posting back. we just found the all to stupid problem... net -U root rpc grant 'DOM\user' SePrintOperatorPrivilege did the job. I tried that a couple of times for different users with and without the domain name and it did not help. Are you using ldap? Is your security domain? Is this printing box also the domain controller? My answers to these questions are: yes, yes and no. Our setup is a simple samba domain member server that acts as a print server. no ldap, no domain controller. it works now and this is what we did: create a printadmin user on the PDC and granting this account the SePrintOperatorPrivilege add the user to the member (print) server (we need that because we don't have nsswitch/ldap). create a storage for the drivers that is writeable by printadmin. now we can manage the printers from window, add drivers and such. there is one point to keep in mind when installing a new driver: change the default settings before hitting OK, or bad things can happen. this has to do with the default device mode. so, sigh, two days of mind boggling, and everything only because we wanted to get rid of CUPS ;) - m. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: Server string cached somewhere ?
You can't help me for this issue ? Roman ZARAGOCI a écrit : Hi all, I set the server string to : (%U/%m - %T) on the global section. When connecting to the samba server, the server string shown is ok. But when I'm opening one of the shares (like [homes]), the old server string is displaying on the top of my window (the title). I restart many times the samba service and the server rebooted many times too. How can I apply the server string set up on the global section to all of my shares ? Soz' for my english, I'm french :o) 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] Clients periodically disconnecting
Samba 3.0.21c, RHEL4. About a week ago, we restarted our Samba server because nmbd had run amok. Since that restart, our Apple clients have periodically disconnected -- by most reports, they disconnect every 15-45 minutes. It doesn't appear to be synchronized, i.e., every Mac on campus doesn't disconnect at once, but only occasionally. They get a message similar to: A server you are using is no longer available. Do you want to continue trying to contact it? (This varies by exact OS revision, of course.) Our Windows clients do not exhibit this behavior. I turned up the logging for a few users for whom this was reliably happening. The following are the last few messages before it disconnects: [2007/02/13 10:08:57, 3] smbd/sec_ctx.c:set_sec_ctx(288) setting sec ctx (0, 0) - sec_ctx_stack_ndx = 0 [2007/02/13 10:08:57, 5] auth/auth_util.c:debug_nt_user_token(433) NT user token: (NULL) [2007/02/13 10:08:57, 5] auth/auth_util.c:debug_unix_user_token(454) UNIX token of user 0 Primary group is 0 and contains 0 supplementary groups [2007/02/13 10:08:57, 5] smbd/uid.c:change_to_root_user(324) change_to_root_user: now uid=(0,0) gid=(0,0) [2007/02/13 10:08:57, 5] lib/username.c:Get_Pwnam_alloc(290) Finding user jrandom [2007/02/13 10:08:57, 5] lib/username.c:Get_Pwnam_internals(234) Trying _Get_Pwnam(), username as lowercase is jrandom [2007/02/13 10:08:57, 5] lib/username.c:Get_Pwnam_internals(267) Get_Pwnam_internals did find user [jrandom]! Any ideas? Chris St. Pierre Unix Systems Administrator Nebraska Wesleyan University -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] Re: Server string cached somewhere ?
It's stored in the registry on XP machines. (98/ME/2000, too, I would guess). Mine was in my profile: HKEY_USERS\S-1-5-21-xx-xxx-xx-\Software\Microsof t\Windows\CurrentVersion\Explorer\ComputerDescriptions It didn't appear in HKEY_CURRENT_USER, though. Just do a registry search for part of the current description, and delete the value when you find it. Then un-map, and remap the share. It should show the value you have setup in Samba. If you change it in Samba, though, you'll have to do it again. Hope this helps, Dennis -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Roman ZARAGOCI Sent: Tuesday, February 13, 2007 8:58 AM Cc: samba@lists.samba.org Subject: [Samba] Re: Server string cached somewhere ? You can't help me for this issue ? Roman ZARAGOCI a écrit : Hi all, I set the server string to : (%U/%m - %T) on the global section. When connecting to the samba server, the server string shown is ok. But when I'm opening one of the shares (like [homes]), the old server string is displaying on the top of my window (the title). I restart many times the samba service and the server rebooted many times too. How can I apply the server string set up on the global section to all of my shares ? Soz' for my english, I'm french :o) Thanks in advance ! -- 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] Samba Domain authentication and shares
Thanks for the link. I have read it over and it seems that my error is probably in winbind. All of these command work. * net ads join -U Administrator* wbinfo -u wbinfo -g net ads info However, the winbind getent passwd indicates the passwords are still coming from the local machine. I can provide you with whatever files you would like to see. Below is my nsswitch.conf file: Thanks in advance. # # /etc/nsswitch.conf # # An example Name Service Switch config file. This file should be # sorted with the most-used services at the beginning. # # The entry '[NOTFOUND=return]' means that the search for an # entry should stop if the search in the previous entry turned # up nothing. Note that if the search failed due to some other reason # (like no NIS server responding) then the search continues with the # next entry. # # Legal entries are: # #nisplus or nis+Use NIS+ (NIS version 3) #nis or ypUse NIS (NIS version 2), also called YP #dnsUse DNS (Domain Name Service) #filesUse the local files #dbUse the local database (.db) files #compatUse NIS on compat mode #hesiodUse Hesiod for user lookups #[NOTFOUND=return]Stop searching if not found so far # # To use db, put the db in front of files for entries you want to be # looked up first in the databases # # Example: #passwd:db files nisplus nis #shadow:db files nisplus nis #group: db files nisplus nis passwd: compat winbind shadow: compat group: compat winbind #hosts: db files nisplus nis dns hosts: files dns # Example - obey only what nisplus tells us... #services: nisplus [NOTFOUND=return] files #networks: nisplus [NOTFOUND=return] files #protocols: nisplus [NOTFOUND=return] files #rpc:nisplus [NOTFOUND=return] files #ethers: nisplus [NOTFOUND=return] files #netmasks: nisplus [NOTFOUND=return] files bootparams: nisplus [NOTFOUND=return] files ethers: files netmasks: files networks: files protocols: files winbind rpc:files services: files winbind netgroup: files winbind publickey: nisplus automount: files winbind aliases:files nisplus -- Dale Schroeder wrote: Kevin, Without your Samba version and smb.conf, it is hard to diagnose what the problem might be. Since many use security = ADS and winbind to authenticate against a W2K3 domain, see if these resources are of any help to you: http://www.enterprisenetworkingplanet.com/netos/article.php/3487081 http://www.enterprisenetworkingplanet.com/netos/article.php/10951_3502441_1 Dale Kevin Gutch wrote: Hello, Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=ISO-8859-1 I have been able to use Samba to join our Win2003 domain. I have also setup folders and permissions in the smb.conf file. I can browser to the Samba Shares 2 ways, thru network neighborhood and by UNC/ip address. Both of these methods prompt me for login which is not successful. I assumed that if I userA had permissions to a folder in the smb.conf file that Windows userA would e able to access wit no problems as long as he was logged onto the domain. Does anyone have any suggestions or troubleshooting tips? Thanks, Kevin -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] My Net is busted
CNRG is a posixgroup: # cnrg, group, igb.uiuc.edu dn: cn=cnrg,ou=group,dc=igb,dc=uiuc,dc=edu cn: cnrg objectClass: posixGroup gidNumber: 102 description: Computer and Network Resource Group memberUid: danield I have smbldap-tools configured, I believe properly, and I can run them and make them work. However, I have not been using them and have created my own scripts for use with my specific needs. One guess I have is that I am missing something from the group entry that samba needs, but I am not sure. Ldap group suffix is set, from smb.conf: ldap group suffix = ou=group ldap suffix = dc=igb,dc=uiuc,dc=edu ldap ssl = on ldap user suffix = ou=People ldap machine suffix = ou=computer I have not fired up wireshark yet, I was hoping to avoid that. If this does not give anyone hints on what I am doing wrong, I will bite the bullet and get it installed. Dan On Fri, 2007-02-09 at 17:21 -0600, Gerald (Jerry) Carter wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Daniel Davidson wrote: I was guessing that, but it will not let me create them: [EMAIL PROTECTED] os]# net groupmap add rid=512 unixgroup=cnrg ntgroup=Domain Admins [2007/02/09 16:45:06, 0] passdb/pdb_ldap.c:ldapsam_add_group_mapping_entry(2330) ldapsam_add_group_mapping_entry: failed to add group 102 error: �_ (Internal (implementation specific) error) adding entry for group Domain Admins failed! Otherwise, your book would be keeping me from posting here. LOL! ok. Fair enough. Basic questions: * Is cnrg a posixGroup in the directory? * Are you using the smbldap tools ? * Have you set the 'ldap group suffix'? * Have you looked at the LDAP modify request on the wire (in Wireshark)? cheers, jerry = Samba--- http://www.samba.org Centeris --- http://www.centeris.com What man is a man who does not make the world better? --Balian -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.3 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFFzQIIIR7qMdg1EfYRAiMgAJ9f/OZw5DAY3xUzlYuQ1UcNsSTEtgCeJt0v g5JPZtEL8t7zzKPgTO4nb7E= =Ikqb -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Domain Admins with Samba 3.024
I can't seem to get the Domain Admins group members to be recognisd as administrators on domain member PCs.Running net groupmap list yeilds the following: Domain Admins (S-1-5-21-1288424760-4211430746-2168377316-512) - admin --irrelevant groups omitted-- Running net rpc group members Domain Admins yeilds: RLRMR\administrator RLRMR\root Looging in as administrator on a network connected domain member I get only normal restricted user priviledges. What am I missing here folks? Thanks, -- Neil Jolly Jolly Computatations #12 800 Bowcroft Place Cochrane, Alberta Phone: (403) 688-7516 Fax: (403) 851-0873 Web: www.jollycom.ca -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Problem with authentification Samba 3.0.24
Dear listmembers, a few weeks ago i've installed a server based on openSUSE 10.0 and Samba 3.0.20 in addition to two existing Windows 2003 servers. My aim is to replace the Windows servers in medium term. The Samba server uses Kerberos v5 to authentificate the users against the W2003-Server. The W2003-Server ist the primary domain controller, the other W2K3-server is the backup domain controller. Samba is a domain member (via server = ADS). Nearly everthing works. But now my problem: The first connect to a samba share needs nearly 20 (!) seconds to be finished (via network places or via network drive - it's the same). If this connect is done, everything works fine. The logfiles show no(!) error or timeout or something like that. Have someone a clue, how i can disable the timeout at the first authentification? I've updated from 3.0.20 to 3.0.24, but nothing happens in that way. Other errors were fixed, but the timeout is the same. Thanks in advance for every hint. Regards, Michel -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Windows: Forcing a Guest Login.
This issue comes up time and time again on the mailing list and internet. I have yet to see a single answer. How do you get windows to access a share with as a guest? The situation is pretty simple: - A samba share exists for which there are guest logins available However this share is inaccessible to windows users because: - Windows by default tries to login to a share with its current username/password - Windows fails - Windows opens a login/password box for user - There is no way to force windows to connect as a guest There are two hacks for this issue: 1. demote to share level security, which windows consumes differently. 2. map to guest option to default failed logins to guest. These hacks have issues: #1 massively reduces the functionality of samba. #2 is viable, however i've found users' often end up logged in as guest when they intended to login as a user. this is a severely suboptimal hack. the nub of the issue is that /Windows/ needs some way of being able to connect as guest. to the best of my knowledge though, the fuckassedbitchcunts at microsoft have not provided any measures for this absolutely basic procedure: logging in as a guest. someone please dear lord tell me i am wrong? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba Domain authentication and shares
Kevin, When I had getent issues, it turned out to be the idmap backend parameter that got me. I should have left it at the default, but didn't. Is your pam login file set up for winbind? Although it seems only vaguely related to your problem, there was an issue about connecting _from_ a W2K3 system listed here: http://lists.samba.org/archive/samba/2007-January/128589.html . I don't know is that is an issue for you or not. If none of these help you, you will need to post your smb.conf and Samba version to let the real experts diagnose. I comment on what burned me. ;-) Good luck, Dale Kevin Gutch wrote: Dale, Thanks for the link. I have read it over and it seems that my error is probably in winbind. All of these command work. * net ads join -U Administrator* wbinfo -u wbinfo -g net ads info However, the winbind getent passwd indicates the passwords are still coming from the local machine. I can provide you with whatever files you would like to see. Below is my nsswitch.conf file: Thanks in advance. # # /etc/nsswitch.conf # # An example Name Service Switch config file. This file should be # sorted with the most-used services at the beginning. # # The entry '[NOTFOUND=return]' means that the search for an # entry should stop if the search in the previous entry turned # up nothing. Note that if the search failed due to some other reason # (like no NIS server responding) then the search continues with the # next entry. # # Legal entries are: # #nisplus or nis+Use NIS+ (NIS version 3) #nis or ypUse NIS (NIS version 2), also called YP #dnsUse DNS (Domain Name Service) #filesUse the local files #dbUse the local database (.db) files #compatUse NIS on compat mode #hesiodUse Hesiod for user lookups #[NOTFOUND=return]Stop searching if not found so far # # To use db, put the db in front of files for entries you want to be # looked up first in the databases # # Example: #passwd:db files nisplus nis #shadow:db files nisplus nis #group: db files nisplus nis passwd: compat winbind shadow: compat group: compat winbind #hosts: db files nisplus nis dns hosts: files dns # Example - obey only what nisplus tells us... #services: nisplus [NOTFOUND=return] files #networks: nisplus [NOTFOUND=return] files #protocols: nisplus [NOTFOUND=return] files #rpc:nisplus [NOTFOUND=return] files #ethers: nisplus [NOTFOUND=return] files #netmasks: nisplus [NOTFOUND=return] files bootparams: nisplus [NOTFOUND=return] files ethers: files netmasks: files networks: files protocols: files winbind rpc:files services: files winbind netgroup: files winbind publickey: nisplus automount: files winbind aliases:files nisplus -- Dale Schroeder wrote: Kevin, Without your Samba version and smb.conf, it is hard to diagnose what the problem might be. Since many use security = ADS and winbind to authenticate against a W2K3 domain, see if these resources are of any help to you: http://www.enterprisenetworkingplanet.com/netos/article.php/3487081 http://www.enterprisenetworkingplanet.com/netos/article.php/10951_3502441_1 Dale Kevin Gutch wrote: Hello, Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=ISO-8859-1 I have been able to use Samba to join our Win2003 domain. I have also setup folders and permissions in the smb.conf file. I can browser to the Samba Shares 2 ways, thru network neighborhood and by UNC/ip address. Both of these methods prompt me for login which is not successful. I assumed that if I userA had permissions to a folder in the smb.conf file that Windows userA would e able to access wit no problems as long as he was logged onto the domain. Does anyone have any suggestions or troubleshooting tips? Thanks, Kevin -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Winbind missing secondary groups depending on case distro
I've been at this on and off for a month, testing, searching, so please bear with me :) I think it's finally time to ask for help before I rip my hair out. winbind is refusing to report a user's secondary groups depending on whether I request it in mixed case, in lower case, and with the domain name. Samba is also refusing to see the user's secondary groups. The username is mixed case on the NT4 PDC server (i.e. David) I've built Ubuntu 6.06LTS, and 7.04 servers with 3.0.22, and 3.0.24 respectively. Both these machines exhibit this problem. I've also built a CentOS 4.4 with 3.0.23d 3.0.24, and it works *fine*, the problem is only on the Ubuntu machines. Considering they both run 3.0.24, this seems kind of bizarre. On the Ubuntu server, id DOMAINNAME+David, id DOMAINNAME+david, and id David only list the primary group, and id david lists all groups. All of these combinations produce all groups on the CentOS server. The NT4 PDC, and the Samba domain member servers have all been built from scratch from bare-bones installs for the sole purpose of figuring this all out (so the solution can be rolled into a production Ubuntu 6.06LTS server NT4 PDC). They all run identical smb.conf and similar nsswitch.conf files. wbinfo -u and -g list the correct users and groups, and getent passwd group also list local and PDC users and groups as expected. A link to a level 10 log of log.winbindd is here == http://www.petrolia.com/files/log.winbindd.txt It is a clean log that only contains startup, and a request (id David) on the Ubuntu 7.04 server. The Ubuntu machine also does not list any BUILTIN groups like the CentOS machine. The [global] section of smb.conf on all machines is: [global] workgroup = TOILETWARS server string = Samba Server security = DOMAIN log file = /var/log/samba/%m.log max log size = 50 socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 preferred master = No local master = No domain master = No dns proxy = No ldap ssl = no idmap uid = 16777216-33554431 idmap gid = 16777216-33554431 winbind separator = + winbind enum users = Yes winbind enum groups = Yes winbind use default domain = Yes cups options = raw What on earth could be the difference between these platforms that is causing this? Roger -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] PDC appears to be BDC in server manager
you're welcome :) what does nmblookup DOMAIN#1b and DOMAIN#1c give you? since everything is working this seems to be a cosmetic error?!?! micha Martin Brook wrote: Many thanks Michael. That worked perfectly. (I think when I tried this previously I didn't delete browse.dat, and I don't think the lack of a properly working root account in samba was helping much either). If I could ask one more question - I've noticed that, in the SAM database, the account flags W and S for the two servers' machine accounts are the wrong way round. e.g. # pdbedit -Lv BIGSERVER$ Unix username:BIGSERVER$ NT username: BIGSERVER$ Account Flags:[W ] ... # pdbedit -Lv LITTLESERVER$ Unix username:LITTLESERVER$ NT username: LITTLESERVER$ Account Flags:[S ] ... shouldn't these be the other way round? according to the manpage: W: Workstation Trust Account S: Server Trust Account I suppose they are swapped because that was how they were when the accounts were migrated. I tried editing the flags with pdbedit but that's not allowed. I tried deleting and recreating the machine accounts but was unable to recreate them (so I restored the .tdb files from backup). Does it even matter, since everything is working now? Martin On 2/11/07, Michael Gasch [EMAIL PROTECTED] wrote: hi again, 2. I somehow need to rename the server back to BIGSERVER, but I'm not sure how to do this without breaking things again. assuming you have a small net work w/ only one DC (samba) and no trusts this should be no problem. - stop all samba processes on the PDC. rename it in smb.conf. - make sure that there's no hostname entry in any configfile on your samba DC that points to LITTLESERVER (e.g. you could grep for it 'grep -ir LITTLESERVER /etc/*' - everything should be BIGSERVER otherwise this could lead to inconsistencies) - delete browse.dat and wins.dat - start nmbd - on another linux system do the following: - nmblookup -M YOURDOMAIN - nmblookup YOURDOMAIN#1b - nmblookup YOURDOMAIN#1c this should always list your samba server (at least after 1 minute). you can also force samba to be the local master in your network (inkl. preferred master). then start smbd. micha -- Michael Gasch Max Planck Institute for Evolutionary Anthropology Department of Human Evolution (IT Staff) Deutscher Platz 6 D-04103 Leipzig Germany Phone: 49 (0)341 - 3550 137 49 (0)341 - 3550 374 Fax: 49 (0)341 - 3550 399 http://www.eva.mpg.de/evolution/ -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Windows cannot obtain the domain controller name foryour computer network error on XP Pro SP2 clients for Samba 3.0.23dPDC
Hi, In the interests of getting to the bottom of this I went and configured Samba on another system as a PDC for a second domain. I then joined yet another machine to this domain (of the same spec and configuration as the systems I'd previous experienced problems with) and diligently examined the event log for any errors ... noting that there were no event id 1054 's reported this time. I think took this client and joined it to the original domain/samba server I was having problems with, but only after removing my first attempt at policy file (NTConfig.POL) from the netlogon share. Another restart and I login to the client and again examine the event logs and verified, again, that there were no 1054 errors. The only conclusion I can come to at this stage is that I somehow mangled the registry on my first test clients with some setting in my NTConfig.POL which lead to the 1054 errors (lovely circular chain of events there). So the good news is my Samba configuration works, the bad news is I have 2 systems with dodgy registries (and registry backups were ... errr, next on my TODO list). I'll be more cautious with future NT policy creation but I'm glad to have gotten to the bottom of this. Sorry if I wasted anyones time, hopefully someone can learn from my mistakes. -stephen stephen mulcahy wrote: Hi, While perusing the SAMBA HOWTOs I decided to try some of the validation steps including the wins test at http://www.samba.org/samba/docs/man/Samba-Guide/secure.html#ch4valid If I try the following, 1. start samba with wins support = yes 2. edit /etc/nsswitch.conf and change hosts to wins only. 3. ping the samba server and I get unknown host error. Does this suggest my wins configuration is broken? I verified in this case that nmbd was running and the log.nmbd doesn't contain any obvious error messages. Thanks, -stephen stephen mulcahy wrote: Hi, In effort to resolve the 1054 errors on the XP client, I tried to create a new test domain on a separate server and join one of the XP clients to that. The joining process went smoothly (with one caveat below) but I notice the same event is logged in the new domain. I notice that is it preceeded by an AutoEnrollment error with event id 15 which is discussed here - http://lists.linux.org.au/archives/lias/2002-November/msg00033.html Is it possible that this is connected to my errors? Did I miss some documentation in the Samba HOWTO relating to my XP client setup? On a related note, when I restarted the XP client for the first time after joining the new test domain, it displayed a dialog on the login screen saying Please wait while the domain list is created which stayed there for a few minutes. Is that normal or is it indicative of a problem? Finally, whats the most current recommended documentation for configuring Samba with a tdbsam backend as a PDC? I'm wondering if further reading of some fine manual may help me in my quest. Thanks, -stephen stephen mulcahy wrote: Hi Paul, Thanks for your reply. I tried adding the following to lmhosts as suggested, 10.1.2.3 duck #PRE #DOM:APLPI and rebooted but I'm still seeing the same error (should I disable the WINS server I have enabled in samba to correctly verify this?). I would note that on the client if I type 'net view \\duck' this consistently works suggesting that name resolution is working (but is there a better way of testing name resolution in a samba environment?) I restarted samba with some additional logging and noted 2 things 1. Samba creates a log-file for the client with the ip address first and then subsequently creates a log-file with the client name. Is this normal or indicative of a problem? 2. I can clearly see the client successfully opening the NTConfig.POL file (and the logon.cmd file) indicating that the client has connected to and downloaded the policy file .. so the nature of the Event 1054 error is unclear to me .. [2007/02/08 14:35:20, 2] smbd/reply.c:reply_tcon_and_X(711) Serving IPC$ as a Dfs root [2007/02/08 14:35:22, 2] smbd/reply.c:reply_tcon_and_X(711) Serving IPC$ as a Dfs root [2007/02/08 14:35:22, 2] auth/auth.c:check_ntlm_password(309) check_ntlm_password: authentication for user [smulcahy] - [smulcahy] - [smulcahy] succeeded [2007/02/08 14:35:22, 2] smbd/reply.c:reply_tcon_and_X(711) Serving IPC$ as a Dfs root [2007/02/08 14:35:22, 2] auth/auth.c:check_ntlm_password(309) check_ntlm_password: authentication for user [smulcahy] - [smulcahy] - [smulcahy] succeeded [2007/02/08 14:35:22, 1] smbd/service.c:make_connection_snum(950) puck (10.7.44.30) connect to service netlogon initially as user smulcahy (uid=1000, gid=1000) (pid 29041) [2007/02/08 14:35:22, 2] smbd/reply.c:reply_tcon_and_X(711) Serving netlogon as a Dfs root [2007/02/08 14:35:22, 2] smbd/open.c:open_file(352) smulcahy opened file NTConfig.POL read=Yes write=No (numopen=1) [2007/02/08 14:35:22, 2]
Re: [Samba] Winbind missing secondary groups depending on case distro
On Tuesday 13 February 2007, Roger Prefontaine wrote: On the Ubuntu server, id DOMAINNAME+David, id DOMAINNAME+david, and id David only list the primary group, and id david lists all groups. All of these combinations produce all groups on the CentOS server. winbind use default domain = Yes May not be much help but out of curiosity I tried the same test on a Samba server that is also a member of an NT4 domain. It is running 3.0.24 plus the 6 Vista patches on a Gentoo server. I don't use the winbind use default domain = Yes in smb.conf, but I did test that way as well. Also I didn't change the default seperator. With the normal setup (winbind use default domain = No): -- id DOMAINNAME\\username - shows all groups id DOMAINNAME\\USERNAME (or any permutation with a cap in the username) - only primary groups id username - returns No such user -- If I set winbind use default domain = Yes then: -- id DOMAINNAME\\username - only primary groups id DOMAINNAME\\USERNAME (or any permutation with a cap in the username) - only primary groups id username - shows all groups -- Chris -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Winbind missing secondary groups depending on case distro
On Tuesday 13 February 2007, Roger Prefontaine wrote: On the Ubuntu server, id DOMAINNAME+David, id DOMAINNAME+david, and id David only list the primary group, and id david lists all groups. All of these combinations produce all groups on the CentOS server. winbind use default domain = Yes May not be much help but out of curiosity I tried the same test on a Samba server that is also a member of an NT4 domain. It is running 3.0.24 plus the 6 Vista patches on a Gentoo server. I don't use the winbind use default domain = Yes in smb.conf, but I did test that way as well. Also I didn't change the default seperator. With the normal setup (winbind use default domain = No): -- id DOMAINNAME\\username - shows all groups id DOMAINNAME\\USERNAME (or any permutation with a cap in the username) - only primary group id username - returns No such user id USERNAME (or any permutation with a cap in the username) - returns No such user -- If I set winbind use default domain = Yes then: -- id DOMAINNAME\\username - only primary group id DOMAINNAME\\USERNAME (or any permutation with a cap in the username) - only primary group id username - shows all groups id USERNAME (or any permutation with a cap in the username) - only primary group -- Chris EDITED to add the other cases (id USERNAME). -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Winbind missing secondary groups depending on case distro
Possibly just a quirk with the id utility. The version I tested with: $ id --version id (GNU coreutils) 6.7 Copyright (C) 2006 Free Software Foundation, Inc. This is free software. You may redistribute copies of it under the terms of the GNU General Public License http://www.gnu.org/licenses/gpl.html. There is NO WARRANTY, to the extent permitted by law. Written by Arnold Robbins and David MacKenzie. Chris -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Win2K Lockdown: The master browser has received a server announcment...
I'm seeing errors like this in my event viewer on win2k clients: Source MRx Smb The master browser has received a server announcement that computer CONAN that believes it is the master browser for the domain ... The master brower is stoppong or an election is being forced. Event ID 8003 The other error that frequently occurs with this: Source: Netlogon No Windows NT or Windows Active Domain Controller is available for the domain SJSA. The following error occured: The RPC server is unavailable. Event ID 5719 Setup: Server Samba 2.2.8a Clients Win2K SP4 lmhosts file with name of PDC with #PRE #DOM:SJSA in it. Kerio Sunbelt personal firewall with rules to 1. Allow all traffic between client and servers. 2. Block all traffic between clients 3. Block all traffic to/from broadcast address. DHCP server is set to tell clients option netbios-name-servers 192.168.1.241 ; option netbios-node-type 2 ; Conan is the master browser and wins server. The system mostly works, except intermittently won't load profile, or takes a long time to load profiles. (As a side effect to trying to stomp client to client communications logins, when they work are very fast.) Ideas? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Windows: Forcing a Guest Login.
How do you get windows to access a share as a guest? But what's a guest? Is that someone logging in with a blank username? Or is it someone logging in with the username Guest and a blank password? Or is it any unknown username regardless of the password? - Windows by default tries to login to a share with its current username/password Correct, so if you allow your existing users to access all the guest shares, it shouldn't matter who they connect as. - Windows opens a login/password box for user As it does when you connect as an invalid username or password, or the account you're connecting as doesn't have enough access. Grant the connecting user access if you don't want the login box to appear. - There is no way to force windows to connect as a guest But Windows asks you for a username to connect as, just log in with the Guest username (isn't that how Windows itself works? Don't people always tell you to disable the Guest account on a new Windows installation for this reason?) 2. map to guest option to default failed logins to guest. #2 is viable, however i've found users' often end up logged in as guest when they intended to login as a user. this is a severely suboptimal hack. I guess it's up to how you define your guest account. If you create an account called Guest and give it a blank password, then people can log in as this guest account or their own account by typing in the appropriate username, and there shouldn't be any mix up. If you were hoping for an easy solution where people don't have to log in at all to access the guest shares, then you'll have to make sure all your legitimate users have access to the appropriate guest shares too, then use one of the 'map to guest' options. I'm not aware of any other way of doing it. the nub of the issue is that /Windows/ needs some way of being able to connect as guest. Since Microsoft use an actual Guest account I expect their method is related to that (whether you have to log in as a Guest, or invalid accounts are automatically mapped to guest I don't know. Perhaps trying to connect to an XP box with the Guest account enabled might tell you.) I think you'll have to use a 'map to guest' option with Samba, that's really the only way having things just work (assuming, as you say, that people don't accidentally log themselves on as a guest.) Cheers, Adam. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Windows: Forcing a Guest Login.
Just for reference, I'm not ever talking about the guest account on windows. I'm taking about guest access, as is convention within samba. On 2/13/07, Adam Nielsen [EMAIL PROTECTED] wrote: How do you get windows to access a share as a guest? But what's a guest? Is that someone logging in with a blank username? Or is it someone logging in with the username Guest and a blank password? Or is it any unknown username regardless of the password? Well, what is a guest to samba? smbclient for example appears to be happy to work anonymously. Does it just pull some data from /dev/urandom for username/password and toss it at the server? Clearly the samba clients have some concept of being a guest, of logging in anonymously. I just wish i could replicate this known unknown username in windows. [snip, you are correct in your comments] - There is no way to force windows to connect as a guest But Windows asks you for a username to connect as, just log in with the Guest username (isn't that how Windows itself works? Don't people always tell you to disable the Guest account on a new Windows installation for this reason?) This is the key! Right here! Samba services appear to permit connectivity without username/password whatsoever. The closest semantic equivalent in the windows login box would be / for username password, but the windows login box will not let you send that, it demands some kind of username to connect. As soon as you enter something in the login box, samba thinks you are trying to connect as a user named Guest. I wish for a way to get windows to try to connect anonymously, to connect as a guest, not as a user named Guest. [snip more] I think you'll have to use a 'map to guest' option with Samba, that's really the only way having things just work (assuming, as you say, that people don't accidentally log themselves on as a guest.) map to guest = bad username is a little safer than map to guest = bad password or other options: if the user enters their own username (they usually manage at least that) they get an err and not just demoted to guest. I guess it's up to how you define your guest account. If you create an account called Guest and give it a blank password, then people can log in as this guest account or their own account by typing in the appropriate username, and there shouldn't be any mix up. I was thinking about this problem today, and arrived at the same solution. It still greatly irritates me that samba is capable of anonymous login, where windows requires creating password-less users to emulate this behavior, but it is at least tenable. The idea here is really to make it so that merely by connecting, the user explicitly knows what kind of network access they have. If they can and do log in as user, it means they have some kind of personal access beyond anonymous access. If they want to log on as a guest, they should know they're logging in as a guest in the first place. I hope I'm being a little clearer. The main keyword (guest) is being overloaded from the samba windows ends... rektide -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] ClearCase Interop problem with recent Samba versions
Dear all,
I have a SUN server running as ClearCase view-server and am using Samba
for Interop. Today I updated Samba from 3.0.21c to 3.0.24 and now I
cannot mount/start my views from windows!!
MVFS error log on my windows client gives {8 pid/tid 4980c58/85fdf178}
MvfsFsNotification: Unsupported filesystem type (6)
Samba logs don't show any error...
Trying other Samba-version (3.0.23a|b|c) gives the same result, only
switching back to 3.0.21 solves this.
Has anyone else seen this problem? And maybe solved this?
Anybody know what changes have been done in filesystem types between 3.0.21 and
3.0.23?
Thanks a lot,
Chris
___
Christian Masopust
SIEMENS AG PSE SMC CI E CM
Tel: +43 (0) 5 1707 26866
E-mail: [EMAIL PROTECTED]
Addr: Austria, 1210 Vienna, Siemensstraße 90-92, B. 33, Rm. 243
Mailcode:
___
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] ClearCase Interop problem with recent Samba versions
On Wed, Feb 14, 2007 at 08:20:36AM +0100, Masopust, Christian wrote:
I have a SUN server running as ClearCase view-server and am using Samba
for Interop. Today I updated Samba from 3.0.21c to 3.0.24 and now I
cannot mount/start my views from windows!!
MVFS error log on my windows client gives {8 pid/tid 4980c58/85fdf178}
MvfsFsNotification: Unsupported filesystem type (6)
Samba logs don't show any error...
Trying other Samba-version (3.0.23a|b|c) gives the same result, only
switching back to 3.0.21 solves this.
Has anyone else seen this problem? And maybe solved this?
Anybody know what changes have been done in filesystem types between 3.0.21
and 3.0.23?
Can you please send debug level 10 logs and tcpdumps of both
versions?
If they are large, you might either send them directly to me
or open a bug at http://bugzilla.samba.org/ and upload them
there.
Thanks,
Volker
pgpN0iON2sMLS.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
svn commit: samba r21306 - in branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules: .
Author: metze
Date: 2007-02-13 08:08:23 + (Tue, 13 Feb 2007)
New Revision: 21306
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21306
Log:
fix the RPC-LSA tests the admin couldn't no longer get the 'currentValue'
attribute...
this needs more works, but make it work again for now
metze
Modified:
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/kludge_acl.c
Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/kludge_acl.c
===
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/kludge_acl.c
2007-02-13 03:52:57 UTC (rev 21305)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/kludge_acl.c
2007-02-13 08:08:23 UTC (rev 21306)
@@ -126,6 +126,7 @@
{
switch (ac-user_type) {
case SYSTEM:
+ case ADMINISTRATOR:
break;
default:
/* remove password attributes */
svn commit: samba r21307 - in branches/SAMBA_4_0/source/libcli/security: .
Author: metze
Date: 2007-02-13 09:27:56 + (Tue, 13 Feb 2007)
New Revision: 21307
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21307
Log:
make it possible to pass in NULL for domain or rid,
if someone isn't interessted in one of it
metze
Modified:
branches/SAMBA_4_0/source/libcli/security/dom_sid.c
Changeset:
Modified: branches/SAMBA_4_0/source/libcli/security/dom_sid.c
===
--- branches/SAMBA_4_0/source/libcli/security/dom_sid.c 2007-02-13 08:08:23 UTC
(rev 21306)
+++ branches/SAMBA_4_0/source/libcli/security/dom_sid.c 2007-02-13 09:27:56 UTC
(rev 21307)
@@ -225,12 +225,18 @@
return NT_STATUS_INVALID_PARAMETER;
}
- if (!(*domain = dom_sid_dup(mem_ctx, sid))) {
- return NT_STATUS_NO_MEMORY;
+ if (domain) {
+ if (!(*domain = dom_sid_dup(mem_ctx, sid))) {
+ return NT_STATUS_NO_MEMORY;
+ }
+
+ (*domain)-num_auths -= 1;
}
- (*domain)-num_auths -= 1;
- *rid = (*domain)-sub_auths[(*domain)-num_auths];
+ if (rid) {
+ *rid = sid-sub_auths[sid-num_auths - 1];
+ }
+
return NT_STATUS_OK;
}
svn commit: samba r21308 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch
Author: gd
Date: 2007-02-13 10:42:53 + (Tue, 13 Feb 2007)
New Revision: 21308
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21308
Log:
Fix some typos and ensure to null terminate the correct strings.
Guenther
Modified:
branches/SAMBA_3_0/source/nsswitch/winbindd_async.c
branches/SAMBA_3_0/source/nsswitch/winbindd_rpc.c
branches/SAMBA_3_0/source/nsswitch/winbindd_util.c
branches/SAMBA_3_0_25/source/nsswitch/winbindd_async.c
branches/SAMBA_3_0_25/source/nsswitch/winbindd_rpc.c
branches/SAMBA_3_0_25/source/nsswitch/winbindd_util.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_async.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_async.c 2007-02-13 09:27:56 UTC
(rev 21307)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_async.c 2007-02-13 10:42:53 UTC
(rev 21308)
@@ -837,7 +837,7 @@
char *name_domain, *name_account;
if ( !root_domain ) {
- DEBUG(5,(lookupname_recv: unable determine forest
root\n));
+ DEBUG(5,(lookupname_recv: unable to determine forest
root\n));
cont(private_data, False, NULL, SID_NAME_UNKNOWN);
return;
}
@@ -907,10 +907,10 @@
char *p;
/* Ensure null termination */
-
state-request.data.sid[sizeof(state-request.data.name.dom_name)-1]='\0';
+
state-request.data.name.dom_name[sizeof(state-request.data.name.dom_name)-1]='\0';
/* Ensure null termination */
- state-request.data.sid[sizeof(state-request.data.name.name)-1]='\0';
+
state-request.data.name.name[sizeof(state-request.data.name.name)-1]='\0';
/* cope with the name being a fully qualified name */
p = strstr(state-request.data.name.name, lp_winbind_separator());
@@ -926,7 +926,7 @@
DEBUG(3, ([%5lu]: lookupname %s%s%s\n, (unsigned long)state-pid,
name_domain, lp_winbind_separator(), name_user));
- /* Lookup name from PDC using lsa_lookup_names() */
+ /* Lookup name from DC using lsa_lookup_names() */
if (!winbindd_lookup_sid_by_name(state-mem_ctx, domain, name_domain,
name_user, sid, type)) {
return WINBINDD_ERROR;
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_rpc.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_rpc.c 2007-02-13 09:27:56 UTC
(rev 21307)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_rpc.c 2007-02-13 10:42:53 UTC
(rev 21308)
@@ -262,7 +262,7 @@
return NT_STATUS_NO_MEMORY;
}
- ws_name_return( full_name, '_' );
+ ws_name_return( full_name, '_' );
DEBUG(3,(name_to_sid [rpc] %s for domain %s\n,
full_name?full_name:, domain_name ));
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_util.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_util.c 2007-02-13 09:27:56 UTC
(rev 21307)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_util.c 2007-02-13 10:42:53 UTC
(rev 21308)
@@ -716,7 +716,7 @@
/* Lookup name */
result = domain-methods-name_to_sid(domain, mem_ctx, domain_name,
name, sid, type);
- /* Return rid and type if lookup successful */
+ /* Return sid and type if lookup successful */
if (!NT_STATUS_IS_OK(result)) {
*type = SID_NAME_UNKNOWN;
}
Modified: branches/SAMBA_3_0_25/source/nsswitch/winbindd_async.c
===
--- branches/SAMBA_3_0_25/source/nsswitch/winbindd_async.c 2007-02-13
09:27:56 UTC (rev 21307)
+++ branches/SAMBA_3_0_25/source/nsswitch/winbindd_async.c 2007-02-13
10:42:53 UTC (rev 21308)
@@ -837,7 +837,7 @@
char *name_domain, *name_account;
if ( !root_domain ) {
- DEBUG(5,(lookupname_recv: unable determine forest
root\n));
+ DEBUG(5,(lookupname_recv: unable to determine forest
root\n));
cont(private_data, False, NULL, SID_NAME_UNKNOWN);
return;
}
@@ -907,10 +907,10 @@
char *p;
/* Ensure null termination */
-
state-request.data.sid[sizeof(state-request.data.name.dom_name)-1]='\0';
+
state-request.data.name.dom_name[sizeof(state-request.data.name.dom_name)-1]='\0';
/* Ensure null termination */
- state-request.data.sid[sizeof(state-request.data.name.name)-1]='\0';
+
state-request.data.name.name[sizeof(state-request.data.name.name)-1]='\0';
/* cope with the name being a fully qualified name */
p = strstr(state-request.data.name.name, lp_winbind_separator());
@@ -926,7
svn commit: samba r21309 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch
Author: gd
Date: 2007-02-13 10:56:04 + (Tue, 13 Feb 2007)
New Revision: 21309
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21309
Log:
Add PRINTF_ATTRIBUTE checks for log statements.
Guenther
Modified:
branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
branches/SAMBA_3_0_25/source/nsswitch/pam_winbind.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
===
--- branches/SAMBA_3_0/source/nsswitch/pam_winbind.c2007-02-13 10:42:53 UTC
(rev 21308)
+++ branches/SAMBA_3_0/source/nsswitch/pam_winbind.c2007-02-13 10:56:04 UTC
(rev 21309)
@@ -78,6 +78,7 @@
return on(ctrl, WINBIND_SILENT);
}
+static void _pam_log(const pam_handle_t *pamh, int ctrl, int err, const char
*format, ...) PRINTF_ATTRIBUTE(4,5);
static void _pam_log(const pam_handle_t *pamh, int ctrl, int err, const char
*format, ...)
{
va_list args;
@@ -117,6 +118,7 @@
return _pam_log_is_debug_enabled(ctrl);
}
+static void _pam_log_debug(const pam_handle_t *pamh, int ctrl, int err, const
char *format, ...) PRINTF_ATTRIBUTE(4,5);
static void _pam_log_debug(const pam_handle_t *pamh, int ctrl, int err, const
char *format, ...)
{
va_list args;
@@ -413,6 +415,7 @@
return ret;
}
+static int _make_remark_format(pam_handle_t * pamh, int flags, int type, const
char *format, ...) PRINTF_ATTRIBUTE(4,5);
static int _make_remark_format(pam_handle_t * pamh, int flags, int type, const
char *format, ...)
{
int ret;
Modified: branches/SAMBA_3_0_25/source/nsswitch/pam_winbind.c
===
--- branches/SAMBA_3_0_25/source/nsswitch/pam_winbind.c 2007-02-13 10:42:53 UTC
(rev 21308)
+++ branches/SAMBA_3_0_25/source/nsswitch/pam_winbind.c 2007-02-13 10:56:04 UTC
(rev 21309)
@@ -78,6 +78,7 @@
return on(ctrl, WINBIND_SILENT);
}
+static void _pam_log(const pam_handle_t *pamh, int ctrl, int err, const char
*format, ...) PRINTF_ATTRIBUTE(4,5);
static void _pam_log(const pam_handle_t *pamh, int ctrl, int err, const char
*format, ...)
{
va_list args;
@@ -117,6 +118,7 @@
return _pam_log_is_debug_enabled(ctrl);
}
+static void _pam_log_debug(const pam_handle_t *pamh, int ctrl, int err, const
char *format, ...) PRINTF_ATTRIBUTE(4,5);
static void _pam_log_debug(const pam_handle_t *pamh, int ctrl, int err, const
char *format, ...)
{
va_list args;
@@ -413,6 +415,7 @@
return ret;
}
+static int _make_remark_format(pam_handle_t * pamh, int flags, int type, const
char *format, ...) PRINTF_ATTRIBUTE(4,5);
static int _make_remark_format(pam_handle_t * pamh, int flags, int type, const
char *format, ...)
{
int ret;
svn commit: samba r21310 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch
Author: gd
Date: 2007-02-13 11:04:10 + (Tue, 13 Feb 2007)
New Revision: 21310
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21310
Log:
Fix invalid printfs in pam_winbind.
Guenther
Modified:
branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
branches/SAMBA_3_0_25/source/nsswitch/pam_winbind.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
===
--- branches/SAMBA_3_0/source/nsswitch/pam_winbind.c2007-02-13 10:56:04 UTC
(rev 21309)
+++ branches/SAMBA_3_0/source/nsswitch/pam_winbind.c2007-02-13 11:04:10 UTC
(rev 21310)
@@ -461,8 +461,12 @@
case WINBINDD_GETPWNAM:
case WINBINDD_LOOKUPNAME:
- _pam_log(pamh, ctrl, LOG_ERR, request failed: %s, NT
error was %s,
+ if (strlen(response-data.auth.nt_status_string) 0) {
+ _pam_log(pamh, ctrl, LOG_ERR, request failed,
NT error was %s,
response-data.auth.nt_status_string);
+ } else {
+ _pam_log(pamh, ctrl, LOG_ERR, request failed);
+ }
return PAM_USER_UNKNOWN;
default:
break;
@@ -518,15 +522,19 @@
}
return retval;
case PAM_SUCCESS:
- if (req_type == WINBINDD_PAM_AUTH) {
- /* Otherwise, the authentication looked good */
- _pam_log(pamh, ctrl, LOG_NOTICE, user '%s' granted
access, user);
- } else if (req_type == WINBINDD_PAM_CHAUTHTOK) {
- /* Otherwise, the authentication looked good */
- _pam_log(pamh, ctrl, LOG_NOTICE, user '%s' password
changed, user);
- } else {
- /* Otherwise, the authentication looked good */
- _pam_log(pamh, ctrl, LOG_NOTICE, user '%s' OK, user);
+ /* Otherwise, the authentication looked good */
+ switch (req_type) {
+ case WINBINDD_INFO:
+ break;
+ case WINBINDD_PAM_AUTH:
+ _pam_log(pamh, ctrl, LOG_NOTICE, user '%s'
granted access, user);
+ break;
+ case WINBINDD_PAM_CHAUTHTOK:
+ _pam_log(pamh, ctrl, LOG_NOTICE, user '%s'
password changed, user);
+ break;
+ default:
+ _pam_log(pamh, ctrl, LOG_NOTICE, user '%s'
OK, user);
+ break;
}
return retval;
@@ -1101,8 +1109,8 @@
if (already_expired == True) {
_pam_log_debug(pamh, ctrl, LOG_DEBUG, Password has
expired
- (Password was last set: %d, the policy
says
- it should expire here %d (now it's:
%d))\n,
+ (Password was last set: %lld, the
policy says
+ it should expire here %lld (now it's:
%lu))\n,
response.data.auth.info3.pass_last_set_time,
response.data.auth.info3.pass_last_set_time +
response.data.auth.policy.expire,
Modified: branches/SAMBA_3_0_25/source/nsswitch/pam_winbind.c
===
--- branches/SAMBA_3_0_25/source/nsswitch/pam_winbind.c 2007-02-13 10:56:04 UTC
(rev 21309)
+++ branches/SAMBA_3_0_25/source/nsswitch/pam_winbind.c 2007-02-13 11:04:10 UTC
(rev 21310)
@@ -461,8 +461,12 @@
case WINBINDD_GETPWNAM:
case WINBINDD_LOOKUPNAME:
- _pam_log(pamh, ctrl, LOG_ERR, request failed: %s, NT
error was %s,
+ if (strlen(response-data.auth.nt_status_string) 0) {
+ _pam_log(pamh, ctrl, LOG_ERR, request failed,
NT error was %s,
response-data.auth.nt_status_string);
+ } else {
+ _pam_log(pamh, ctrl, LOG_ERR, request failed);
+ }
return PAM_USER_UNKNOWN;
default:
break;
@@ -518,15 +522,19 @@
}
return retval;
case PAM_SUCCESS:
- if (req_type == WINBINDD_PAM_AUTH) {
- /* Otherwise, the authentication looked good */
- _pam_log(pamh, ctrl, LOG_NOTICE, user '%s' granted
access, user);
- } else if (req_type == WINBINDD_PAM_CHAUTHTOK) {
-
svn commit: samba r21311 - in branches/SAMBA_4_0/source/lib/ldb/ldb_tdb: .
Author: metze
Date: 2007-02-13 12:32:48 + (Tue, 13 Feb 2007)
New Revision: 21311
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21311
Log:
fix very ugly using free'ed memory bug
This was there since 2005...
metze
Modified:
branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_index.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_index.c
===
--- branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_index.c 2007-02-13
11:04:10 UTC (rev 21310)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_tdb/ldb_index.c 2007-02-13
12:32:48 UTC (rev 21311)
@@ -337,7 +337,7 @@
ldb_oom(module-ldb);
return -1;
}
- list-dn[0] = talloc_strdup(list, (char
*)tree-u.equality.value.data);
+ list-dn[0] = talloc_strdup(list-dn, (char
*)tree-u.equality.value.data);
if (list-dn[0] == NULL) {
ldb_oom(module-ldb);
return -1;
svn commit: samba r21312 - in branches/SAMBA_3_0/source/lib/ldb/ldb_tdb: .
Author: metze
Date: 2007-02-13 12:42:28 + (Tue, 13 Feb 2007)
New Revision: 21312
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21312
Log:
merge from SAMBA_4_0:
fix memory hierachy, and access to already freed memory
metze
Modified:
branches/SAMBA_3_0/source/lib/ldb/ldb_tdb/ldb_index.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/ldb/ldb_tdb/ldb_index.c
===
--- branches/SAMBA_3_0/source/lib/ldb/ldb_tdb/ldb_index.c 2007-02-13
12:32:48 UTC (rev 21311)
+++ branches/SAMBA_3_0/source/lib/ldb/ldb_tdb/ldb_index.c 2007-02-13
12:42:28 UTC (rev 21312)
@@ -337,7 +337,7 @@
ldb_oom(module-ldb);
return -1;
}
- list-dn[0] = talloc_strdup(list, (char
*)tree-u.equality.value.data);
+ list-dn[0] = talloc_strdup(list-dn, (char
*)tree-u.equality.value.data);
if (list-dn[0] == NULL) {
ldb_oom(module-ldb);
return -1;
svn commit: samba r21313 - in branches/SAMBA_3_0_25/source/lib/ldb/ldb_tdb: .
Author: vlendec
Date: 2007-02-13 12:48:54 + (Tue, 13 Feb 2007)
New Revision: 21313
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21313
Log:
Janitor for metze :-)
Modified:
branches/SAMBA_3_0_25/source/lib/ldb/ldb_tdb/ldb_index.c
Changeset:
Modified: branches/SAMBA_3_0_25/source/lib/ldb/ldb_tdb/ldb_index.c
===
--- branches/SAMBA_3_0_25/source/lib/ldb/ldb_tdb/ldb_index.c2007-02-13
12:42:28 UTC (rev 21312)
+++ branches/SAMBA_3_0_25/source/lib/ldb/ldb_tdb/ldb_index.c2007-02-13
12:48:54 UTC (rev 21313)
@@ -337,7 +337,7 @@
ldb_oom(module-ldb);
return -1;
}
- list-dn[0] = talloc_strdup(list, (char
*)tree-u.equality.value.data);
+ list-dn[0] = talloc_strdup(list-dn, (char
*)tree-u.equality.value.data);
if (list-dn[0] == NULL) {
ldb_oom(module-ldb);
return -1;
svn commit: samba r21314 - in branches/SAMBA_4_0/source/auth/credentials: .
Author: metze
Date: 2007-02-13 13:14:14 + (Tue, 13 Feb 2007)
New Revision: 21314
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21314
Log:
add more usefull debug output
metze
Modified:
branches/SAMBA_4_0/source/auth/credentials/credentials_files.c
Changeset:
Modified: branches/SAMBA_4_0/source/auth/credentials/credentials_files.c
===
--- branches/SAMBA_4_0/source/auth/credentials/credentials_files.c
2007-02-13 12:48:54 UTC (rev 21313)
+++ branches/SAMBA_4_0/source/auth/credentials/credentials_files.c
2007-02-13 13:14:14 UTC (rev 21314)
@@ -226,15 +226,15 @@
msgs, attrs,
%s, filter);
if (ldb_ret == 0) {
- DEBUG(1, (Could not find entry to match filter: %s\n,
- filter));
+ DEBUG(1, (Could not find entry to match filter: '%s' base:
'%s'\n,
+ filter, base));
/* set anonymous as the fallback, if the machine account won't
work */
cli_credentials_set_anonymous(cred);
talloc_free(mem_ctx);
return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
} else if (ldb_ret != 1) {
- DEBUG(1, (Found more than one (%d) entry to match filter:
%s\n,
- ldb_ret, filter));
+ DEBUG(1, (Found more than one (%d) entry to match filter: '%s'
base: '%s'\n,
+ ldb_ret, filter, base));
/* set anonymous as the fallback, if the machine account won't
work */
cli_credentials_set_anonymous(cred);
talloc_free(mem_ctx);
@@ -247,8 +247,8 @@
machine_account = ldb_msg_find_attr_as_string(msgs[0],
samAccountName, NULL);
if (!machine_account) {
- DEBUG(1, (Could not find 'samAccountName' in join record to
domain: %s\n,
- cli_credentials_get_domain(cred)));
+ DEBUG(1, (Could not find 'samAccountName' in join record to
domain: %s: filter: '%s' base: '%s'\n,
+ cli_credentials_get_domain(cred), filter, base));
/* set anonymous as the fallback, if the machine account won't
work */
cli_credentials_set_anonymous(cred);
talloc_free(mem_ctx);
Re: svn commit: samba r21311 - in branches/SAMBA_4_0/source/lib/ldb/ldb_tdb: .
On Tue, 2007-02-13 at 12:32 +, [EMAIL PROTECTED] wrote: Author: metze Date: 2007-02-13 12:32:48 + (Tue, 13 Feb 2007) New Revision: 21311 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21311 Log: fix very ugly using free'ed memory bug This was there since 2005... Thanks! Simo. -- Simo Sorce Samba Team GPL Compliance Officer email: [EMAIL PROTECTED] http://samba.org
svn commit: samba r21315 - in branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules: .
Author: metze
Date: 2007-02-13 13:43:23 + (Tue, 13 Feb 2007)
New Revision: 21315
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21315
Log:
ldb now supports filters like
((dn=%s)((objectClass=kerberosSecret)(privateKeytab=*))) again
we can use such a filter:-)
we should only update the keytab for records matching this filter,
that means we need to do a search before calling cli_credentials_set_secrets()
metze
Modified:
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/update_keytab.c
Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/update_keytab.c
===
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/update_keytab.c
2007-02-13 13:14:14 UTC (rev 21314)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/update_keytab.c
2007-02-13 13:43:23 UTC (rev 21315)
@@ -45,10 +45,38 @@
static int add_modified(struct ldb_module *module, struct ldb_dn *dn, BOOL
delete) {
struct update_kt_private *data = talloc_get_type(module-private_data,
struct update_kt_private);
- struct dn_list *item = talloc(data-changed_dns? (void
*)data-changed_dns: (void *)data, struct dn_list);
+ struct dn_list *item;
char *filter;
+ struct ldb_result *res;
+ const char *attrs[] = { NULL };
+ int ret;
NTSTATUS status;
+
+ filter = talloc_asprintf(data,
((dn=%s)((objectClass=kerberosSecret)(privateKeytab=*))),
+ldb_dn_get_linearized(dn));
+ if (!filter) {
+ ldb_oom(module-ldb);
+ return LDB_ERR_OPERATIONS_ERROR;
+ }
+
+ ret = ldb_search(module-ldb, dn, LDB_SCOPE_BASE,
+filter, attrs, res);
+ if (ret != LDB_SUCCESS) {
+ talloc_free(filter);
+ return ret;
+ }
+
+ if (res-count != 1) {
+ /* if it's not a kerberosSecret then we don't have anything to
update */
+ talloc_free(res);
+ talloc_free(filter);
+ return LDB_SUCCESS;
+ }
+ talloc_free(res);
+
+ item = talloc(data-changed_dns? (void *)data-changed_dns: (void
*)data, struct dn_list);
if (!item) {
+ talloc_free(filter);
ldb_oom(module-ldb);
return LDB_ERR_OPERATIONS_ERROR;
}
@@ -56,14 +84,12 @@
item-creds = cli_credentials_init(item);
if (!item-creds) {
DEBUG(1, (cli_credentials_init failed!));
+ talloc_free(filter);
ldb_oom(module-ldb);
return LDB_ERR_OPERATIONS_ERROR;
}
cli_credentials_set_conf(item-creds);
-/* filter = talloc_asprintf(item,
objectClass=kerberosSecret)(privateKeytab=*))(|(secret=*)(ntPwdHash=*)))(distinguishedName=%s)),
*/
- filter = talloc_asprintf(item, dn=%s,
-ldb_dn_get_linearized(dn));
status = cli_credentials_set_secrets(item-creds, module-ldb, NULL,
filter);
talloc_free(filter);
if (NT_STATUS_IS_OK(status)) {
svn commit: samba r21316 - in branches/SAMBA_4_0/source/libcli/nbt: .
Author: metze
Date: 2007-02-13 15:17:29 + (Tue, 13 Feb 2007)
New Revision: 21316
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21316
Log:
if we got an unexpected nbt packet that most times mean
we got a 2nd answer to a broadcast message and have already remove
the packet id from out list while getting the first response
metze
Modified:
branches/SAMBA_4_0/source/libcli/nbt/nbtsocket.c
Changeset:
Modified: branches/SAMBA_4_0/source/libcli/nbt/nbtsocket.c
===
--- branches/SAMBA_4_0/source/libcli/nbt/nbtsocket.c2007-02-13 13:43:23 UTC
(rev 21315)
+++ branches/SAMBA_4_0/source/libcli/nbt/nbtsocket.c2007-02-13 15:17:29 UTC
(rev 21316)
@@ -215,7 +215,7 @@
if (nbtsock-unexpected.handler) {
nbtsock-unexpected.handler(nbtsock, packet, src);
} else {
- DEBUG(2,(Failed to match request for incoming name
packet id 0x%04x on %p\n,
+ DEBUG(10,(Failed to match request for incoming name
packet id 0x%04x on %p\n,
packet-name_trn_id, nbtsock));
}
talloc_free(tmp_ctx);
svn commit: samba r21317 - in branches/SAMBA_4_0/source/nbt_server/wins: .
Author: metze
Date: 2007-02-13 15:20:44 + (Tue, 13 Feb 2007)
New Revision: 21317
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21317
Log:
this happens very often when you have multihomed nodes
and isn't an error.
metze
Modified:
branches/SAMBA_4_0/source/nbt_server/wins/winsserver.c
Changeset:
Modified: branches/SAMBA_4_0/source/nbt_server/wins/winsserver.c
===
--- branches/SAMBA_4_0/source/nbt_server/wins/winsserver.c 2007-02-13
15:17:29 UTC (rev 21316)
+++ branches/SAMBA_4_0/source/nbt_server/wins/winsserver.c 2007-02-13
15:20:44 UTC (rev 21317)
@@ -217,7 +217,7 @@
if (!NT_STATUS_IS_OK(status) ||
rec2-version != rec-version ||
strcmp(rec2-wins_owner, rec-wins_owner) != 0) {
- DEBUG(1,(WINS: record %s changed during WACK - failing
registration\n,
+ DEBUG(5,(WINS: record %s changed during WACK - failing
registration\n,
nbt_name_string(s, rec-name)));
wins_wack_deny(s);
return;
svn commit: samba r21318 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch
Author: gd
Date: 2007-02-13 15:56:09 + (Tue, 13 Feb 2007)
New Revision: 21318
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21318
Log:
Fix Bug #4225.
Cached logon with pam_winbind should work now also for NT4 and samba3
domains.
Guenther
Modified:
branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c
branches/SAMBA_3_0_25/source/nsswitch/pam_winbind.c
branches/SAMBA_3_0_25/source/nsswitch/winbindd_pam.c
Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
===
--- branches/SAMBA_3_0/source/nsswitch/pam_winbind.c2007-02-13 15:20:44 UTC
(rev 21317)
+++ branches/SAMBA_3_0/source/nsswitch/pam_winbind.c2007-02-13 15:56:09 UTC
(rev 21318)
@@ -1029,14 +1029,9 @@
request.flags = WBFLAG_PAM_INFO3_TEXT | WBFLAG_PAM_CONTACT_TRUSTDOM;
- if (ctrl WINBIND_KRB5_AUTH) {
-
+ if (ctrl (WINBIND_KRB5_AUTH|WINBIND_CACHED_LOGIN)) {
struct passwd *pwd = NULL;
- _pam_log_debug(pamh, ctrl, LOG_DEBUG, enabling krb5 login
flag\n);
-
- request.flags |= WBFLAG_PAM_KRB5 |
WBFLAG_PAM_FALLBACK_AFTER_KRB5;
-
pwd = getpwnam(user);
if (pwd == NULL) {
return PAM_USER_UNKNOWN;
@@ -1044,6 +1039,13 @@
request.data.auth.uid = pwd-pw_uid;
}
+ if (ctrl WINBIND_KRB5_AUTH) {
+
+ _pam_log_debug(pamh, ctrl, LOG_DEBUG, enabling krb5 login
flag\n);
+
+ request.flags |= WBFLAG_PAM_KRB5 |
WBFLAG_PAM_FALLBACK_AFTER_KRB5;
+ }
+
if (ctrl WINBIND_CACHED_LOGIN) {
_pam_log_debug(pamh, ctrl, LOG_DEBUG, enabling cached login
flag\n);
request.flags |= WBFLAG_PAM_CACHED_LOGIN;
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c
===
--- branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c 2007-02-13 15:20:44 UTC
(rev 21317)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c 2007-02-13 15:56:09 UTC
(rev 21318)
@@ -866,15 +866,12 @@
return NT_STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT;
}
- /* The info3 acct_flags in NT4's samlogon reply don't have
-* ACB_NORMAL set. */
-#if 0
if (!(my_info3-acct_flags ACB_NORMAL)) {
- DEBUG(10,(winbindd_dual_pam_auth_cached: whats wrong
with that one?: 0x%08x\n,
+ DEBUG(0,(winbindd_dual_pam_auth_cached: whats wrong
with that one?: 0x%08x\n,
my_info3-acct_flags));
return NT_STATUS_LOGON_FAILURE;
}
-#endif
+
kickoff_time = nt_time_to_unix(my_info3-kickoff_time);
if (kickoff_time != 0 time(NULL) kickoff_time) {
return NT_STATUS_ACCOUNT_EXPIRED;
@@ -1242,6 +1239,65 @@
} while ( (attempts 2) retry );
+ /* handle the case where a NT4 DC does not fill in the acct_flags in
+* the samlogon reply info3. When accurate info3 is required by the
+* caller, we look up the account flags ourselve - gd */
+
+ if ((state-request.flags WBFLAG_PAM_INFO3_TEXT)
+ (my_info3-acct_flags == 0) NT_STATUS_IS_OK(result)) {
+
+ struct rpc_pipe_client *samr_pipe;
+ POLICY_HND samr_domain_handle, user_pol;
+ SAM_USERINFO_CTR *user_ctr;
+ NTSTATUS status_tmp;
+ uint32 acct_flags;
+
+ ZERO_STRUCT(user_ctr);
+
+ status_tmp = cm_connect_sam(contact_domain, state-mem_ctx,
+ samr_pipe, samr_domain_handle);
+
+ if (!NT_STATUS_IS_OK(status_tmp)) {
+ DEBUG(3, (could not open handle to SAMR pipe: %s\n,
+ nt_errstr(status_tmp)));
+ goto done;
+ }
+
+ status_tmp = rpccli_samr_open_user(samr_pipe, state-mem_ctx,
+ samr_domain_handle,
+ MAXIMUM_ALLOWED_ACCESS,
+ my_info3-user_rid,
user_pol);
+
+ if (!NT_STATUS_IS_OK(status_tmp)) {
+ DEBUG(3, (could not open user handle on SAMR pipe:
%s\n,
+ nt_errstr(status_tmp)));
+ goto done;
+ }
+
+ status_tmp = rpccli_samr_query_userinfo(samr_pipe,
state-mem_ctx,
+ user_pol, 16,
user_ctr);
+
+ if (!NT_STATUS_IS_OK(status_tmp)) {
+ DEBUG(3, (could not query user info on SAMR pipe:
%s\n,
+
svn commit: samba r21319 - in branches/SAMBA_3_0/source/smbd: .
Author: vlendec
Date: 2007-02-13 15:57:54 + (Tue, 13 Feb 2007)
New Revision: 21319
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21319
Log:
Remove functions not needed anymore
Modified:
branches/SAMBA_3_0/source/smbd/files.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/files.c
===
--- branches/SAMBA_3_0/source/smbd/files.c 2007-02-13 15:56:09 UTC (rev
21318)
+++ branches/SAMBA_3_0/source/smbd/files.c 2007-02-13 15:57:54 UTC (rev
21319)
@@ -361,50 +361,6 @@
return NULL;
}
-/*
- * Same as file_find_di_first/next, but also finds non-fd opens.
- *
- * Jeremy, do we really need the fsp-fh-fd != -1 ??
- */
-
-struct files_struct *fsp_find_di_first(SMB_DEV_T dev, SMB_INO_T inode)
-{
- files_struct *fsp;
-
- if (fsp_fi_cache.dev == dev fsp_fi_cache.inode == inode) {
- /* Positive or negative cache hit. */
- return fsp_fi_cache.fsp;
- }
-
- fsp_fi_cache.dev = dev;
- fsp_fi_cache.inode = inode;
-
- for (fsp=Files;fsp;fsp=fsp-next) {
- if ((fsp-dev == dev) (fsp-inode == inode)) {
- /* Setup positive cache. */
- fsp_fi_cache.fsp = fsp;
- return fsp;
- }
- }
-
- /* Setup negative cache. */
- fsp_fi_cache.fsp = NULL;
- return NULL;
-}
-
-struct files_struct *fsp_find_di_next(files_struct *start_fsp)
-{
- files_struct *fsp;
-
- for (fsp = start_fsp-next;fsp;fsp=fsp-next) {
- if ( (fsp-dev == start_fsp-dev)
- (fsp-inode == start_fsp-inode) )
- return fsp;
- }
-
- return NULL;
-}
-
/
Find a fsp that is open for printing.
/
svn commit: samba r21320 - in branches: SAMBA_3_0/source/rpcclient SAMBA_3_0_25/source/rpcclient
Author: gd
Date: 2007-02-13 16:04:36 + (Tue, 13 Feb 2007)
New Revision: 21320
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21320
Log:
Display query_user info level 16 in rpcclient.
Guenther
Modified:
branches/SAMBA_3_0/source/rpcclient/cmd_samr.c
branches/SAMBA_3_0_25/source/rpcclient/cmd_samr.c
Changeset:
Modified: branches/SAMBA_3_0/source/rpcclient/cmd_samr.c
===
--- branches/SAMBA_3_0/source/rpcclient/cmd_samr.c 2007-02-13 15:57:54 UTC
(rev 21319)
+++ branches/SAMBA_3_0/source/rpcclient/cmd_samr.c 2007-02-13 16:04:36 UTC
(rev 21320)
@@ -47,6 +47,14 @@
}
/
+ display sam_user_info_16 structure
+ /
+static void display_sam_user_info_16(SAM_USER_INFO_16 *usr)
+{
+ printf(\tAcct Flags :\tox%x\n, usr-acb_info);
+}
+
+/
display sam_user_info_21 structure
/
static void display_sam_user_info_21(SAM_USER_INFO_21 *usr)
@@ -411,15 +419,18 @@
goto done;
switch (user_ctr-switch_value) {
- case 21:
- display_sam_user_info_21(user_ctr-info.id21);
- break;
case 7:
display_sam_user_info_7(user_ctr-info.id7);
break;
case 9:
display_sam_user_info_9(user_ctr-info.id9);
break;
+ case 16:
+ display_sam_user_info_16(user_ctr-info.id16);
+ break;
+ case 21:
+ display_sam_user_info_21(user_ctr-info.id21);
+ break;
default:
printf(Unsupported infolevel: %d\n, info_level);
break;
Modified: branches/SAMBA_3_0_25/source/rpcclient/cmd_samr.c
===
--- branches/SAMBA_3_0_25/source/rpcclient/cmd_samr.c 2007-02-13 15:57:54 UTC
(rev 21319)
+++ branches/SAMBA_3_0_25/source/rpcclient/cmd_samr.c 2007-02-13 16:04:36 UTC
(rev 21320)
@@ -47,6 +47,14 @@
}
/
+ display sam_user_info_16 structure
+ /
+static void display_sam_user_info_16(SAM_USER_INFO_16 *usr)
+{
+ printf(\tAcct Flags :\tox%x\n, usr-acb_info);
+}
+
+/
display sam_user_info_21 structure
/
static void display_sam_user_info_21(SAM_USER_INFO_21 *usr)
@@ -411,15 +419,18 @@
goto done;
switch (user_ctr-switch_value) {
- case 21:
- display_sam_user_info_21(user_ctr-info.id21);
- break;
case 7:
display_sam_user_info_7(user_ctr-info.id7);
break;
case 9:
display_sam_user_info_9(user_ctr-info.id9);
break;
+ case 16:
+ display_sam_user_info_16(user_ctr-info.id16);
+ break;
+ case 21:
+ display_sam_user_info_21(user_ctr-info.id21);
+ break;
default:
printf(Unsupported infolevel: %d\n, info_level);
break;
Rev 11424: Fix installation of headers. in file:///home/jelmer/bzr.samba/nogtk/
At file:///home/jelmer/bzr.samba/nogtk/ revno: 11424 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: nogtk timestamp: Mon 2007-02-12 12:24:03 +0100 message: Fix installation of headers. modified: .bzrignore svn-v2:[EMAIL PROTECTED] source/configure.acsvn-v2:[EMAIL PROTECTED] source/headermap.txt svn-v2:[EMAIL PROTECTED] source/lib/events/config.mksvn-v2:[EMAIL PROTECTED] source/lib/events/events.h svn-v2:[EMAIL PROTECTED] source/librpc/config.mksvn-v2:[EMAIL PROTECTED] webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/translation/C.po svn-v2:[EMAIL PROTECTED] === modified file '.bzrignore' --- a/.bzrignore2007-01-23 01:29:17 + +++ b/.bzrignore2007-02-12 11:24:03 + @@ -162,3 +162,10 @@ source/st source/samba.info source/pidl/cover_db +source/dsdb/repl/drepl_service_proto.h +webapps/qooxdoo-0.6.5-sdk/frontend/framework/.cache +webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/locale/data +webapps/swat/source/translation +webapps/swat/source/class/swat/translation +webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/locale/translation +webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/translation/messages.pot === modified file 'source/configure.ac' --- a/source/configure.ac 2007-01-15 19:08:03 + +++ b/source/configure.ac 2007-02-12 11:24:03 + @@ -38,7 +38,6 @@ m4_include(smbd/process_model.m4) m4_include(lib/registry/config.m4) m4_include(scripting/swig/config.m4) -m4_include(gtk/config.m4) m4_include(ntvfs/posix/config.m4) m4_include(ntvfs/unixuid/config.m4) m4_include(lib/socket_wrapper/config.m4) === modified file 'source/headermap.txt' --- a/source/headermap.txt 2006-11-07 01:25:17 + +++ b/source/headermap.txt 2007-02-12 11:24:03 + @@ -43,9 +43,17 @@ librpc/gen_ndr/netlogon.h: gen_ndr/netlogon.h librpc/gen_ndr/ndr_misc.h: gen_ndr/ndr_misc.h librpc/gen_ndr/ndr_dcerpc.h: gen_ndr/ndr_dcerpc.h +librpc/gen_ndr/mgmt.h: dcerpc/mgmt.h +librpc/gen_ndr/ndr_mgmt.h: dcerpc/ndr_mgmt.h +librpc/gen_ndr/ndr_mgmt_c.h: dcerpc/ndr_mgmt_c.h +librpc/gen_ndr/epmapper.h: dcerpc/epmapper.h +librpc/gen_ndr/ndr_epmapper.h: dcerpc/ndr_epmapper.h +librpc/gen_ndr/ndr_epmapper_c.h: dcerpc/ndr_epmapper_c.h librpc/gen_ndr/misc.h: gen_ndr/misc.h librpc/gen_ndr/lsa.h: gen_ndr/lsa.h -librpc/gen_ndr/samr.h: gen_ndr/samr.h +librpc/gen_ndr/samr.h: dcerpc/samr.h +librpc/gen_ndr/ndr_samr.h: dcerpc/ndr_samr.h +librpc/gen_ndr/ndr_samr_c.h: dcerpc/ndr_samr_c.h librpc/gen_ndr/security.h: gen_ndr/security.h librpc/ndr/libndr_proto.h: ndr/proto.h librpc/rpc/dcerpc_proto.h: dcerpc/proto.h @@ -94,3 +102,5 @@ param/share_proto.h: param/share_proto.h lib/util/util_tdb.h: util_tdb.h lib/util/wrap_xattr.h: wrap_xattr.h +lib/events/events.h: events/events.h +lib/events/events_internal.h: events/events_internal.h === modified file 'source/lib/events/config.mk' --- a/source/lib/events/config.mk 2007-01-21 08:23:14 + +++ b/source/lib/events/config.mk 2007-02-12 11:24:03 + @@ -32,6 +32,7 @@ # Start SUBSYSTEM LIBEVENTS [SUBSYSTEM::LIBEVENTS] OBJ_FILES = events.o events_timed.o events_signal.o +PUBLIC_HEADERS = events.h events_internal.h PUBLIC_DEPENDENCIES = LIBTALLOC # End SUBSYSTEM LIBEVENTS ## === modified file 'source/lib/events/events.h' --- a/source/lib/events/events.h2007-01-21 10:32:39 + +++ b/source/lib/events/events.h2007-02-12 11:24:03 + @@ -23,6 +23,9 @@ #ifndef __EVENTS_H__ #define __EVENTS_H__ +#include talloc.h +#include stdlib.h + struct event_context; struct event_ops; struct fd_event; === modified file 'source/librpc/config.mk' --- a/source/librpc/config.mk 2006-12-21 03:39:33 + +++ b/source/librpc/config.mk 2007-02-12 11:24:03 + @@ -110,7 +110,7 @@ [SUBSYSTEM::NDR_SAMR] OBJ_FILES = gen_ndr/ndr_samr.o -PUBLIC_HEADERS = gen_ndr/samr.h +PUBLIC_HEADERS = gen_ndr/samr.h gen_ndr/ndr_samr.h gen_ndr/ndr_samr_c.h PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC NDR_LSA NDR_SECURITY [SUBSYSTEM::NDR_NFS4ACL] @@ -175,7 +175,7 @@ [SUBSYSTEM::NDR_MGMT] OBJ_FILES = gen_ndr/ndr_mgmt.o -PUBLIC_DEPENDENCIES = LIBNDR NDR_DCERPC +PUBLIC_DEPENDENCIES = LIBNDR [SUBSYSTEM::NDR_PROTECTED_STORAGE] OBJ_FILES = gen_ndr/ndr_protected_storage.o @@ -441,7 +441,9 @@ VERSION = 0.0.1 SO_VERSION = 0 DESCRIPTION = DCE/RPC client library -PUBLIC_HEADERS = rpc/dcerpc.h +PUBLIC_HEADERS = rpc/dcerpc.h \ + gen_ndr/mgmt.h gen_ndr/ndr_mgmt.h gen_ndr/ndr_mgmt_c.h \ + gen_ndr/epmapper.h gen_ndr/ndr_epmapper.h gen_ndr/ndr_epmapper_c.h PUBLIC_PROTO_HEADER = rpc/dcerpc_proto.h OBJ_FILES = \ rpc/dcerpc.o \ @@ -455,8 +457,7 @@ rpc/dcerpc_connect.o PRIVATE_DEPENDENCIES = \
Rev 11169: Merge upstream. in file:///home/jelmer/bzr.samba/4.0-regwrite/
At file:///home/jelmer/bzr.samba/4.0-regwrite/ revno: 11169 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: svn-v2:[EMAIL PROTECTED] committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: 4.0-regwrite timestamp: Mon 2007-02-12 22:07:46 +0100 message: Merge upstream. removed: source/gtk/README svn-v2:[EMAIL PROTECTED] source/gtk/common/ svn-v2:[EMAIL PROTECTED] source/gtk/common/credentials.c svn-v2:[EMAIL PROTECTED] source/gtk/common/gtk-smb.csvn-v2:[EMAIL PROTECTED] source/gtk/common/gtk-smb.hsvn-v2:[EMAIL PROTECTED] source/gtk/common/gtk_events.c svn-v2:[EMAIL PROTECTED] source/gtk/common/select.c svn-v2:[EMAIL PROTECTED] source/gtk/common/select.h svn-v2:[EMAIL PROTECTED] source/gtk/config.m4 svn-v2:[EMAIL PROTECTED] source/gtk/config.mk svn-v2:[EMAIL PROTECTED] source/gtk/man/svn-v2:[EMAIL PROTECTED] source/gtk/man/gepdump.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/man/gregedit.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/man/gwcrontab.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/man/gwsvcctl.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/meta/ svn-v2:[EMAIL PROTECTED] source/gtk/meta/gepdump.desktop svn-v2:[EMAIL PROTECTED] source/gtk/meta/gregedit.desktop svn-v2:[EMAIL PROTECTED] source/gtk/meta/gwcrontab.desktop svn-v2:[EMAIL PROTECTED] source/gtk/tools/gepdump.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gregedit.csvn-v2:[EMAIL PROTECTED] source/gtk/tools/gwcrontab.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gwsam.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gwsam_user.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gwsvcctl.csvn-v2:[EMAIL PROTECTED] added: webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/table/AbstractResizeBehavior.js svn-v2:[EMAIL PROTECTED] webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/table/DefaultResizeBehavior.js svn-v2:[EMAIL PROTECTED] webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/table/ResizeBehaviorColumnData.js svn-v2:[EMAIL PROTECTED] webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/table/ResizeTableColumnModel.js svn-v2:[EMAIL PROTECTED] modified: .bzrignore svn-v2:[EMAIL PROTECTED] source/configure.acsvn-v2:[EMAIL PROTECTED] source/dsdb/repl/replicated_objects.c svn-v2:[EMAIL PROTECTED] source/headermap.txt svn-v2:[EMAIL PROTECTED] source/include/core.h svn-v2:[EMAIL PROTECTED] source/lib/events/config.mksvn-v2:[EMAIL PROTECTED] source/lib/events/events.h svn-v2:[EMAIL PROTECTED] source/lib/registry/registry.h svn-v2:[EMAIL PROTECTED] source/lib/replace/README svn-v2:[EMAIL PROTECTED] source/lib/replace/libreplace.m4 svn-v2:[EMAIL PROTECTED] source/lib/replace/libreplace_macros.m4 svn-v2:[EMAIL PROTECTED] source/lib/talloc/talloc.h svn-v2:[EMAIL PROTECTED] source/libcli/util/doserr.csvn-v2:[EMAIL PROTECTED] source/libcli/util/doserr.hsvn-v2:[EMAIL PROTECTED] source/libcli/util/nt_status.h svn-v2:[EMAIL PROTECTED] source/libnet/libnet_become_dc.c svn-v2:[EMAIL PROTECTED] source/libnet/libnet_become_dc.h svn-v2:[EMAIL PROTECTED] source/libnet/libnet_samdump.c svn-v2:[EMAIL PROTECTED] source/libnet/libnet_samdump_keytab.c svn-v2:[EMAIL PROTECTED] source/libnet/libnet_samsync_ldb.c svn-v2:[EMAIL PROTECTED] source/libnet/libnet_vampire.c svn-v2:[EMAIL PROTECTED] source/libnet/libnet_vampire.h svn-v2:[EMAIL PROTECTED] source/librpc/config.mksvn-v2:[EMAIL PROTECTED] source/librpc/idl/netlogon.idl svn-v2:[EMAIL PROTECTED] source/main.mk svn-v2:[EMAIL PROTECTED] source/pidl/lib/Parse/Pidl/Samba4/Header.pm svn-v2:[EMAIL PROTECTED] source/scripting/libjs/provision.js svn-v2:[EMAIL PROTECTED] source/setup/provision_init.ldif svn-v2:[EMAIL PROTECTED] source/torture/basic/misc.csvn-v2:[EMAIL PROTECTED] source/torture/libnet/libnet_BecomeDC.c svn-v2:[EMAIL PROTECTED] source/torture/rpc/dssync.csvn-v2:[EMAIL PROTECTED] webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/table/Table.js svn-v2:[EMAIL PROTECTED] webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/treevirtual/TreeVirtual.js svn-v2:[EMAIL PROTECTED] webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/util/fsm/FiniteStateMachine.js svn-v2:[EMAIL PROTECTED] webapps/swat/source/class/swat/main/AbstractModule.js svn-v2:[EMAIL PROTECTED] webapps/swat/source/class/swat/main/AbstractModuleFsm.js svn-v2:[EMAIL PROTECTED] webapps/swat/source/class/swat/module/ldbbrowse/Fsm.js svn-v2:[EMAIL PROTECTED] webapps/swat/source/class/swat/module/ldbbrowse/Gui.js svn-v2:[EMAIL PROTECTED] webapps/swat/source/class/swat/module/ldbbrowse/LdbModify.js svn-v2:[EMAIL PROTECTED]
Rev 11434: Provide simple redirecting headers for standard headers. in file:///home/jelmer/bzr.samba/SAMBA_4_0/
At file:///home/jelmer/bzr.samba/SAMBA_4_0/ revno: 11434 revision-id: [EMAIL PROTECTED] parent: svn-v2:[EMAIL PROTECTED] committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: SAMBA_4_0 timestamp: Mon 2007-02-12 18:30:50 +0100 message: Provide simple redirecting headers for standard headers. modified: source/lib/replace/README svn-v2:[EMAIL PROTECTED] source/lib/replace/libreplace.m4 svn-v2:[EMAIL PROTECTED] source/lib/replace/libreplace_macros.m4 svn-v2:[EMAIL PROTECTED] === modified file 'source/lib/replace/README' --- a/source/lib/replace/README 2006-10-16 21:39:07 + +++ b/source/lib/replace/README 2007-02-12 17:30:50 + @@ -81,6 +81,10 @@ MAX QSORT_CAST +Headers: +stdint.h +stdbool.h + Prerequisites: memset (for bzero) syslog (for vsyslog) === modified file 'source/lib/replace/libreplace.m4' --- a/source/lib/replace/libreplace.m4 2007-01-15 19:08:03 + +++ b/source/lib/replace/libreplace.m4 2007-02-12 17:30:50 + @@ -61,9 +61,12 @@ AC_CHECK_FUNCS(pipe strftime srandom random srand rand usleep setbuffer lstat getpgrp) -AC_CHECK_HEADERS(stdbool.h sys/select.h) +AC_CHECK_HEADERS(stdbool.h stdint.h sys/select.h) AC_CHECK_HEADERS(setjmp.h) +LIBREPLACE_PROVIDE_HEADER([stdint.h]) +LIBREPLACE_PROVIDE_HEADER([stdbool.h]) + AC_CHECK_TYPE(bool, [AC_DEFINE(HAVE_BOOL, 1, [Whether the bool type is available])],, [ === modified file 'source/lib/replace/libreplace_macros.m4' --- a/source/lib/replace/libreplace_macros.m4 2006-10-11 13:36:37 + +++ b/source/lib/replace/libreplace_macros.m4 2007-02-12 17:30:50 + @@ -306,3 +306,12 @@ ) AS_IF([test $AS_TR_SH([ac_cv_c_prototype_$1]) = yes],[$3],[$4]) ]) + +AC_DEFUN(LIBREPLACE_PROVIDE_HEADER, +[AC_CHECK_HEADER([$1], + [ AC_CONFIG_COMMANDS(rm-$1, [rm -f $libreplacedir/$1], [libreplacedir=$libreplacedir]) ], + [ AC_CONFIG_COMMANDS(mk-$1, [echo #include \replace.h\ $libreplacedir/$1], [libreplacedir=$libreplacedir]) ] + ) +]) + +
Rev 11170: Fix more build issues. in file:///home/jelmer/bzr.samba/4.0-regwrite/
At file:///home/jelmer/bzr.samba/4.0-regwrite/
revno: 11170
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij [EMAIL PROTECTED]
branch nick: 4.0-regwrite
timestamp: Tue 2007-02-13 00:53:54 +0100
message:
Fix more build issues.
removed:
source/gtk/svn-v2:[EMAIL PROTECTED]
source/gtk/tools/ svn-v2:[EMAIL PROTECTED]
modified:
source/lib/registry/dir.c svn-v2:[EMAIL PROTECTED]
source/lib/registry/regf.c svn-v2:[EMAIL PROTECTED]
source/lib/registry/rpc.c svn-v2:[EMAIL PROTECTED]
source/lib/registry/tests/generic.c svn-v2:[EMAIL PROTECTED]
source/lib/registry/tools/regdiff.c svn-v2:[EMAIL PROTECTED]
source/lib/registry/tools/regpatch.c svn-v2:[EMAIL PROTECTED]
source/lib/registry/tools/regshell.c svn-v2:[EMAIL PROTECTED]
source/lib/registry/tools/regtree.c svn-v2:[EMAIL PROTECTED]
=== removed directory 'source/gtk'
=== removed directory 'source/gtk/tools'
=== modified file 'source/lib/registry/dir.c'
--- a/source/lib/registry/dir.c 2007-02-10 15:02:22 +
+++ b/source/lib/registry/dir.c 2007-02-12 23:53:54 +
@@ -123,7 +123,7 @@
{
if(!location) return WERR_INVALID_PARAM;
- *key = talloc(h, struct registry_key);
+ *key = talloc(parent_ctx, struct registry_key);
(*key)-backend_data = talloc_strdup(*key, location);
return WERR_OK;
}
=== modified file 'source/lib/registry/regf.c'
--- a/source/lib/registry/regf.c2007-02-08 17:18:35 +
+++ b/source/lib/registry/regf.c2007-02-12 23:53:54 +
@@ -1692,7 +1692,7 @@
return WERR_OK;
}
-static struct hive_operations reg_backend_regf = {
+static struct reg_key_operations reg_backend_regf = {
.name = regf,
.num_subkeys = regf_num_subkeys,
.num_values = regf_num_values,
=== modified file 'source/lib/registry/rpc.c'
--- a/source/lib/registry/rpc.c 2007-02-10 15:02:22 +
+++ b/source/lib/registry/rpc.c 2007-02-12 23:53:54 +
@@ -21,7 +21,7 @@
#include registry.h
#include librpc/gen_ndr/ndr_winreg_c.h
-static struct hive_operations reg_backend_rpc;
+static struct reg_key_operations reg_backend_rpc;
/**
* This is the RPC backend for the registry library.
=== modified file 'source/lib/registry/tests/generic.c'
--- a/source/lib/registry/tests/generic.c 2007-02-12 21:00:15 +
+++ b/source/lib/registry/tests/generic.c 2007-02-12 23:53:54 +
@@ -46,11 +46,6 @@
const struct test_backend_settings *backend = test_data;
TALLOC_CTX *mem_ctx = tctx;
- if (!reg_has_backend(backend-name)) {
- torture_skip(tctx, talloc_asprintf(tctx,
- Backend '%s' support not
compiled in, backend-name));
- }
-
error = reg_open_hive(mem_ctx, backend-name,
backend-location, NULL,
cmdline_credentials, root);
torture_assert_werr_ok(tctx, error, reg_open_hive());
=== modified file 'source/lib/registry/tools/regdiff.c'
--- a/source/lib/registry/tools/regdiff.c 2007-02-12 21:00:15 +
+++ b/source/lib/registry/tools/regdiff.c 2007-02-12 23:53:54 +
@@ -23,7 +23,6 @@
#include includes.h
#include lib/registry/registry.h
#include lib/events/events.h
-#include lib/registry/reg_backend_rpc.h
#include lib/cmdline/popt_common.h
int main(int argc, const char **argv)
=== modified file 'source/lib/registry/tools/regpatch.c'
--- a/source/lib/registry/tools/regpatch.c 2007-02-12 21:00:15 +
+++ b/source/lib/registry/tools/regpatch.c 2007-02-12 23:53:54 +
@@ -23,7 +23,6 @@
#include lib/events/events.h
#include lib/registry/registry.h
#include lib/cmdline/popt_common.h
-#include lib/registry/reg_backend_rpc.h
int main(int argc, char **argv)
{
=== modified file 'source/lib/registry/tools/regshell.c'
--- a/source/lib/registry/tools/regshell.c 2007-02-12 21:00:15 +
+++ b/source/lib/registry/tools/regshell.c 2007-02-12 23:53:54 +
@@ -23,7 +23,6 @@
#include lib/registry/registry.h
#include lib/cmdline/popt_common.h
#include lib/events/events.h
-#include lib/registry/reg_backend_rpc.h
#include system/time.h
#include lib/smbreadline/smbreadline.h
#include librpc/gen_ndr/ndr_security.h
=== modified file 'source/lib/registry/tools/regtree.c'
--- a/source/lib/registry/tools/regtree.c 2007-02-12 21:00:15 +
+++ b/source/lib/registry/tools/regtree.c 2007-02-12 23:53:54 +
@@ -22,7 +22,6 @@
#include includes.h
#include lib/registry/registry.h
#include lib/events/events.h
-#include lib/registry/reg_backend_rpc.h
#include lib/cmdline/popt_common.h
static void print_tree(int l, struct registry_key *p, int fullpath, int novals)
Rev 11391: Merge from upstream. in file:///home/jelmer/bzr.samba/4.0-movetests/
At file:///home/jelmer/bzr.samba/4.0-movetests/ revno: 11391 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: svn-v2:[EMAIL PROTECTED] committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: 4.0-movetests timestamp: Mon 2007-02-12 22:23:05 +0100 message: Merge from upstream. removed: source/gtk/svn-v2:[EMAIL PROTECTED] source/gtk/README svn-v2:[EMAIL PROTECTED] source/gtk/common/ svn-v2:[EMAIL PROTECTED] source/gtk/common/credentials.c svn-v2:[EMAIL PROTECTED] source/gtk/common/gtk-smb.csvn-v2:[EMAIL PROTECTED] source/gtk/common/gtk-smb.hsvn-v2:[EMAIL PROTECTED] source/gtk/common/gtk_events.c svn-v2:[EMAIL PROTECTED] source/gtk/common/select.c svn-v2:[EMAIL PROTECTED] source/gtk/common/select.h svn-v2:[EMAIL PROTECTED] source/gtk/config.m4 svn-v2:[EMAIL PROTECTED] source/gtk/config.mk svn-v2:[EMAIL PROTECTED] source/gtk/man/svn-v2:[EMAIL PROTECTED] source/gtk/man/gepdump.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/man/gregedit.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/man/gwcrontab.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/man/gwsvcctl.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/meta/ svn-v2:[EMAIL PROTECTED] source/gtk/meta/gepdump.desktop svn-v2:[EMAIL PROTECTED] source/gtk/meta/gregedit.desktop svn-v2:[EMAIL PROTECTED] source/gtk/meta/gwcrontab.desktop svn-v2:[EMAIL PROTECTED] source/gtk/tools/ svn-v2:[EMAIL PROTECTED] source/gtk/tools/gepdump.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gregedit.csvn-v2:[EMAIL PROTECTED] source/gtk/tools/gwcrontab.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gwsam.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gwsam_user.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gwsvcctl.csvn-v2:[EMAIL PROTECTED] added: webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/table/AbstractResizeBehavior.js svn-v2:[EMAIL PROTECTED] webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/table/DefaultResizeBehavior.js svn-v2:[EMAIL PROTECTED] webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/table/ResizeBehaviorColumnData.js svn-v2:[EMAIL PROTECTED] webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/table/ResizeTableColumnModel.js svn-v2:[EMAIL PROTECTED] modified: .bzrignore svn-v2:[EMAIL PROTECTED] source/cluster/cluster.c svn-v2:[EMAIL PROTECTED] source/cluster/cluster.h svn-v2:[EMAIL PROTECTED] source/cluster/cluster_private.h svn-v2:[EMAIL PROTECTED] source/cluster/ctdb/common/ctdb.c svn-v2:[EMAIL PROTECTED] source/cluster/ctdb/common/ctdb_message.c svn-v2:[EMAIL PROTECTED] source/cluster/ctdb/ctdb_cluster.c svn-v2:[EMAIL PROTECTED] source/cluster/ctdb/include/ctdb.h svn-v2:[EMAIL PROTECTED] source/cluster/local.c svn-v2:[EMAIL PROTECTED] source/configure.acsvn-v2:[EMAIL PROTECTED] source/dsdb/repl/replicated_objects.c svn-v2:[EMAIL PROTECTED] source/headermap.txt svn-v2:[EMAIL PROTECTED] source/include/core.h svn-v2:[EMAIL PROTECTED] source/lib/events/config.mksvn-v2:[EMAIL PROTECTED] source/lib/events/events.h svn-v2:[EMAIL PROTECTED] source/lib/messaging/messaging.c svn-v2:[EMAIL PROTECTED] source/lib/registry/config.mk svn-v2:[EMAIL PROTECTED] source/lib/registry/registry.h svn-v2:[EMAIL PROTECTED] source/lib/replace/README svn-v2:[EMAIL PROTECTED] source/lib/replace/libreplace.m4 svn-v2:[EMAIL PROTECTED] source/lib/replace/libreplace_macros.m4 svn-v2:[EMAIL PROTECTED] source/lib/talloc/talloc.h svn-v2:[EMAIL PROTECTED] source/libcli/util/doserr.csvn-v2:[EMAIL PROTECTED] source/libcli/util/doserr.hsvn-v2:[EMAIL PROTECTED] source/libcli/util/nt_status.h svn-v2:[EMAIL PROTECTED] source/libnet/libnet_become_dc.c svn-v2:[EMAIL PROTECTED] source/libnet/libnet_become_dc.h svn-v2:[EMAIL PROTECTED] source/libnet/libnet_samdump.c svn-v2:[EMAIL PROTECTED] source/libnet/libnet_samdump_keytab.c svn-v2:[EMAIL PROTECTED] source/libnet/libnet_samsync_ldb.c svn-v2:[EMAIL PROTECTED] source/libnet/libnet_vampire.c svn-v2:[EMAIL PROTECTED] source/libnet/libnet_vampire.h svn-v2:[EMAIL PROTECTED] source/librpc/config.mksvn-v2:[EMAIL PROTECTED] source/librpc/idl/netlogon.idl svn-v2:[EMAIL PROTECTED] source/main.mk svn-v2:[EMAIL PROTECTED] source/pidl/lib/Parse/Pidl/Samba4/Header.pm svn-v2:[EMAIL PROTECTED] source/pidl/tests/header.plsvn-v2:[EMAIL PROTECTED] source/scripting/libjs/provision.js svn-v2:[EMAIL PROTECTED] source/setup/provision_init.ldif svn-v2:[EMAIL PROTECTED] source/torture/basic/misc.csvn-v2:[EMAIL PROTECTED] source/torture/libnet/libnet_BecomeDC.c svn-v2:[EMAIL PROTECTED] source/torture/rpc/dssync.csvn-v2:[EMAIL PROTECTED]
Rev 11168: More work getting the build working again. in file:///home/jelmer/bzr.samba/4.0-regwrite/
At file:///home/jelmer/bzr.samba/4.0-regwrite/
revno: 11168
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij [EMAIL PROTECTED]
branch nick: 4.0-regwrite
timestamp: Mon 2007-02-12 22:00:15 +0100
message:
More work getting the build working again.
modified:
source/gtk/tools/gregedit.csvn-v2:[EMAIL PROTECTED]
source/lib/registry/interface.c svn-v2:[EMAIL PROTECTED]
source/lib/registry/ldb.c svn-v2:[EMAIL PROTECTED]
source/lib/registry/tests/generic.c svn-v2:[EMAIL PROTECTED]
source/lib/registry/tools/regdiff.c svn-v2:[EMAIL PROTECTED]
source/lib/registry/tools/regpatch.c svn-v2:[EMAIL PROTECTED]
source/lib/registry/tools/regshell.c svn-v2:[EMAIL PROTECTED]
source/lib/registry/tools/regtree.c svn-v2:[EMAIL PROTECTED]
source/smbd/server.c svn-v2:[EMAIL PROTECTED]
webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/translation/C.po
svn-v2:[EMAIL PROTECTED]
=== modified file 'source/gtk/tools/gregedit.c'
--- a/source/gtk/tools/gregedit.c 2006-09-16 16:59:37 +
+++ b/source/gtk/tools/gregedit.c 2007-02-12 21:00:15 +
@@ -972,8 +972,6 @@
mem_ctx = talloc_init(gregedit);
- registry_init();
-
gtk_init(argc, argv);
mainwin = create_mainwindow();
gtk_widget_show_all(mainwin);
=== modified file 'source/lib/registry/interface.c'
--- a/source/lib/registry/interface.c 2007-02-08 17:18:35 +
+++ b/source/lib/registry/interface.c 2007-02-12 21:00:15 +
@@ -101,16 +101,12 @@
struct
cli_credentials *credentials,
struct registry_key
**root)
{
- struct registry_hive *rethive;
- struct registry_key *retkey = NULL;
- struct reg_init_function_entry *entry;
- WERROR werr;
int fd, num;
char peek[20];
/* Check for directory */
if (directory_exist(location)) {
- return reg_open_directory(location, root);
+ return reg_open_directory(parent_ctx, location, root);
}
fd = open(location, O_RDWR);
@@ -125,13 +121,13 @@
if (!strncmp(peek, CREG, 4)) {
close(fd);
- return reg_open_creg_file(location, root);
+ return reg_open_creg_file(parent_ctx, location, root);
} else if (!strncmp(peek, REGF, 4)) {
close(fd);
- return reg_open_regf_file(location, root);
+ return reg_open_regf_file(parent_ctx, location, root);
} else if (!strncmp(peek, TDB file, 8)) {
close(fd);
- return reg_open_ldb_file(location, session_info, credentials,
root);
+ return reg_open_ldb_file(parent_ctx, location, session_info,
credentials, root);
}
return WERR_BADFILE;
=== modified file 'source/lib/registry/ldb.c'
--- a/source/lib/registry/ldb.c 2007-02-10 15:02:22 +
+++ b/source/lib/registry/ldb.c 2007-02-12 21:00:15 +
@@ -261,7 +261,7 @@
return WERR_OK;
}
-WERROR reg_open_ldb_file(const char *location,
+WERROR reg_open_ldb_file(TALLOC_CTX *parent_ctx, const char *location,
struct
auth_session_info *session_info,
struct
cli_credentials *credentials,
struct
registry_key **k)
@@ -272,7 +272,7 @@
if (!location)
return WERR_INVALID_PARAM;
- wrap = ldb_wrap_connect(hive, location, session_info, credentials, 0,
NULL);
+ wrap = ldb_wrap_connect(parent_ctx, location, session_info,
credentials, 0, NULL);
if(!wrap) {
DEBUG(1, (__FILE__: unable to connect\n));
@@ -282,7 +282,7 @@
ldb_set_debug_stderr(wrap);
hive-backend_data = wrap;
- *k = talloc_zero(hive, struct registry_key);
+ *k = talloc_zero(parent_ctx, struct registry_key);
talloc_set_destructor (*k, reg_close_ldb_key);
talloc_set_destructor (hive, ldb_free_hive);
(*k)-name = talloc_strdup(*k, );
=== modified file 'source/lib/registry/tests/generic.c'
--- a/source/lib/registry/tests/generic.c 2007-02-08 15:59:04 +
+++ b/source/lib/registry/tests/generic.c 2007-02-12 21:00:15 +
@@ -151,8 +151,6 @@
REGISTRY);
int i;
- registry_init();
-
torture_suite_add_simple_test(suite, str_regtype, test_str_regtype);
torture_suite_add_simple_test(suite, reg_val_data_string dword,
test_reg_val_data_string_dword);
torture_suite_add_simple_test(suite, reg_val_data_string sz,
test_reg_val_data_string_sz);
=== modified file
Rev 11429: Remove the GTK+ tools and library from the main repository. They are now maintained separately in bzr at http://people.samba.org/bzr/jelmer/samba-gtk in file:///home/jelmer/bzr.samba/SAMBA_
At file:///home/jelmer/bzr.samba/SAMBA_4_0/ revno: 11429 revision-id: [EMAIL PROTECTED] parent: svn-v2:[EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: SAMBA_4_0 timestamp: Mon 2007-02-12 13:05:16 +0100 message: Remove the GTK+ tools and library from the main repository. They are now maintained separately in bzr at http://people.samba.org/bzr/jelmer/samba-gtk This also adds some more headers to the list that is installed and a couple of extra #include lines so these headers can be used externally without problems. removed: source/gtk/svn-v2:[EMAIL PROTECTED] source/gtk/README svn-v2:[EMAIL PROTECTED] source/gtk/common/ svn-v2:[EMAIL PROTECTED] source/gtk/common/credentials.c svn-v2:[EMAIL PROTECTED] source/gtk/common/gtk-smb.csvn-v2:[EMAIL PROTECTED] source/gtk/common/gtk-smb.hsvn-v2:[EMAIL PROTECTED] source/gtk/common/gtk_events.c svn-v2:[EMAIL PROTECTED] source/gtk/common/select.c svn-v2:[EMAIL PROTECTED] source/gtk/common/select.h svn-v2:[EMAIL PROTECTED] source/gtk/config.m4 svn-v2:[EMAIL PROTECTED] source/gtk/config.mk svn-v2:[EMAIL PROTECTED] source/gtk/man/svn-v2:[EMAIL PROTECTED] source/gtk/man/gepdump.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/man/gregedit.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/man/gwcrontab.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/man/gwsvcctl.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/meta/ svn-v2:[EMAIL PROTECTED] source/gtk/meta/gepdump.desktop svn-v2:[EMAIL PROTECTED] source/gtk/meta/gregedit.desktop svn-v2:[EMAIL PROTECTED] source/gtk/meta/gwcrontab.desktop svn-v2:[EMAIL PROTECTED] source/gtk/tools/ svn-v2:[EMAIL PROTECTED] source/gtk/tools/gepdump.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gregedit.csvn-v2:[EMAIL PROTECTED] source/gtk/tools/gwcrontab.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gwsam.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gwsam_user.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gwsvcctl.csvn-v2:[EMAIL PROTECTED] modified: .bzrignore svn-v2:[EMAIL PROTECTED] source/configure.acsvn-v2:[EMAIL PROTECTED] source/headermap.txt svn-v2:[EMAIL PROTECTED] source/include/core.h svn-v2:[EMAIL PROTECTED] source/lib/events/config.mksvn-v2:[EMAIL PROTECTED] source/lib/events/events.h svn-v2:[EMAIL PROTECTED] source/lib/registry/config.mk svn-v2:[EMAIL PROTECTED] source/lib/registry/registry.h svn-v2:[EMAIL PROTECTED] source/lib/talloc/talloc.h svn-v2:[EMAIL PROTECTED] source/libcli/util/nt_status.h svn-v2:[EMAIL PROTECTED] source/librpc/config.mksvn-v2:[EMAIL PROTECTED] source/main.mk svn-v2:[EMAIL PROTECTED] source/pidl/lib/Parse/Pidl/Samba4/Header.pm svn-v2:[EMAIL PROTECTED] webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/translation/C.po svn-v2:[EMAIL PROTECTED] revno: 11422.1.3 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: nogtk timestamp: Mon 2007-02-12 12:54:14 +0100 message: Install more headers. revno: 11422.1.2 merged: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: nogtk timestamp: Mon 2007-02-12 12:24:03 +0100 message: Fix installation of headers. revno: 11422.1.1 merged: [EMAIL PROTECTED] parent: svn-v2:[EMAIL PROTECTED] committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: SAMBA_4_0 timestamp: Mon 2007-02-12 02:32:36 +0100 message: Remove GTK+ tools from the tree. Diff too large for email (5250 lines, the limit is 1000).
Rev 11423: Remove GTK+ tools from the tree. in file:///home/jelmer/bzr.samba/SAMBA_4_0/
At file:///home/jelmer/bzr.samba/SAMBA_4_0/ revno: 11423 revision-id: [EMAIL PROTECTED] parent: svn-v2:[EMAIL PROTECTED] committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: SAMBA_4_0 timestamp: Mon 2007-02-12 02:32:36 +0100 message: Remove GTK+ tools from the tree. removed: source/gtk/svn-v2:[EMAIL PROTECTED] source/gtk/README svn-v2:[EMAIL PROTECTED] source/gtk/common/ svn-v2:[EMAIL PROTECTED] source/gtk/common/credentials.c svn-v2:[EMAIL PROTECTED] source/gtk/common/gtk-smb.csvn-v2:[EMAIL PROTECTED] source/gtk/common/gtk-smb.hsvn-v2:[EMAIL PROTECTED] source/gtk/common/gtk_events.c svn-v2:[EMAIL PROTECTED] source/gtk/common/select.c svn-v2:[EMAIL PROTECTED] source/gtk/common/select.h svn-v2:[EMAIL PROTECTED] source/gtk/config.m4 svn-v2:[EMAIL PROTECTED] source/gtk/config.mk svn-v2:[EMAIL PROTECTED] source/gtk/man/svn-v2:[EMAIL PROTECTED] source/gtk/man/gepdump.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/man/gregedit.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/man/gwcrontab.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/man/gwsvcctl.1.xml svn-v2:[EMAIL PROTECTED] source/gtk/meta/ svn-v2:[EMAIL PROTECTED] source/gtk/meta/gepdump.desktop svn-v2:[EMAIL PROTECTED] source/gtk/meta/gregedit.desktop svn-v2:[EMAIL PROTECTED] source/gtk/meta/gwcrontab.desktop svn-v2:[EMAIL PROTECTED] source/gtk/tools/ svn-v2:[EMAIL PROTECTED] source/gtk/tools/gepdump.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gregedit.csvn-v2:[EMAIL PROTECTED] source/gtk/tools/gwcrontab.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gwsam.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gwsam_user.c svn-v2:[EMAIL PROTECTED] source/gtk/tools/gwsvcctl.csvn-v2:[EMAIL PROTECTED] modified: source/main.mk svn-v2:[EMAIL PROTECTED] Diff too large for email (4600 lines, the limit is 1000).
Rev 11425: Install more headers. in file:///home/jelmer/bzr.samba/nogtk/
At file:///home/jelmer/bzr.samba/nogtk/ revno: 11425 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: nogtk timestamp: Mon 2007-02-12 12:54:14 +0100 message: Install more headers. modified: source/headermap.txt svn-v2:[EMAIL PROTECTED] source/include/core.h svn-v2:[EMAIL PROTECTED] source/lib/registry/config.mk svn-v2:[EMAIL PROTECTED] source/lib/registry/registry.h svn-v2:[EMAIL PROTECTED] source/lib/talloc/talloc.h svn-v2:[EMAIL PROTECTED] source/libcli/util/nt_status.h svn-v2:[EMAIL PROTECTED] source/librpc/config.mksvn-v2:[EMAIL PROTECTED] source/pidl/lib/Parse/Pidl/Samba4/Header.pm svn-v2:[EMAIL PROTECTED] === modified file 'source/headermap.txt' --- a/source/headermap.txt 2007-02-12 11:24:03 + +++ b/source/headermap.txt 2007-02-12 11:54:14 + @@ -33,6 +33,8 @@ gtk/common/select.h: gtk/select.h librpc/ndr/libndr.h: ndr.h lib/registry/registry.h: registry.h +lib/registry/reg_backend_rpc.h: registry_rpc.h +lib/registry/registry_proto.h: registry/proto.h libcli/util/nterr.h: core/nterr.h libcli/util/doserr.h: core/doserr.h libcli/util/nt_status.h: core/ntstatus.h @@ -49,6 +51,9 @@ librpc/gen_ndr/epmapper.h: dcerpc/epmapper.h librpc/gen_ndr/ndr_epmapper.h: dcerpc/ndr_epmapper.h librpc/gen_ndr/ndr_epmapper_c.h: dcerpc/ndr_epmapper_c.h +librpc/gen_ndr/ndr_atsvc.h: dcerpc/ndr_atsvc.h +librpc/gen_ndr/atsvc.h: dcerpc/atsvc.h +librpc/gen_ndr/ndr_atsvc_c.h: dcerpc/ndr_atsvc_c.h librpc/gen_ndr/misc.h: gen_ndr/misc.h librpc/gen_ndr/lsa.h: gen_ndr/lsa.h librpc/gen_ndr/samr.h: dcerpc/samr.h @@ -81,7 +86,9 @@ libcli/libcli.h: client.h libcli/libcli_proto.h: client/proto.h librpc/gen_ndr/nbt.h: gen_ndr/nbt.h -librpc/gen_ndr/svcctl.h: gen_ndr/nbt.h +librpc/gen_ndr/svcctl.h: dcerpc/svcctl.h +librpc/gen_ndr/ndr_svcctl.h: dcerpc/ndr_svcctl.h +librpc/gen_ndr/ndr_svcctl_c.h: dcerpc/ndr_svcctl_c.h lib/cmdline/popt_common.h: samba/popt.h lib/util/dlinklist.h: dlinklist.h version.h: samba/version.h === modified file 'source/include/core.h' --- a/source/include/core.h 2007-01-10 11:50:33 + +++ b/source/include/core.h 2007-02-12 11:54:14 + @@ -26,6 +26,8 @@ #include libcli/util/nt_status.h +#include stdbool.h +#include stdlib.h typedef bool BOOL; #define False false === modified file 'source/lib/registry/config.mk' --- a/source/lib/registry/config.mk 2006-09-07 10:02:32 + +++ b/source/lib/registry/config.mk 2007-02-12 11:54:14 + @@ -52,7 +52,7 @@ # Start MODULE registry_rpc [MODULE::registry_rpc] INIT_FUNCTION = registry_rpc_init -PRIVATE_PROTO_HEADER = reg_backend_rpc.h +PUBLIC_PROTO_HEADER = reg_backend_rpc.h OUTPUT_TYPE = INTEGRATED SUBSYSTEM = registry OBJ_FILES = \ @@ -99,7 +99,7 @@ patchfile.o PUBLIC_DEPENDENCIES = \ LIBSAMBA-UTIL CHARSET -PRIVATE_PROTO_HEADER = registry_proto.h +PUBLIC_PROTO_HEADER = registry_proto.h PUBLIC_HEADERS = registry.h # End MODULE registry_ldb === modified file 'source/lib/registry/registry.h' --- a/source/lib/registry/registry.h2006-11-07 00:48:36 + +++ b/source/lib/registry/registry.h2007-02-12 11:54:14 + @@ -22,6 +22,8 @@ #ifndef _REGISTRY_H /* _REGISTRY_H */ #define _REGISTRY_H +#include core.h +#include talloc.h #include librpc/gen_ndr/security.h /* Handles for the predefined keys */ === modified file 'source/lib/talloc/talloc.h' --- a/source/lib/talloc/talloc.h2006-12-15 22:45:36 + +++ b/source/lib/talloc/talloc.h2007-02-12 11:54:14 + @@ -26,6 +26,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include stdlib.h +#include stdio.h +#include stdarg.h + /* this is only needed for compatibility with the old talloc */ typedef void TALLOC_CTX; === modified file 'source/libcli/util/nt_status.h' --- a/source/libcli/util/nt_status.h2006-03-17 01:36:32 + +++ b/source/libcli/util/nt_status.h2007-02-12 11:54:14 + @@ -22,6 +22,8 @@ #ifndef _NT_STATUS_H #define _NT_STATUS_H +#include stdint.h + /* the following rather strange looking definitions of NTSTATUS and WERROR and there in order to catch common coding errors where different error types are mixed up. This is especially important as we slowly convert Samba === modified file 'source/librpc/config.mk' --- a/source/librpc/config.mk 2007-02-12 11:24:03 + +++ b/source/librpc/config.mk 2007-02-12 11:54:14 + @@ -135,10 +135,12 @@ [SUBSYSTEM::NDR_SVCCTL] OBJ_FILES = gen_ndr/ndr_svcctl.o +PUBLIC_HEADERS = gen_ndr/ndr_svcctl.h gen_ndr/svcctl.h PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC [SUBSYSTEM::NDR_ATSVC] OBJ_FILES = gen_ndr/ndr_atsvc.o +PUBLIC_HEADERS = gen_ndr/atsvc.h gen_ndr/ndr_atsvc.h PUBLIC_DEPENDENCIES = LIBNDR [SUBSYSTEM::NDR_EVENTLOG] @@ -344,10 +346,12 @@
Rev 11326: Remove samba-gtk bits, add bzr-builddeb. in file:///home/jelmer/bzr.samba/4.0-debian/
At file:///home/jelmer/bzr.samba/4.0-debian/
revno: 11326
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij [EMAIL PROTECTED]
branch nick: 4.0-debian
timestamp: Tue 2007-02-13 00:30:59 +0100
message:
Remove samba-gtk bits, add bzr-builddeb.
removed:
debian/libgtksamba-dev.install svn-v2:[EMAIL PROTECTED]
debian/libgtksamba0.installsvn-v2:[EMAIL PROTECTED]
debian/samba-gtk-frontends.install svn-v2:[EMAIL PROTECTED]
modified:
.bzr-builddeb/default.conf default.conf-20070127221815-iop0s8809kcw71wm-1
.bzrignore svn-v2:[EMAIL PROTECTED]
debian/changelog svn-v2:[EMAIL PROTECTED]
debian/control svn-v2:[EMAIL PROTECTED]
debian/rules svn-v2:[EMAIL PROTECTED]
source/main.mk svn-v2:[EMAIL PROTECTED]
=== removed file 'debian/libgtksamba-dev.install'
--- a/debian/libgtksamba-dev.install2007-01-27 22:11:08 +
+++ b/debian/libgtksamba-dev.install1970-01-01 00:00:00 +
@@ -1,4 +0,0 @@
-usr/include/samba-4.0/gtk-smb.h
-usr/include/samba-4.0/gtk/*.h
-usr/lib/pkgconfig/gtksamba.pc
-usr/lib/libgtksamba.so
=== removed file 'debian/libgtksamba0.install'
--- a/debian/libgtksamba0.install 2007-01-27 22:11:08 +
+++ b/debian/libgtksamba0.install 1970-01-01 00:00:00 +
@@ -1,1 +0,0 @@
-usr/lib/libgtksamba.so.0.*
=== removed file 'debian/samba-gtk-frontends.install'
--- a/debian/samba-gtk-frontends.install2007-01-27 22:11:08 +
+++ b/debian/samba-gtk-frontends.install1970-01-01 00:00:00 +
@@ -1,6 +0,0 @@
-usr/bin/gregedit
-usr/bin/gepdump
-usr/bin/gwcrontab
-usr/share/man/man1/gregedit.1
-usr/share/man/man1/gepdump.1
-usr/share/man/man1/gwcrontab.1
=== modified file '.bzr-builddeb/default.conf'
--- a/.bzr-builddeb/default.conf2007-01-27 22:51:26 +
+++ b/.bzr-builddeb/default.conf2007-02-12 23:30:59 +
@@ -1,3 +1,2 @@
[BUILDDEB]
merge = True
-export-upstream = svn://svn.samba.org/samba/branches/SAMBA_4_0_RELEASE
=== modified file '.bzrignore'
--- a/.bzrignore2007-01-23 01:29:17 +
+++ b/.bzrignore2007-02-12 23:30:59 +
@@ -162,3 +162,26 @@
source/st
source/samba.info
source/pidl/cover_db
+debian/ldb-tools
+debian/libgensec-dev
+debian/libgensec0
+debian/libldb-dev
+debian/libldb0
+debian/libparse-pidl-perl
+debian/libsamba-dev
+debian/libsamba0
+debian/libtalloc-dev
+debian/libtalloc0
+debian/libtdb-dev
+debian/libtdb0
+debian/samba
+debian/samba-clients
+debian/samba-common
+debian/samba-dev
+debian/samba-testsuite
+debian/swat
+debian/tmp
+debian/winregistry-tools
+source/dsdb/repl/drepl_service_proto.h
+build-stamp
+configure-stamp
=== modified file 'debian/changelog'
--- a/debian/changelog 2007-01-27 22:11:08 +
+++ b/debian/changelog 2007-02-12 23:30:59 +
@@ -1,4 +1,4 @@
-samba (4.0.0~~svn19515-1) UNRELEASED; urgency=low
+samba (4.0.0tp4-1) UNRELEASED; urgency=low
* New upstream versions (svn snapshots of r19515).
=== modified file 'debian/control'
--- a/debian/control2007-01-27 22:11:08 +
+++ b/debian/control2007-02-12 23:30:59 +
@@ -4,7 +4,7 @@
Maintainer: Jelmer Vernooij [EMAIL PROTECTED]
Uploaders: Steve Langasek [EMAIL PROTECTED], Christian Perrier [EMAIL
PROTECTED], Noèl Köthe [EMAIL PROTECTED], Steinar H. Gunderson [EMAIL
PROTECTED]
Standards-Version: 3.6.2
-Build-Depends: libgtk2.0-dev, libgconf2-dev, debhelper ( 5.0.0),
libparse-yapp-perl, perl, docbook-xsl, docbook-xml, xsltproc, po-debconf,
libgnutls-dev, libreadline5-dev, libpam0g-dev, libblkid-dev, libattr1-dev,
flex, bison
+Build-Depends: debhelper ( 5.0.0), libparse-yapp-perl, perl, docbook-xsl,
docbook-xml, xsltproc, po-debconf, libgnutls-dev, libreadline5-dev,
libpam0g-dev, libblkid-dev, libattr1-dev, flex, bison
Package: samba
Architecture: any
@@ -81,27 +81,6 @@
This package contains programs for testing the reliability and speed
of SMB servers, Samba in particular.
-Package: samba-gtk-frontends
-Architecture: any
-Depends: ${shlibs:Depends}
-Section: x11
-Description: graphical Samba client utilities
- The Samba software suite is a collection of programs that
- implements the SMB protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients, as well as
- run as a domain controller for Active Directory.
- .
- These packages contain snapshot versions of Samba 4, the next-generation
- version of Samba. These should be considered _experimental_, and should
- not be used in production. In particular, no guarantees are made with
- regard to upgrades between versions.
- .
- This package contains GTK+ programs for maintaining:
- .
- * Remote SAM databases
- * Local and remote registries
- * DCE/RPC endpoints
-
Package: winregistry-tools
Architecture: any
Depends: ${shlibs:Depends}
@@ -250,22 +229,6 @@
.
This package contains the files
Rev 11431: Fix the build for those that don't have talloc.h installed. in file:///home/jelmer/bzr.samba/SAMBA_4_0/
At file:///home/jelmer/bzr.samba/SAMBA_4_0/ revno: 11431 revision-id: [EMAIL PROTECTED] parent: svn-v2:[EMAIL PROTECTED] committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: SAMBA_4_0 timestamp: Mon 2007-02-12 14:00:37 +0100 message: Fix the build for those that don't have talloc.h installed. modified: source/lib/events/events.h svn-v2:[EMAIL PROTECTED] source/lib/registry/registry.h svn-v2:[EMAIL PROTECTED] === modified file 'source/lib/events/events.h' --- a/source/lib/events/events.h2007-02-12 12:12:12 + +++ b/source/lib/events/events.h2007-02-12 13:00:37 + @@ -23,7 +23,7 @@ #ifndef __EVENTS_H__ #define __EVENTS_H__ -#include talloc.h +#include talloc/talloc.h #include stdlib.h struct event_context; === modified file 'source/lib/registry/registry.h' --- a/source/lib/registry/registry.h2007-02-12 12:12:12 + +++ b/source/lib/registry/registry.h2007-02-12 13:00:37 + @@ -23,7 +23,7 @@ #define _REGISTRY_H #include core.h -#include talloc.h +#include talloc/talloc.h #include librpc/gen_ndr/security.h /* Handles for the predefined keys */
svn commit: samba r21321 - in branches/SAMBA_4_0/webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/treevirtual: .
Author: derrell
Date: 2007-02-13 20:35:48 + (Tue, 13 Feb 2007)
New Revision: 21321
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21321
Log:
- Allow pruning all of the children of a node without removing the node
itself.
- By default, create only one meta column if only the tree is displayed. If
additional columns are displayed, then put all of them in a separate meta
column, and the tree in the first meta column by itself.
Modified:
branches/SAMBA_4_0/webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/treevirtual/SimpleTreeDataModel.js
branches/SAMBA_4_0/webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/treevirtual/TreeVirtual.js
Changeset:
Modified:
branches/SAMBA_4_0/webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/treevirtual/SimpleTreeDataModel.js
===
---
branches/SAMBA_4_0/webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/treevirtual/SimpleTreeDataModel.js
2007-02-13 16:04:36 UTC (rev 21320)
+++
branches/SAMBA_4_0/webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/treevirtual/SimpleTreeDataModel.js
2007-02-13 20:35:48 UTC (rev 21321)
@@ -405,35 +405,42 @@
/**
- * Prune the tree by removing the specified node, and, if the node has
- * children, recursively all of its children.
+ * Prune the tree by removing, recursively, all of a node's children. If
+ * requested, also remove the node itself.
*
* @param nodeId {Integer}
* The node id, previously returned by [EMAIL PROTECTED] #addLeaf} or [EMAIL
PROTECTED]
* #addBranch}, of the node (and its children) to be pruned from the tree.
+ *
+ * @param bSelfAlso {Boolean}
+ * If itrue/i then remove the node identified by inodeId/i as well
+ * as all of the children.
*/
-qx.Proto.prune = function(nodeId)
+qx.Proto.prune = function(nodeId, bSelfAlso)
{
// First, recursively remove all children
for (var i = 0; i this._nodeArr[nodeId].children.length; i++)
{
-this.prune(this._nodeArr[nodeId].children[i]);
+this.prune(this._nodeArr[nodeId].children[i], true);
}
- // Delete ourself from our parent's children list
- var node = this._nodeArr[nodeId];
- qx.lang.Array.remove(this._nodeArr[node.parentNodeId].children, nodeId);
+ if (bSelfAlso)
+ {
+// Delete ourself from our parent's children list
+var node = this._nodeArr[nodeId];
+qx.lang.Array.remove(this._nodeArr[node.parentNodeId].children, nodeId);
- // Delete ourself from the selections list, if we're in it.
- if (this._selections[nodeId])
- {
-delete this._selections[nodeId];
+// Delete ourself from the selections list, if we're in it.
+if (this._selections[nodeId])
+{
+ delete this._selections[nodeId];
+}
+
+// We can't splice the node itself out, because that would muck up the
+// nodeId == index correspondence. Instead, just replace the node with
+// null so its index just becomes unused.
+this._nodeArr[nodeId] = null;
}
-
- // We can't splice the node itself out, because that would muck up the
- // nodeId == index correspondence. Instead, just replace the node with
- // null so its index just becomes unused.
- this._nodeArr[nodeId] = null;
};
Modified:
branches/SAMBA_4_0/webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/treevirtual/TreeVirtual.js
===
---
branches/SAMBA_4_0/webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/treevirtual/TreeVirtual.js
2007-02-13 16:04:36 UTC (rev 21320)
+++
branches/SAMBA_4_0/webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/treevirtual/TreeVirtual.js
2007-02-13 20:35:48 UTC (rev 21321)
@@ -71,7 +71,7 @@
// Set sizes
this.setRowHeight(16);
- this.setMetaColumnCounts([1, -1]);
+ this.setMetaColumnCounts(headings.length 1 ? [ 1, -1 ] : [ 1 ]);
// Set the data cell render. We use the SimpleTreeDataCellRenderer for the
// tree column, and our DefaultDataCellRenderer for all other columns.
svn commit: samba r21322 - in branches/SAMBA_3_0_25/source: . include lib librpc/gen_ndr libsmb nmbd nsswitch param printing rpc_server smbd torture utils
Author: vlendec Date: 2007-02-13 20:55:17 + (Tue, 13 Feb 2007) New Revision: 21322 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21322 Log: No feedback means consent :-) It does not matter if I screw up 3.0.25 or 3.0.26 with this, so do it rather sooner than later. Add the notify support that already exists in 3_0 to 3_0_25. If you want to see this patch dissected into digestable parts, look at 3_0, revisions at about 20800 and following. Volker Added: branches/SAMBA_3_0_25/source/librpc/gen_ndr/ndr_notify.c branches/SAMBA_3_0_25/source/librpc/gen_ndr/ndr_notify.h branches/SAMBA_3_0_25/source/librpc/gen_ndr/notify.h branches/SAMBA_3_0_25/source/smbd/notify_inotify.c branches/SAMBA_3_0_25/source/smbd/notify_internal.c Removed: branches/SAMBA_3_0_25/source/smbd/notify_fam.c branches/SAMBA_3_0_25/source/smbd/notify_hash.c branches/SAMBA_3_0_25/source/smbd/notify_kernel.c Modified: branches/SAMBA_3_0_25/source/Makefile.in branches/SAMBA_3_0_25/source/configure.in branches/SAMBA_3_0_25/source/include/event.h branches/SAMBA_3_0_25/source/include/includes.h branches/SAMBA_3_0_25/source/include/messages.h branches/SAMBA_3_0_25/source/include/nt_status.h branches/SAMBA_3_0_25/source/include/smb.h branches/SAMBA_3_0_25/source/include/vfs.h branches/SAMBA_3_0_25/source/include/vfs_macros.h branches/SAMBA_3_0_25/source/lib/debug.c branches/SAMBA_3_0_25/source/lib/dmallocmsg.c branches/SAMBA_3_0_25/source/lib/events.c branches/SAMBA_3_0_25/source/lib/messages.c branches/SAMBA_3_0_25/source/lib/tallocmsg.c branches/SAMBA_3_0_25/source/lib/util.c branches/SAMBA_3_0_25/source/lib/util_tdb.c branches/SAMBA_3_0_25/source/libsmb/clidgram.c branches/SAMBA_3_0_25/source/nmbd/nmbd.c branches/SAMBA_3_0_25/source/nmbd/nmbd_elections.c branches/SAMBA_3_0_25/source/nmbd/nmbd_winsserver.c branches/SAMBA_3_0_25/source/nsswitch/winbindd.c branches/SAMBA_3_0_25/source/nsswitch/winbindd_cm.c branches/SAMBA_3_0_25/source/nsswitch/winbindd_cred_cache.c branches/SAMBA_3_0_25/source/nsswitch/winbindd_dual.c branches/SAMBA_3_0_25/source/param/loadparm.c branches/SAMBA_3_0_25/source/printing/nt_printing.c branches/SAMBA_3_0_25/source/printing/printing.c branches/SAMBA_3_0_25/source/rpc_server/srv_spoolss_nt.c branches/SAMBA_3_0_25/source/rpc_server/srv_srvsvc_nt.c branches/SAMBA_3_0_25/source/smbd/blocking.c branches/SAMBA_3_0_25/source/smbd/close.c branches/SAMBA_3_0_25/source/smbd/conn.c branches/SAMBA_3_0_25/source/smbd/dosmode.c branches/SAMBA_3_0_25/source/smbd/files.c branches/SAMBA_3_0_25/source/smbd/notify.c branches/SAMBA_3_0_25/source/smbd/nttrans.c branches/SAMBA_3_0_25/source/smbd/open.c branches/SAMBA_3_0_25/source/smbd/oplock.c branches/SAMBA_3_0_25/source/smbd/process.c branches/SAMBA_3_0_25/source/smbd/reply.c branches/SAMBA_3_0_25/source/smbd/server.c branches/SAMBA_3_0_25/source/smbd/service.c branches/SAMBA_3_0_25/source/smbd/trans2.c branches/SAMBA_3_0_25/source/smbd/vfs.c branches/SAMBA_3_0_25/source/torture/msgtest.c branches/SAMBA_3_0_25/source/torture/vfstest.c branches/SAMBA_3_0_25/source/utils/net_ads.c branches/SAMBA_3_0_25/source/utils/smbcontrol.c Changeset: Sorry, the patch is too large (6502 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21322
svn commit: samba r21323 - in branches/SAMBA_4_0/source/librpc/idl: .
Author: metze
Date: 2007-02-13 22:13:59 + (Tue, 13 Feb 2007)
New Revision: 21323
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21323
Log:
add a start to parse the supplementalCredentials value,
it doesn't work yet but it's a start
metze
Modified:
branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl 2007-02-13 20:55:17 UTC
(rev 21322)
+++ branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl 2007-02-13 22:13:59 UTC
(rev 21323)
@@ -202,6 +202,31 @@
);
typedef [public] struct {
+ uint16 name_len;
+ uint16 data_len;
+ uint16 id;
+ [charset(UTF16)] uint8 name[name_len];
+ uint8 data[data_len];
+ } supplementalCredentialsPackage;
+
+ typedef [public] struct {
+ uint32 unknown1;
+ [charset(UTF16)] uint16 unknown2[0x30];
+ uint16 unknown3;
+ uint16 num_packages;
+ supplementalCredentialsPackage packages[num_packages];
+ } supplementalCredentialsSubBlob;
+
+ typedef [public] struct {
+ [value(0)] uint32 version;
+ [subcontext(4)] supplementalCredentialsSubBlob sub;
+ } supplementalCredentialsBlob;
+
+ void decode_supplementalCredentials(
+ [in] supplementalCredentialsBlob blob
+ );
+
+ typedef [public] struct {
uint32 marker;
DATA_BLOB data;
} DsCompressedChunk;
Build status as of Wed Feb 14 00:00:02 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-02-13 00:00:44.0 + +++ /home/build/master/cache/broken_results.txt 2007-02-14 00:00:23.0 + @@ -1,4 +1,4 @@ -Build status as of Tue Feb 13 00:00:02 2007 +Build status as of Wed Feb 14 00:00:02 2007 Build counts: Tree Total Broken Panic @@ -6,17 +6,17 @@ build_farm 0 0 0 ccache 31 6 0 ctdb 0 0 0 -distcc 2 0 0 -ldb 30 3 0 -libreplace 28 2 0 -lorikeet-heimdal 27 15 0 -ppp 15 0 0 -rsync31 5 0 +distcc 3 0 0 +ldb 29 3 0 +libreplace 27 2 0 +lorikeet-heimdal 26 15 0 +ppp 14 0 0 +rsync30 5 0 samba0 0 0 samba-docs 0 0 0 -samba4 35 31 0 -samba_3_037 13 0 -smb-build29 28 0 -talloc 31 0 0 -tdb 30 2 0 +samba4 35 27 0 +samba_3_037 12 1 +smb-build28 28 0 +talloc 30 0 0 +tdb 29 2 0
svn commit: samba r21324 - in branches: SAMBA_3_0/source/include SAMBA_3_0/source/modules SAMBA_3_0/source/profile SAMBA_3_0/source/smbd SAMBA_3_0_25/source/include SAMBA_3_0_25/source/modules SAMBA_3
Author: jmcd Date: 2007-02-14 02:37:14 + (Wed, 14 Feb 2007) New Revision: 21324 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21324 Log: Add linux setlease to the vfs layer. Next round, as Volker points out, it should be abstracted a little higher up so other os'es can have an entry, but it will take a bit more work. Thanks to Chetan Shringarpure and Mathias Dietz. I didn't increment the vfs number again because the kernel change notify stuff hasn't been released yet anyway. Modified: branches/SAMBA_3_0/source/include/smbprofile.h branches/SAMBA_3_0/source/include/vfs.h branches/SAMBA_3_0/source/include/vfs_macros.h branches/SAMBA_3_0/source/modules/vfs_default.c branches/SAMBA_3_0/source/modules/vfs_full_audit.c branches/SAMBA_3_0/source/modules/vfs_gpfs.c branches/SAMBA_3_0/source/profile/profile.c branches/SAMBA_3_0/source/smbd/oplock_linux.c branches/SAMBA_3_0_25/source/include/smbprofile.h branches/SAMBA_3_0_25/source/include/vfs.h branches/SAMBA_3_0_25/source/include/vfs_macros.h branches/SAMBA_3_0_25/source/modules/vfs_default.c branches/SAMBA_3_0_25/source/modules/vfs_full_audit.c branches/SAMBA_3_0_25/source/modules/vfs_gpfs.c branches/SAMBA_3_0_25/source/profile/profile.c branches/SAMBA_3_0_25/source/smbd/oplock_linux.c Changeset: Sorry, the patch is too large (609 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21324
svn commit: samba r21325 - in branches/SAMBA_4_0/webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/treevirtual: .
Author: derrell
Date: 2007-02-14 04:13:46 + (Wed, 14 Feb 2007)
New Revision: 21325
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21325
Log:
delete children in reverse order since the array is manipulated during the
recursive delete
Modified:
branches/SAMBA_4_0/webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/treevirtual/SimpleTreeDataModel.js
Changeset:
Modified:
branches/SAMBA_4_0/webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/treevirtual/SimpleTreeDataModel.js
===
---
branches/SAMBA_4_0/webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/treevirtual/SimpleTreeDataModel.js
2007-02-14 02:37:14 UTC (rev 21324)
+++
branches/SAMBA_4_0/webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/class/qx/ui/treevirtual/SimpleTreeDataModel.js
2007-02-14 04:13:46 UTC (rev 21325)
@@ -419,7 +419,7 @@
qx.Proto.prune = function(nodeId, bSelfAlso)
{
// First, recursively remove all children
- for (var i = 0; i this._nodeArr[nodeId].children.length; i++)
+ for (var i = this._nodeArr[nodeId].children.length - 1; i = 0; i--)
{
this.prune(this._nodeArr[nodeId].children[i], true);
}
svn commit: samba r21326 - in branches/SAMBA_4_0/webapps: .
Author: derrell Date: 2007-02-14 04:19:13 + (Wed, 14 Feb 2007) New Revision: 21326 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21326 Log: get rid of old qooxdoo version. Removed: branches/SAMBA_4_0/webapps/qooxdoo-0.6.3-sdk/ Changeset:
svn commit: samba r21327 - in branches/SAMBA_3_0_25/source/modules: .
Author: vlendec
Date: 2007-02-14 04:47:15 + (Wed, 14 Feb 2007)
New Revision: 21327
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21327
Log:
Jim, thanks for the review! :-)
Now to test this...
Volker
Modified:
branches/SAMBA_3_0_25/source/modules/vfs_default.c
Changeset:
Modified: branches/SAMBA_3_0_25/source/modules/vfs_default.c
===
--- branches/SAMBA_3_0_25/source/modules/vfs_default.c 2007-02-14 04:19:13 UTC
(rev 21326)
+++ branches/SAMBA_3_0_25/source/modules/vfs_default.c 2007-02-14 04:47:15 UTC
(rev 21327)
@@ -850,6 +850,33 @@
return result;
}
+static NTSTATUS vfswrap_notify_watch(vfs_handle_struct *vfs_handle,
+struct sys_notify_context *ctx,
+struct notify_entry *e,
+void (*callback)(struct sys_notify_context
*ctx,
+ void *private_data,
+ struct notify_event *ev),
+void *private_data, void *handle)
+{
+ /*
+* So far inotify is the only supported default notify mechanism. If
+* another platform like the the BSD's or a proprietary Unix comes
+* along and wants another default, we can play the same trick we
+* played with Posix ACLs.
+*
+* Until that is the case, hard-code inotify here.
+*/
+#ifdef HAVE_INOTIFY
+ if (lp_kernel_change_notify(ctx-conn-params)) {
+ return inotify_watch(ctx, e, callback, private_data, handle);
+ }
+#endif
+ /*
+* Do nothing, leave everything to notify_internal.c
+*/
+ return NT_STATUS_OK;
+}
+
static size_t vfswrap_fget_nt_acl(vfs_handle_struct *handle, files_struct
*fsp, int fd, uint32 security_info, SEC_DESC **ppdesc)
{
size_t result;
@@ -1231,6 +1258,8 @@
SMB_VFS_LAYER_OPAQUE},
{SMB_VFS_OP(vfswrap_realpath), SMB_VFS_OP_REALPATH,
SMB_VFS_LAYER_OPAQUE},
+ {SMB_VFS_OP(vfswrap_notify_watch), SMB_VFS_OP_NOTIFY_WATCH,
+SMB_VFS_LAYER_OPAQUE},
/* NT ACL operations. */
svn commit: samba r21328 - in branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse: .
Author: idra
Date: 2007-02-14 05:16:05 + (Wed, 14 Feb 2007)
New Revision: 21328
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=21328
Log:
Ok, now we can successfully modify the ldb and refresh the tree
but ...
- we have a problem with removeAll() in ldbmodify
- we seem to not properly cactch errors, we always return a success
alert even if the operation is not successful :(
Modified:
branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse/Gui.js
branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse/LdbModify.js
Changeset:
Modified:
branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse/Gui.js
===
--- branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse/Gui.js
2007-02-14 04:47:15 UTC (rev 21327)
+++ branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse/Gui.js
2007-02-14 05:16:05 UTC (rev 21328)
@@ -138,10 +138,16 @@
this._displaySearchResults(module, rpcRequest);
break;
+ case modify:
+this._displayModifyResults(module, rpcRequest);
+break;
+
case add:
- case modify:
+this._displayAddResults(module, rpcRequest);
+break;
+
case delete:
-this._displayCommitResults(module, rpcRequest, requestType);
+this._displayDeleteResults(module, rpcRequest);
break;
case tree_open:
@@ -475,34 +481,51 @@
qx.Proto._confirmDeleteRecord = function()
{
- //this._newb.setEnabled(false);
- //this._modb.setEnabled(false);
- //this._delb.setEnabled(false);
this._ldbmod.showConfirmDelete();
};
-qx.Proto._displayCommitResults = function(module, rpcRequest, type)
+qx.Proto._displayModifyResults = function(module, rpcRequest)
{
+ var tree = module.fsm.getObject(tree);
+ tree.createDispatchDataEvent(changeSelection, tree.getSelectedNodes());
+
+ alert(Object successfully modified!);
+
+ this._switchToNormal();
+ //this._ldbmod.postCleanUp();
+}
+
+qx.Proto._displayAddResults = function(module, rpcRequest)
+{
var result = rpcRequest.getUserData(result);
- switch (type) {
- case add:
-alert(Object successfully added!);
-break;
+ var tree = module.fsm.getObject(tree);
+ var node = tree.getSelectedNodes()[0];
+
+ tree.getDataModel().prune(node.nodeId, false);
+ node.bOpened = false;
+ tree.toggleOpened(node);
- case modify:
-alert(Object successfully modified!);
-break;
+ alert(Object successfully added!);
- case delete:
-alert(Object Successfully deleted!);
-break;
- }
-
this._switchToNormal();
+ //this._ldbmod.postCleanUp();
+};
- //TODO: reload tree after add or delete
+qx.Proto._displayDeleteResults = function(module, rpcRequest, type)
+{
+ var result = rpcRequest.getUserData(result);
+ var tree = module.fsm.getObject(tree);
+ var node =
tree.getDataModel().getData()[tree.getSelectedNodes()[0].parentNodeId];
+
+ tree.getDataModel().prune(node.nodeId, false);
+ node.bOpened = false;
+ tree.toggleOpened(node);
+
+ alert(Object Successfully deleted!);
+
+ this._ldbmod.setBase();
};
qx.Proto._displaySearchResults = function(module, rpcRequest)
@@ -559,12 +582,14 @@
var parentNode = rpcRequest.getUserData(parentNode);
var attributes = rpcRequest.getUserData(attributes);
+ // Remove any existing children, they will be replaced by the result of this
call (refresh)
+ dataModel.setData();
+
// Any children?
if (! result || result[length] == 0)
{
// Nope. Remove parent's expand/contract button.
dataModel.setState(parentNode.nodeId, { bHideOpenClose : true });
-dataModel.setData();
return;
}
Modified:
branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse/LdbModify.js
===
---
branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse/LdbModify.js
2007-02-14 04:47:15 UTC (rev 21327)
+++
branches/SAMBA_4_0/webapps/swat/source/class/swat/module/ldbbrowse/LdbModify.js
2007-02-14 05:16:05 UTC (rev 21328)
@@ -97,8 +97,7 @@
if (this._active) {
if (this._type == add) {
- this._basedn.setValue(this.basedn);
- this._basedn.setWidth(8 * this.basedn.length);
+ this._basedn.setHtml(this.basedn);
}
}
}
@@ -113,6 +112,12 @@
this._setExitCallback(callback, obj);
+ if (this.basedn == ) {
+alert(Please select the parent node in the tree first!);
+this._callExitCallback();
+return;
+ }
+
this._active = true;
this._type = add;
@@ -130,8 +135,7 @@
// The basedn of the object
// TODO: add validator
- this._basedn = new qx.ui.form.TextField(this.basedn);
- this._basedn.setWidth(8 * this.basedn.length);
+ this._basedn = new qx.ui.basic.Label(this.basedn);
hlayout.add(dnlabel, this._rdn, dnsep, this._basedn);
@@ -211,18 +215,14 @@
this._mainArea.removeAll();
this._active = false;
this._type = null;
- return;
}
