Re: [Samba] ACL and copy/move file
man, 02.05.2005 kl. 00.34 skrev Andi: Inside a single directory, I have 2 subdirectories: dirname=working (root.root rwsrwsr-x) user::rwx group::rwx user:user1:rwx group:group1:rwx default:user::rwx default:group::rwx default:user:user1:rwx default:group:group1:rwx dirname=controlled (root.root rwsrwsr-x) user::rwx group::rwx group:group2:rwx default:group:group2:rwx default:user::rwx default:group::rwx The idea being that files from the 'working' directory get copied/moved into the 'controlled' area, and are then read-only to everybody (except for group2). When a file is *copied* from 'working' to 'controlled' the default acl of 'controlled' is applied. If the file is *moved*, the acl's that are on the file in the 'working' directory, are also transferred - effectively allowing that file to be modified. With WinXP, the permissions from the destination directory are applied to the file, whether it is copied or moved. I believe the same is true on WinNT. Is this a bug with Samba? (Using Samba 3.0.14a) Last week I asked a tangential question. The answer was, naturally, that, given a dual environment Windows/Unix, the underlying Unix rules for a filesystem will always apply to files on the Samba server. In your case (as in mine) what you're seeing is the normal Unix cp/mv behavior and I wouldn't call it a Samba bug. I suppose a routine could be written into samba to counter this, the developers would have to answer that. --Tonni -- Nothing sucksseeds like a pigeon without a beak ... mail: [EMAIL PROTECTED] http://www.billy.demon.nl They'll love us, won't they? They feed us, don't they? ... -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba-3 by Example Ch 6
man, 02.05.2005 kl. 07.07 skrev taso: I am following Chapter 6 of Samba-3 By Example to set up Samba on a Fedora 3 box. It seems to go Ok until page 144 step 5. # net getlocalsid [2005/05/02 00:22:04, 0] lib/smbldap.c:smbldap_search_suffix(1155) smbldap_search_suffix: Problem during the LDAP search: (No such object) SID for domain SIROCCO is: S-1-5-21- etc The smbldap_search_suffix: error went away when I added the following entries to LDAP directory. dn: dc=esands,dc=com objectclass: dcObject objectclass: organization o: ESS dc: esands dn: cn=Manager,dc=esands,dc=com objectclass: organizationalRole cn: Manager http://www.openldap.org/doc/admin22/quickstart.html shows how to do the above. Now net getlocalsid sirocco produces the same SID as net getlocalsid esands, ie the same SID for both the host (PDC) and the domain. Can anybody confirm that it's supposed to be like that? There is no such command as net getlocalsid user. What you're seeing in both cases is the output of net getlocalsid. 'man net', search for getlocalsid. --Tonni -- Nothing sucksseeds like a pigeon without a beak ... mail: [EMAIL PROTECTED] http://www.billy.demon.nl They'll love us, won't they? They feed us, don't they? ... -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Caching
I have big problems with samba (client or server, dont know) caching files. a client writes a file and reads it back right away, and then it reads the old contents. can this problem be solved? remco -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] wbinfo -n and wbinfo -s are broken with win2003 SP1
Hello, I had the same troubles, and it was solve from Samba 3-0-14a It is due to Windows 2003 SP1troubles Best regards Philippe Besson Customer Support Engineer Modality Specialist Angio/Cardio Philips SA Medical Systems Av. du Mont-Blanc 31 CH- 1196 Gland Tel: +41 22 364 96 56 Fax: +41 22 364 44 66 mailto:email: [EMAIL PROTECTED] http://www.philips.ch/medical -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Q: windbind, local groups and domain user membership?
Albrecht Dreß a écrit : Joris De Pooter schrieb: To manipulates a domain user, you have to use its FQN (fully qualified name): assuming you have a domain called CRAPULE and a user called brigand, and the winbind separator = + (in smb.conf) then, it's name is CRAPULE+brigand That doesn't work for me: [EMAIL PROTECTED] root]# wbinfo -C local-special-group [EMAIL PROTECTED] root]# wbinfo -o DOMAIN_user:local-special-group Could not add user to group The messages don't contain any further error information. I am sure, though, that the grouf has been created, as trying to add it again results in an error message there. Thanks, Albrecht Oops, i thought you wanted to create a local unix group. Why not consider this option ? -- Joris De Pooter -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] auth methods and ads
Hello What is sequence for auth methods running in ADS mode ? How I can find this ? With best regards Martynas -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] charset problem with smbmount
Old and busted: smbfs New hotness: cifs While the cifs module is also not maintained here either (I'm pretty sure), it's much better and often times solves the issue of the day. Try to use it to mount your share and see what happens. With mount -t cifs it works! Thanks Dobos Sandor IBCnet Hungary Ltd. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] W2K3 SP1 - PERSISTENT CONNECTION(S) BUG?
After testing my W2K3 SP1 terminal server against a SAMBA server *AND* a W2K server, I have noticed the following *odd* behavior. LOGIN: Map drive letters LOGOUT: Connections are still connected. on BOTH W2K and SAMBA file servers. LOGIN: Map drive letters LOGOUT: Now you have TWO sets of connections still connected for the one user. REPEAT: For each time you repeat the above procedure, you end up with persistent connections from the W2K3 SP1 system! Now imagine a system with 50+ users logging in and out all day long! If you REBOOT the W2K3 SP1 system, all the connections are properly disconnected. If you run net use * /delete /yes, all the connections are properly disconnected. PROBLEM: This causes resource exhaustion on the SAMBA server. (And probably on the W2K server as well, haven't tested it that far yet.) MITIGATION: I added a policy that runs the following command on user logout: net use * /delete /yes This seems to *mostly* elimate the persistent, resource exhausting, and totally useless connections. Is this a W2K3 SP1 bug? An intentional change in behavior? Is there anything I can do on the SAMBA side to enable detection of these should be disconnected persistent connections for logged out users and elimate them? (I tried deadtime=1 and keepalive=1, but they stay connected anyways). -- Michael Joyner/System Administrator Edward Waters College -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] My public folder is not public
look in chapter one of ther samba guide, page number 8 (pdf document page 40), and look for the usage of sticky bit (chmod -R ug+rwxs,o-w,o+rx /YOURDIR). with this, and the force user and force group mentioned by Mark, your problems should go away. Hope this help! RP Mark Cooke wrote: On Sun, 2005-05-01 at 16:38 -0300, Hernani Donato wrote: [publica] available = yes browseable = yes comment = public folder guest ok = yes path = /home/public read only = no writable = yes The problem is: The user Bob open any folder located in publica share, then create a new folder and insert new content. The user Magie open the folder created by Bob and your content is invisible for Magie and others users. Only Bob can view the contents!!! See 'force user' and 'force group' for one possible solution, if you don't want to retain ownership information. On our temporary data transfer shares I just force a common owner for the files. Works a treat. Alternatively, you can use the 'create mask' and 'directory mask' to ensure the defaults allow group/other access too. Cheers, Mark -- Raúl D. Pittí Palma Associate Global Engineering and Technologies mobile (507)-616-0194 office (507)-264-2362 Republic of Panama www.globaltecsa.com -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] browsing via vpn problem
Hi, I've got a small problem that has been driving me nuts over the last couple of days. I have a Samba (v3.0.11 on linux 2.4.21) server that is connected to the internet and has all smb and netbios ports firewalled. Access is provided via a OpenVPN tunnel interface with all traffic going through there. Clients get a /30 address with a route to the server. I have enabled WINS and the servers netbios name resolves with a ping and I can connect to a share via the NET command with no problems (on a windows 2000 machine). I put the interfaces and bind interfaces only lines with the range of the private vpn but am having problems with browsing not working, the local machine shows up in the network neighbourhood but the server is missing. I think I've managed to track it down to Samba giving the non accessible public IP address of the server for the WORKGROUP master browser (type 1B) when I look at the netbios cache via nbtstat -c. Also WORKGROUP group (type 1E) is giving an address 0.0.0.0 is this normal? my smb.conf is: interfaces = 10.8.0.1/255.255.255.0 bind interfaces only = true wins support = true dns proxy = false workgroup = WORKGROUP announce as = NT announce version = 5.2 domain master = yes local master = no Have I made a fundemental setup error? if anyone can help it would be much appreciated. Markus -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] I am unable to access my shares: Incorrect password orInvalid user name
when i log in to my banking i get this messagemissing information or log in valid 200505021112354263284 what am i doing wrong -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] General security question
Hi, I'm new at samba, and i have this question on security. I went through the how-to guide on samba.org, and visited various different websites, but found nothing on what i'm looking for. I was wondering whether it's possible to detect brute forcing attacks against a samba server, and if there's any security auditing features that samba supports. Hope someone can point me to right direction. Thanks, AV -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Migrating Samba
Dear all, for migrating Samba, I would like to install the latest Samba Server on a new server machine in parallel to the operational one. My questions: - Is there the risk of corrupting data if two machines work on the same (NFS-shared) data? - If so, what is the recommended way of upgrading/migrating samba? - If no, is there anything in particular I need to take care of? Thanks in advance for any help! Gruss, Lukas -- Lukas Ruf http://www.lpr.ch | Raw IP http://www.rawip.org | Style http://email.rawip.org | -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] What is good about kereberos auth?
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Just curious but what is so great about Kereberos authentication? Would my LDAP PDC arrangement benefit? Jim C. -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.5 (MingW32) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFCdlqCB4AhF6wVFMERAvA2AJ9ZLZlQp8cWSHWdJRu7C3ZZO9+9KwCgmZKT /2QLrrhjgisoJerB0RrOpmw= =SnGr -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] LDAP Logon Problem
Hi everybody, I got a strange problem. I'm using fedora core 3 and openldap. Configured samba 3.0.11 to act as LDAP PDC and everything worked fine. But now creating a new user and trying to log on I get: check_ntlm_password: Authentication for user [florian] - [florian] FAILED with error NT_STATUS_WRONG_PASSWORD In LDAP there seems to be everything fine, but I cannot manage to logon with a new user. The old ones are working fine. Greetings and thanks for helping out Sascha -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] What is good about kereberos auth?
There are two main benefits to Kerberos authentication. The first is that in a true Kerberos environment, no password is never sent across the wire. The second, is that you get the holy grail of single sign on. Your LDAP PDC should be able to make use of Kerberos though not in the true sense. There is Kerberos support in Samba, but as I understand it, it's only for interacting with a Microsoft AD server and not others. What will happen is authentication requests will come to the PDC which will then use the underlying mechanism (a.k.a. PAM) to authenticate a user. This is how I understand it and I'll defer to those more knowledgeable on the list if I'm wrong. On Mon, 2005-05-02 at 09:51 -0700, Jim C. wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Just curious but what is so great about Kereberos authentication? Would my LDAP PDC arrangement benefit? Jim C. -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.5 (MingW32) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFCdlqCB4AhF6wVFMERAvA2AJ9ZLZlQp8cWSHWdJRu7C3ZZO9+9KwCgmZKT /2QLrrhjgisoJerB0RrOpmw= =SnGr -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] HELP: winbindd stops with INTERNAL ERROR
my environment samba 3.0.14a , w2k ADS/kerberos, winbind + idmap_rid on IBM x345 we installed samba 3.0.14a on several servers using RedHat AS2.1 and AS3.x by rebuilding the binaries from samba-3.0.14a-1.src.rpm everything works perfect and smooth - CONGRATULATIONS TO THE SAMBA TEAM !! creating kerberos a ticket, joining the domain and browsing network shares is performing as expected on 4 servers except only ONE machine. on this one, i had installed an orignal redhad samba 2.2.7 package before upgrading to 3.0.14a i have remove all old packages from the previous release samba-client-2.2.7-1.21as, samba-common-2.2.7-1.21as, samba-2.2.7-1.21as, samba-swat-2.2.7-1.21as as well all directories relating to samba (/etc/samba and /var/cache/samba) i joined my w2k domain and can connect to shares but continously receive the error process_loop: Invalid request size. after several hours my winbindd terminates with INTERNAL ERROR: Signal 6 i have checked all servers for /lib/libnss_winbind.so and /lib/security/pam_winbind.so files. they are all the same size and date since they came from exactly the same rpm. can somebody point me to a direction how to fix this. i cannot explain why winbindd works perfectly on three servers but panics on another [2005/04/24 09:01:01, 0] nsswitch/winbindd.c:process_loop(747) process_loop: Invalid request size from pid 4584: 1304 bytes sent, should be 1824 This usually means that you are running old wbinfo, pam_winbind or libnss_winbind clients [2005/04/24 09:10:00, 0] nsswitch/winbindd.c:process_loop(747) process_loop: Invalid request size from pid 5308: 1304 bytes sent, should be 1824 This usually means that you are running old wbinfo, pam_winbind or libnss_winbind clients [2005/04/24 09:12:00, 0] nsswitch/winbindd.c:process_loop(747) process_loop: Invalid request size from pid 5468: 1304 bytes sent, should be 1824 This usually means that you are running old wbinfo, pam_winbind or libnss_winbind clients [2005/04/24 09:12:00, 0] nsswitch/winbindd.c:process_loop(747) process_loop: Invalid request size from pid 5470: 1304 bytes sent, should be 1824 This usually means that you are running old wbinfo, pam_winbind or libnss_winbind clients [2005/04/24 09:12:01, 0] lib/fault.c:fault_report(36) === [2005/04/24 09:12:01, 0] lib/fault.c:fault_report(37) INTERNAL ERROR: Signal 6 in pid 4071 (3.0.14a) Please read the appendix Bugs of the Samba HOWTO collection [2005/04/24 09:12:01, 0] lib/fault.c:fault_report(39) === [2005/04/24 09:12:01, 0] lib/util.c:smb_panic2(1495) PANIC: internal error [2005/04/24 09:12:01, 0] lib/util.c:smb_panic2(1502) BACKTRACE: 27 stack frames: #0 winbindd(smb_panic2+0x15e) [0x80c541e] #1 winbindd(smb_panic+0x11) [0x80c52b1] #2 winbindd [0x80b4767] #3 /lib/i686/libc.so.6 [0x40161958] #4 /lib/i686/libc.so.6(abort+0x15e) [0x40163092] #5 winbindd [0x80e32f5] #6 winbindd [0x80e35e4] #7 winbindd(cli_krb5_get_ticket+0x19f) [0x80e38bf] #8 winbindd(spnego_gen_negTokenTarg+0x36) [0x80e4406] #9 winbindd [0x8154d01] #10 winbindd [0x8154fac] #11 winbindd(ads_sasl_bind+0x10c) [0x81555ec] #12 winbindd(ads_connect+0x211) [0x814fc11] #13 winbindd(ads_do_search_retry+0x1cd) [0x815a49d] #14 winbindd(ads_USN+0x3a) [0x815378a] #15 winbindd [0x8085856] #16 winbindd [0x8077f86] #17 winbindd [0x8078187] #18 winbindd [0x8079445] #19 winbindd(winbindd_lookup_sid_by_name+0x45) [0x8075e55] #20 winbindd(winbindd_getpwnam+0x25c) [0x8070d1c] #21 winbindd(ber_scanf+0x799) [0x806f669] #22 winbindd(winbind_process_packet+0x1d) [0x806f94d] #23 winbindd(strftime+0x1aa9) [0x806fd79] #24 winbindd(main+0x4fc) [0x807080c] #25 /lib/i686/libc.so.6(__libc_start_main+0x93) [0x4014f657] #26 winbindd(chroot+0x31) [0x806ef51] [global] dos charset = ISO8859-15 unix charset = ISO8859-15 workgroup = CP realm = CP.INT netbios aliases = FS2-01, FS2-02, FS2-03 server string = RedHat AS2.1 interfaces = 10.10.200.12/16 bind interfaces only = Yes security = ADS allow trusted domains = No obey pam restrictions = Yes password server = CPFIS-DC1, CPFIS-DC2 log file = /var/log/samba/%m.log max log size = 50 socket options = TCP_NODELAY SO_RCVBUF=16384 SO_SNDBUF=16384 load printers = No show add printer wizard = No preferred master = No local master = No domain master = No lock directory = /var/cache/samba/FS2 pid directory = /var/run/samba idmap backend = idmap_rid:CP=1000-100 idmap uid = 1000-100 idmap gid = 1000-100 template homedir = /usr/mnt/samba2/home/%D/%U template shell = /bin/bash winbind separator = + winbind enum users = No winbind enum groups = No winbind use default domain
[Samba] winbindd terminates with INTERNAL_ERROR
my environment samba 3.0.14a , w2k ADS/kerberos, winbind + idmap_rid on IBM x345 we installed samba 3.0.14a on several servers using RedHat AS2.1 and AS3.x by rebuilding the binaries from samba-3.0.14a-1.src.rpm. everything works perfect and smooth - CONGRATULATIONS TO THE SAMBA TEAM !! creating a kerberos ticket, joining the domain and browsing network shares is performing as expected on 4 servers except only ONE machine. on this one, i had installed an orignal redhad samba 2.2.7 package before upgrading to 3.0.14a. all old packages from the previous release were removed (samba-client-2.2.7-1.21as, samba-common-2.2.7-1.21as, samba-2.2.7-1.21as, samba-swat-2.2.7-1.21as) as well all directories relating to samba (/etc/samba and /var/cache/samba). i joined my w2k domain and can connect to shares but continously receive the error process_loop: Invalid request size. after several hours my winbindd terminates with: [2005/04/24 09:12:01, 0] lib/fault.c:fault_report(37) INTERNAL ERROR: Signal 6 in pid 4071 (3.0.14a) i have checked all servers for /lib/libnss_winbind.so and /lib/security/pam_winbind.so files. they are all the same size and date since they came from exactly the same rpm. can somebody point me to a direction how to fix this. i cannot explain why winbindd works perfectly on three servers but panics on another. thanks in advance [2005/04/24 09:01:01, 0] nsswitch/winbindd.c:process_loop(747) process_loop: Invalid request size from pid 4584: 1304 bytes sent, should be 1824 This usually means that you are running old wbinfo, pam_winbind or libnss_winbind clients [2005/04/24 09:10:00, 0] nsswitch/winbindd.c:process_loop(747) process_loop: Invalid request size from pid 5308: 1304 bytes sent, should be 1824 This usually means that you are running old wbinfo, pam_winbind or libnss_winbind clients [2005/04/24 09:12:00, 0] nsswitch/winbindd.c:process_loop(747) process_loop: Invalid request size from pid 5468: 1304 bytes sent, should be 1824 This usually means that you are running old wbinfo, pam_winbind or libnss_winbind clients [2005/04/24 09:12:00, 0] nsswitch/winbindd.c:process_loop(747) process_loop: Invalid request size from pid 5470: 1304 bytes sent, should be 1824 This usually means that you are running old wbinfo, pam_winbind or libnss_winbind clients [2005/04/24 09:12:01, 0] lib/fault.c:fault_report(36) === [2005/04/24 09:12:01, 0] lib/fault.c:fault_report(37) INTERNAL ERROR: Signal 6 in pid 4071 (3.0.14a) Please read the appendix Bugs of the Samba HOWTO collection [2005/04/24 09:12:01, 0] lib/fault.c:fault_report(39) === [2005/04/24 09:12:01, 0] lib/util.c:smb_panic2(1495) PANIC: internal error [2005/04/24 09:12:01, 0] lib/util.c:smb_panic2(1502) BACKTRACE: 27 stack frames: #0 winbindd(smb_panic2+0x15e) [0x80c541e] #1 winbindd(smb_panic+0x11) [0x80c52b1] #2 winbindd [0x80b4767] #3 /lib/i686/libc.so.6 [0x40161958] #4 /lib/i686/libc.so.6(abort+0x15e) [0x40163092] #5 winbindd [0x80e32f5] #6 winbindd [0x80e35e4] #7 winbindd(cli_krb5_get_ticket+0x19f) [0x80e38bf] #8 winbindd(spnego_gen_negTokenTarg+0x36) [0x80e4406] #9 winbindd [0x8154d01] #10 winbindd [0x8154fac] #11 winbindd(ads_sasl_bind+0x10c) [0x81555ec] #12 winbindd(ads_connect+0x211) [0x814fc11] #13 winbindd(ads_do_search_retry+0x1cd) [0x815a49d] #14 winbindd(ads_USN+0x3a) [0x815378a] #15 winbindd [0x8085856] #16 winbindd [0x8077f86] #17 winbindd [0x8078187] #18 winbindd [0x8079445] #19 winbindd(winbindd_lookup_sid_by_name+0x45) [0x8075e55] #20 winbindd(winbindd_getpwnam+0x25c) [0x8070d1c] #21 winbindd(ber_scanf+0x799) [0x806f669] #22 winbindd(winbind_process_packet+0x1d) [0x806f94d] #23 winbindd(strftime+0x1aa9) [0x806fd79] #24 winbindd(main+0x4fc) [0x807080c] #25 /lib/i686/libc.so.6(__libc_start_main+0x93) [0x4014f657] #26 winbindd(chroot+0x31) [0x806ef51] [global] dos charset = ISO8859-15 unix charset = ISO8859-15 workgroup = CP realm = CP.INT netbios aliases = FS2-01, FS2-02, FS2-03 server string = RedHat AS2.1 interfaces = 10.10.200.12/16 bind interfaces only = Yes security = ADS allow trusted domains = No obey pam restrictions = Yes password server = CPFIS-DC1, CPFIS-DC2 log file = /var/log/samba/%m.log max log size = 50 socket options = TCP_NODELAY SO_RCVBUF=16384 SO_SNDBUF=16384 load printers = No show add printer wizard = No preferred master = No local master = No domain master = No lock directory = /var/cache/samba/FS2 pid directory = /var/run/samba idmap backend = idmap_rid:CP=1000-100 idmap uid = 1000-100 idmap gid = 1000-100 template homedir = /usr/mnt/samba2/home/%D/%U template shell = /bin/bash winbind separator
[Samba] Re: W2K3 SP1 - PERSISTENT CONNECTION(S) BUG?
Michael Joyner wrote: After testing my W2K3 SP1 terminal server against a SAMBA server *AND* a W2K server, I have noticed the following *odd* behavior. I believe this is relevant: http://support.microsoft.com/default.aspx?scid=kb;en-us;190162 -- Rex -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Loosing admin privileges after login
Hello, I am a Samba-newbie, so please excuse, if my question seems to you stupid. I've set up a PDC, based on Samba 3.0.14a (SerNet) and a OpenLDAP-Server. So I took a Windows XP client and integrated it to the domain. Afterwards I logged in as administrator and copied the existing profile of an user to the server. The user was able to login and his profile was loaded from the server. But I wonder, why the user only has user rights and not administrative privileges, although he is in the group of local administrators. On the PDC he's only domain user. Can anybody help me? Herbert ___ Gesendet von Yahoo! Mail - Jetzt mit 250MB Speicher kostenlos - Hier anmelden: http://mail.yahoo.de -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] problem with remote profiles
Hi people. i have the following situation. Im using samba 3.0.14 as a PDC with tdbsam to hold remote profiles of some windows 2003. Everything works OK except one little thing. When i log in, the windows 2003 maps my profile as a drive. I just can't avoid this. Is there anyway i can to avoid the windows 2003 to map my profile as a letter? I just can't explain every user that the letter Z: is the remote profile and they must not touch or modified this files. Tnxs in advance. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Re: W2K3 SP1 - PERSISTENT CONNECTION(S) BUG?
Rex Dieter wrote: Michael Joyner wrote: After testing my W2K3 SP1 terminal server against a SAMBA server *AND* a W2K server, I have noticed the following *odd* behavior. I believe this is relevant: http://support.microsoft.com/default.aspx?scid=kb;en-us;190162 -- Rex The said KB article does not apply to 2K and 2K3. The described behavior does not occur on my non-SP1 TS W2K3 machine. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Loosing admin privileges after login
Herbert Mann wrote: Hello, I am a Samba-newbie, so please excuse, if my question seems to you stupid. I've set up a PDC, based on Samba 3.0.14a (SerNet) and a OpenLDAP-Server. So I took a Windows XP client and integrated it to the domain. Afterwards I logged in as administrator and copied the existing profile of an user to the server. The user was able to login and his profile was loaded from the server. But I wonder, why the user only has user rights and not administrative privileges, although he is in the group of local administrators. On the PDC he's only domain user. on the workstation, while logged in as an administrator try this: net localgroup administrators /add DOMAINNAME\username and see if that helps. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Re: W2K3 SP1 - PERSISTENT CONNECTION(S) BUG?
Michael Joyner wrote: Rex Dieter wrote: Michael Joyner wrote: After testing my W2K3 SP1 terminal server against a SAMBA server *AND* a W2K server, I have noticed the following *odd* behavior. I believe this is relevant: http://support.microsoft.com/default.aspx?scid=kb;en-us;190162 The said KB article does not apply to 2K and 2K3. The described behavior does not occur on my non-SP1 TS W2K3 machine. I'd suggest trying the registry mod regardless... I recall it solving similar TS-related issues in the past. -- Rex -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] problem with remote profiles
i can to avoid the windows 2003 to map my profile as a letter? I just can't explain every user that the letter Z: is the remote profile and they must not touch or modified this files. Perhaps post your smb.conf and you could be provided with some changes to make. -- Paul GiengerOffice: 701-281-1884 Applied Engineering Inc. Systems Architect Fax:701-281-1322 URL: www.ae-solutions.com mailto: [EMAIL PROTECTED] -- 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.10-1.4E and RedHat ES 4.0
I have successfully, well somewhat successfully, joined a native Windows 2003 Active Directory domain as a domain member. The home domain has a two-way trust relationship with another domain in the same Forest. The Samba server can provide proper access to any object within it's home domain, however, I am having difficulty providing access to the Samba server share(s) to objects in the trusted domain. The getent passwd and getent group commands appear to work fine for the home domain, but are failing to list trusted domain objects. The wbinfo -u and wbinfo -g commands work fine and list the objects of the home domain, but nothing for the trusted domain. The wbinfo -m will not work and produces the following error within the /var/log/samba/winbindd.log file: RTP+vanderce RTP+Vandivl RTP+Vandivlt RTP+vangorr RTP+VEACHJL RTP+Villiaem RTP+Voat RTP+Vogeljs RTP+Wagnerwl RTP+Walkerjv RTP+Wardensd RTP+Watkinrm RTP+Wayh RTP+Weathett RTP+Wedekise RTP+Weekscn RTP+Weissbj RTP+Westsk RTP+Wheelekt RTP+whitakja RTP+Whitela RTP+Whitesje RTP+Wiedmamm RTP+wigginrs RTP+wilkiesm RTP+WILKINVM RTP+Willetjb RTP+Williabt RTP+Williajm RTP+WILLIAJN RTP+Williak4 RTP+Williaka RTP+Williapc RTP+Willias2 RTP+willifja RTP+Willitag RTP+Wilsondd RTP+winburja RTP+Wintroma RTP+WITTEWS RTP+woodal RTP+Woodroma RTP+Wootenns RTP+Wrightar RTP+wrightwr RTP+Wudelj RTP+Wurstdl RTP+Wyckoff RTP+xerox012 RTP+Yangs RTP+yelvermy RTP+Yocumh RTP+youngera RTP+Youngmd RTP+Younteo RTP+YUANJ RTP+yudeenv RTP+Yunkerrm RTP+zamunda RTP+zelenine RTP+Zhitoves RTP+Zimmersa RTP+Zinntb [EMAIL PROTECTED] samba]# ll total 4052 -rw-r--r-- 1 root root 694249 May 2 08:42 adgroup3.txt -rw-r--r-- 1 root root 1354945 May 2 10:10 adusers2.txt -rw-r--r-- 1 root root 248530 May 2 13:21 adusers3.txt -rw-r--r-- 1 root root 1354553 Apr 29 07:46 adusers.txt -rw-r--r-- 1 root root 20 Jan 3 22:09 lmhosts -rw--- 1 root root8192 May 2 12:55 secrets.tdb -rw--- 1 root root8192 Apr 18 10:48 secrets.tdb.bak -rw-r--r-- 1 root root 14107 May 2 14:13 smb.conf -rw-r--r-- 1 root root 11550 Apr 20 10:47 smb.conf.adwork -rw-r--r-- 1 root root 14131 Apr 29 10:18 smb.conf.bak -rw-r--r-- 1 root root 14054 Apr 28 17:12 smb.conf.latest -rw-r--r-- 1 root root 11245 Apr 18 15:11 smb.conf.work -rw--- 1 root root 101 Apr 18 18:11 smbpasswd -rw-r--r-- 1 root root 97 Apr 18 14:15 smbusers -rw-r--r-- 1 root root 40003 Apr 29 07:47 wbinfo-g.txt -rw-r--r-- 1 root root 130 Apr 28 15:53 wbinfo-m.txt -rw-r--r-- 1 root root 311912 Apr 29 07:48 wbinfo-u.txt [EMAIL PROTECTED] samba]# rm adusers3.txt rm: remove regular file `adusers3.txt'? y [EMAIL PROTECTED] samba]# getent group adgroup2.txt [EMAIL PROTECTED] samba]# ll total 3944 -rw-r--r-- 1 root root 135253 May 2 14:47 adgroup2.txt -rw-r--r-- 1 root root 694249 May 2 08:42 adgroup3.txt -rw-r--r-- 1 root root 1354945 May 2 10:10 adusers2.txt -rw-r--r-- 1 root root 1354553 Apr 29 07:46 adusers.txt -rw-r--r-- 1 root root 20 Jan 3 22:09 lmhosts -rw--- 1 root root8192 May 2 12:55 secrets.tdb -rw--- 1 root root8192 Apr 18 10:48 secrets.tdb.bak -rw-r--r-- 1 root root 14107 May 2 14:13 smb.conf -rw-r--r-- 1 root root 11550 Apr 20 10:47 smb.conf.adwork -rw-r--r-- 1 root root 14131 Apr 29 10:18 smb.conf.bak -rw-r--r-- 1 root root 14054 Apr 28 17:12 smb.conf.latest -rw-r--r-- 1 root root 11245 Apr 18 15:11 smb.conf.work -rw--- 1 root root 101 Apr 18 18:11 smbpasswd -rw-r--r-- 1 root root 97 Apr 18 14:15 smbusers -rw-r--r-- 1 root root 40003 Apr 29 07:47 wbinfo-g.txt -rw-r--r-- 1 root root 130 Apr 28 15:53 wbinfo-m.txt -rw-r--r-- 1 root root 311912 Apr 29 07:48 wbinfo-u.txt [EMAIL PROTECTED] samba]# getent passwd adusers3.txt [EMAIL PROTECTED] samba]# ll total 4252 -rw-r--r-- 1 root root 135253 May 2 14:47 adgroup2.txt -rw-r--r-- 1 root root 694249 May 2 08:42 adgroup3.txt -rw-r--r-- 1 root root 1354945 May 2 10:10 adusers2.txt -rw-r--r-- 1 root root 307732 May 2 14:47 adusers3.txt -rw-r--r-- 1 root root 1354553 Apr 29 07:46 adusers.txt -rw-r--r-- 1 root root 20 Jan 3 22:09 lmhosts -rw--- 1 root root8192 May 2 12:55 secrets.tdb -rw--- 1 root root8192 Apr 18 10:48 secrets.tdb.bak -rw-r--r-- 1 root root 14107 May 2 14:13 smb.conf -rw-r--r-- 1 root root 11550 Apr 20 10:47 smb.conf.adwork -rw-r--r-- 1 root root 14131 Apr 29 10:18 smb.conf.bak -rw-r--r-- 1 root root 14054 Apr 28 17:12 smb.conf.latest -rw-r--r-- 1 root root 11245 Apr 18 15:11 smb.conf.work -rw--- 1 root root 101 Apr 18 18:11 smbpasswd -rw-r--r-- 1 root root 97 Apr 18 14:15 smbusers -rw-r--r-- 1 root root 40003 Apr 29 07:47 wbinfo-g.txt -rw-r--r-- 1 root root 130 Apr 28 15:53 wbinfo-m.txt -rw-r--r-- 1 root root 311912 Apr 29 07:48 wbinfo-u.txt [EMAIL PROTECTED] samba]# rm adusers3.txt rm: remove regular file `adusers3.txt'? y [EMAIL PROTECTED] samba]# ll total 3944 -rw-r--r-- 1 root
[Samba] User gets access denied after changed AD password
Have a situation that just started. AD Server as PDC: Windows 2003/2000 server User's PC: Windows XP Pro Server: Solaris 9, samba-3.0.10 for AD. This user has been working fine the past 90 days until today when he is forced due to AD password aging rules to enter a new password to logon to his AD Domain. Since this change, he is unable to map drives to the Sun Server. new view //server is getting error 5 (IIRC, invalid password). Is there something caching the password on the sun side? It should be using the AD for this... -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba as a PDC with LDAP and Kerberos
So I'm still doing something wrong. I now have a root sambaSamAccount in my directory with the PrimaryGroupSID of the Domain Admins SID. The ldap admin dn can write to the directory. From my PDC I can do the following successfully: net -S localhost rpc join (Success) smbpasswd -a -w pdc (Success and pdc$ added to the LDAP machine group wiht password) However the following fails: net -S localhost rpc rights grant CI\Domain Admins SeMachineAccountPrivilege SePrintOperatorPrivilege SeAddUsersPrivilege SeDiskOperatorPrivilege SeRemoteShutdownPrivilege Reading through the logs, everything appears to be fine until it goes to assign privileges. Here's a snip from the logs (log level = 10): [2005/05/02 12:09:43, 7] rpc_parse/parse_prs.c:prs_debug(82) 000152 smb_io_unistr2 string [2005/05/02 12:09:43, 5] rpc_parse/parse_prs.c:prs_uint32(642) 0154 uni_max_len: 0019 [2005/05/02 12:09:43, 5] rpc_parse/parse_prs.c:prs_uint32(642) 0158 offset : [2005/05/02 12:09:43, 5] rpc_parse/parse_prs.c:prs_uint32(642) 015c uni_str_len: 0019 [2005/05/02 12:09:43, 5] rpc_parse/parse_prs.c:dbg_rw_punival(814) 0160 buffer : S.e.R.e.m.o.t.e.S.h.u.t.d.o.w.n.P.r.i.v.i.l.e.g.e. [2005/05/02 12:09:43, 4] rpc_server/srv_lsa_hnd.c:find_policy_by_hnd_internal(162) Found policy hnd[0] [000] 00 00 00 00 03 00 00 00 00 00 00 00 D7 5E 76 42 .^vB [010] 3E 31 00 00 1.. [2005/05/02 12:09:43, 5] rpc_parse/parse_prs.c:prs_debug(82) 00 lsa_io_r_add_acct_rights [2005/05/02 12:09:43, 5] rpc_parse/parse_prs.c:prs_ntstatus(672) status: NT_STATUS_ACCESS_DENIED The LDAP logs show everything successful and there's no MODs trying to occur. Below is my smb.conf [global] security = user log level = 10 log file = /var/log/samba/samba.log workgroup = CI netbios name = PDC server string = Primary Domain Controller private dir = /var/lib/samba/private passdb backend = ldapsam:ldap://ldap.example.com domain logons = Yes os level = 33 preferred master = Yes domain master = Yes enable privileges = Yes hosts allow = none ldap admin dn = uid=samba_server,ou=people,o=ci,dc=example,dc=com ldap group suffix = ou=group ldap machine suffix = ou=hosts,ou=samba ldap suffix = o=ci,dc=uchicago,dc=edu ldap ssl = start tls ldap user suffix = ou=people [netlogon] path = /var/lib/samba/netlogon browseable = No [profiles] path = /var/lib/samba/profiles read only = No create mask = 0600 directory mask = 0700 On Wed, 2005-04-27 at 15:07 -0400, Josh Kelley wrote: [EMAIL PROTECTED] wrote: So I think I have the steps needed to get this all working, but I think I have a chicken/egg problem now. snip So, is there a way to get it to a point where a normal user in the Domain Admins group can join machine and add Samba Accounts, etc without requiring a uid 0 user to be in LDAP. The sambaSamAccount entry for root needs to be in the LDAP directory, but the rest of the account doesn't. We have an entry for the root account in our LDAP directory that only has the following non-Samba attributes defined: dn: uid=root,dc=jbc,dc=edu objectClass: account objectClass: sambaSamAccount uid: root displayName: root cn: root Although this technically means that there is a uid 0 user in LDAP, it's only a uid 0 user as far as Samba is concerned; Linux/Unix won't recognize the LDAP portion of the root account as being a valid user. From what I've read, this setup won't work if you set ldapsam:trusted = yes in smb.conf, but it will work long enough to assign privileges then set ldapsam:trusted. Also, what pieces are really needed to join a machine to the Samba Domain. And what and who needs to be able to read/write LDAP for this to happen? Pieces I've identified so far. Things starting with '?' I'm not sure about. - Domain Users, Domain Admins, and Domain Guests groups exist with valid sambaSIDs (posixGroup and sambaGroupMapping) - Domain Admins group has the SeMachineAccountPrivilege privilege Correct. - a sambaDomainName object with a valid sambaSID It's a sambaDomain object, not a sambaDomainName object. I'm pretty sure that Samba will create this for you if it doesn't exist. - a user (posixAccount and sambaSamAccount) who has a valid uid, sambaSID, whose SID is in the the Domain Admins sambaSIDList Correct. ? A machine user (posixAccount sambaSamAccount) with a valid uid and sambaSID and whose parent LDAP tree is listed as a passwd search path for NSS Generally unnecessary. Although you can create it yourself, it's easier to set up an add machine script (such as that provided by the Idealx smbldap-tools, if you're using
[Samba] Strange file permissions behavior
I am quite perplexed. SuSe 9.2 Samba 3.0.14a Windows XP SP2 client May 2 16:17:07 wptzhome smbd[17103]: sherberg opened file fixed assets/VEHICLES/brad.xls read=Yes write=No (numopen=13) May 2 16:17:07 wptzhome smbd[17103]: sherberg opened file fixed assets/VEHICLES/brad.xls read=Yes write=No (numopen=13) May 2 16:17:07 wptzhome smbd[17103]: sherberg opened file fixed assets/VEHICLES/brad.xls read=Yes write=No (numopen=13) May 2 16:17:07 wptzhome smbd[17103]: sherberg opened file fixed assets/VEHICLES/brad.xls read=Yes write=No (numopen=13) May 2 16:17:07 wptzhome smbd[17103]: sherberg opened file fixed assets/VEHICLES/brad.xls read=Yes write=Yes (numopen=13) May 2 16:17:07 wptzhome smbd[17103]: sherberg opened file fixed assets/VEHICLES/brad.xls read=Yes write=No (numopen=14) It seems that in the space of less than 1 second this file has been opened 6 times by the same user from the same machine and one of those times it was Read/Write. Is this how I should read this or am I missing something? Thanks Mike -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Network Places question
Hi All, I run Linux with two interfaces. Configured those interfaces with IP and added both IPs to DNS (which is not Windows DNS on my domain controller) lets say with names A and name B. I run SAMBA on that Linux and joined as ADS to a domain controller D and I used the name A and it shows up in the computers list. Now, I created shares and I could map them using \\a\share or \\b\share and those run like a Swiss watch. However: == Why when I browse network places and click on the domain B I see only the name A (which I joined the domain as) but not also the name B. I don't use netbios and or WINS. I don't use the Windows DNS that on my AD domain. Basically, my question is, how do I let the browser know that the name B is also in my machine and should be part of domain D when it comes to browsing. Will appreciate any hint. Cheers, Ephi -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] LDAP Logon Problem
Sascha Bieler schrieb: Hi everybody, I got a strange problem. I'm using fedora core 3 and openldap. Configured samba 3.0.11 to act as LDAP PDC and everything worked fine. But now creating a new user and trying to log on I get: check_ntlm_password: Authentication for user [florian] - [florian] FAILED with error NT_STATUS_WRONG_PASSWORD In LDAP there seems to be everything fine, but I cannot manage to logon with a new user. The old ones are working fine. Greetings and thanks for helping out Sascha Hi Sascha, i had simular problems with setting samba 3.0.14a ldap on suse 9.3 at last i got it run but it was a march trough hell, none of my methods which allways worked throug all releases of samba 3 on suse 9-1-2 which ever worked fine, dont worked as expected it seems to me something really broke between samba ldap idealx-scripts and nss_lib and it only get to work if you have the right releases matching, and suse has totally reconfigured pam modules ( which is nice described on a html page , but didnt worked at firstthe yast way) But this is just an idea, this time i taked me 2 days to init the ldap pdc ( which nerver happend before )...i had done this same setup last week with suse 9.2/smb7ldap 3.013 in one hour.. Anyone else who noticed problems like that, i would write it to bugzilla but i have no idea why it worked at lastone thing but seems clear the 3.015 beta has bugs with usrmgr ( i had no chance to get it work ) -- Mit freundlichen Gruessen Best Regards Robert Schetterer robert_at_schetterer.org Munich / Bavaria / Germany https://www.schetterer.org \** \* gnupgp \* public key: \* https://www.schetterer.org/public.key \** -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] admin users
Hello, I am facing problem with admin uses =joy parameter. After enabling admin user=joy for read only share. I can't access that share by joy account with admin privileges. I can see in log that user joy is connecting as uid 0. What could be wrong? Thank you Komal -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] winbind: 3.0.14 to 2.2.7? NT_STATUS_NOT_SUPPORTED...
does winbind on a samba 3.0.14 domain member server work against a samba 2.2.7 pdc ? this is the first time i've set up winbind, so i don't know if there's a version issue or just a generic config issue. after setting winbind up (including adding to the domain), i attempt to access the domain member server from a win2k client, which fails with the network request is not supported. this is in samba client log: [2005/05/03 01:44:23, 2] auth/auth.c:check_ntlm_password(312) check_ntlm_password: Authentication for user [mike] - [mike] FAILED with error NT_STATUS_NOT_SUPPORTED this in winbind log: [2005/05/03 01:44:23, 4] rpc_client/cli_netlogon.c:cli_net_req_chal(45) cli_net_req_chal: LSA Request Challenge from DDSSRV10 to 10.4.40.135: D49E35CF83280EEC [2005/05/03 01:44:23, 0] rpc_client/cli_netlogon.c:cli_nt_setup_creds(256) cli_nt_setup_creds: request challenge failed [2005/05/03 01:44:23, 3] nsswitch/winbindd_pam.c:winbindd_pam_auth_crap(538) could not open handle to NETLOGON pipe (error: NT_STATUS_NOT_SUPPORTED) [2005/05/03 01:44:23, 2] nsswitch/winbindd_pam.c:winbindd_pam_auth_crap(654) NTLM CRAP authentication for user [DDS]\[mike] returned NT_STATUS_NOT_SUPPORTED (PAM: 4) [2005/05/03 01:46:39, 3] nsswitch/winbindd_rpc.c:trusted_domains(970) rpc: trusted_domains here is a section of smb.conf: security = domain idmap uid = 1-2 idmap gid = 1-2 template primary group = Domain Users template shell = /bin/bash # username map = /etc/samba/smbusers # winbind enable local accounts = Yes add user script = /usr/sbin/useradd -m '%u' add machine script = /usr/sbin/useradd -M '%u' add group script = /usr/sbin/groupadd '%g' encrypt passwords = true obey pam restrictions = yes guest account = nobody invalid users = root any help? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
svn commit: samba-docs r524 - in trunk/Samba-Guide: .
Author: jht Date: 2005-05-02 06:26:19 + (Mon, 02 May 2005) New Revision: 524 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=524 Log: More fixups. Modified: trunk/Samba-Guide/SBE-2000UserNetwork.xml trunk/Samba-Guide/SBE-500UserNetwork.xml trunk/Samba-Guide/SBE-AddingUNIXClients.xml trunk/Samba-Guide/SBE-Appendix1.xml trunk/Samba-Guide/SBE-Appendix2.xml trunk/Samba-Guide/SBE-DomainAppsSupport.xml trunk/Samba-Guide/SBE-MakingHappyUsers.xml trunk/Samba-Guide/SBE-MigrateNW4Samba3.xml Changeset: Sorry, the patch is too large (618 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=524
svn commit: samba-docs r525 - in trunk: .
Author: jelmer Date: 2005-05-02 08:06:30 + (Mon, 02 May 2005) New Revision: 525 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=525 Log: Add structure diagram Added: trunk/structure.dia Changeset: Added: trunk/structure.dia === (Binary files differ) Property changes on: trunk/structure.dia ___ Name: svn:mime-type + application/octet-stream
svn commit: samba-docs r526 - in trunk: .
Author: jelmer Date: 2005-05-02 08:28:41 + (Mon, 02 May 2005) New Revision: 526 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=526 Log: Rename manpages to manpages-3 so I can pull in the Samba 4 manpages later Added: trunk/manpages-3/ Removed: trunk/manpages/ Modified: trunk/Makefile.settings.in Changeset: Modified: trunk/Makefile.settings.in === --- trunk/Makefile.settings.in 2005-05-02 08:06:30 UTC (rev 525) +++ trunk/Makefile.settings.in 2005-05-02 08:28:41 UTC (rev 526) @@ -28,9 +28,9 @@ ARCHIVEDIR = archive TEXINFODIR = $(OUTPUTDIR)/texi SRCDIR = @SAMBASOURCEDIR@ -MANDIR = $(OUTPUTDIR)/manpages +MANDIR = $(OUTPUTDIR)/manpages-3 EPSTOPDF = @EPSTOPDF@ -MANPAGEDIR = manpages +MANPAGEDIR = manpages-3 MAKEINDEX = @MAKEINDEX@ EXAMPLESDIR = $(OUTPUTDIR)/examples SMBDOTCONFDOC = smbdotconf Copied: trunk/manpages-3 (from rev 519, trunk/manpages)
svn commit: samba-docs r527 - in trunk: . Samba-HOWTO-Collection
Author: jelmer
Date: 2005-05-02 08:49:42 + (Mon, 02 May 2005)
New Revision: 527
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=527
Log:
Add optional manpages to the Samba HOWTO Collection
Added:
trunk/Samba-HOWTO-Collection/manpages.xml
Modified:
trunk/Makefile
trunk/Samba-HOWTO-Collection/index.xml
Changeset:
Modified: trunk/Makefile
===
--- trunk/Makefile 2005-05-02 08:28:41 UTC (rev 526)
+++ trunk/Makefile 2005-05-02 08:49:42 UTC (rev 527)
@@ -41,6 +41,7 @@
$(DOCBOOKDIR)/Samba-Guide.xml: $(filter-out Samba-Guide/index.xml,$(wildcard
Samba-Guide/*.xml))
$(DOCBOOKDIR)/Samba-HOWTO-Collection.xml: $(filter-out
Samba-HOWTO-Collection/index.xml,$(wildcard Samba-HOWTO-Collection/*.xml))
Samba-HOWTO-Collection-attributions.xml
+Samba-HOWTO-Collection/manpages.xml: $(MANPAGEDIR)/smb.conf.5.xml
$(DOCBOOKDIR)/Samba-Developers-Guide.xml: $(filter-out
Samba-Developers-Guide/index.xml,$(wildcard Samba-Developers-Guide/*.xml))
Samba-Developers-Guide-attributions.xml
# Pseudo targets
Modified: trunk/Samba-HOWTO-Collection/index.xml
===
--- trunk/Samba-HOWTO-Collection/index.xml 2005-05-02 08:28:41 UTC (rev
526)
+++ trunk/Samba-HOWTO-Collection/index.xml 2005-05-02 08:49:42 UTC (rev
527)
@@ -141,14 +141,15 @@
part id=Appendix
titleAppendixes/title
+!-- Comment out the following line to include the manpages.
+*Please* do not commit with the line below enabled! --
+!--xi:include href=manpages.xml/--
xi:include href=TOSHARG-Compiling.xml/
xi:include href=TOSHARG-Portability.xml/
xi:include href=TOSHARG-Other-Clients.xml/
xi:include href=TOSHARG-Speed.xml/
xi:include href=TOSHARG-DNS-DHCP-Configuration.xml/
-/part
-
xi:include href=http://www.gnu.org/licenses/gpl.xml/
xi:include href=TOSHARG-glossary.xml/
@@ -156,5 +157,6 @@
?latex \chaptermark{Subject index} ?
index/
+/part
/book
Added: trunk/Samba-HOWTO-Collection/manpages.xml
===
--- trunk/Samba-HOWTO-Collection/manpages.xml 2005-05-02 08:28:41 UTC (rev
526)
+++ trunk/Samba-HOWTO-Collection/manpages.xml 2005-05-02 08:49:42 UTC (rev
527)
@@ -0,0 +1,26 @@
+?xml version=1.0 encoding=iso-8859-1?
+!DOCTYPE reference PUBLIC -//Samba-Team//DTD DocBook V4.2-Based Variant
V1.0//EN http://www.samba.org/samba/DTD/samba-doc;
+reference id=manuals xmlns:xi=http://www.w3.org/2003/XInclude;
titleManual pages/title
+
+ paraThis appendix contains most of the manual pages from the official
Samba distribution. All manual pages have been written by members of
+ ulink url=http://samba.org/samba/team.html;the Samba
Team/ulink./para
+
+ xi:include href=../manpages/smb.conf.5.xml/
+ xi:include href=../manpages/nmblookup.1.xml/
+ xi:include href=../manpages/rpcclient.1.xml/
+ xi:include href=../manpages/smbcacls.1.xml/
+ xi:include href=../manpages/smbcacls.1.xml/
+ xi:include href=../manpages/net.8.xml/
+ xi:include href=../manpages/nmbd.8.xml/
+ xi:include href=../manpages/pdbedit.8.xml/
+ xi:include href=../manpages/smbcquotas.1.xml/
+ xi:include href=../manpages/smbd.8.xml/
+ xi:include href=../manpages/smbpasswd.5.xml/
+ xi:include href=../manpages/smbpasswd.8.xml/
+ xi:include href=../manpages/smbstatus.1.xml/
+ xi:include href=../manpages/smbtree.1.xml/
+ xi:include href=../manpages/testparm.1.xml/
+ xi:include href=../manpages/wbinfo.1.xml/
+ xi:include href=../manpages/winbindd.8.xml/
+
+/reference
svn commit: samba-docs r528 - in trunk/Samba-Guide: .
Author: jht Date: 2005-05-02 08:55:11 + (Mon, 02 May 2005) New Revision: 528 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=528 Log: Ouch fixes. Modified: trunk/Samba-Guide/SBE-SecureOfficeServer.xml trunk/Samba-Guide/SBE-TheSmallOffice.xml trunk/Samba-Guide/SBE-UpgradingSamba.xml Changeset: Modified: trunk/Samba-Guide/SBE-SecureOfficeServer.xml === --- trunk/Samba-Guide/SBE-SecureOfficeServer.xml2005-05-02 08:49:42 UTC (rev 527) +++ trunk/Samba-Guide/SBE-SecureOfficeServer.xml2005-05-02 08:55:11 UTC (rev 528) @@ -862,7 +862,7 @@ file. The final, fully qualified path for this file should be filename/etc/samba/smb.conf/filename. smbconfexample id=promisnet -title130 User Network with emphasistdbsam/emphasis smbmdash; [globals] Section/title +title130 User Network with emphasistdbsam/emphasis smbmdash; [global] Section/title smbconfcommentGlobal parameters/smbconfcomment smbconfsection name=[global]/ smbconfoption name=workgroupPROMISES/smbconfoption Modified: trunk/Samba-Guide/SBE-TheSmallOffice.xml === --- trunk/Samba-Guide/SBE-TheSmallOffice.xml2005-05-02 08:49:42 UTC (rev 527) +++ trunk/Samba-Guide/SBE-TheSmallOffice.xml2005-05-02 08:55:11 UTC (rev 528) @@ -640,7 +640,7 @@ /procedure smbconfexample id=acct2conf -titleAccounting Office Network smb.conf; File smbmdash; [globals] Section/title +titleAccounting Office Network smb.conf; File smbmdash; [global] Section/title smbconfcommentGlobal parameters/smbconfcomment smbconfsection name=[global]/ smbconfoption name=workgroupBILLMORE/smbconfoption Modified: trunk/Samba-Guide/SBE-UpgradingSamba.xml === --- trunk/Samba-Guide/SBE-UpgradingSamba.xml2005-05-02 08:49:42 UTC (rev 527) +++ trunk/Samba-Guide/SBE-UpgradingSamba.xml2005-05-02 08:55:11 UTC (rev 528) @@ -1139,7 +1139,7 @@ command and then reloading the same data into the new LDAP server using the commandslapadd/command command. Do not forget to install and configure the commandnss_ldap/command tool and the filename/etc/nsswitch.conf/filename - (as shown in Chapter 5). + (as shown in link linkend=happy/). /para/listitem listitempara
svn commit: samba r6568 - in branches/SAMBA_4_0/source: build/smb_build script/tests
Author: jelmer Date: 2005-05-02 09:44:59 + (Mon, 02 May 2005) New Revision: 6568 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6568 Log: Some more small 'make test' fixes Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm branches/SAMBA_4_0/source/script/tests/selftest.sh Changeset: Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm === --- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2005-05-01 20:55:55 UTC (rev 6567) +++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2005-05-02 09:44:59 UTC (rev 6568) @@ -153,10 +153,9 @@ test: all ./script/tests/selftest.sh $(prefix) -SOCKET_WRAPPER_DIR=`pwd`/sockdir +export SOCKET_WRAPPER_DIR=$(shell pwd)/sockdir test-swrap: all - export SOCKET_WRAPPER_DIR mkdir -p $(SOCKET_WRAPPER_DIR) ./script/tests/selftest.sh $(prefix) Modified: branches/SAMBA_4_0/source/script/tests/selftest.sh === --- branches/SAMBA_4_0/source/script/tests/selftest.sh 2005-05-01 20:55:55 UTC (rev 6567) +++ branches/SAMBA_4_0/source/script/tests/selftest.sh 2005-05-02 09:44:59 UTC (rev 6568) @@ -3,7 +3,6 @@ REALM=$DOMAIN PASSWORD=penguin SRCDIR=`pwd` -SOCKET_WRAPPER_DIR=$PREFIX/sockdir TMPDIR=$PREFIX/tmp if [ $# -lt 1 ] @@ -17,7 +16,6 @@ rm -f $PREFIX/private/* ./setup/provision.pl --quiet --outputdir $PREFIX/private --domain $DOMAIN --realm $REALM --adminpass $PASSWORD -mkdir -p $SOCKET_WRAPPER_DIR cat $PREFIX/lib/smb.conf EOF [global] workgroup = $DOMAIN @@ -31,9 +29,9 @@ cd $PREFIX ./sbin/smbd sleep 2 -$PREFIX/bin/smbtorture ncalrpc: LOCAL-* -$SRCDIR/script/tests/test_rpc.sh localhost administrator $PASSWORD $DOMAIN -$SRCDIR/script/tests/test_binding_string.sh localhost administrator $PASSWORD $DOMAIN -$SRCDIR/script/tests/test_echo.sh localhost administrator $PASSWORD $DOMAIN -$SRCDIR/script/tests/test_posix.sh //localhost/tmp administrator $PASSWORD +$SRCDIR/script/tests/test_rpc.sh localhost administrator $PASSWORD $DOMAIN || exit 1 +$SRCDIR/script/tests/test_binding_string.sh localhost administrator $PASSWORD $DOMAIN || exit 1 +$SRCDIR/script/tests/test_echo.sh localhost administrator $PASSWORD $DOMAIN || exit 1 +$SRCDIR/script/tests/test_posix.sh //localhost/tmp administrator $PASSWORD || exit 1 +$PREFIX/bin/smbtorture ncalrpc: LOCAL-* || exit 1 kill `cat $PREFIX/var/locks/smbd.pid`
svn commit: samba r6569 - in branches/tmp/pidl2/source: auth build/pidl build/smb_build include lib lib/messaging lib/socket lib/socket_wrapper librpc/idl librpc/rpc script/tests setup torture/local torture/rpc
Author: jelmer Date: 2005-05-02 10:10:33 + (Mon, 02 May 2005) New Revision: 6569 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6569 Log: Merge in changes from SAMBA_4_0, fix some ref allocation issues Added: branches/tmp/pidl2/source/script/tests/selftest.sh Modified: branches/tmp/pidl2/source/auth/auth_domain.c branches/tmp/pidl2/source/auth/auth_sam.c branches/tmp/pidl2/source/build/pidl/ndr_parser.pm branches/tmp/pidl2/source/build/smb_build/makefile.pm branches/tmp/pidl2/source/include/credentials.h branches/tmp/pidl2/source/include/includes.h branches/tmp/pidl2/source/include/structs.h branches/tmp/pidl2/source/lib/credentials.c branches/tmp/pidl2/source/lib/messaging/messaging.c branches/tmp/pidl2/source/lib/socket/socket.c branches/tmp/pidl2/source/lib/socket/socket_unix.c branches/tmp/pidl2/source/lib/socket_wrapper/socket_wrapper.c branches/tmp/pidl2/source/librpc/idl/misc.idl branches/tmp/pidl2/source/librpc/idl/netlogon.idl branches/tmp/pidl2/source/librpc/rpc/dcerpc.h branches/tmp/pidl2/source/librpc/rpc/dcerpc_schannel.c branches/tmp/pidl2/source/librpc/rpc/dcerpc_util.c branches/tmp/pidl2/source/setup/provision.ldif branches/tmp/pidl2/source/setup/provision.pl branches/tmp/pidl2/source/torture/local/messaging.c branches/tmp/pidl2/source/torture/rpc/samlogon.c branches/tmp/pidl2/source/torture/rpc/samsync.c branches/tmp/pidl2/source/torture/rpc/schannel.c Changeset: Sorry, the patch is too large (1180 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6569
svn commit: samba r6570 - in branches/SAMBA_3_0/source: . include lib
Author: jelmer Date: 2005-05-02 10:12:36 + (Mon, 02 May 2005) New Revision: 6570 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6570 Log: Add socket_wrapper library to 3.0. Can be enabled by passing --enable-socket-wrapper to configure Added: branches/SAMBA_3_0/source/include/socket_wrapper.h branches/SAMBA_3_0/source/lib/socket_wrapper.c Modified: branches/SAMBA_3_0/source/Makefile.in branches/SAMBA_3_0/source/configure.in branches/SAMBA_3_0/source/include/includes.h Changeset: Sorry, the patch is too large (594 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6570
svn commit: samba-docs r529 - in trunk/Samba-HOWTO-Collection: .
Author: jelmer Date: 2005-05-02 12:04:32 + (Mon, 02 May 2005) New Revision: 529 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=529 Log: Put manual pages just before the GPL in the Appendices part Modified: trunk/Samba-HOWTO-Collection/index.xml Changeset: Modified: trunk/Samba-HOWTO-Collection/index.xml === --- trunk/Samba-HOWTO-Collection/index.xml 2005-05-02 08:55:11 UTC (rev 528) +++ trunk/Samba-HOWTO-Collection/index.xml 2005-05-02 12:04:32 UTC (rev 529) @@ -141,15 +141,15 @@ part id=Appendix titleAppendixes/title -!-- Comment out the following line to include the manpages. -*Please* do not commit with the line below enabled! -- -!--xi:include href=manpages.xml/-- xi:include href=TOSHARG-Compiling.xml/ xi:include href=TOSHARG-Portability.xml/ xi:include href=TOSHARG-Other-Clients.xml/ xi:include href=TOSHARG-Speed.xml/ xi:include href=TOSHARG-DNS-DHCP-Configuration.xml/ +!-- Comment out the following line to include the manpages. +*Please* do not commit with the line below enabled! -- + !--xi:include href=manpages.xml/-- xi:include href=http://www.gnu.org/licenses/gpl.xml/ xi:include href=TOSHARG-glossary.xml/
svn commit: samba-web r658 - in trunk: .
Author: tpot Date: 2005-05-02 12:21:59 + (Mon, 02 May 2005) New Revision: 658 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=658 Log: Add a para about the fact that you should expect to be spammed and viruses after posting to the samba mailing list. Posters should use spamgourmet.com if they are especially worried about this. Modified: trunk/archives.html Changeset: Modified: trunk/archives.html === --- trunk/archives.html 2005-04-29 18:44:16 UTC (rev 657) +++ trunk/archives.html 2005-05-02 12:21:59 UTC (rev 658) @@ -2,7 +2,7 @@ titleSamba - Mailing List Archives/title !--#include virtual=/samba/header2.html -- -h2Samba Mailing list/h2 +h2Samba Mailing Lists/h2 tabletrtd !-- table wrapper is needed to fix page breaking problem in IE -- @@ -13,7 +13,8 @@ pIf you do not have web access, you may subscribe over email by sending a blank email to ilistname/itt[EMAIL PROTECTED]/tt with the word 'help' in the subject line./p - +pNote that posting to any of the Samba mailing lists will effectively expose your email address to the public, including spammers and machines infected with Windows viruses. Many people have reported an increase in spam and viruses on new email addresses after posting to mailing lists hosted on samba.org. Prospective posters may wish to use a disposable email service like a href=http://www.spamgourmet.com/;spamgourmet/a. You have been warned!/p + br / h3Archives/h3
svn commit: samba r6571 - in branches/SAMBA_4_0/source/setup: .
Author: metze
Date: 2005-05-02 12:34:44 + (Mon, 02 May 2005)
New Revision: 6571
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6571
Log:
create a simple smb.conf by provision.pl
metze
Added:
branches/SAMBA_4_0/source/setup/provision.smb.conf
Modified:
branches/SAMBA_4_0/source/setup/provision.pl
Changeset:
Modified: branches/SAMBA_4_0/source/setup/provision.pl
===
--- branches/SAMBA_4_0/source/setup/provision.pl2005-05-02 10:12:36 UTC
(rev 6570)
+++ branches/SAMBA_4_0/source/setup/provision.pl2005-05-02 12:34:44 UTC
(rev 6571)
@@ -440,6 +440,14 @@
FileSave($newdb/$dnsdomain.zone, $res);
+$data = FileLoad(setup/provision.smb.conf) || die Unable to load
provision.smb.conf\n;
+
+$res = apply_substitutions($data);
+
+$opt_quiet or print saving smb.conf to $newdb/smb.conf ...\n;
+
+FileSave($newdb/smb.conf, $res);
+
$opt_quiet or print creating $newdb/hklm.ldb ... \n;
system(ldbadd -H $newdb/hklm.ldb setup/hklm.ldif) == 0 || die Failed to
create hklm.ldb\n;
@@ -449,5 +457,7 @@
Installation:
- Please move $newdb/*.ldb to the private/ directory of your
Samba4 installation
+- Please move $newdb/smb.conf to the lib/ directory of your
+ Samba4 installation
- Please use $newdb/$dnsdomain.zone in BIND on your dns server
;
Added: branches/SAMBA_4_0/source/setup/provision.smb.conf
===
--- branches/SAMBA_4_0/source/setup/provision.smb.conf 2005-05-02 10:12:36 UTC
(rev 6570)
+++ branches/SAMBA_4_0/source/setup/provision.smb.conf 2005-05-02 12:34:44 UTC
(rev 6571)
@@ -0,0 +1,4 @@
+[globals]
+ netbios name= ${HOSTNAME}
+ workgroup = ${DOMAIN}
+ realm = ${REALM}
svn commit: samba r6572 - in branches/SAMBA_4_0/source: build/pidl librpc/idl librpc/ndr
Author: metze
Date: 2005-05-02 13:37:05 + (Mon, 02 May 2005)
New Revision: 6572
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6572
Log:
add string_array as new scalar type for handling SPOOLSS string array's
metze
Modified:
branches/SAMBA_4_0/source/build/pidl/ndr_header.pm
branches/SAMBA_4_0/source/build/pidl/typelist.pm
branches/SAMBA_4_0/source/librpc/idl/idl_types.h
branches/SAMBA_4_0/source/librpc/idl/spoolss.idl
branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c
Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/ndr_header.pm
===
--- branches/SAMBA_4_0/source/build/pidl/ndr_header.pm 2005-05-02 12:34:44 UTC
(rev 6571)
+++ branches/SAMBA_4_0/source/build/pidl/ndr_header.pm 2005-05-02 13:37:05 UTC
(rev 6572)
@@ -60,7 +60,7 @@
pidl tabs();
HeaderType($element, $element-{TYPE}, );
pidl ;
-if ($element-{POINTERS} $element-{TYPE} ne string) {
+if ($element-{POINTERS} not $element-{TYPE} =~ string) {
for (my($i)=$element-{POINTERS}; $i 0; $i--) {
pidl *;
}
Modified: branches/SAMBA_4_0/source/build/pidl/typelist.pm
===
--- branches/SAMBA_4_0/source/build/pidl/typelist.pm2005-05-02 12:34:44 UTC
(rev 6571)
+++ branches/SAMBA_4_0/source/build/pidl/typelist.pm2005-05-02 13:37:05 UTC
(rev 6572)
@@ -86,6 +86,10 @@
C_TYPE = const char *,
NDR_ALIGN = 4 #???
},
+ string_array = {
+ C_TYPE = const char **,
+ NDR_ALIGN = 4 #???
+ },
# time types
time_t= {
Modified: branches/SAMBA_4_0/source/librpc/idl/idl_types.h
===
--- branches/SAMBA_4_0/source/librpc/idl/idl_types.h2005-05-02 12:34:44 UTC
(rev 6571)
+++ branches/SAMBA_4_0/source/librpc/idl/idl_types.h2005-05-02 13:37:05 UTC
(rev 6572)
@@ -81,6 +81,11 @@
*/
#define utf8string [flag(STR_UTF8|STR_NULLTERM)] string
+/*
+ a null terminated UCS2 string
+*/
+#define nstring_array [flag(STR_NULLTERM)] string_array
+
#define NDR_NOALIGN LIBNDR_FLAG_NOALIGN
#define NDR_REMAINING LIBNDR_FLAG_REMAINING
#define NDR_ALIGN2LIBNDR_FLAG_ALIGN2
Modified: branches/SAMBA_4_0/source/librpc/idl/spoolss.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/spoolss.idl2005-05-02 12:34:44 UTC
(rev 6571)
+++ branches/SAMBA_4_0/source/librpc/idl/spoolss.idl2005-05-02 13:37:05 UTC
(rev 6572)
@@ -409,7 +409,7 @@
[relative] nstring *data_file;
[relative] nstring *config_file;
[relative] nstring *help_file;
- [relative] nstring *dependent_files; /* array */
+ [relative] nstring_array *dependent_files;
[relative] nstring *monitor_name;
[relative] nstring *default_datatype;
} spoolss_DriverInfo3;
@@ -422,10 +422,10 @@
[relative] nstring *data_file;
[relative] nstring *config_file;
[relative] nstring *help_file;
- [relative] nstring *dependent_files; /* array */
+ [relative] nstring_array *dependent_files;
[relative] nstring *monitor_name;
[relative] nstring *default_datatype;
- [relative] nstring *previous_names; /* array */
+ [relative] nstring_array *previous_names;
} spoolss_DriverInfo4;
typedef struct {
@@ -448,10 +448,10 @@
[relative] nstring *data_file;
[relative] nstring *config_file;
[relative] nstring *help_file;
- [relative] nstring *dependent_files; /* array */
+ [relative] nstring_array *dependent_files;
[relative] nstring *monitor_name;
[relative] nstring *default_datatype;
- [relative] nstring *previous_names; /* array */
+ [relative] nstring_array *previous_names;
NTTIME driver_data;
hyper driver_version;
[relative] nstring *manufacturer_name;
Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c
===
--- branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c 2005-05-02 12:34:44 UTC
(rev 6571)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c 2005-05-02 13:37:05 UTC
(rev 6572)
@@ -497,3 +497,75 @@
if(!(*string)) return ret;
return ret+strlen(*string)+1;
}
+
+/*
+ pull a general string array from the wire
+*/
+NTSTATUS ndr_pull_string_array(struct ndr_pull *ndr, int ndr_flags,
svn commit: samba r6573 - in branches/SAMBA_4_0/source: include lib lib/samba3 libnet passdb utils/net
Author: abartlet Date: 2005-05-02 14:17:19 + (Mon, 02 May 2005) New Revision: 6573 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6573 Log: Start on my project to implement an NT4 compatible BDC in Samba4. This brings in a compatability layer for Samba3 in Samba4 - where we will start to define file formats and similar details. The 'net samdump' command uses 'password server = ' for now, and performs a similar task to Samba3's 'net rpc samsync'. Andrew Bartlett Added: branches/SAMBA_4_0/source/lib/samba3/ branches/SAMBA_4_0/source/lib/samba3/README branches/SAMBA_4_0/source/lib/samba3/smbpasswd.c branches/SAMBA_4_0/source/libnet/libnet_vampire.c branches/SAMBA_4_0/source/libnet/libnet_vampire.h branches/SAMBA_4_0/source/utils/net/net_vampire.c Modified: branches/SAMBA_4_0/source/include/structs.h branches/SAMBA_4_0/source/lib/basic.mk branches/SAMBA_4_0/source/lib/credentials.c branches/SAMBA_4_0/source/lib/util_str.c branches/SAMBA_4_0/source/libnet/config.mk branches/SAMBA_4_0/source/libnet/libnet.h branches/SAMBA_4_0/source/passdb/secrets.c branches/SAMBA_4_0/source/utils/net/config.mk branches/SAMBA_4_0/source/utils/net/net.c Changeset: Sorry, the patch is too large (731 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6573
svn commit: samba r6574 - in branches/SAMBA_4_0/source/librpc/ndr: .
Author: metze
Date: 2005-05-02 14:53:19 + (Mon, 02 May 2005)
New Revision: 6574
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6574
Log:
send a value for embedded ref pointers,
(this fixes the doublepointer test against w2k3)
but we accept zero pointers on the receive side,
because it's used in DRSUAPI
metze
Modified:
branches/SAMBA_4_0/source/librpc/ndr/ndr_basic.c
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr_basic.c
===
--- branches/SAMBA_4_0/source/librpc/ndr/ndr_basic.c2005-05-02 14:17:19 UTC
(rev 6573)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr_basic.c2005-05-02 14:53:19 UTC
(rev 6574)
@@ -577,7 +577,7 @@
if (p == NULL) {
return NT_STATUS_INVALID_PARAMETER_MIX;
}
- return ndr_push_uint32(ndr, NDR_SCALARS, 0);
+ return ndr_push_uint32(ndr, NDR_SCALARS, 0xAEF1AEF1);
}
svn commit: samba r6575 - in branches/SAMBA_3_0/source/torture: .
Author: idra
Date: 2005-05-02 15:00:51 + (Mon, 02 May 2005)
New Revision: 6575
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6575
Log:
use samba4 torture please message on samba 3 torture
Modified:
branches/SAMBA_3_0/source/torture/torture.c
Changeset:
Modified: branches/SAMBA_3_0/source/torture/torture.c
===
--- branches/SAMBA_3_0/source/torture/torture.c 2005-05-02 14:53:19 UTC (rev
6574)
+++ branches/SAMBA_3_0/source/torture/torture.c 2005-05-02 15:00:51 UTC (rev
6575)
@@ -4861,6 +4861,9 @@
{
int i;
+ printf(WARNING samba4 test suite is much more complete nowadays.\n);
+ printf(Please use samba4 torture.\n\n);
+
printf(Usage: smbtorture //server/share options TEST1 TEST2 ...\n);
printf(\t-d debuglevel\n);
svn commit: samba r6576 - in trunk/source/torture: .
Author: idra
Date: 2005-05-02 15:06:11 + (Mon, 02 May 2005)
New Revision: 6576
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6576
Log:
keep volker happy :-)
Modified:
trunk/source/torture/torture.c
Changeset:
Modified: trunk/source/torture/torture.c
===
--- trunk/source/torture/torture.c 2005-05-02 15:00:51 UTC (rev 6575)
+++ trunk/source/torture/torture.c 2005-05-02 15:06:11 UTC (rev 6576)
@@ -4861,6 +4861,9 @@
{
int i;
+ printf(WARNING samba4 test suite is much more complete nowadays.\n);
+ printf(Please use samba4 torture.\n\n);
+
printf(Usage: smbtorture //server/share options TEST1 TEST2 ...\n);
printf(\t-d debuglevel\n);
svn commit: samba r6577 - in branches/SAMBA_4_0/source: build/smb_build librpc/idl script/tests
Author: jelmer
Date: 2005-05-02 15:19:25 + (Mon, 02 May 2005)
New Revision: 6577
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6577
Log:
Make test works without installation now.
Running as a non-root user using socket_wrapper is possible by simple
export SOCKET_WRAPPER_DIR before running 'make test'
Modified:
branches/SAMBA_4_0/source/build/smb_build/makefile.pm
branches/SAMBA_4_0/source/librpc/idl/epmapper.idl
branches/SAMBA_4_0/source/librpc/idl/rot.idl
branches/SAMBA_4_0/source/script/tests/selftest.sh
Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2005-05-02
15:06:11 UTC (rev 6576)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2005-05-02
15:19:25 UTC (rev 6577)
@@ -151,14 +151,8 @@
basics: idl proto_exists
test: all
- ./script/tests/selftest.sh $(prefix)
+ ./script/tests/selftest.sh `pwd`/prefix-test
-export SOCKET_WRAPPER_DIR=$(shell pwd)/sockdir
-
-test-swrap: all
- mkdir -p $(SOCKET_WRAPPER_DIR)
- ./script/tests/selftest.sh $(prefix)
-
__EOD__
return $output;
Modified: branches/SAMBA_4_0/source/librpc/idl/epmapper.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/epmapper.idl 2005-05-02 15:06:11 UTC
(rev 6576)
+++ branches/SAMBA_4_0/source/librpc/idl/epmapper.idl 2005-05-02 15:19:25 UTC
(rev 6577)
@@ -12,7 +12,7 @@
uuid(e1af8308-5d1f-11c9-91a4-08002b14a0fa),
version(3.0),
endpoint(ncacn_np:[\\pipe\\epmapper], ncacn_ip_tcp:[135],
- ncalrpc:[EPMAPPER], ncacn_unix_stream:[/tmp/epmapper]),
+ ncalrpc:[EPMAPPER]),
helpstring(EndPoint Mapper),
pointer_default(unique)
]
Modified: branches/SAMBA_4_0/source/librpc/idl/rot.idl
===
--- branches/SAMBA_4_0/source/librpc/idl/rot.idl2005-05-02 15:06:11 UTC
(rev 6576)
+++ branches/SAMBA_4_0/source/librpc/idl/rot.idl2005-05-02 15:19:25 UTC
(rev 6577)
@@ -6,7 +6,7 @@
pointer_default(unique),
depends(orpc),
endpoint(ncacn_np:[\\pipe\\epmapper], ncacn_ip_tcp:[135],
- ncalrpc:[EPMAPPER], ncacn_unix_stream:[/tmp/epmapper])
+ ncalrpc:[EPMAPPER])
] interface rot
{
WERROR rot_add (
Modified: branches/SAMBA_4_0/source/script/tests/selftest.sh
===
--- branches/SAMBA_4_0/source/script/tests/selftest.sh 2005-05-02 15:06:11 UTC
(rev 6576)
+++ branches/SAMBA_4_0/source/script/tests/selftest.sh 2005-05-02 15:19:25 UTC
(rev 6577)
@@ -1,9 +1,9 @@
#!/bin/sh
DOMAIN=SAMBADOMAIN
+USERNAME=administrator
REALM=$DOMAIN
PASSWORD=penguin
SRCDIR=`pwd`
-TMPDIR=$PREFIX/tmp
if [ $# -lt 1 ]
then
@@ -12,26 +12,40 @@
fi
PREFIX=$1
+TMPDIR=$PREFIX/tmp
+LIBDIR=$PREFIX/lib
+PIDDIR=$PREFIX/pid
+CONFFILE=$LIBDIR/smb.conf
+PRIVATEDIR=$PREFIX/private
+NCALRPCDIR=$PREFIX/ncalrpc
+LOCKDIR=$PREFIX/lockdir
-rm -f $PREFIX/private/*
-./setup/provision.pl --quiet --outputdir $PREFIX/private --domain $DOMAIN
--realm $REALM --adminpass $PASSWORD
+mkdir -p $PRIVATEDIR $LIBDIR $PIDDIR $NCALRPCDIR $LOCKDIR $TMPDIR
+rm -f $PRIVATEDIR/*
+./setup/provision.pl --quiet --outputdir $PRIVATEDIR --domain $DOMAIN --realm
$REALM --adminpass $PASSWORD
-cat $PREFIX/lib/smb.conf EOF
+cat $CONFFILEEOF
[global]
workgroup = $DOMAIN
+ realm = $REALM
+ private dir = $PRIVATEDIR
+ pid directory = $PIDDIR
+ ncalrpc dir = $NCALRPCDIR
+ lock dir = $LOCKDIR
+ sam database = tdb://$PRIVATEDIR/sam.ldb
[tmp]
path = $TMPDIR
read only = no
EOF
-export SOCKET_WRAPPER_DIR
-cd $PREFIX
-./sbin/smbd
+ADDARG=-s $CONFFILE
+
+$SRCDIR/bin/smbd -s $CONFFILE -M single || exit 1
sleep 2
-$SRCDIR/script/tests/test_rpc.sh localhost administrator $PASSWORD $DOMAIN ||
exit 1
-$SRCDIR/script/tests/test_binding_string.sh localhost administrator $PASSWORD
$DOMAIN || exit 1
-$SRCDIR/script/tests/test_echo.sh localhost administrator $PASSWORD $DOMAIN ||
exit 1
-$SRCDIR/script/tests/test_posix.sh //localhost/tmp administrator $PASSWORD ||
exit 1
-$PREFIX/bin/smbtorture ncalrpc: LOCAL-* || exit 1
-kill `cat $PREFIX/var/locks/smbd.pid`
+$SRCDIR/script/tests/test_rpc.sh localhost $USERNAME $PASSWORD $DOMAIN $ADDARG
|| exit 1
+$SRCDIR/script/tests/test_binding_string.sh localhost $USERNAME $PASSWORD
$DOMAIN $ADDARG || exit 1
+$SRCDIR/script/tests/test_echo.sh localhost $USERNAME $PASSWORD $DOMAIN
$ADDARG || exit 1
+$SRCDIR/script/tests/test_posix.sh //localhost/tmp $USERNAME $PASSWORD $ADDARG
|| exit 1
+$SRCDIR/bin/smbtorture $ADDARG ncalrpc: LOCAL-* || exit 1
+kill `cat $PIDDIR/smbd.pid`
svn commit: samba-docs r530 - in trunk/Samba-HOWTO-Collection: .
Author: jht Date: 2005-05-02 15:47:25 + (Mon, 02 May 2005) New Revision: 530 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-docsrev=530 Log: Fixing man pages. Modified: trunk/Samba-HOWTO-Collection/manpages.xml Changeset: Modified: trunk/Samba-HOWTO-Collection/manpages.xml === --- trunk/Samba-HOWTO-Collection/manpages.xml 2005-05-02 12:04:32 UTC (rev 529) +++ trunk/Samba-HOWTO-Collection/manpages.xml 2005-05-02 15:47:25 UTC (rev 530) @@ -5,22 +5,27 @@ paraThis appendix contains most of the manual pages from the official Samba distribution. All manual pages have been written by members of ulink url=http://samba.org/samba/team.html;the Samba Team/ulink./para - xi:include href=../manpages/smb.conf.5.xml/ - xi:include href=../manpages/nmblookup.1.xml/ - xi:include href=../manpages/rpcclient.1.xml/ - xi:include href=../manpages/smbcacls.1.xml/ - xi:include href=../manpages/smbcacls.1.xml/ - xi:include href=../manpages/net.8.xml/ - xi:include href=../manpages/nmbd.8.xml/ - xi:include href=../manpages/pdbedit.8.xml/ - xi:include href=../manpages/smbcquotas.1.xml/ - xi:include href=../manpages/smbd.8.xml/ - xi:include href=../manpages/smbpasswd.5.xml/ - xi:include href=../manpages/smbpasswd.8.xml/ - xi:include href=../manpages/smbstatus.1.xml/ - xi:include href=../manpages/smbtree.1.xml/ - xi:include href=../manpages/testparm.1.xml/ - xi:include href=../manpages/wbinfo.1.xml/ - xi:include href=../manpages/winbindd.8.xml/ + xi:include href=../manpages-3/net.8.xml/ + xi:include href=../manpages-3/nmbd.8.xml/ + xi:include href=../manpages-3/nmblookup.1.xml/ + xi:include href=../manpages-3/pdbedit.8.xml/ + xi:include href=../manpages-3/profiles.1.xml/ + xi:include href=../manpages-3/rpcclient.1.xml/ + xi:include href=../manpages-3/smbcacls.1.xml/ + xi:include href=../manpages-3/smbclient.1.xml/ + xi:include href=../manpages-3/smb.conf.5.xml/ + xi:include href=../manpages-3/smbcquotas.1.xml/ + xi:include href=../manpages-3/smbd.8.xml/ + xi:include href=../manpages-3/smbpasswd.5.xml/ + xi:include href=../manpages-3/smbpasswd.8.xml/ + xi:include href=../manpages-3/smbstatus.1.xml/ + xi:include href=../manpages-3/smbtree.1.xml/ + xi:include href=../manpages-3/tdbbackup.8.xml/ + xi:include href=../manpages-3/tdbdump.8.xml/ + xi:include href=../manpages-3/testparm.1.xml/ + xi:include href=../manpages-3/wbinfo.1.xml/ + xi:include href=../manpages-3/winbindd.8.xml/ /reference + +
svn commit: samba r6578 - in branches/SAMBA_4_0/source/lib/messaging: .
Author: tridge
Date: 2005-05-02 15:58:03 + (Mon, 02 May 2005)
New Revision: 6578
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6578
Log:
brown paper bag time with the new messaging code
Modified:
branches/SAMBA_4_0/source/lib/messaging/messaging.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/messaging/messaging.c
===
--- branches/SAMBA_4_0/source/lib/messaging/messaging.c 2005-05-02 15:19:25 UTC
(rev 6577)
+++ branches/SAMBA_4_0/source/lib/messaging/messaging.c 2005-05-02 15:58:03 UTC
(rev 6578)
@@ -156,7 +156,7 @@
return;
}
- rec-data = data_blob_talloc(rec, data, rec-header.length);
+ rec-data = data_blob_talloc(rec, data+sizeof(rec-header),
rec-header.length);
if (rec-data.data == NULL) {
talloc_free(rec);
return;
svn commit: samba r6579 - in branches/SAMBA_4_0/source/ntvfs/posix: .
Author: tridge
Date: 2005-05-02 15:58:54 + (Mon, 02 May 2005)
New Revision: 6579
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6579
Log:
improved the handling of lock timeouts and cancels in the pvfs locking
code. On lock cancel don't retry the lock.
Modified:
branches/SAMBA_4_0/source/ntvfs/posix/pvfs_lock.c
Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_lock.c
===
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_lock.c 2005-05-02 15:58:03 UTC
(rev 6578)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_lock.c 2005-05-02 15:58:54 UTC
(rev 6579)
@@ -104,7 +104,6 @@
int i;
BOOL timed_out;
- /* we consider a cancel to be a timeout */
timed_out = (reason != PVFS_WAIT_EVENT);
locks = lck-lockx.in.locks + lck-lockx.in.ulock_cnt;
@@ -117,16 +116,21 @@
DLIST_REMOVE(f-pending_list, pending);
- status = brl_lock(pvfs-brl_context,
- f-handle-brl_locking_key,
- req-smbpid,
- f-fnum,
- locks[pending-pending_lock].offset,
- locks[pending-pending_lock].count,
- rw, NULL);
-
+ /* we don't retry on a cancel */
+ if (reason == PVFS_WAIT_CANCEL) {
+ status = NT_STATUS_CANCELLED;
+ } else {
+ status = brl_lock(pvfs-brl_context,
+ f-handle-brl_locking_key,
+ req-smbpid,
+ f-fnum,
+ locks[pending-pending_lock].offset,
+ locks[pending-pending_lock].count,
+ rw, NULL);
+ }
if (NT_STATUS_IS_OK(status)) {
f-lock_count++;
+ timed_out = False;
}
/* if we have failed and timed out, or succeeded, then we
@@ -153,14 +157,10 @@
}
/* if we haven't timed out yet, then we can do more pending locks */
- if (timed_out) {
- pending = NULL;
+ if (rw == READ_LOCK) {
+ rw = PENDING_READ_LOCK;
} else {
- if (rw == READ_LOCK) {
- rw = PENDING_READ_LOCK;
- } else {
- rw = PENDING_WRITE_LOCK;
- }
+ rw = PENDING_WRITE_LOCK;
}
/* we've now got the pending lock. try and get the rest, which might
svn commit: samba r6580 - in branches/SAMBA_4_0/source/ntvfs/posix: .
Author: tridge
Date: 2005-05-02 15:59:34 + (Mon, 02 May 2005)
New Revision: 6580
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6580
Log:
fixed the bug that caused the truncation of the main file on a stream
open with openx and the 'truncate if exists' flag
Modified:
branches/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c
branches/SAMBA_4_0/source/ntvfs/posix/xattr_system.c
Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c
===
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c 2005-05-02 15:58:54 UTC
(rev 6579)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c 2005-05-02 15:59:34 UTC
(rev 6580)
@@ -856,7 +856,7 @@
uint32_t create_options;
uint32_t share_access;
uint32_t access_mask;
- BOOL stream_existed;
+ BOOL stream_existed, stream_truncate=False;
/* use the generic mapping code to avoid implementing all the
different open calls. */
@@ -892,13 +892,16 @@
return NT_STATUS_INVALID_PARAMETER;
}
+ flags = 0;
+
switch (io-generic.in.open_disposition) {
case NTCREATEX_DISP_SUPERSEDE:
- flags = O_TRUNC;
- break;
-
case NTCREATEX_DISP_OVERWRITE_IF:
- flags = O_TRUNC;
+ if (name-stream_name == NULL) {
+ flags = O_TRUNC;
+ } else {
+ stream_truncate = True;
+ }
break;
case NTCREATEX_DISP_OPEN:
@@ -912,7 +915,11 @@
if (!name-stream_exists) {
return NT_STATUS_OBJECT_NAME_NOT_FOUND;
}
- flags = O_TRUNC;
+ if (name-stream_name == NULL) {
+ flags = O_TRUNC;
+ } else {
+ stream_truncate = True;
+ }
break;
case NTCREATEX_DISP_CREATE:
@@ -1075,6 +1082,13 @@
talloc_free(lck);
return status;
}
+ if (stream_truncate) {
+ status = pvfs_stream_truncate(pvfs, f-handle-name,
fd, 0);
+ if (!NT_STATUS_IS_OK(status)) {
+ talloc_free(lck);
+ return status;
+ }
+ }
}
/* re-resolve the open fd */
Modified: branches/SAMBA_4_0/source/ntvfs/posix/xattr_system.c
===
--- branches/SAMBA_4_0/source/ntvfs/posix/xattr_system.c2005-05-02
15:58:54 UTC (rev 6579)
+++ branches/SAMBA_4_0/source/ntvfs/posix/xattr_system.c2005-05-02
15:59:34 UTC (rev 6580)
@@ -37,7 +37,7 @@
#if HAVE_XATTR_SUPPORT
int ret;
- *blob = data_blob_talloc(mem_ctx, NULL, estimated_size);
+ *blob = data_blob_talloc(mem_ctx, NULL, estimated_size+16);
if (blob-data == NULL) {
return NT_STATUS_NO_MEMORY;
}
svn commit: samba r6581 - in branches/SAMBA_4_0/source/torture/raw: .
Author: tridge
Date: 2005-05-02 16:00:18 + (Mon, 02 May 2005)
New Revision: 6581
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6581
Log:
improved the error message for RAW-LOCK timeouts
Modified:
branches/SAMBA_4_0/source/torture/raw/lock.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/raw/lock.c
===
--- branches/SAMBA_4_0/source/torture/raw/lock.c2005-05-02 15:59:34 UTC
(rev 6580)
+++ branches/SAMBA_4_0/source/torture/raw/lock.c2005-05-02 16:00:18 UTC
(rev 6581)
@@ -543,11 +543,13 @@
status = smb_raw_lock(cli-tree, io);
CHECK_STATUS(status, NT_STATUS_OK);
+ t = time(NULL);
status = smbcli_request_simple_recv(req);
CHECK_STATUS(status, NT_STATUS_OK);
if (time(NULL) t+2) {
- printf(lock cancel by unlock was not immediate (%s)\n,
__location__);
+ printf(lock cancel by unlock was not immediate (%s) - took %d
secs\n,
+ __location__, (int)time(NULL)-t);
ret = False;
goto done;
}
svn commit: samba r6582 - in branches/SAMBA_4_0/source/torture/rpc: .
Author: abartlet
Date: 2005-05-02 16:02:52 + (Mon, 02 May 2005)
New Revision: 6582
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6582
Log:
Remove the hack that metze needed because Samba4 didn't have a samdump
command.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/torture/rpc/samsync.c
Changeset:
Modified: branches/SAMBA_4_0/source/torture/rpc/samsync.c
===
--- branches/SAMBA_4_0/source/torture/rpc/samsync.c 2005-05-02 16:00:18 UTC
(rev 6581)
+++ branches/SAMBA_4_0/source/torture/rpc/samsync.c 2005-05-02 16:02:52 UTC
(rev 6582)
@@ -543,15 +543,6 @@
}
}
- if (nt_hash_p) {
- DATA_BLOB nt_hash_blob = data_blob_const(nt_hash_p, 16);
- DEBUG(100,(ACCOUNT [%s\\%-25s] NTHASH %s\n,
samsync_state-domain_name[0], username, data_blob_hex_string(mem_ctx,
nt_hash_blob)));
- }
- if (lm_hash_p) {
- DATA_BLOB lm_hash_blob = data_blob_const(lm_hash_p, 16);
- DEBUG(100,(ACCOUNT [%s\\%-25s] LMHASH %s\n,
samsync_state-domain_name[0], username, data_blob_hex_string(mem_ctx,
lm_hash_blob)));
- }
-
nt_status = test_SamLogon(samsync_state-p_netlogon_wksta, mem_ctx,
samsync_state-creds_netlogon_wksta,
domain,
username,
svn commit: samba r6583 - in trunk/source/nsswitch: .
Author: vlendec Date: 2005-05-02 16:13:35 + (Mon, 02 May 2005) New Revision: 6583 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6583 Log: Make getpwuid and getpwnam async. Now I think I got all requests in the critical path async. Missing are the enumerating ones and getgrgid/getgrnam. I think during normal operation of a Samba server these should not be affected. The enum calls should work, but are still being done by the parent winbind in a blocking fashion. During testing I've found the error path for various stuff not being valgrind clean, I have to fix that. Volker Modified: trunk/source/nsswitch/winbindd.c trunk/source/nsswitch/winbindd_async.c trunk/source/nsswitch/winbindd_cache.c trunk/source/nsswitch/winbindd_dual.c trunk/source/nsswitch/winbindd_nss.h trunk/source/nsswitch/winbindd_sid.c trunk/source/nsswitch/winbindd_user.c Changeset: Sorry, the patch is too large (676 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6583
svn commit: samba r6584 - in branches/tmp/pidl2/source: build/smb_build include lib lib/messaging libnet librpc/idl librpc/ndr ntvfs/posix passdb script/tests setup torture/raw torture/rpc utils/net
Author: jelmer Date: 2005-05-02 16:17:51 + (Mon, 02 May 2005) New Revision: 6584 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6584 Log: Merge in SAMBA_4_0 changes Added: branches/tmp/pidl2/source/lib/samba3/ branches/tmp/pidl2/source/libnet/libnet_vampire.c branches/tmp/pidl2/source/libnet/libnet_vampire.h branches/tmp/pidl2/source/setup/provision.smb.conf branches/tmp/pidl2/source/utils/net/net_vampire.c Modified: branches/tmp/pidl2/source/build/smb_build/makefile.pm branches/tmp/pidl2/source/include/structs.h branches/tmp/pidl2/source/lib/basic.mk branches/tmp/pidl2/source/lib/credentials.c branches/tmp/pidl2/source/lib/messaging/messaging.c branches/tmp/pidl2/source/lib/util_str.c branches/tmp/pidl2/source/libnet/config.mk branches/tmp/pidl2/source/libnet/libnet.h branches/tmp/pidl2/source/librpc/idl/epmapper.idl branches/tmp/pidl2/source/librpc/idl/idl_types.h branches/tmp/pidl2/source/librpc/idl/rot.idl branches/tmp/pidl2/source/librpc/idl/spoolss.idl branches/tmp/pidl2/source/librpc/ndr/ndr_basic.c branches/tmp/pidl2/source/librpc/ndr/ndr_string.c branches/tmp/pidl2/source/ntvfs/posix/pvfs_lock.c branches/tmp/pidl2/source/ntvfs/posix/pvfs_open.c branches/tmp/pidl2/source/ntvfs/posix/xattr_system.c branches/tmp/pidl2/source/passdb/secrets.c branches/tmp/pidl2/source/script/tests/selftest.sh branches/tmp/pidl2/source/setup/provision.pl branches/tmp/pidl2/source/torture/raw/lock.c branches/tmp/pidl2/source/torture/rpc/samsync.c branches/tmp/pidl2/source/utils/net/config.mk branches/tmp/pidl2/source/utils/net/net.c Changeset: Sorry, the patch is too large (655 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6584
svn commit: samba r6585 - in branches/SAMBA_3_0/source: .
Author: jelmer Date: 2005-05-02 16:23:02 + (Mon, 02 May 2005) New Revision: 6585 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6585 Log: Fix socket-wrapper-enabled build for the tdb tools Modified: branches/SAMBA_3_0/source/Makefile.in Changeset: Modified: branches/SAMBA_3_0/source/Makefile.in === --- branches/SAMBA_3_0/source/Makefile.in 2005-05-02 16:17:51 UTC (rev 6584) +++ branches/SAMBA_3_0/source/Makefile.in 2005-05-02 16:23:02 UTC (rev 6585) @@ -855,7 +855,7 @@ bin/[EMAIL PROTECTED]@: $(PROFILES_OBJ) @BUILD_POPT@ bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(PROFILES_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ + @$(CC) $(FLAGS) -o $@ $(PROFILES_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ @SOCKWRAP@ bin/[EMAIL PROTECTED]@: $(EDITREG_OBJ) @BUILD_POPT@ bin/.dummy @echo Linking $@ @@ -1268,15 +1268,15 @@ bin/[EMAIL PROTECTED]@: $(TDBBACKUP_OBJ) bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(DYNEXP) $(TDBBACKUP_OBJ) + @$(CC) $(FLAGS) -o $@ $(DYNEXP) $(TDBBACKUP_OBJ) @SOCKWRAP@ bin/[EMAIL PROTECTED]@: $(TDBTOOL_OBJ) bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(DYNEXP) $(TDBTOOL_OBJ) + @$(CC) $(FLAGS) -o $@ $(DYNEXP) $(TDBTOOL_OBJ) @SOCKWRAP@ bin/[EMAIL PROTECTED]@: $(TDBDUMP_OBJ) bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(DYNEXP) $(TDBDUMP_OBJ) + @$(CC) $(FLAGS) -o $@ $(DYNEXP) $(TDBDUMP_OBJ) @SOCKWRAP@ bin/[EMAIL PROTECTED]@: bin/[EMAIL PROTECTED]@ torture/t_strcmp.o $(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) torture/t_strcmp.o -L ./bin -lbigballofmud @@ -1569,3 +1569,10 @@ # running it. For the time being we don't build all of BIN_PROGS, # because they're not all needed. check-programs: bin/t_strcmp bin/t_strstr bin/t_push_ucs2 bin/smbcontrol bin/t_snprintf + +test: all + @if test -z $(SMB4TORTURE); then \ + echo Please set the SMB4TORTURE environment variable; \ + exit 1; \ + fi + ./script/smb4torture.sh `pwd`/prefix-test $(SMB4TORTURE)
svn commit: samba r6586 - in branches/SAMBA_3_0/source: lib libads libsmb smbd tests torture
Author: herb
Date: 2005-05-02 17:49:43 + (Mon, 02 May 2005)
New Revision: 6586
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6586
Log:
get rid of a few more compiler warnings
Modified:
branches/SAMBA_3_0/source/lib/dummyroot.c
branches/SAMBA_3_0/source/lib/dummysmbd.c
branches/SAMBA_3_0/source/lib/interfaces.c
branches/SAMBA_3_0/source/lib/sysquotas.c
branches/SAMBA_3_0/source/lib/sysquotas_4A.c
branches/SAMBA_3_0/source/lib/sysquotas_linux.c
branches/SAMBA_3_0/source/lib/sysquotas_xfs.c
branches/SAMBA_3_0/source/libads/kerberos.c
branches/SAMBA_3_0/source/libsmb/clikrb5.c
branches/SAMBA_3_0/source/smbd/notify_kernel.c
branches/SAMBA_3_0/source/smbd/oplock_linux.c
branches/SAMBA_3_0/source/tests/shlib.c
branches/SAMBA_3_0/source/tests/sysquotas.c
branches/SAMBA_3_0/source/torture/denytest.c
branches/SAMBA_3_0/source/torture/mangle_test.c
branches/SAMBA_3_0/source/torture/torture.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/dummyroot.c
===
--- branches/SAMBA_3_0/source/lib/dummyroot.c 2005-05-02 16:23:02 UTC (rev
6585)
+++ branches/SAMBA_3_0/source/lib/dummyroot.c 2005-05-02 17:49:43 UTC (rev
6586)
@@ -22,6 +22,9 @@
/* Stupid dummy functions required due to the horrible dependency mess
in Samba. */
+void become_root(void);
+void unbecome_root(void);
+
void become_root(void)
{
return;
Modified: branches/SAMBA_3_0/source/lib/dummysmbd.c
===
--- branches/SAMBA_3_0/source/lib/dummysmbd.c 2005-05-02 16:23:02 UTC (rev
6585)
+++ branches/SAMBA_3_0/source/lib/dummysmbd.c 2005-05-02 17:49:43 UTC (rev
6586)
@@ -22,6 +22,8 @@
/* Stupid dummy functions required due to the horrible dependency mess
in Samba. */
+void decrement_smbd_process_count( void );
+
void decrement_smbd_process_count( void )
{
return;
Modified: branches/SAMBA_3_0/source/lib/interfaces.c
===
--- branches/SAMBA_3_0/source/lib/interfaces.c 2005-05-02 16:23:02 UTC (rev
6585)
+++ branches/SAMBA_3_0/source/lib/interfaces.c 2005-05-02 17:49:43 UTC (rev
6586)
@@ -358,6 +358,8 @@
/* this wrapper is used to remove duplicates from the interface list generated
above */
+int get_interfaces(struct iface_struct *ifaces, int max_interfaces);
+
int get_interfaces(struct iface_struct *ifaces, int max_interfaces)
{
int total, i, j;
Modified: branches/SAMBA_3_0/source/lib/sysquotas.c
===
--- branches/SAMBA_3_0/source/lib/sysquotas.c 2005-05-02 16:23:02 UTC (rev
6585)
+++ branches/SAMBA_3_0/source/lib/sysquotas.c 2005-05-02 17:49:43 UTC (rev
6586)
@@ -497,6 +497,8 @@
}
#else /* HAVE_SYS_QUOTAS */
+ void dummy_sysquotas_c(void);
+
void dummy_sysquotas_c(void)
{
return;
Modified: branches/SAMBA_3_0/source/lib/sysquotas_4A.c
===
--- branches/SAMBA_3_0/source/lib/sysquotas_4A.c2005-05-02 16:23:02 UTC
(rev 6585)
+++ branches/SAMBA_3_0/source/lib/sysquotas_4A.c2005-05-02 17:49:43 UTC
(rev 6586)
@@ -335,5 +335,7 @@
}
#else /* HAVE_QUOTACTL_4A */
+ void dummy_sysquotas_4A(void);
+
void dummy_sysquotas_4A(void){}
#endif /* HAVE_QUOTACTL_4A */
Modified: branches/SAMBA_3_0/source/lib/sysquotas_linux.c
===
--- branches/SAMBA_3_0/source/lib/sysquotas_linux.c 2005-05-02 16:23:02 UTC
(rev 6585)
+++ branches/SAMBA_3_0/source/lib/sysquotas_linux.c 2005-05-02 17:49:43 UTC
(rev 6586)
@@ -556,5 +556,7 @@
}
#else /* HAVE_QUOTACTL_LINUX */
+ void dummy_sysquotas_linux(void);
+
void dummy_sysquotas_linux(void){}
#endif /* HAVE_QUOTACTL_LINUX */
Modified: branches/SAMBA_3_0/source/lib/sysquotas_xfs.c
===
--- branches/SAMBA_3_0/source/lib/sysquotas_xfs.c 2005-05-02 16:23:02 UTC
(rev 6585)
+++ branches/SAMBA_3_0/source/lib/sysquotas_xfs.c 2005-05-02 17:49:43 UTC
(rev 6586)
@@ -329,5 +329,7 @@
}
#else /* HAVE_XFS_QUOTAS */
+ void dummy_sysquotas_xfs(void);
+
void dummy_sysquotas_xfs(void){}
#endif /* HAVE_XFS_QUOTAS */
Modified: branches/SAMBA_3_0/source/libads/kerberos.c
===
--- branches/SAMBA_3_0/source/libads/kerberos.c 2005-05-02 16:23:02 UTC (rev
6585)
+++ branches/SAMBA_3_0/source/libads/kerberos.c 2005-05-02 17:49:43 UTC (rev
6586)
@@ -248,7 +248,7 @@
Setting principal to NULL deletes this entry.
/
- BOOL kerberos_secrets_store_salting_principal(const char *service,
+BOOL kerberos_secrets_store_salting_principal(const char *service,
svn commit: samba r6587 - in trunk/source: lib libads libsmb smbd tests torture
Author: herb
Date: 2005-05-02 17:53:09 + (Mon, 02 May 2005)
New Revision: 6587
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6587
Log:
merge change 6586 from SAMBA_3_0
Modified:
trunk/source/lib/dummyroot.c
trunk/source/lib/dummysmbd.c
trunk/source/lib/interfaces.c
trunk/source/lib/sysquotas.c
trunk/source/lib/sysquotas_4A.c
trunk/source/lib/sysquotas_linux.c
trunk/source/lib/sysquotas_xfs.c
trunk/source/libads/kerberos.c
trunk/source/libsmb/clikrb5.c
trunk/source/smbd/notify_kernel.c
trunk/source/smbd/oplock_linux.c
trunk/source/tests/shlib.c
trunk/source/tests/sysquotas.c
trunk/source/torture/denytest.c
trunk/source/torture/mangle_test.c
trunk/source/torture/torture.c
Changeset:
Modified: trunk/source/lib/dummyroot.c
===
--- trunk/source/lib/dummyroot.c2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/lib/dummyroot.c2005-05-02 17:53:09 UTC (rev 6587)
@@ -22,6 +22,9 @@
/* Stupid dummy functions required due to the horrible dependency mess
in Samba. */
+void become_root(void);
+void unbecome_root(void);
+
void become_root(void)
{
return;
Modified: trunk/source/lib/dummysmbd.c
===
--- trunk/source/lib/dummysmbd.c2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/lib/dummysmbd.c2005-05-02 17:53:09 UTC (rev 6587)
@@ -22,6 +22,8 @@
/* Stupid dummy functions required due to the horrible dependency mess
in Samba. */
+void decrement_smbd_process_count( void );
+
void decrement_smbd_process_count( void )
{
return;
Modified: trunk/source/lib/interfaces.c
===
--- trunk/source/lib/interfaces.c 2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/lib/interfaces.c 2005-05-02 17:53:09 UTC (rev 6587)
@@ -358,6 +358,8 @@
/* this wrapper is used to remove duplicates from the interface list generated
above */
+int get_interfaces(struct iface_struct *ifaces, int max_interfaces);
+
int get_interfaces(struct iface_struct *ifaces, int max_interfaces)
{
int total, i, j;
Modified: trunk/source/lib/sysquotas.c
===
--- trunk/source/lib/sysquotas.c2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/lib/sysquotas.c2005-05-02 17:53:09 UTC (rev 6587)
@@ -497,6 +497,8 @@
}
#else /* HAVE_SYS_QUOTAS */
+ void dummy_sysquotas_c(void);
+
void dummy_sysquotas_c(void)
{
return;
Modified: trunk/source/lib/sysquotas_4A.c
===
--- trunk/source/lib/sysquotas_4A.c 2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/lib/sysquotas_4A.c 2005-05-02 17:53:09 UTC (rev 6587)
@@ -335,5 +335,7 @@
}
#else /* HAVE_QUOTACTL_4A */
+ void dummy_sysquotas_4A(void);
+
void dummy_sysquotas_4A(void){}
#endif /* HAVE_QUOTACTL_4A */
Modified: trunk/source/lib/sysquotas_linux.c
===
--- trunk/source/lib/sysquotas_linux.c 2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/lib/sysquotas_linux.c 2005-05-02 17:53:09 UTC (rev 6587)
@@ -556,5 +556,7 @@
}
#else /* HAVE_QUOTACTL_LINUX */
+ void dummy_sysquotas_linux(void);
+
void dummy_sysquotas_linux(void){}
#endif /* HAVE_QUOTACTL_LINUX */
Modified: trunk/source/lib/sysquotas_xfs.c
===
--- trunk/source/lib/sysquotas_xfs.c2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/lib/sysquotas_xfs.c2005-05-02 17:53:09 UTC (rev 6587)
@@ -329,5 +329,7 @@
}
#else /* HAVE_XFS_QUOTAS */
+ void dummy_sysquotas_xfs(void);
+
void dummy_sysquotas_xfs(void){}
#endif /* HAVE_XFS_QUOTAS */
Modified: trunk/source/libads/kerberos.c
===
--- trunk/source/libads/kerberos.c 2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/libads/kerberos.c 2005-05-02 17:53:09 UTC (rev 6587)
@@ -247,7 +247,7 @@
Setting principal to NULL deletes this entry.
/
- BOOL kerberos_secrets_store_salting_principal(const char *service,
+BOOL kerberos_secrets_store_salting_principal(const char *service,
int enctype,
const char *principal)
{
Modified: trunk/source/libsmb/clikrb5.c
===
--- trunk/source/libsmb/clikrb5.c 2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/libsmb/clikrb5.c 2005-05-02 17:53:09 UTC (rev 6587)
@@ -525,11 +525,13 @@
#if defined(HAVE_KRB5_PRINCIPAL_GET_COMP_STRING)
!defined(HAVE_KRB5_PRINC_COMPONENT)
+ const krb5_data
Re: svn commit: samba r6586 - in branches/SAMBA_3_0/source: lib libads libsmb smbd tests torture
[EMAIL PROTECTED] writes:
Log:
get rid of a few more compiler warnings
Modified: branches/SAMBA_3_0/source/lib/dummyroot.c
===
--- branches/SAMBA_3_0/source/lib/dummyroot.c 2005-05-02 16:23:02 UTC (rev
6585)
+++ branches/SAMBA_3_0/source/lib/dummyroot.c 2005-05-02 17:49:43 UTC (rev
6586)
@@ -22,6 +22,9 @@
/* Stupid dummy functions required due to the horrible dependency mess
in Samba. */
+void become_root(void);
+void unbecome_root(void);
+
void become_root(void)
{
return;
Herb, I don't get it. What is the purpose of a forward declaration
immediately prior to an actual function declaration? What type of warning
were you getting that this solves?
Confused,
Derrell
Re: svn commit: samba r6586 - in branches/SAMBA_3_0/source: lib libads libsmb smbd tests torture
[EMAIL PROTECTED] writes:
[EMAIL PROTECTED] writes:
Log:
get rid of a few more compiler warnings
Modified: branches/SAMBA_3_0/source/lib/dummyroot.c
===
--- branches/SAMBA_3_0/source/lib/dummyroot.c2005-05-02 16:23:02 UTC
(rev 6585)
+++ branches/SAMBA_3_0/source/lib/dummyroot.c2005-05-02 17:49:43 UTC
(rev 6586)
@@ -22,6 +22,9 @@
/* Stupid dummy functions required due to the horrible dependency mess
in Samba. */
+void become_root(void);
+void unbecome_root(void);
+
void become_root(void)
{
return;
Herb, I don't get it. What is the purpose of a forward declaration
immediately prior to an actual function declaration? What type of warning
were you getting that this solves?
Herb, in talking with abartlet, I now understand what problem this was trying
to solve. These are public functions, and therefore should have calls by
external (not in the same file) users. (If not, they'd likely be declared
static.) These stub functions that you have corrected should, as you
discovered, have external declarations as well. Since the callers are
intended to be external, the external declarations should really be in a
header file so that all callers to these functions are using the same external
declaration. By putting the external declarations in the C file with the
function declaration, the warning is removed, but the purpose of the warning
is defeated.
In our discussion, abartlet and I agreed that the proper place for these
declarations is probably in proto.h, which raises the question as to why they
are not automagically being added to proto.h. Would you like to try to figure
out why they're not being generated in proto.h, and perhaps fix it so they
are?
If there is some reason that they shouldn't in fact, go in proto.h, then it
seems that includes.h would likely be the right place for them.
Cheers,
Derrell
svn commit: samba r6588 - in branches/SAMBA_3_0/source/lib: .
Author: herb
Date: 2005-05-02 21:30:57 + (Mon, 02 May 2005)
New Revision: 6588
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6588
Log:
just include includes.h to get prototypes here.
Modified:
branches/SAMBA_3_0/source/lib/dummyroot.c
branches/SAMBA_3_0/source/lib/dummysmbd.c
Changeset:
Modified: branches/SAMBA_3_0/source/lib/dummyroot.c
===
--- branches/SAMBA_3_0/source/lib/dummyroot.c 2005-05-02 17:53:09 UTC (rev
6587)
+++ branches/SAMBA_3_0/source/lib/dummyroot.c 2005-05-02 21:30:57 UTC (rev
6588)
@@ -22,8 +22,7 @@
/* Stupid dummy functions required due to the horrible dependency mess
in Samba. */
-void become_root(void);
-void unbecome_root(void);
+#include includes.h
void become_root(void)
{
Modified: branches/SAMBA_3_0/source/lib/dummysmbd.c
===
--- branches/SAMBA_3_0/source/lib/dummysmbd.c 2005-05-02 17:53:09 UTC (rev
6587)
+++ branches/SAMBA_3_0/source/lib/dummysmbd.c 2005-05-02 21:30:57 UTC (rev
6588)
@@ -22,7 +22,7 @@
/* Stupid dummy functions required due to the horrible dependency mess
in Samba. */
-void decrement_smbd_process_count( void );
+#include includes.h
void decrement_smbd_process_count( void )
{
Build status as of Tue May 3 00:00:01 2005
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2005-05-02 00:00:20.0 + +++ /home/build/master/cache/broken_results.txt 2005-05-03 00:00:26.0 + @@ -1,4 +1,4 @@ -Build status as of Mon May 2 00:00:02 2005 +Build status as of Tue May 3 00:00:01 2005 Build counts: Tree Total Broken Panic @@ -9,7 +9,7 @@ samba1 0 0 samba-docs 0 0 0 samba4 38 22 0 -samba_3_038 8 0 +samba_3_038 5 0 Currently broken builds: Host Tree Compiler Status @@ -19,9 +19,7 @@ rhonwynsamba_3_0gcc-4.0ok/ 2/?/? rhonwynsamba4 tccok/ 2/?/? shelob ccache iccok/ok/ok/ 2 -aretnapsamba_3_0gccok/ok/ok/ 1 aretnapccache iccok/ok/ok/ 1 -aretnapsamba_3_0iccok/ok/ok/ 2 gc4samba4 gccok/ 1/?/? manhattan samba4 cc ok/ 1/?/? sbfsamba4 gccok/ 1/?/? @@ -41,7 +39,6 @@ gc20 samba4 gccok/ 2/?/? sun1 samba4 cc ok/ 2/?/? sun1 samba4 gccok/ 2/?/? -sun1 samba_3_0gccok/ok/ok/ 1 fire1 samba4 gccok/ 2/?/? m30ccache gccok/ok/ok/ 2 m30rsyncgccok/ok/ok/ 2
svn commit: samba r6589 - in branches/SAMBA_4_0/source/build/smb_build: .
Author: tpot
Date: 2005-05-03 01:48:24 + (Tue, 03 May 2005)
New Revision: 6589
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6589
Log:
Make the library versioning options for building a shared library optional.
This will allow us to build unversioned libraries suitable for loading
using dlopen() i.e for the swig wrappers.
Modified:
branches/SAMBA_4_0/source/build/smb_build/input.pm
Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/input.pm
===
--- branches/SAMBA_4_0/source/build/smb_build/input.pm 2005-05-02 21:30:57 UTC
(rev 6588)
+++ branches/SAMBA_4_0/source/build/smb_build/input.pm 2005-05-03 01:48:24 UTC
(rev 6589)
@@ -114,9 +114,16 @@
}
$lib-{OUTPUT_TYPE} = SHARED_LIBRARY;
- $lib-{MAJOR_VERSION} = join('', @{$lib-{MAJOR_VERSION}});
- $lib-{MINOR_VERSION} = join('', @{$lib-{MINOR_VERSION}});
- $lib-{RELEASE_VERSION} = join('', @{$lib-{RELEASE_VERSION}});
+
+ if (defined($lib-{MAJOR_VERSION})) {
+ $lib-{MAJOR_VERSION} = join('', $lib-{MAJOR_VERSION});
+ }
+ if (defined($lib-{MINOR_VERSION})) {
+ $lib-{MINOR_VERSION} = join('', $lib-{MINOR_VERSION});
+ }
+ if (defined($lib-{RELEASE_VERSION})) {
+ $lib-{RELEASE_VERSION} = join('', $lib-{RELEASE_VERSION});
+ }
}
sub check_binary($$)
svn commit: samba r6590 - in branches/SAMBA_4_0/source/scripting/swig: .
Author: tpot Date: 2005-05-03 01:48:50 + (Tue, 03 May 2005) New Revision: 6590 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=6590 Log: Remove bogus library versioning variables from swig wrappers. Modified: branches/SAMBA_4_0/source/scripting/swig/config.mk Changeset: Modified: branches/SAMBA_4_0/source/scripting/swig/config.mk === --- branches/SAMBA_4_0/source/scripting/swig/config.mk 2005-05-03 01:48:24 UTC (rev 6589) +++ branches/SAMBA_4_0/source/scripting/swig/config.mk 2005-05-03 01:48:50 UTC (rev 6590) @@ -1,11 +1,5 @@ [LIBRARY::swig_tdb] -MAJOR_VERSION = 0 -MINOR_VERSION = 0 -RELEASE_VERSION = 1 REQUIRED_SUBSYSTEMS = LIBTDB [LIBRARY::swig_dcerpc] -MAJOR_VERSION = 0 -MINOR_VERSION = 0 -RELEASE_VERSION = 1 REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBBASIC CONFIG RPC_NDR_SAMR RPC_NDR_LSA
