Re: [Samba] Samba PDC - User Permissions
Anyone with a suggestion? Thanks Stylianos Asmargianakis wrote: Hello list, I have setup a Samba 3 server as PDC and need to give to specific account access to read and write to particular directories under C:\ drive. Can anyone please send me any docs,urls where I can find relevant information? Thanks a lot -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Slow samba transfer
Thats the diagnosis: transfering the same file via smb, scp and ftp I got big speed differences. SMB: file : 1Gb, transfer rate 15-35 kb/s SCP: file : 1Gb, transfer rate 360-780 kb/s FTP: file : 1Gb, transfer rate 360-780 kb/s Why is via smb so slow? Attachment is my own smb:conf, the same that's on air. [global] workgroup = NO1KNOWS netbios name = PBT server string = Samba %v, File server ; wins support = no ; wins server = w.x.y.z dns proxy = no os level = 64 ; name resolve order = lmhosts host wins bcast log file = /var/log/samba/log.%m max log size = 50 ; syslog only = no syslog = 0 panic action = /usr/share/samba/panic-action %d ### Authentication ### security = user encrypt passwords = yes passdb backend = tdbsam guest obey pam restrictions = yes ; guest account = nobody invalid users = root unix password sync = yes passwd program = /usr/bin/passwd %u passwd chat = *Enter\snew\sUNIX\spassword:* %n\n *Retype\snew\sUNIX\spassword:* %n\n . ; pam password change = no socket options = TCP_NODELAY IPTOS_LOWDELAY SO_SNDBUF=8192 SORCVBUF=8192 local master = yes domain master =yes #Other stuff ;-)) domain logons = yes hosts allow = 127.0.0.1 192.168.1.0/255.255.255.0 192.168.2.0/255.255.255.0 192.168.3.0/255.255.255.0 logon home = \\%L\%U\.profile logon path = \\%L\profile\%U logon drive = H: logon script = netlogon.bat [homes] comment = Home Directories browseable = no writable = yes create mask = 0700 directory mask = 0700 [profile] path = /home/samba/profile writable = yes browsable = no create mask = 600 directory mask = 700 # Un-comment the following and create the netlogon directory for Domain Logons # (you need to configure Samba to act as a domain controller too.) [netlogon] comment = Network Logon Service path = /home/samba/netlogon read only = yes write list = @admin guest ok = no writable = no share modes = no browsable = no [Tutto] path = /mnt/ writable = yes directory mask = 0754 browseable = yes # read only = yes guest ok = yes [Condivisa] path = /shared/ writable = yes directory mask = 0774 browseable = yes # read only = yes guest ok = yes Help a honest worker! thanx to all-- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] printing without a spool
Hello all at Samba I'm new to this list. I need to investigate the possibility of configuring a Samba print server without a spool (that's right: without a spool !!!). I know this is really strange, but I really need to get some clear ideas on this. I'm developing a project with very (very) limited disk storage and one of the possibilities we are considering is printing without spool (with all the disadvantages it implies...)... Can anyone shed some light on this matter ? Thank you very much regards Joao -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] net ads info can't find the ldap server.
Hi all: After I upgraded to samba 3.0.23d, I can’t use net ads info to retrieve DC information. In my previous version (3.0.21c), I can use net ads info and get the information: LDAP server: 172.23.26.204 LDAP server name: nas-2003 Realm: NAS.LOCAL Bind Path: dc=NAS,dc=LOCAL LDAP port: 389 Server time: Mon, 22 Jan 2007 09:51:02 GMT KDC server: 172.23.26.204 Server time offset: -60 After upgrade to 3.0.23d: Didn't find the ldap server! The detailed information is as follows: It seem there’s some problem with protocol negotiation. My openldap version is 2.1.22. I also tried 2.3.32, but also fail. Could someone help me out? Thanks, Latrell. [2007/01/22 18:00:24, 3] param/loadparm.c:lp_load(4945) lp_load: refreshing parameters [2007/01/22 18:00:24, 3] param/loadparm.c:init_globals(1410) Initialising global parameters [2007/01/22 18:00:24, 3] param/params.c:pm_process(572) params.c:pm_process() - Processing configuration file /etc/samba/smb.conf [2007/01/22 18:00:24, 3] param/loadparm.c:do_section(3687) Processing section [global] [2007/01/22 18:00:24, 3] lib/module.c:do_smb_load_module(49) Error loading module '/usr/lib/charset/ANSI_X3.4-1968.so': /usr/lib/charset/ANSI_X3.4-1968.so: cannot open shared object file: No such file or directory [2007/01/22 18:00:24, 2] lib/interface.c:add_interface(81) added interface ip=172.23.26.152 bcast=172.23.26.255 nmask=255.255.255.0 [2007/01/22 18:00:24, 3] libsmb/namequery.c:get_dc_list(1426) get_dc_list: preferred server list: 172.23.26.204, NAS.LOCAL * [2007/01/22 18:00:24, 1] libads/cldap.c:recv_cldap_netlogon(240) Failed to parse cldap reply [2007/01/22 18:00:24, 3] libads/ldap.c:ads_try_connect(136) ads_try_connect: CLDAP request 172.23.26.204 failed. Didn't find the ldap server! [2007/01/22 18:00:24, 2] utils/net.c:main(988) return code = -1 [smb.conf] [global] dos charset = UTF8 display charset = UTF8 unix charset = UTF8 server string = %h netbios name = NSAF933 write ok = yes guest account = smbguest map to guest = bad user encrypt passwords = yes map archive = no client use spnego = no auth methods = guest sam_ignoredomain winbind:ntdomain host msdfs = yes winbind use default domain = yes workgroup = NAS security = ads password server = NAS.LOCAL * idmap uid = 10-50 idmap gid = 10-50 winbind cache time = 15 template homedir = /tmp/users/home/%D/%U template shell = /bin/bash -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] compiled smbd and nmbd doesn't rise up
I know that as my first day I shouldn't spam off this mailing list but : as it tells I did, but they won't be usefull... http://www.samba.org/samba/docs/man/Samba-HOWTO-Collection/ compiling.html I compiled the new stable version in /root/samba_test with #configure --prefix=/root/samba_test but when I launch the servers they don't want to rise up neither /root/samba_test/sbin/smbd -D -s /root/samba_test/etc/smb.conf nor /root/samba_test/sbin/nmbd -D -s /root/samba_test/etc/smb.conf start 'em up! do you know if could be such a problem with any ubuntu systems? gday! Rob -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Compiled smbd and nmbd doesn't start up
know that as my first day I shouldn't spam off this mailing list but : as it tells I did, but they won't be usefull... http://www.samba.org/samba/docs/man/Samba-HOWTO-Collection/ compiling.html I compiled the new stable version in /root/samba_test with #configure --prefix=/root/samba_test but when I launch the servers they don't want to rise up neither /root/samba_test/sbin/smbd -D -s /root/samba_test/etc/smb.conf nor /root/samba_test/sbin/nmbd -D -s /root/samba_test/etc/smb.conf start 'em up! do you know if could be such a problem with any ubuntu systems? gday! Rob -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Bug in NetSessionEnum implementation ?
Hi Everybody, It seems that there is a bug in the implementation of the MS Windows API function NetSessionEnum. I am using Windows XP against a Samba 3.023d domain controller. When NetSessionEnum is successful it is supposed to return either NERR_Success (0) when it is finished or ERROR_MORE_DATA when there is more data outstanding. In my program which tries to retrieve all currently logged-on users from the domain controller, NetSessionEnum always return NERR_Success, even if there is more data to come. NetSessionEnum returns data in chunks of 32 entries. So it pretends to be finished after the first 32 entries retrieved. I've developped a workaround for this, but I still think it is wrong. I'm not sure whether the bug is in Windows or in Samba, as I have no Windows based domain controller to test it. But I could imagine that the Samba server gives an incorrect response. BTW, the problem does not occur in my own program only, but can be reproduced in the computer management console of Windows XP like this: Open the computer management console, select Action-Connect to another computer, connect to the domain controller, click System Tools-Shared Folders-Sessions, and you will never see more than 32 entries, even if many more people are connected. Best, Peter Rindfuss -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Bug in NetSessionEnum implementation ?
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Peter Rindfuss wrote: Hi Everybody, It seems that there is a bug in the implementation of the MS Windows API function NetSessionEnum. I am using Windows XP against a Samba 3.023d domain controller. When NetSessionEnum is successful it is supposed to return either NERR_Success (0) when it is finished or ERROR_MORE_DATA when there is more data outstanding. Could you test the SAMBA_3_0_24 branch? That code has already been reworked. cheers, jerry = Samba--- http://www.samba.org Centeris --- http://www.centeris.com What man is a man who does not make the world better? --Balian -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.2.2 (Darwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFFtMS9IR7qMdg1EfYRAnftAKDZpOn+22DApb6Gc6Mgic7jIvIGoACg0vqY JrKuyMZZYPsdVyQ2kaA3BAY= =r0E1 -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] net ads info can't find the ldap server.
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Latrell Wang 王獻綱 wrote: Failed to parse cldap reply Can you send me a raw sniff from Wireshark? And a level 10 debug log from 'net ads info'? cheers, jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.2.2 (Darwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFFtMUtIR7qMdg1EfYRAuqlAKCrMRHnPTF0lkJWzFqV7ASApjMyNgCeP4A+ dsmGJx76nEC30nf7qX64tko= =BHrj -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Assign different shells to
Thanks for the reply - your idea is exactly want i want to do . I am setting up default winbind to no shell /sbin/false - the question how do i accomplish the secaond have of your answer which is to give certain users access to the shell /bin/bash - winbind users don't appear in /etc/passwd thats why I can't just user usermod -s /bin/bash username does anybody know who to give certain winbind users access to the shell while the global setting in smb.conf is set to /sbin/false Thanks On 1/21/07, Tim Boneko [EMAIL PROTECTED] wrote: M Azer schrieb: However, there are some users that require shell access. How can I set a real shell for those domain users that need a shell on the machine ? Hello! I don't have winbind installed and can't test it, but what about this idea: If winbind allowed to use some sort of default shell setting (like reading the shell from /etc/passwd), it should be possible to set a different shell for each user there and configure a winbind default shell like /bin/false for the rest of the users. The english section of my brain seems a bit sleepy today. Did you get my idea? And: is it any worth? timbo -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- Unless you try to do something beyond what you have already mastered, you will never grow. Ronald E. Osborn -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Slow samba transfer
What environment are you doing this in? In other words, is this over a wireless connection to a remote site? Perhaps something else? As a general rule of thumb, SMB is a MUCH less efficient protocol than others such as FTP. In a near perfect world (i.e. a controlled real world setting), I've found SMB to be between 35% and 45% as fast as FTP. This was independent of operating system. If you are doing SMB over a wireless link, it can be even worse if you have a problematic wireless connection that requires lots of retransmits. I'm betting you are doing this over wireless and you've got some serious interference or other issues going on. Am I even close? Roberto su tiscali wrote: Thats the diagnosis: transfering the same file via smb, scp and ftp I got big speed differences. SMB: file : 1Gb, transfer rate 15-35 kb/s SCP: file : 1Gb, transfer rate 360-780 kb/s FTP: file : 1Gb, transfer rate 360-780 kb/s Why is via smb so slow? Attachment is my own smb:conf, the same that's on air. [global] workgroup = NO1KNOWS netbios name = PBT server string = Samba %v, File server ; wins support = no ; wins server = w.x.y.z dns proxy = no os level = 64 ; name resolve order = lmhosts host wins bcast log file = /var/log/samba/log.%m max log size = 50 ; syslog only = no syslog = 0 panic action = /usr/share/samba/panic-action %d ### Authentication ### security = user encrypt passwords = yes passdb backend = tdbsam guest obey pam restrictions = yes ; guest account = nobody invalid users = root unix password sync = yes passwd program = /usr/bin/passwd %u passwd chat = *Enter\snew\sUNIX\spassword:* %n\n *Retype\snew\sUNIX\spassword:* %n\n . ; pam password change = no socket options = TCP_NODELAY IPTOS_LOWDELAY SO_SNDBUF=8192 SORCVBUF=8192 local master = yes domain master =yes #Other stuff ;-)) domain logons = yes hosts allow = 127.0.0.1 192.168.1.0/255.255.255.0 192.168.2.0/255.255.255.0 192.168.3.0/255.255.255.0 logon home = \\%L\%U\.profile logon path = \\%L\profile\%U logon drive = H: logon script = netlogon.bat [homes] comment = Home Directories browseable = no writable = yes create mask = 0700 directory mask = 0700 [profile] path = /home/samba/profile writable = yes browsable = no create mask = 600 directory mask = 700 # Un-comment the following and create the netlogon directory for Domain Logons # (you need to configure Samba to act as a domain controller too.) [netlogon] comment = Network Logon Service path = /home/samba/netlogon read only = yes write list = @admin guest ok = no writable = no share modes = no browsable = no [Tutto] path = /mnt/ writable = yes directory mask = 0754 browseable = yes # read only = yes guest ok = yes [Condivisa] path = /shared/ writable = yes directory mask = 0774 browseable = yes # read only = yes guest ok = yes Help a honest worker! thanx to all-- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Assign different shells to
I dupplicate the entry in /etc/passwd: getent passwd myuser return (resolved throught winbind): myuser:*:15507:10153::/home/myuser:/bin/false So I add exactly the same line in /etc/passwd only the shell is modified The idea is that the mapping uid - sid won't change Emmanuel Le lundi 22 janvier 2007 15:32, M Azer a écrit : Thanks for the reply - your idea is exactly want i want to do . I am setting up default winbind to no shell /sbin/false - the question how do i accomplish the secaond have of your answer which is to give certain users access to the shell /bin/bash - winbind users don't appear in /etc/passwd thats why I can't just user usermod -s /bin/bash username does anybody know who to give certain winbind users access to the shell while the global setting in smb.conf is set to /sbin/false Thanks On 1/21/07, Tim Boneko [EMAIL PROTECTED] wrote: M Azer schrieb: However, there are some users that require shell access. How can I set a real shell for those domain users that need a shell on the machine ? Hello! I don't have winbind installed and can't test it, but what about this idea: If winbind allowed to use some sort of default shell setting (like reading the shell from /etc/passwd), it should be possible to set a different shell for each user there and configure a winbind default shell like /bin/false for the rest of the users. The english section of my brain seems a bit sleepy today. Did you get my idea? And: is it any worth? timbo -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- Unless you try to do something beyond what you have already mastered, you will never grow. Ronald E. Osborn -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] problem establishing a trust to Win2003 and samba
Hello, I have a problem establishing a trust to Win2003 (domaine testcoet) and samba (domaine broceliande) where the Windows domain is the trusted domain. When I try to establish the trust from the samba side, I get the following error: net rpc trustdom establish testcoet Could not connect to server W31INFO [2005/06/22 11:41:35, 0, effective(0, 0), real(0, 0)] rpc_client/cli_pipe.c:cli_nt_session_open(1451) cli_nt_session_open: cli_nt_create failed on pipe \wkssvc to machine W31INFO. Error was NT_STATUS_ACCESS_DENIED [2005/06/22 11:41:35, 0, effective(0, 0), real(0, 0)] utils/net_rpc.c:rpc_trustdom_establish(4672) Couldn't not initialise wkssvc pipe Dou you have find a solution ? -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Samba members in NT4.0 to AD upgrade
Hi, I've got an NT4.0 domain that I'm planning to upgrade to Active Directory. I've got a couple of Samba member servers in the domain, various versions above 3.0. So I have two questions: 1. Are there any gotchas with this scenario or will the Samba clients just keep working as NT4-esque clients. 2. Is it possible to upgrade a Samba member server to be an Active Directory client whilst retaining the user entries for file shares etc. (i.e. so the SIDs still match). Thanks in advance for any help, Leon... ___ Now you can scan emails quickly with a reading pane. Get the new Yahoo! Mail. http://uk.docs.yahoo.com/nowyoucan.html -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Name mangling
Hi all. I'm in the same boat as this http://groups.google.com/group/linux.samba/browse_thread/thread/b7ca67f0 bfe9a201/8c0b8b75e44eae61?lnk=stq=manglingrnum=11#8c0b8b75e44eae61, but setting mangling method = hash, had no effect, altough i've havent't restart samba yet, just reload and killed the daemon associated with my client computer. Is this going to provde me with the longfilename to longfil~1 mangling result? TIA. Bruno Guerreiro -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] checking a locked file
I've been trying to determine if a file is locked by samba from unix. Is
there some magic incantation to find this? E.g. if someone is copying a file
in from a windows system via samba.
I'm using the default locking parameters on 3.0.10 with a 2.6 kernel. I've
tried checking posix byte ranges, posix locking, and kernel op locks.
Here is my test program:
#include sys/types.h
#include unistd.h
#include fcntl.h
#include stdio.h
/* kernel op locks */
#define F_GETLEASE 1025
int main(int argc, char **argv)
{
struct flock the_lock;
int f;
int retlck;
int smblck;
if(argc != 2) {
fprintf(stdout, Usage: %s file\n, argv[0]);
return 1;
}
f = open(argv[1], O_RDONLY);
the_lock.l_type = F_WRLCK;
the_lock.l_whence = SEEK_SET;
the_lock.l_start = 0;
the_lock.l_len = 0;
if(f = 0) {
fprintf(stderr, Cannot open file: %s\n, argv[1]);
return 1;
}
fcntl(f, F_GETLK, the_lock);
retlck = flock(f, LOCK_EX | LOCK_NB);
smblck = fcntl(f, F_GETLEASE, 0);
fprintf(stdout, smblck: %x\n, smblck);
close(f);
if((the_lock.l_type == F_UNLCK) (retlck == 0))
{
fprintf(stdout, File is not locked\n);
}
else
{
fprintf(stdout, File is locked\n);
return 1;
}
return 0;
}
--
To unsubscribe from this list go to the following URL and read the
instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] winbind - timeouts in domain with 100000 domain users
Hi, I'm trying out samba with winbind. The domain has 10 users and I'm having some problems with the wbinfo and getent programs. The server is domain member and running debin etch (x86_64) with samba-3.0.23d. idmap uid = 7-30 idmap gid = 7-30 winbind enum users = yes winbind enum groups = yes winbind use default domain = yes template shell = /bin/false security = domain $ wbinfo -i emea\\ralfgro ralfgro:*:7:7:Gross, Ralf:/home/EMEA/ralfgro:/bin/false $ wbinfo -t checking the trust secret via RPC calls succeeded $ id -a ralfgro ...long timeout $ getent passwd [local unix users] ...long timeout Sometimes I get back the list of domain users, but this happens only rarely. During the these commands I can't connect to my shares with my domain account. Even the top and ps commands seem to hang. session setup failed: Call timed out: server did not respond after 2 milliseconds If I do an 'ls -l' in a dirctory with files that belong to a doamin user, it sometimes takes ages to return the file list. I have a local unix account ralfgro that has uid 50789 and a domain account that is mapped to uid 7. If I now copy files to the server using smbclient they are created with my domain uid. If I create files with an editor on the local fs (vim) they have the uid of my unix account. Is this the way it should be? I ask this, because an old server should be migrate to this new hardware and there are many unix accounts and much data that already belong to users. The old server has never been member of this domain, only 'security = server' was used for authentication. /etc/passwd ralfgro:x:50789:50789::/home/ralfgro:/bin/sh $ wbinfo -i emea\\ralfgro ralfgro:*:7:7:Gross, Ralf:/home/EMEA/ralfgro:/bin/false $ ls -l /tmp/foo insgesamt 48 -rw-r--r-- 1 ralfgro ralfgro 5 2007-01-22 14:13 test -rw-rw 1 ralfgro domain users 41180 2007-01-22 14:11 test2 $ ls -ln /tmp/foo insgesamt 48 -rw-r--r-- 1 50789 50789 5 2007-01-22 14:13 test -rw-rw 1 7 7 41180 2007-01-22 14:11 test2 Ralf -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] winbind - timeouts in domain with 100000 domain users
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Ralf Gross wrote: Hi, I'm trying out samba with winbind. The domain has 10 users and I'm having some problems with the wbinfo and getent programs. The server is domain member and running debin etch (x86_64) with samba-3.0.23d. idmap uid = 7-30 idmap gid = 7-30 winbind enum users = yes winbind enum groups = yes Is there any real reason that you have these enabled? jerry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.2.2 (Darwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFFtO7YIR7qMdg1EfYRArIbAJ4+7kaiGXPiFcbOVY2R9Ek9RQ19BgCg5o9W U9M0A3OH1/bnUv5fQPsSyEQ= =FRnL -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] winbind - timeouts in domain with 100000 domain users
Gerald (Jerry) Carter schrieb: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Ralf Gross wrote: Hi, I'm trying out samba with winbind. The domain has 10 users and I'm having some problems with the wbinfo and getent programs. The server is domain member and running debin etch (x86_64) with samba-3.0.23d. idmap uid = 7-30 idmap gid = 7-30 winbind enum users = yes winbind enum groups = yes Is there any real reason that you have these enabled? From the smb.conf man page. Warning Turning off user enumeration may cause some programs to behave oddly. For example, the finger program relies on having access to the full user list when searching for matching usernames. Default: winbind enum users = no I tried both settings but I couldn't see any difference. This is with winbind enum users/groups = no $ wbinfo -t checking the trust secret via RPC calls succeeded $ wbinfo -i emea\\ralfgro ralfgro:*:7:7:Gross, Ralf:/home/EMEA/ralfgro:/bin/false $ wbinfo -u ...hangs ctrl-c $ wbinfo -i emea\\ralfgro Could not get info for user emea\ralfgro Tha main problem ist not that wbinfo doesn't return all users, it's the fact that winbind seems to be completely unaccessible afterwards. [2007/01/22 18:26:14, 0] rpc_client/cli_pipe.c:rpc_api_pipe(790) rpc_api_pipe: Remote machine pipe \NETLOGON fnum 0x4015returned critical error. Error was Call timed out: server did not respond after 1 milliseconds [2007/01/22 18:26:16, 1] libsmb/clientgen.c:cli_rpc_pipe_close(376) cli_rpc_pipe_close: cli_close failed on pipe \NETLOGON, fnum 0x4015 to machine SSTRD010. Error was Call timed out: server did not respond after 1 milliseconds $ /etc/init.d/winbind stop Stopping the Winbind daemon: winbind. $ pgrep -l -f winbind 24262 /usr/sbin/winbindd -B 24263 /usr/sbin/winbindd -B $ pkill -9 winbindd $ pgrep -l -f winbind $ /etc/init.d/winbind start Starting the Winbind daemon: winbind. $ wbinfo -i emea\\ralfgro ralfgro:*:7:7:Gross, Ralf:/home/EMEA/ralfgro:/bin/false winbind didn't respond until I killed the process and restarted the daemon. At the same time winbind hung on this system I could execute 'wbinfo -i emea\\ralfgro' on an other system with success. Ralf -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Duplicate Desktop Icons...
Hi,
I posted this problem a while back but wasn't able to resolve the issue.
It's gotten worse--now almost all of my users in the network have the
duplicate icon problem.
I'm recently upgraded to samba-3.0.23d from 3.0.21 on an OpenBSD 4.0
server. I'm using folder redirection to redirect the Application Data,
Desktop, My Documents, and Favorites folders off to
%LOGONSERVER%\profiles\%USERNAME%\ on the server by changing the
appropriate values in the registry with regedt32. Additionally, I've
used mmc to make these changes to use local profiles with folder
redirection.
Local Computer Policy-Administrative Templates-System-User Profiles
Do not check for user ownership of Roaming Profile Enabled
Delete cached copies of roaming profilesDisabled
Prevent roaming profile changes from propagatingEnabled
Only allow local user profiles Enabled
User Configuration-Administrative Templates-System-User Profiles
Exclude directories in roaming profile Enabled
Directories Excluded
Application Data;Desktop;My Documents;Favorites
Most of my users now have duplicate icons on their desktops. For
example, if there is a file named test.doc in the
/profiles/username/Desktop directory on the server, their desktop will
actually display two icons for the file. The properties on either icon
show its location to be \\SAMBA\profiles\username\Desktop, and deleting
one of the icons will make the other also go away when the desktop is
refreshed.
The My Documents folder does not display this double icon problem when I
open the folder, so I don't think the problem is specific to folder
redirection.
I didn't have any luck finding anything about this problem on Google, so
any insights would be greatly appreciated.
My smb.conf file is below.
Thanks,
Jeff Ross
[global]
workgroup = WYKIDS
netbios name = Samba
interfaces = em0
bind interfaces only = Yes
passdb backend = tdbsam
pam password change = Yes
passwd program = /usr/bin/passwd %u
passwd chat = *New*Password* %n\n *Re-enter*new*password*%n\n
*Password*changed*
username map = /etc/samba/smbusers
unix password sync = Yes
debug timestamp = no
log level = 1
syslog only = yes
syslog = 3
smb ports = 139
name resolve order = wins bcast hosts
time server = Yes
#printcap name = CUPS
#show add printer wizard = No
add user script = /usr/sbin/useradd -m '%u'
delete user script = /usr/sbin/userdel -r '%u'
add group script = /usr/sbin/groupadd '%g'
delete group script = /usr/sbin/groupdel '%g'
add user to group script = /usr/sbin/usermod -G '%g' '%u'
add machine script = /usr/sbin/useradd -s /bin/false -d /tmp '%u'
;shutdown script = /var/lib/samba/scripts/shutdown.sh
preexec = sh -c 'echo \Welcome to %S!\ |/usr/local/bin/smbclient
-M %m -I %I'
abort shutdown script = /sbin/shutdown -c
logon drive = H:
logon home = \\%L\%U
logon path = \\%L\Profiles\%U
logon script = scripts\logon.bat
domain logons = Yes
preferred master = Yes
wins support = Yes
utmp = Yes
map acl inherit = Yes
#printing = cups
#cups options = Raw
printing = bsd
veto files = /*.eml /*.nws/ *.{*}/
veto oplock files = /*.doc /*.xls /*.mdb /*.pdf /*.PST
passdb expand explicit = no
nt acl support = no
# Share Definitions
==
[homes]
comment = Home Directories
valid users = %S
read only = No
browseable = No
default case = lower
preserve case = no
short preserve case = no
mangled names = yes
case sensitive = no
writable = yes
[netlogon]
comment = Network Logon Service
path = /var/netlogon
writable = yes
browsable = yes
[Profiles]
path = /profiles
writable = yes
create mask = 0600
directory mask = 0700
browsable = yes
acl check permissions = no
hide files = /desktop.ini/outlook*.lnk/*Briefcase*/Thumbs.db
# NOTE: If you have a BSD-style print system there is no need to
# specifically define each individual printer
[printers]
comment = All Printers
path = /var/spool/samba
browseable = no
# Set public = yes to allow user 'guest account' to print
guest ok = no
writable = no
printable = yes
[Apps]
comment = Applications
path = /apps
read only = no
public = yes
create mask = 1775
directory mask = 1775
[Bookkeeping]
comment = Bookkeeping
path = /bookkeeping
read only = no
public = no
[archives]
comment = Archives
path = /archives
read only = yes
public = yes
[Shared]
comment = Shared
path = /shared
read only = no
public = yes
create mask = 1775
directory mask = 1775
[STARS]
comment = STARS
path = /stars
read only = no
public = yes
create mask = 1775
directory mask = 1775
[Backup]
comment = Backup
path = /backup
read only = no
public = yes
[Music]
comment = Music
path = /music
read only = no
public = yes
--
To unsubscribe from
[Samba] Synchronization between Windows XP and samba
Hi, I'm using samba version 2.2.9. On the clientside I'm using Windows XP. Samba is running as pdc and while I'm in the office, all works fine. During my session, I can create documents in my personal folder (for example on my desktop) and when I log out, all files are synced to my serverside profile. When I work offline (so that I'm not connected to the pbc) and I create files (*.docs, *.xls, ... ), then these file will be stored in my personal folders too. The next time I connect to the pdc my local profile will be synced to the serverside profil. The files on my client are still in the same direction. Now I log out and the files, generated in offline mode are not synced to my serverside profil. I already checked the samba.log generated for this client, but it's looking ok. What do I do wrong? Why are these files not synced by samba as the pdc? Are there any hints? Markus -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Multi share point to the same drive letter
Have you tried valid users = hide unreadable = yes Would that work for you? M Azer wrote: I have the same setup where all of my Dept shares under a parent share for example finance, sales, IT are all under the shares folder and i have setup a one login script in the user profile to map to the parent share net use P: \\samba\shares however if someone from the sales group log in he will see all 3 share but will only be permitted to go in the sales share same works with the other group members. What I am trying to do is when the sales user log in I only want the user to see the Sales folder 'share' only not the other two shares. I have set the right permission on all shares where the each group own the folder for example sales folder will be owned by the root and the group will be the sales group sales rwxrwx000 root sales however when someone not a member of the sales group logon they still see the sales folder 'share' On 1/20/07, *Dale Schroeder* [EMAIL PROTECTED] mailto:[EMAIL PROTECTED] wrote: I did exactly that by creating a super share. For example, if you have shared directories /data/finance, /data/IT, and /data/Devel, you can map the drive letter P to the shared directory /data. Adjust the configurations of the super share and subshares to provide the controlled access that you wish. Good luck, Dale M Azer wrote: I have samba 3 setup up as ads for windows 2003 AD. is there any way to create multiable shares in Samba that point to same drive letter. for instance: [finance] [IT] [Devel] what I want to accomplish is when the user double click MY Computer 2 network drive exist H for user home P for Company shares which should show the 3 above shares Thanks -- Unless you try to do something beyond what you have already mastered, you will never grow. Ronald E. Osborn No virus found in this incoming message. Checked by AVG. Version: 7.5.441 / Virus Database: 268.17.4/644 - Release Date: 01/22/2007 07:30 AM -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Synchronization between Windows XP and samba
On Monday 22 January 2007 13:10, Markus Lauterbach wrote: Are there any hints? For starters, here's a couple of hints: 1) Don't step on another thread by using reply to create a new thread. Your new subject post get's buried in the current thread and you destroy the continuity of the current thread. 2) Upgrade to a current version of Samba. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Multi share point to the same drive letter
This what i did. Not what i was looking for but it works fine - now when users logon they see 3 shares Home, Public and their group share. Not sure if this is the way everybody is doing it but if there is a better way please let me know /Shares drwxrws--- 4 root devel 4096 Jan 22 12:50 devel drwxrws--- 4 root finance 4096 Jan 22 10:51 fin drwxrws--- 3 root it4096 Jan 22 11:39 it drwxrwx--- 5 root Domain Users 4096 Jan 22 12:50 pub Login script: net use H: \\itbox\%username% /persistent:no net use P: \\itbox\Public Share /persistent:no net use O: \\itbox\Development Dept Share /persistent:no net use F: \\itbox\Finance Dept Share /persistent:no net use I: \\itbox\Info Sys Dept Share /persistent:no smb.conf [homes] comment = Users Home Directories read only = no browseable = no [Development Dept Share] comment = Development Dept Share path = /shares/devel public = no browseable = yes writable = yes directory mask = 0770 create mask = 0770 [Finance Dept Share] comment = Finance Dept Share path = /shares/fin public = no browseable = yes writable = yes directory mask = 0770 create mask = 0770 [Info Sys Dept Share] comment = IT Dept Share path = /shares/it public = no browseable = yes writable = yes directory mask = 0770 create mask = 0770 [Public Share] comment = CAD Public Share path = /shares/pub public = no browseable = yes writable = yes directory mask = 0770 create mask = 0770 On 1/22/07, Dale Schroeder [EMAIL PROTECTED] wrote: Have you tried valid users = hide unreadable = yes Would that work for you? M Azer wrote: I have the same setup where all of my Dept shares under a parent share for example finance, sales, IT are all under the shares folder and i have setup a one login script in the user profile to map to the parent share net use P: \\samba\shares however if someone from the sales group log in he will see all 3 share but will only be permitted to go in the sales share same works with the other group members. What I am trying to do is when the sales user log in I only want the user to see the Sales folder 'share' only not the other two shares. I have set the right permission on all shares where the each group own the folder for example sales folder will be owned by the root and the group will be the sales group sales rwxrwx000 root sales however when someone not a member of the sales group logon they still see the sales folder 'share' On 1/20/07, Dale Schroeder [EMAIL PROTECTED] wrote: I did exactly that by creating a super share. For example, if you have shared directories /data/finance, /data/IT, and /data/Devel, you can map the drive letter P to the shared directory /data. Adjust the configurations of the super share and subshares to provide the controlled access that you wish. Good luck, Dale M Azer wrote: I have samba 3 setup up as ads for windows 2003 AD. is there any way to create multiable shares in Samba that point to same drive letter. for instance: [finance] [IT] [Devel] what I want to accomplish is when the user double click MY Computer 2 network drive exist H for user home P for Company shares which should show the 3 above shares Thanks -- Unless you try to do something beyond what you have already mastered, you will never grow. Ronald E. Osborn -- No virus found in this incoming message. Checked by AVG. Version: 7.5.441 / Virus Database: 268.17.4/644 - Release Date: 01/22/2007 07:30 AM -- Unless you try to do something beyond what you have already mastered, you will never grow. Ronald E. Osborn -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] slow streaming but fast copy
Hi List, I wanted to update you on progress made. I downgraded my samba package from the latest samba.org debian stable package to the stock debian package which came with the latest sarge (samba 3.0.14a-Debian). I re-enabled oplocks for my configuration. After this I noticed the following: - Playing MP3's from the network share(s) improved but is not yet optimal - Playing Video's from the network share(s) still is an issue - copying a large file (700 MB ISO) from the share(s) sometimes takes a long time: - It only takes a long time if an oplock EXCLUSIVE+BATCH is granted - when the oplock breaks (and returns to Level II or none), copying goes lightning fast! - I have increased the debugging level but don't see any differences in logging between a correct (fast) copy a slow copy Could this have something to do with my CPU/kernel configuration (see original below)? Or maybe someone knows extra debugging, steps, I might take to tackle this issue? I am getting desperate in this matter ;-) Kind regards, Tom -Original Message- From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] On Behalf Of Tom Van den Eynde Sent: zaterdag 6 januari 2007 13:32 To: samba@lists.samba.org Subject: [Samba] slow streaming but fast copy Hi List, I have some very strange problems with samba on my shiny new server. The first problem was that file transfers were very slow (copying a file of 700Mb took 50 minutes over 100Mbit network). I checked other protcols (ftp/http/scp) on the server and they were able to use the 100Mbit link for full. After a lot of debugging, I found that the problem was related to oplocks. When disabling oplocks, the same file was copied in just under 2 minutes. However a second problem occured. Although copying files of the samba file share works perfectly, playing mp3 files of the share does not. When I open up any mp3 player and want to play a file, it stutters and it is impossible to listen to. With Winamp, I mangaged to get some quality by setting the buffer to 100Mb but I don't want to do this at every pc and in every mp3 client. I tried different settings (tcp_nodelay, SNDBUF, SRVBUF, TCP_TOS) but no effect there. I also ran a tcpdump when copying a file (good) and when streaming a file (bad) but there are no noticable differences there. On the samba server, there is also a VMware server running so I tried setting up a Win VM in there (on the same physical server) and when I stream files from the Windows VM, I have no problems whatsoever This leads me to believe that there is a problem with either samba or the linux kernel. The server specs are the following: Hardware: Core 2 Duo 6600, 2 GB DDR RAM, 500 GB SATA, Asus Mobo with Realtek 10/100/1000 NIC OS: Debian Stable 3.1, Linux Version 2.6.19.1 SMP SAMBA: 3.0.23d (from apt repository at samba.org) Sanitized smb.conf: [global] panic action = /usr/share/samba/panic-action %d workgroup = TESTGROUP netbios name = server server string = VDE Server hosts allow = 1.2.3.4 printcap name = cups load printers = yes printing = cups log file = /var/log/samba/log.%m max log size = 500 log level = 1 security = user encrypt passwords = true passdb backend = tdbsam smb passwd file = /etc/samba/smbpasswd unix password sync = Yes passwd program = /usr/bin/passwd %u passwd chat = *New*UNIX*password* %n\n *ReType*new*UNIX*password* %n\n *passwd:*all*authentication*tokens*updated*successfully* socket options = TCP_NODELAY oplocks = no level2 oplocks = no interfaces = 1.2.3.4/24 local master = yes os level = 65 domain master = yes preferred master = yes time server = yes domain logons = no wins support = yes dns proxy = yes preserve case = yes short preserve case = yes case sensitive = no [mp3] path = /home/mp3 comment= MP3 disk public = yes guest ok = yes writable = yes printable = no force user = nobody force group = nogroup Does anyone has a clue what might be wrong? Oh yeah, the same smb.conf worked perfectly on the old server (with oplocks enabled that is) Many thanks, Kind regards, Tom -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Prevent windows users from changing file/folder permission
how do i prevent windows users from changing file/folder permission? In my smb.conf i have directory security mask = security mask = force security mode = 777 but I am still able to change the files attributes read-only Hidden Archive -- Unless you try to do something beyond what you have already mastered, you will never grow. Ronald E. Osborn -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] slow streaming but fast copy
Tom Van den Eynde wrote: - I have increased the debugging level but don't see any differences in logging between a correct (fast) copy a slow copy Be aware that turning on debugging massively impacts throughput performance. We were seeing only 50Mbs on Samba servers (with 100M cards) and couldn't figure out what was wrong. Then we noticed log level = 9 ;-) Turning that off kicked performance up to 80Mbs - which is equivalent to our Win2K3 servers. -- Cheers Jason Haar Information Security Manager, Trimble Navigation Ltd. Phone: +64 3 9635 377 Fax: +64 3 9635 417 PGP Fingerprint: 7A2E 0407 C9A6 CAF6 2B9F 8422 C063 5EBB FE1D 66D1 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Mode 0x1b4 errors in logs, unable to save Word documents
Since you are running an rc version of an older release... maybe you should update first? I would, but upgrading a production machine can be a bit of a hassle especially when you don't know if it will fix the problem (since it works perfectly otherwise.) There seems to be a bit of recent discussion about this but no definite response, so I'm not so sure it has been fixed. Cheers, Adam. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Duplicate Desktop Icons...
Most of my users now have duplicate icons on their desktops. Just a guess, but Windows has two desktop locations. There's the All Users desktop and the user's personal desktop. The icons displayed are those two locations combined. If the All Users desktop is somehow pointing to the same location as the user's personal desktop, that could explain why there are duplicate icons. Cheers, Adam. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] winbind - timeouts in domain with 100000 domain users
Sometimes I get back the list of domain users, but this happens only rarely. During the these commands I can't connect to my shares with my domain account. Even the top and ps commands seem to hang. security = domain I had this same issue with security=domain. Changing to security=ads fixed the problem. It seems that domain mode requires a complete list of users, whereas ads mode is quite happy to look up single users as and when required. I also found that security=domain would not reliably detect changes to group membership. Sometimes reloading winbind would bring the changes through, sometimes it wouldn't. Again, changing to security=ads fixed this. I have a local unix account ralfgro that has uid 50789 and a domain account that is mapped to uid 7. So ralfgro == 50789 and domain == 7 If I now copy files to the server using smbclient they are created with my domain uid. Correct, as smbclient is connecting with uid 7. If I create files with an editor on the local fs (vim) they have the uid of my unix account. Correct, assuming you're logged on as ralfgro at the time. Is this the way it should be? I ask this, because an old server should be migrate to this new hardware and there are many unix accounts and much data that already belong to users. The old server has never been member of this domain, only 'security = server' was used for authentication. The only way you can fix this is to make sure that each domain account is mapped to the same UID as the local user. There are a number of ways of doing this, check the Samba manual for details. It may be easier to use SMB for authentication as well, so that the UNIX users no longer log in with their local username, but the SMB username (which in your case would mean you'd be logging on with UID 7.) This way you wouldn't need to manually map any domain accounts to UIDs. Cheers, Adam. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Remote Registry Changes
Heyho. I'm trying to add registry entries to my workstations remotely from my server. I can currently do this remotely from any other workstation, using the standard Windows regedt32, but I'd like to do it form the server. .. The server is Samba 3.0.22-r3 on a Gentoo server. I've been digging around for a while now, and have managed to find docs for samba-tng which seem to allow this (which is useless to me as I'm not using samba-tng :) ), and a couple of sites that suggest that the command 'regcreatekey' should be usable with the rpcclient command. (One example is from http://www.linuxtopia.org/online_books/ network_administration_guides/using_samba_book/appd_01_00.html). Actually, I even seem to find a reference to them in the patch file here: (http://lists.samba.org/archive/samba-cvs/2005-February/ 054808.html) Anyway, there is no documentation of this (or any similar) commands in the rpcclient man page, or help text, nor the net command's man page or help text, and no attempts to find them or get them to work have worked. So ... has this been removed or something? More importantly, it actually possible to do what I want? Thanks -- Matt Skerritt [EMAIL PROTECTED] -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] login problem with domain users
Hi all, I am using samba 3.0.23d on my linux machine. This machine is connected in a domain where all other users are using domain username and password to login. but with this username and password they are unable to login in samba. my smb.conf file is like following, [global] workgroup = BSIL server string = Samba testing encrypt passwords = yes os level = 20 security = ads netbios name = MDT506 [data] path = /export guest ok = yes writeable = yes browseable = yes guest only = yes I want everyone(domain user , guest accounts and others without password also) to access this share. can anyone help me in this regard. Regards, Mahesh Pawar. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Compiled smbd and nmbd doesn't start up
do you know if could be such a problem with any ubuntu systems? You'll need to tell us what errors are printed before we can help! Try tail /var/log/messages if your system is set up that way. Cheers, Adam. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
svn commit: samba r20945 - in branches/SAMBA_4_0/source/cluster/ctdb: . common include
Author: tridge
Date: 2007-01-22 09:35:26 + (Mon, 22 Jan 2007)
New Revision: 20945
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20945
Log:
fixed the bug causing locktest to fail with the ctdb backend after a
couple of hundred opertations. Also removed a lot of the debug code I
was using to track this down.
Modified:
branches/SAMBA_4_0/source/cluster/ctdb/brlock_ctdb.c
branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb.c
branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_call.c
branches/SAMBA_4_0/source/cluster/ctdb/common/ctdb_ltdb.c
branches/SAMBA_4_0/source/cluster/ctdb/include/ctdb_private.h
Changeset:
Modified: branches/SAMBA_4_0/source/cluster/ctdb/brlock_ctdb.c
===
--- branches/SAMBA_4_0/source/cluster/ctdb/brlock_ctdb.c2007-01-22
04:04:36 UTC (rev 20944)
+++ branches/SAMBA_4_0/source/cluster/ctdb/brlock_ctdb.c2007-01-22
09:35:26 UTC (rev 20945)
@@ -101,8 +101,6 @@
brl-server = server;
brl-messaging_ctx = messaging_ctx;
- DEBUG(0,(brl_ctdb_init: brl=%p\n, brl));
-
return brl;
}
@@ -116,9 +114,6 @@
return NULL;
}
- DEBUG(0,(file_key\n));
- dump_data(0,file_key-data, file_key-length);
-
brlh-key = *file_key;
brlh-ntvfs = ntvfs;
ZERO_STRUCT(brlh-last_lock);
@@ -261,23 +256,6 @@
return NT_STATUS_LOCK_NOT_GRANTED;
}
-
-static void show_locks(const char *op, struct lock_struct *locks, int count)
-{
- int i;
- DEBUG(0,(OP: %s\n, op));
- for (i=0;icount;i++) {
- DEBUG(0,(%2d: %4d %4d %d.%d.%d %p %p\n,
-i, (int)locks[i].start, (int)locks[i].size,
-locks[i].context.server.node,
-locks[i].context.server.id,
-locks[i].context.smbpid,
-locks[i].context.ctx,
-locks[i].ntvfs));
- }
-}
-
-
struct ctdb_lock_req {
uint16_t smbpid;
uint64_t start;
@@ -333,23 +311,11 @@
lock.lock_type = req-lock_type;
lock.notify_ptr = req-notify_ptr;
- {
- int xlen = sizeof(lock);
- uint8_t *xx = lock;
- int ii, fd = open(/dev/null, O_WRONLY);
- for (ii=0;iixlen;ii++) {
- write(fd, xx[ii], 1);
- }
- close(fd);
- }
-
if (dbuf.dptr) {
/* there are existing locks - make sure they don't conflict */
locks = (struct lock_struct *)dbuf.dptr;
count = dbuf.dsize / sizeof(*locks);
- show_locks(lock, locks, count);
-
for (i=0; icount; i++) {
if (brl_ctdb_conflict(locks[i], lock)) {
status = NT_STATUS_LOCK_NOT_GRANTED;
@@ -375,8 +341,6 @@
status = NT_STATUS_LOCK_NOT_GRANTED;
}
- DEBUG(0,(lock: size now %d\n, call-new_data-dsize));
-
reply:
call-reply_data = talloc(call, TDB_DATA);
if (call-reply_data == NULL) {
@@ -428,10 +392,9 @@
req.server = brl-server;
req.brl = brl;
req.ntvfs = brlh-ntvfs;
-
+
ret = ctdb_call(brl-ctdb, kbuf, FUNC_BRL_LOCK, rbuf, sbuf);
if (ret == -1) {
- DEBUG(0,(ctdb_call failed - %s\n, __location__));
return NT_STATUS_INTERNAL_DB_CORRUPTION;
}
@@ -523,8 +486,6 @@
locks = (struct lock_struct *)dbuf.dptr;
count = dbuf.dsize / sizeof(*locks);
- show_locks(unlock, locks, count);
-
for (i=0; icount; i++) {
struct lock_struct *lock = locks[i];
@@ -561,10 +522,6 @@
}
}
- if (call-new_data) {
- DEBUG(0,(unlock: size now %d\n, call-new_data-dsize));
- }
-
if (i == count) {
/* we didn't find it */
status = NT_STATUS_RANGE_NOT_LOCKED;
@@ -650,8 +607,6 @@
locks = (struct lock_struct *)dbuf.dptr;
count = dbuf.dsize / sizeof(*locks);
- show_locks(remove_pending, locks, count);
-
for (i=0; icount; i++) {
struct lock_struct *lock = locks[i];
@@ -676,10 +631,6 @@
}
}
- if (call-new_data) {
- DEBUG(0,(remove_pending: size now %d\n,
call-new_data-dsize));
- }
-
if (i == count) {
/* we didn't find it */
status = NT_STATUS_RANGE_NOT_LOCKED;
@@ -769,8 +720,6 @@
locks = (struct lock_struct *)dbuf.dptr;
count = dbuf.dsize / sizeof(*locks);
- show_locks(locktest, locks, count);
-
for (i=0; icount; i++) {
if (brl_ctdb_conflict_other(locks[i], lock)) {
status = NT_STATUS_FILE_LOCK_CONFLICT;
@@ -860,11
svn commit: samba r20946 - in branches/SAMBA_4_0/source/cluster/ctdb: .
Author: tridge
Date: 2007-01-22 11:45:48 + (Mon, 22 Jan 2007)
New Revision: 20946
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20946
Log:
fixed another couple of bugs in the brlock ctdb backend. It now
survives very long random locktest runs.
Modified:
branches/SAMBA_4_0/source/cluster/ctdb/brlock_ctdb.c
Changeset:
Modified: branches/SAMBA_4_0/source/cluster/ctdb/brlock_ctdb.c
===
--- branches/SAMBA_4_0/source/cluster/ctdb/brlock_ctdb.c2007-01-22
09:35:26 UTC (rev 20945)
+++ branches/SAMBA_4_0/source/cluster/ctdb/brlock_ctdb.c2007-01-22
11:45:48 UTC (rev 20946)
@@ -81,6 +81,23 @@
struct lock_struct last_lock;
};
+#if 0
+static void show_locks(const char *op, struct lock_struct *locks, int count)
+{
+ int i;
+ DEBUG(0,(OP: %s\n, op));
+ for (i=0;icount;i++) {
+ DEBUG(0,(%2d: %4d %4d %d.%d.%d %p %p\n,
+i, (int)locks[i].start, (int)locks[i].size,
+locks[i].context.server.node,
+locks[i].context.server.id,
+locks[i].context.smbpid,
+locks[i].context.ctx,
+locks[i].ntvfs));
+ }
+}
+#endif
+
/*
Open up the brlock.tdb database. Close it down using
talloc_free(). We need the messaging_ctx to allow for
@@ -472,7 +489,7 @@
struct ctdb_unlock_req *req = (struct ctdb_unlock_req
*)call-call_data-dptr;
TDB_DATA dbuf;
int count, i;
- struct lock_struct *locks;
+ struct lock_struct *locks, *lock;
struct lock_context context;
NTSTATUS status = NT_STATUS_OK;
@@ -487,38 +504,53 @@
count = dbuf.dsize / sizeof(*locks);
for (i=0; icount; i++) {
- struct lock_struct *lock = locks[i];
-
+ lock = locks[i];
if (brl_ctdb_same_context(lock-context, context)
lock-ntvfs == req-ntvfs
lock-start == req-start
lock-size == req-size
+ lock-lock_type == WRITE_LOCK) {
+ break;
+ }
+ }
+ if (i count) goto found;
+
+ for (i=0; icount; i++) {
+ lock = locks[i];
+ if (brl_ctdb_same_context(lock-context, context)
+ lock-ntvfs == req-ntvfs
+ lock-start == req-start
+ lock-size == req-size
lock-lock_type PENDING_READ_LOCK) {
+ break;
+ }
+ }
+
+found:
+ if (i count) {
#if ENABLE_NOTIFIES
- struct lock_struct removed_lock = *lock;
+ struct lock_struct removed_lock = *lock;
#endif
- call-new_data = talloc(call, TDB_DATA);
- if (call-new_data == NULL) {
- return CTDB_ERR_NOMEM;
- }
-
- call-new_data-dptr = talloc_size(call, dbuf.dsize -
sizeof(lock));
- if (call-new_data-dptr == NULL) {
- return CTDB_ERR_NOMEM;
- }
- call-new_data-dsize = dbuf.dsize - sizeof(lock);
-
- memcpy(call-new_data-dptr, locks, i*sizeof(lock));
- memcpy(call-new_data-dptr+i*sizeof(lock), locks+i+1,
- (count-(i+1))*sizeof(lock));
-
- if (count 1) {
+ call-new_data = talloc(call, TDB_DATA);
+ if (call-new_data == NULL) {
+ return CTDB_ERR_NOMEM;
+ }
+
+ call-new_data-dptr = talloc_size(call, dbuf.dsize -
sizeof(*lock));
+ if (call-new_data-dptr == NULL) {
+ return CTDB_ERR_NOMEM;
+ }
+ call-new_data-dsize = dbuf.dsize - sizeof(*lock);
+
+ memcpy(call-new_data-dptr, locks, i*sizeof(*lock));
+ memcpy(call-new_data-dptr+i*sizeof(*lock), locks+i+1,
+ (count-(i+1))*sizeof(*lock));
+
+ if (count 1) {
#if ENABLE_NOTIFIES
- brl_ctdb_notify_unlock(req-brl, locks, count,
removed_lock);
+ brl_ctdb_notify_unlock(req-brl, locks, count,
removed_lock);
#endif
- }
- break;
}
}
@@ -618,15 +650,15 @@
return CTDB_ERR_NOMEM;
}
- call-new_data-dptr = talloc_size(call, dbuf.dsize -
sizeof(lock));
+ call-new_data-dptr = talloc_size(call, dbuf.dsize -
sizeof(*lock));
if (call-new_data-dptr == NULL) {
svn commit: samba r20947 - in branches/SAMBA_4_0/source/ntvfs/common: .
Author: tridge
Date: 2007-01-22 11:46:27 + (Mon, 22 Jan 2007)
New Revision: 20947
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20947
Log:
fixed a bug in the unlock logic in the brlock tdb backend
I'm very surprised this didn't show up earlier!
Modified:
branches/SAMBA_4_0/source/ntvfs/common/brlock_tdb.c
Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/common/brlock_tdb.c
===
--- branches/SAMBA_4_0/source/ntvfs/common/brlock_tdb.c 2007-01-22 11:45:48 UTC
(rev 20946)
+++ branches/SAMBA_4_0/source/ntvfs/common/brlock_tdb.c 2007-01-22 11:46:27 UTC
(rev 20947)
@@ -423,7 +423,7 @@
{
TDB_DATA kbuf, dbuf;
int count, i;
- struct lock_struct *locks;
+ struct lock_struct *locks, *lock;
struct lock_context context;
NTSTATUS status;
@@ -449,42 +449,58 @@
count = dbuf.dsize / sizeof(*locks);
for (i=0; icount; i++) {
- struct lock_struct *lock = locks[i];
-
+ lock = locks[i];
if (brl_tdb_same_context(lock-context, context)
lock-ntvfs == brlh-ntvfs
lock-start == start
lock-size == size
+ lock-lock_type == WRITE_LOCK) {
+ break;
+ }
+ }
+ if (i count) goto found;
+
+ for (i=0; icount; i++) {
+ lock = locks[i];
+ if (brl_tdb_same_context(lock-context, context)
+ lock-ntvfs == brlh-ntvfs
+ lock-start == start
+ lock-size == size
lock-lock_type PENDING_READ_LOCK) {
- /* found it - delete it */
- if (count == 1) {
- if (tdb_delete(brl-w-tdb, kbuf) != 0) {
- status =
NT_STATUS_INTERNAL_DB_CORRUPTION;
- goto fail;
- }
- } else {
- struct lock_struct removed_lock = *lock;
- if (i count-1) {
- memmove(locks[i], locks[i+1],
- sizeof(*locks)*((count-1) - i));
- }
- count--;
+ break;
+ }
+ }
- /* send notifications for any relevant pending
locks */
- brl_tdb_notify_unlock(brl, locks, count,
removed_lock);
-
- dbuf.dsize = count * sizeof(*locks);
-
- if (tdb_store(brl-w-tdb, kbuf, dbuf,
TDB_REPLACE) != 0) {
- status =
NT_STATUS_INTERNAL_DB_CORRUPTION;
- goto fail;
- }
+found:
+ if (i count) {
+ /* found it - delete it */
+ if (count == 1) {
+ if (tdb_delete(brl-w-tdb, kbuf) != 0) {
+ status = NT_STATUS_INTERNAL_DB_CORRUPTION;
+ goto fail;
}
+ } else {
+ struct lock_struct removed_lock = *lock;
+ if (i count-1) {
+ memmove(locks[i], locks[i+1],
+ sizeof(*locks)*((count-1) - i));
+ }
+ count--;
- free(dbuf.dptr);
- tdb_chainunlock(brl-w-tdb, kbuf);
- return NT_STATUS_OK;
+ /* send notifications for any relevant pending locks */
+ brl_tdb_notify_unlock(brl, locks, count, removed_lock);
+
+ dbuf.dsize = count * sizeof(*locks);
+
+ if (tdb_store(brl-w-tdb, kbuf, dbuf, TDB_REPLACE) !=
0) {
+ status = NT_STATUS_INTERNAL_DB_CORRUPTION;
+ goto fail;
+ }
}
+
+ free(dbuf.dptr);
+ tdb_chainunlock(brl-w-tdb, kbuf);
+ return NT_STATUS_OK;
}
/* we didn't find it */
svn commit: samba r20948 - in branches/SAMBA_4_0/source/cluster/ctdb: . example
Author: tridge Date: 2007-01-22 11:57:45 + (Mon, 22 Jan 2007) New Revision: 20948 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20948 Log: a very simple example on how to setup and test ctdb Added: branches/SAMBA_4_0/source/cluster/ctdb/example/ branches/SAMBA_4_0/source/cluster/ctdb/example/cluster_start.sh branches/SAMBA_4_0/source/cluster/ctdb/example/howto.txt branches/SAMBA_4_0/source/cluster/ctdb/example/nlist.txt branches/SAMBA_4_0/source/cluster/ctdb/example/smb.conf.cluster branches/SAMBA_4_0/source/cluster/ctdb/example/smb.conf.node1 branches/SAMBA_4_0/source/cluster/ctdb/example/smb.conf.node2 branches/SAMBA_4_0/source/cluster/ctdb/example/unclist.txt Changeset: Added: branches/SAMBA_4_0/source/cluster/ctdb/example/cluster_start.sh === --- branches/SAMBA_4_0/source/cluster/ctdb/example/cluster_start.sh 2007-01-22 11:46:27 UTC (rev 20947) +++ branches/SAMBA_4_0/source/cluster/ctdb/example/cluster_start.sh 2007-01-22 11:57:45 UTC (rev 20948) @@ -0,0 +1,12 @@ +#!/bin/sh + +killall smbd +sleep 1 +killall -9 smbd +killall -9 valgrind + +type=$1 + +xterm -e $type bin/smbd -s /home/tridge/samba/samba4.svn/prefix/etc/smb.conf.node1 -M single -i +xterm -e $type bin/smbd -s /home/tridge/samba/samba4.svn/prefix/etc/smb.conf.node2 -M single -i + Property changes on: branches/SAMBA_4_0/source/cluster/ctdb/example/cluster_start.sh ___ Name: svn:executable + * Added: branches/SAMBA_4_0/source/cluster/ctdb/example/howto.txt === --- branches/SAMBA_4_0/source/cluster/ctdb/example/howto.txt2007-01-22 11:46:27 UTC (rev 20947) +++ branches/SAMBA_4_0/source/cluster/ctdb/example/howto.txt2007-01-22 11:57:45 UTC (rev 20948) @@ -0,0 +1,19 @@ +Here is a very brief howto for setting up a simple test of the current +ctdb code. + +1) put smb.conf.cluster, smb.conf.node1, smb.conf.node2 and nlist.txt in the + prefix/etc/ directory for samba4. Adjust them for your local paths. + +2) use the script cluster_start.sh to start the two nodes. You can + pass extra arguments to start under valgrind or gdb. For example: + + cluster_start.sh gdb --args + +3) test using the following command: + + bin/locktest //localhost/test //win2003/test -Uadministrator%password -l unclist.txt + + with the unclist.txt supplied + +NOTE: This is very much experimental code! + Added: branches/SAMBA_4_0/source/cluster/ctdb/example/nlist.txt === --- branches/SAMBA_4_0/source/cluster/ctdb/example/nlist.txt2007-01-22 11:46:27 UTC (rev 20947) +++ branches/SAMBA_4_0/source/cluster/ctdb/example/nlist.txt2007-01-22 11:57:45 UTC (rev 20948) @@ -0,0 +1,2 @@ +127.0.0.1:9001 +127.0.0.2:9001 Added: branches/SAMBA_4_0/source/cluster/ctdb/example/smb.conf.cluster === --- branches/SAMBA_4_0/source/cluster/ctdb/example/smb.conf.cluster 2007-01-22 11:46:27 UTC (rev 20947) +++ branches/SAMBA_4_0/source/cluster/ctdb/example/smb.conf.cluster 2007-01-22 11:57:45 UTC (rev 20948) @@ -0,0 +1,26 @@ + ctdb:shared data = /home/tridge/samba/samba4.svn/prefix/cluster + ctdb:maxlacount = 7 + ctdb:brlock = true +; ctdb:selfconnect = true + ctdb:nlist = /home/tridge/samba/samba4.svn/prefix/etc/nlist.txt + dos charset = ascii + unix charset = utf8 + display charset = utf8 + netbios name= blu + workgroup = bludom + realm = bludom.tridgell.net + panic action= backtrace %PID% %PROG% + js include = /home/tridge/samba/samba4.svn/source/scripting/libjs + setup directory = /home/tridge/samba/samba4.svn/source/setup + tls enabled = yes + server role = domain controller + posix:sharedelay = 10 + server services = smb + bind interfaces only = true + name resolve order = bcast + smb ports = 445 + +[test] + ntvfs handler = unixuid posix + path = /home/tridge/prefix/testdir + read only = No Added: branches/SAMBA_4_0/source/cluster/ctdb/example/smb.conf.node1 === --- branches/SAMBA_4_0/source/cluster/ctdb/example/smb.conf.node1 2007-01-22 11:46:27 UTC (rev 20947) +++ branches/SAMBA_4_0/source/cluster/ctdb/example/smb.conf.node1 2007-01-22 11:57:45 UTC (rev 20948) @@ -0,0 +1,6 @@ +ctdb:address = 127.0.0.1:9001 +interfaces = lo +log file = /home/tridge/samba/samba4.svn/prefix/var/log.node1 +pid directory = /home/tridge/samba/samba4.svn/prefix/var/run/node1 +lock directory = /home/tridge/samba/samba4.svn/prefix/var/run/locks/node1 +include = /home/tridge/samba/samba4.svn/prefix/etc/smb.conf.cluster Added:
svn commit: samba r20949 - in branches/SAMBA_4_0/source: auth/ntlmssp torture/auth
Author: abartlet
Date: 2007-01-22 12:33:27 + (Mon, 22 Jan 2007)
New Revision: 20949
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20949
Log:
Looking over some lcov output, try and walk some error paths.
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_sign.c
branches/SAMBA_4_0/source/torture/auth/ntlmssp.c
Changeset:
Modified: branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_sign.c
===
--- branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_sign.c 2007-01-22
11:57:45 UTC (rev 20948)
+++ branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_sign.c 2007-01-22
12:33:27 UTC (rev 20949)
@@ -168,7 +168,7 @@
}
if (sig-length 8) {
- DEBUG(0, (NTLMSSP packet check failed due to short signature
(%lu bytes)!\n,
+ DEBUG(1, (NTLMSSP packet check failed due to short signature
(%lu bytes)!\n,
(unsigned long)sig-length));
}
@@ -192,7 +192,7 @@
DEBUG(5, (BAD SIG: got signature over %llu bytes of
input:\n, (unsigned long long)pdu_length));
dump_data(5, sig-data, sig-length);
- DEBUG(0, (NTLMSSP NTLM2 packet check failed due to
invalid signature on %llu bytes of input!\n, (unsigned long long)pdu_length));
+ DEBUG(1, (NTLMSSP NTLM2 packet check failed due to
invalid signature on %llu bytes of input!\n, (unsigned long long)pdu_length));
return NT_STATUS_ACCESS_DENIED;
}
} else {
@@ -205,7 +205,7 @@
DEBUG(5, (BAD SIG: got signature of %llu bytes of
input:\n, (unsigned long long)length));
dump_data(5, sig-data, sig-length);
- DEBUG(0, (NTLMSSP NTLM1 packet check failed due to
invalid signature on %llu bytes of input:\n, (unsigned long long)length));
+ DEBUG(1, (NTLMSSP NTLM1 packet check failed due to
invalid signature on %llu bytes of input:\n, (unsigned long long)length));
return NT_STATUS_ACCESS_DENIED;
}
}
Modified: branches/SAMBA_4_0/source/torture/auth/ntlmssp.c
===
--- branches/SAMBA_4_0/source/torture/auth/ntlmssp.c2007-01-22 11:57:45 UTC
(rev 20948)
+++ branches/SAMBA_4_0/source/torture/auth/ntlmssp.c2007-01-22 12:33:27 UTC
(rev 20949)
@@ -72,6 +72,18 @@
torture_assert(tctx, 0 == memcmp(sig.data, expected_sig.data,
sig.length),
data mismatch);
+ torture_assert_ntstatus_equal(tctx,
+
gensec_ntlmssp_check_packet(gensec_security, gensec_security,
+ data.data,
data.length, data.data, data.length, sig),
+ NT_STATUS_ACCESS_DENIED, Check of just
signed packet (should fail, wrong end));
+
+ gensec_ntlmssp_state-session_key = data_blob(NULL, 0);
+
+ torture_assert_ntstatus_equal(tctx,
+
gensec_ntlmssp_check_packet(gensec_security, gensec_security,
+ data.data,
data.length, data.data, data.length, sig),
+ NT_STATUS_NO_USER_SESSION_KEY, Check of
just signed packet without a session key should fail);
+
talloc_free(gensec_security);
torture_assert_ntstatus_ok(tctx,
@@ -114,6 +126,11 @@
torture_assert(tctx, 0 == memcmp(sig.data+8, expected_sig.data+8,
sig.length-8),
data mismatch);
+ torture_assert_ntstatus_equal(tctx,
+
gensec_ntlmssp_check_packet(gensec_security, gensec_security,
+ data.data,
data.length, data.data, data.length, sig),
+ NT_STATUS_ACCESS_DENIED, Check of just
signed packet (should fail, wrong end));
+
talloc_free(gensec_security);
return true;
}
Rev 9146: Convert more files to C in file:///home/jelmer/aurelia-bzr-samba/bzr.samba/4.0-upgrade/
revno: 714 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: upgrade timestamp: Mon 2007-01-22 17:31:15 +0100 message: Convert more files to C added: source/lib/provision/ provision-20060729100937-ur4xyws8bglo6bme-1 source/lib/provision/config.mk config.mk-20060729101104-vl061zw4mrg15dgg-1 renamed: source/scripting/libjs/provision.js = source/lib/provision/provision.c svn-v1:[EMAIL PROTECTED] modified: source/lib/basic.mksvn-v1:[EMAIL PROTECTED] source/lib/upgrade/config.mk config.mk-20060723194108-0q2x0prd2r6373t0-2 source/lib/provision/provision.c svn-v1:[EMAIL PROTECTED] === added directory 'source/lib/provision' === added file 'source/lib/provision/config.mk' --- a/source/lib/provision/config.mk1970-01-01 00:00:00 + +++ b/source/lib/provision/config.mk2007-01-22 16:31:15 + @@ -0,0 +1,2 @@ +[SUBSYSTEM::PROVISION] +OBJ_FILES = provision.o === renamed file 'source/scripting/libjs/provision.js' = 'source/lib/provision/provision.c' --- a/source/scripting/libjs/provision.js 2006-06-15 18:25:41 + +++ b/source/lib/provision/provision.c 2007-01-22 16:31:15 + @@ -1,11 +1,11 @@ /* backend code for provisioning a Samba4 server Copyright Andrew Tridgell 2005 + + Rewritten in C by Jelmer Vernooij 2006 Released under the GNU GPL v2 or later */ -sys = sys_init(); - /* return true if the current install seems to be OK */ @@ -791,5 +791,3 @@ return true; } - -return 0; === modified file 'source/lib/basic.mk' --- a/source/lib/basic.mk 2006-07-23 20:31:49 + +++ b/source/lib/basic.mk 2007-01-22 16:31:15 + @@ -12,6 +12,7 @@ include cmdline/config.mk include socket_wrapper/config.mk include appweb/config.mk +include provision/config.mk include replace/config.mk include stream/config.mk include util/config.mk === modified file 'source/lib/upgrade/config.mk' --- a/source/lib/upgrade/config.mk 2006-07-23 19:41:56 + +++ b/source/lib/upgrade/config.mk 2007-01-22 16:31:15 + @@ -1,2 +1,2 @@ [SUBSYSTEM::UPGRADE] -OBJ_FILES = registry.o +OBJ_FILES = upgrade.o
svn commit: samba r20950 - in branches/SAMBA_3_0_24/source/sam: .
Author: gd
Date: 2007-01-22 16:33:55 + (Mon, 22 Jan 2007)
New Revision: 20950
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20950
Log:
Use attr_uidnumber and attr_gidnumber for the LDAP queries.
Guenther
Modified:
branches/SAMBA_3_0_24/source/sam/idmap_ad.c
Changeset:
Modified: branches/SAMBA_3_0_24/source/sam/idmap_ad.c
===
--- branches/SAMBA_3_0_24/source/sam/idmap_ad.c 2007-01-22 12:33:27 UTC (rev
20949)
+++ branches/SAMBA_3_0_24/source/sam/idmap_ad.c 2007-01-22 16:33:55 UTC (rev
20950)
@@ -170,14 +170,14 @@
case ID_USERID:
if (asprintf(expr,
((|(sAMAccountType=%d)(sAMAccountType=%d)(sAMAccountType=%d))(%s=%d)),
ATYPE_NORMAL_ACCOUNT, ATYPE_WORKSTATION_TRUST,
ATYPE_INTERDOMAIN_TRUST,
- ads-schema.posix_uidnumber_attr,
(int)unid.uid) == -1) {
+ attr_uidnumber, (int)unid.uid) == -1) {
return NT_STATUS_NO_MEMORY;
}
break;
case ID_GROUPID:
if (asprintf(expr,
((|(sAMAccountType=%d)(sAMAccountType=%d))(%s=%d)),
ATYPE_SECURITY_GLOBAL_GROUP,
ATYPE_SECURITY_LOCAL_GROUP,
- ads-schema.posix_gidnumber_attr,
(int)unid.gid) == -1) {
+ attr_gidnumber, (int)unid.gid) == -1) {
return NT_STATUS_NO_MEMORY;
}
break;
svn commit: samba r20951 - in branches/SAMBA_3_0/source: include nsswitch
Author: jerry Date: 2007-01-22 16:54:02 + (Mon, 22 Jan 2007) New Revision: 20951 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20951 Log: Remove the DOM_SID field in the struct idmap_domain and bounce domain SID lookups through the struct winbindd_domain *domain_list by searching by name. Refactor the order lookup when searching for the correct idmap_domain to a single function and remove the requirement that the default domain be listed first in the config file. I would still like to make the idmap_domain array a linked list and remove the existing code which makes use of indexes into the list. Basic testing with tdb pans out ok. Modified: branches/SAMBA_3_0/source/include/idmap.h branches/SAMBA_3_0/source/nsswitch/idmap.c branches/SAMBA_3_0/source/nsswitch/idmap_rid.c Changeset: Sorry, the patch is too large (514 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20951
svn commit: samba r20952 - in branches/SAMBA_4_0/source/lib/ldb/common: .
Author: metze Date: 2007-01-22 17:46:38 + (Mon, 22 Jan 2007) New Revision: 20952 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20952 Log: when a component is changed we need to rebuild the linearized string metze Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c Changeset: Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c === --- branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c 2007-01-22 16:54:02 UTC (rev 20951) +++ branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c 2007-01-22 17:46:38 UTC (rev 20952) @@ -1421,6 +1421,7 @@ dn-valid_case = false; } LDB_FREE(dn-casefold); + LDB_FREE(dn-linearized); return LDB_SUCCESS; }
Re: svn commit: samba r20952 - in branches/SAMBA_4_0/source/lib/ldb/common: .
On Mon, 2007-01-22 at 17:46 +, [EMAIL PROTECTED] wrote: Author: metze Date: 2007-01-22 17:46:38 + (Mon, 22 Jan 2007) New Revision: 20952 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20952 Log: when a component is changed we need to rebuild the linearized string Good catch Metze, Thanks! Simo. -- Simo Sorce Samba Team GPL Compliance Officer email: [EMAIL PROTECTED] http://samba.org
Rev 11285: Add lcov target, fix gcov. in file:///home/jelmer/bzr.samba/SAMBA_4_0/
revno: 11285
revision-id: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij [EMAIL PROTECTED]
branch nick: SAMBA_4_0
timestamp: Mon 2007-01-22 19:11:20 +0100
message:
Add lcov target, fix gcov.
modified:
source/torture/config.mk svn-v2:[EMAIL PROTECTED]
=== modified file 'source/torture/config.mk'
--- a/source/torture/config.mk 2007-01-05 21:27:24 +
+++ b/source/torture/config.mk 2007-01-22 18:11:20 +
@@ -338,9 +338,18 @@
gcov:
@$(MAKE) test \
+ HOSTCC_CFLAGS=$(HOSTCC_CFLAGS) $(GCOV_FLAGS) \
CFLAGS=$(CFLAGS) $(GCOV_FLAGS) \
- LD_FLAGS=$(LD_FLAGS) $(GCOV_FLAGS) \
- LIBS=$(LIBS) $(GCOV_LIBS)
+ LDFLAGS=$(LDFLAGS) $(GCOV_FLAGS) $(GCOV_LIBS)
for I in $(sort $(dir $(ALL_OBJS))); \
do $(GCOV) -p -o $$I $$I/*.c; \
done
+
+lcov:
+ @$(MAKE) test \
+ HOSTCC_CFLAGS=$(HOSTCC_CFLAGS) $(GCOV_FLAGS) \
+ CFLAGS=$(CFLAGS) $(GCOV_FLAGS) \
+ LDFLAGS=$(LDFLAGS) $(GCOV_FLAGS) $(GCOV_LIBS)
+ rm **/{lex,parse}.{gcda,gcno}
+ lcov --base-directory `pwd` --directory . --capture --output-file
samba.info
+ genhtml -o coverage samba.info
svn commit: samba r20953 - in branches/SAMBA_4_0/source/scripting/libjs: .
Author: metze Date: 2007-01-22 18:15:54 + (Mon, 22 Jan 2007) New Revision: 20953 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20953 Log: add templates in provision_become_dc() metze Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js Changeset: Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js === --- branches/SAMBA_4_0/source/scripting/libjs/provision.js 2007-01-22 17:46:38 UTC (rev 20952) +++ branches/SAMBA_4_0/source/scripting/libjs/provision.js 2007-01-22 18:15:54 UTC (rev 20953) @@ -481,6 +481,9 @@ message(Setting up + paths.samdb + indexes\n); setup_add_ldif(provision_index.ldif, info, samdb, false); + message(Setting up + paths.samdb + templates\n); + setup_add_ldif(provision_templates.ldif, info, samdb, false); + ok = samdb.transaction_commit(); assert(ok);
svn commit: samba r20954 - in branches/SAMBA_4_0: . source/torture
Author: jelmer
Date: 2007-01-22 18:16:01 + (Mon, 22 Jan 2007)
New Revision: 20954
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20954
Log:
Add lcov target, fix gcov.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/torture/config.mk
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
- [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
+ [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
Modified: branches/SAMBA_4_0/source/torture/config.mk
===
--- branches/SAMBA_4_0/source/torture/config.mk 2007-01-22 18:15:54 UTC (rev
20953)
+++ branches/SAMBA_4_0/source/torture/config.mk 2007-01-22 18:16:01 UTC (rev
20954)
@@ -338,9 +338,18 @@
gcov:
@$(MAKE) test \
+ HOSTCC_CFLAGS=$(HOSTCC_CFLAGS) $(GCOV_FLAGS) \
CFLAGS=$(CFLAGS) $(GCOV_FLAGS) \
- LD_FLAGS=$(LD_FLAGS) $(GCOV_FLAGS) \
- LIBS=$(LIBS) $(GCOV_LIBS)
+ LDFLAGS=$(LDFLAGS) $(GCOV_FLAGS) $(GCOV_LIBS)
for I in $(sort $(dir $(ALL_OBJS))); \
do $(GCOV) -p -o $$I $$I/*.c; \
done
+
+lcov:
+ @$(MAKE) test \
+ HOSTCC_CFLAGS=$(HOSTCC_CFLAGS) $(GCOV_FLAGS) \
+ CFLAGS=$(CFLAGS) $(GCOV_FLAGS) \
+ LDFLAGS=$(LDFLAGS) $(GCOV_FLAGS) $(GCOV_LIBS)
+ rm **/{lex,parse}.{gcda,gcno}
+ lcov --base-directory `pwd` --directory . --capture --output-file
samba.info
+ genhtml -o coverage samba.info
Rev 11286: Add tests in file:///home/jelmer/bzr.samba/SAMBA_4_0/
revno: 11286
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij [EMAIL PROTECTED]
branch nick: SAMBA_4_0
timestamp: Mon 2007-01-22 19:16:48 +0100
message:
Add tests
modified:
source/torture/local/ndr.c svn-v2:[EMAIL PROTECTED]
=== modified file 'source/torture/local/ndr.c'
--- a/source/torture/local/ndr.c2006-10-16 13:06:41 +
+++ b/source/torture/local/ndr.c2007-01-22 18:16:48 +
@@ -70,6 +70,116 @@
return true;
}
+static bool test_guid_from_string_valid(struct torture_context *tctx)
+{
+ /* FIXME */
+ return true;
+}
+
+static bool test_guid_from_string_null(struct torture_context *tctx)
+{
+ struct GUID guid;
+ torture_assert_ntstatus_equal(tctx, NT_STATUS_INVALID_PARAMETER,
+
GUID_from_string(NULL, guid),
+ NULL
failed);
+ return true;
+}
+
+static bool test_guid_from_string_invalid(struct torture_context *tctx)
+{
+ struct GUID g1;
+ torture_assert_ntstatus_equal(tctx, NT_STATUS_INVALID_PARAMETER,
+
GUID_from_string(bla, g1),
+ parameter
not invalid);
+ return true;
+}
+
+static bool test_guid_from_string(struct torture_context *tctx)
+{
+ struct GUID g1, exp;
+ torture_assert_ntstatus_ok(tctx,
+
GUID_from_string(0001-0002-0003-0405-060708090a0b, g1),
+ invalid return
code);
+ exp.time_low = 1;
+ exp.time_mid = 2;
+ exp.time_hi_and_version = 3;
+ exp.clock_seq[0] = 4;
+ exp.clock_seq[1] = 5;
+ exp.node[0] = 6;
+ exp.node[1] = 7;
+ exp.node[2] = 8;
+ exp.node[3] = 9;
+ exp.node[4] = 10;
+ exp.node[5] = 11;
+ torture_assert(tctx, GUID_equal(g1, exp), UUID parsed incorrectly);
+ torture_assert_ntstatus_ok(tctx,
+
GUID_from_string({0001-0002-0003-0405-060708090a0b}, g1),
+ invalid return
code);
+ torture_assert(tctx, GUID_equal(g1, exp), UUID parsed incorrectly);
+
+ return true;
+}
+
+static bool test_guid_string_valid(struct torture_context *tctx)
+{
+ struct GUID g;
+ g.time_low = 1;
+ g.time_mid = 2;
+ g.time_hi_and_version = 3;
+ g.clock_seq[0] = 4;
+ g.clock_seq[1] = 5;
+ g.node[0] = 6;
+ g.node[1] = 7;
+ g.node[2] = 8;
+ g.node[3] = 9;
+ g.node[4] = 10;
+ g.node[5] = 11;
+ torture_assert_str_equal(tctx, 0001-0002-0003-0405-060708090a0b,
GUID_string(tctx, g),
+parsing guid failed);
+ return true;
+}
+
+static bool test_guid_string2_valid(struct torture_context *tctx)
+{
+ struct GUID g;
+ g.time_low = 1;
+ g.time_mid = 2;
+ g.time_hi_and_version = 3;
+ g.clock_seq[0] = 4;
+ g.clock_seq[1] = 5;
+ g.node[0] = 6;
+ g.node[1] = 7;
+ g.node[2] = 8;
+ g.node[3] = 9;
+ g.node[4] = 10;
+ g.node[5] = 11;
+ torture_assert_str_equal(tctx,
{0001-0002-0003-0405-060708090a0b}, GUID_string2(tctx, g),
+parsing guid failed);
+ return true;
+}
+
+static bool test_compare_uuid(struct torture_context *tctx)
+{
+ struct GUID g1, g2;
+ ZERO_STRUCT(g1); ZERO_STRUCT(g2);
+ torture_assert_int_equal(tctx, 0, GUID_compare(g1, g2),
+GUIDs not equal);
+ g1.time_low = 1;
+ torture_assert_int_equal(tctx, 1, GUID_compare(g1, g2),
+GUID diff invalid);
+
+ g1.time_low = 10;
+ torture_assert_int_equal(tctx, 10, GUID_compare(g1, g2),
+GUID diff invalid);
+
+ g1.time_low = 0;
+ g1.clock_seq[1] = 20;
+ torture_assert_int_equal(tctx, 20, GUID_compare(g1, g2),
+GUID diff invalid);
+ return true;
+}
+
+
struct torture_suite *torture_local_ndr(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx, NDR);
@@ -77,5 +187,26 @@
torture_suite_add_simple_test(suite, string terminator,
test_check_string_terminator);
+ torture_suite_add_simple_test(suite, guid_from_string_null,
+
test_guid_from_string_null);
Rev 11287: merge upstream in file:///home/jelmer/bzr.samba/SAMBA_4_0/
revno: 11287 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] parent: svn-v2:[EMAIL PROTECTED] committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: SAMBA_4_0 timestamp: Mon 2007-01-22 19:19:23 +0100 message: merge upstream modified: source/scripting/libjs/provision.js svn-v2:[EMAIL PROTECTED] revno: 11284.1.2 merged: svn-v2:[EMAIL PROTECTED] parent: svn-v2:[EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: jelmer timestamp: Mon 2007-01-22 18:16:01 + message: Add lcov target, fix gcov. revno: 11284.1.1 merged: svn-v2:[EMAIL PROTECTED] parent: svn-v2:[EMAIL PROTECTED] committer: metze timestamp: Mon 2007-01-22 18:15:54 + message: add templates in provision_become_dc() metze === modified file 'source/scripting/libjs/provision.js' --- a/source/scripting/libjs/provision.js 2007-01-20 10:27:22 + +++ b/source/scripting/libjs/provision.js 2007-01-22 18:15:54 + @@ -481,6 +481,9 @@ message(Setting up + paths.samdb + indexes\n); setup_add_ldif(provision_index.ldif, info, samdb, false); + message(Setting up + paths.samdb + templates\n); + setup_add_ldif(provision_templates.ldif, info, samdb, false); + ok = samdb.transaction_commit(); assert(ok);
svn commit: samba r20955 - in branches/SAMBA_4_0: . source/torture/local
Author: jelmer
Date: 2007-01-22 18:24:24 + (Mon, 22 Jan 2007)
New Revision: 20955
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20955
Log:
Add tests
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/torture/local/ndr.c
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
- [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
+ [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
Modified: branches/SAMBA_4_0/source/torture/local/ndr.c
===
--- branches/SAMBA_4_0/source/torture/local/ndr.c 2007-01-22 18:16:01 UTC
(rev 20954)
+++ branches/SAMBA_4_0/source/torture/local/ndr.c 2007-01-22 18:24:24 UTC
(rev 20955)
@@ -70,6 +70,116 @@
return true;
}
+static bool test_guid_from_string_valid(struct torture_context *tctx)
+{
+ /* FIXME */
+ return true;
+}
+
+static bool test_guid_from_string_null(struct torture_context *tctx)
+{
+ struct GUID guid;
+ torture_assert_ntstatus_equal(tctx, NT_STATUS_INVALID_PARAMETER,
+
GUID_from_string(NULL, guid),
+ NULL
failed);
+ return true;
+}
+
+static bool test_guid_from_string_invalid(struct torture_context *tctx)
+{
+ struct GUID g1;
+ torture_assert_ntstatus_equal(tctx, NT_STATUS_INVALID_PARAMETER,
+
GUID_from_string(bla, g1),
+ parameter
not invalid);
+ return true;
+}
+
+static bool test_guid_from_string(struct torture_context *tctx)
+{
+ struct GUID g1, exp;
+ torture_assert_ntstatus_ok(tctx,
+
GUID_from_string(0001-0002-0003-0405-060708090a0b, g1),
+ invalid return
code);
+ exp.time_low = 1;
+ exp.time_mid = 2;
+ exp.time_hi_and_version = 3;
+ exp.clock_seq[0] = 4;
+ exp.clock_seq[1] = 5;
+ exp.node[0] = 6;
+ exp.node[1] = 7;
+ exp.node[2] = 8;
+ exp.node[3] = 9;
+ exp.node[4] = 10;
+ exp.node[5] = 11;
+ torture_assert(tctx, GUID_equal(g1, exp), UUID parsed incorrectly);
+ torture_assert_ntstatus_ok(tctx,
+
GUID_from_string({0001-0002-0003-0405-060708090a0b}, g1),
+ invalid return
code);
+ torture_assert(tctx, GUID_equal(g1, exp), UUID parsed incorrectly);
+
+ return true;
+}
+
+static bool test_guid_string_valid(struct torture_context *tctx)
+{
+ struct GUID g;
+ g.time_low = 1;
+ g.time_mid = 2;
+ g.time_hi_and_version = 3;
+ g.clock_seq[0] = 4;
+ g.clock_seq[1] = 5;
+ g.node[0] = 6;
+ g.node[1] = 7;
+ g.node[2] = 8;
+ g.node[3] = 9;
+ g.node[4] = 10;
+ g.node[5] = 11;
+ torture_assert_str_equal(tctx, 0001-0002-0003-0405-060708090a0b,
GUID_string(tctx, g),
+parsing guid failed);
+ return true;
+}
+
+static bool test_guid_string2_valid(struct torture_context *tctx)
+{
+ struct GUID g;
+ g.time_low = 1;
+ g.time_mid = 2;
+ g.time_hi_and_version = 3;
+ g.clock_seq[0] = 4;
+ g.clock_seq[1] = 5;
+ g.node[0] = 6;
+ g.node[1] = 7;
+ g.node[2] = 8;
+ g.node[3] = 9;
+ g.node[4] = 10;
+ g.node[5] = 11;
+ torture_assert_str_equal(tctx,
{0001-0002-0003-0405-060708090a0b}, GUID_string2(tctx, g),
+parsing guid failed);
+ return true;
+}
+
+static bool test_compare_uuid(struct torture_context *tctx)
+{
+ struct GUID g1, g2;
+ ZERO_STRUCT(g1); ZERO_STRUCT(g2);
+ torture_assert_int_equal(tctx, 0, GUID_compare(g1, g2),
+GUIDs not equal);
+ g1.time_low = 1;
+ torture_assert_int_equal(tctx, 1, GUID_compare(g1, g2),
+
svn commit: samba r20957 - in branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules: .
Author: metze
Date: 2007-01-22 19:07:57 + (Mon, 22 Jan 2007)
New Revision: 20957
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20957
Log:
a value of FF isn't stored as schemaInfo
so we need to use it as value if nothing is stored
metze
Modified:
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/schema_fsmo.c
Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/schema_fsmo.c
===
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/schema_fsmo.c
2007-01-22 18:56:44 UTC (rev 20956)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/schema_fsmo.c
2007-01-22 19:07:57 UTC (rev 20957)
@@ -42,6 +42,7 @@
struct ldb_result *schema_res;
const struct ldb_val *prefix_val;
const struct ldb_val *info_val;
+ struct ldb_val info_val_default;
struct ldb_result *a_res;
struct ldb_result *c_res;
uint32_t i;
@@ -116,10 +117,13 @@
}
info_val = ldb_msg_find_ldb_val(schema_res-msgs[0], schemaInfo);
if (!info_val) {
- ldb_debug_set(module-ldb, LDB_DEBUG_FATAL,
- schema_fsmo_init: no schemaInfo attribute
found\n);
- talloc_free(mem_ctx);
- return LDB_ERR_CONSTRAINT_VIOLATION;
+ info_val_default =
strhex_to_data_blob(FF);
+ if (!info_val_default.data) {
+ ldb_oom(module-ldb);
+ return LDB_ERR_OPERATIONS_ERROR;
+ }
+ talloc_steal(mem_ctx, info_val_default.data);
+ info_val = info_val_default;
}
status = dsdb_load_oid_mappings_ldb(schema, prefix_val, info_val);
Re: Rev 9146: Convert more files to C in file:///home/jelmer/aurelia-bzr-samba/bzr.samba/4.0-upgrade/
Jelmer, Convert more files to C ... === renamed file 'source/scripting/libjs/provision.js' = 'source/lib/provision/provision.c' Why are you converting to C? I was quite happy that a fair bit of our code was going from C to js. I'd actually like things like smbclient to become a js program eventually, so admins can more easily extend/modify it. Cheers, Tridge
Re: Rev 9146: Convert more files to C in file:///home/jelmer/aurelia-bzr-samba/bzr.samba/4.0-upgrade/
On Tue, Jan 23, 2007 at 06:45:56AM +1100, [EMAIL PROTECTED] wrote: Convert more files to C ... === renamed file 'source/scripting/libjs/provision.js' = 'source/lib/provision/provision.c' Why are you converting to C? I was quite happy that a fair bit of our code was going from C to js. I'd actually like things like smbclient to become a js program eventually, so admins can more easily extend/modify it. Please note this is an experimental branch. I'm not planning on committing this stuff without discussing it first as it changes some pretty core code. This branch has existed for about half a year now, and I occassionally make changes to it. I'm playing with moving some functionality from js to C (especially the upgrade code I did a while ago), because I find EJS hard to work with. This shouldn't touch the provisioning code later on, but I've changed some of the provisioning code in this branch as well as it's so tightly coupled to the upgrade code. Cheers, Jelmer signature.asc Description: Digital signature
Rev 11288: Update selftest perl in file:///home/jelmer/bzr.samba/4.0-perlselftest/
revno: 11288 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: 4.0-perlselftest timestamp: Mon 2007-01-22 23:55:34 +0100 message: Update selftest perl modified: .bzrignore svn-v2:[EMAIL PROTECTED] source/heimdal/lib/asn1/parse.c svn-v2:[EMAIL PROTECTED] source/heimdal/lib/asn1/parse.h svn-v2:[EMAIL PROTECTED] source/main.mk svn-v2:[EMAIL PROTECTED] source/script/tests/selftest.pl svn-v2:[EMAIL PROTECTED] source/script/tests/test_ldap.sh svn-v2:[EMAIL PROTECTED] Diff too large for email (2074, the limit is 1000).
svn commit: samba r20958 - in branches/SAMBA_4_0/testprogs/blackbox: .
Author: abartlet Date: 2007-01-22 23:09:07 + (Mon, 22 Jan 2007) New Revision: 20958 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20958 Log: Inspired by the lcov output, check the PASSWD_FILE and --authentication-file options to smbclient. Andrew Bartlett Modified: branches/SAMBA_4_0/testprogs/blackbox/test_smbclient.sh Changeset: Modified: branches/SAMBA_4_0/testprogs/blackbox/test_smbclient.sh === --- branches/SAMBA_4_0/testprogs/blackbox/test_smbclient.sh 2007-01-22 19:07:57 UTC (rev 20957) +++ branches/SAMBA_4_0/testprogs/blackbox/test_smbclient.sh 2007-01-22 23:09:07 UTC (rev 20958) @@ -97,6 +97,17 @@ echo ls | runcmd List directory with LANMAN1 -m LANMAN1 || failed=`expr $failed + 1` echo ls | runcmd List directory with LANMAN2 -m LANMAN2 || failed=`expr $failed + 1` -rm -f tmpfile tmpfile-old tmpfilex +echo ls | testit Test login with --machine-pass $VALGRIND bin/smbclient $CONFIGURATION //$SERVER/tmp --machine-pass +echo password=$PASSWORD\nusername=$USERNAME\ndomain=$DOMAIN tmpauthfile + +echo ls | testit Test login with --authentication-file $VALGRIND bin/smbclient $CONFIGURATION //$SERVER/tmp --authentication-file=tmpauthfile + +echo $PASSWORD tmppassfile + +echo ls | PASSWD_FILE=tmppassfile testit Test login with PASSWD_FILE $VALGRIND bin/smbclient $CONFIGURATION //$SERVER/tmp -W $DOMAIN -U$USERNAME + + +rm -f tmpfile tmpfile-old tmpfilex tmpauthfile tmppassfile + exit $failed
Rev 11291: Add ignore entries in file:///home/jelmer/bzr.samba/SAMBA_4_0/
revno: 11291 revision-id: [EMAIL PROTECTED] parent: svn-v2:[EMAIL PROTECTED] committer: Jelmer Vernooij [EMAIL PROTECTED] branch nick: SAMBA_4_0 timestamp: Tue 2007-01-23 00:35:49 +0100 message: Add ignore entries modified: .bzrignore svn-v2:[EMAIL PROTECTED] === modified file '.bzrignore' --- a/.bzrignore2007-01-16 14:32:56 + +++ b/.bzrignore2007-01-22 23:35:49 + @@ -150,3 +150,13 @@ source/heimdal/lib/roken/err.h source/scripting/ejs/ejsnet/proto.h source/heimdal/lib/hx509/asn1_*.c +*.gcno +*.gcda +source/bin/shared/*.so* +*.1 +*.3 +*.8 +source/pidl/blib +source/pidl/pm_to_blib +source/coverage +source/st
svn commit: samba r20959 - in branches/SAMBA_4_0: .
Author: jelmer Date: 2007-01-22 23:38:55 + (Mon, 22 Jan 2007) New Revision: 20959 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20959 Log: Add ignore entries Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/.bzrignore Changeset: Property changes on: branches/SAMBA_4_0 ___ Name: bzr:merge - [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] + [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] Modified: branches/SAMBA_4_0/.bzrignore === --- branches/SAMBA_4_0/.bzrignore 2007-01-22 23:09:07 UTC (rev 20958) +++ branches/SAMBA_4_0/.bzrignore 2007-01-22 23:38:55 UTC (rev 20959) @@ -150,3 +150,13 @@ source/heimdal/lib/roken/err.h source/scripting/ejs/ejsnet/proto.h source/heimdal/lib/hx509/asn1_*.c +*.gcno +*.gcda +source/bin/shared/*.so* +*.1 +*.3 +*.8 +source/pidl/blib +source/pidl/pm_to_blib +source/coverage +source/st
Rev 11292: Fix lcov in file:///home/jelmer/bzr.samba/SAMBA_4_0/
revno: 11292
revision-id: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij [EMAIL PROTECTED]
branch nick: SAMBA_4_0
timestamp: Tue 2007-01-23 00:40:54 +0100
message:
Fix lcov
modified:
.bzrignore svn-v2:[EMAIL PROTECTED]
source/torture/config.mk svn-v2:[EMAIL PROTECTED]
=== modified file '.bzrignore'
--- a/.bzrignore2007-01-22 23:38:55 +
+++ b/.bzrignore2007-01-22 23:40:54 +
@@ -160,3 +160,4 @@
source/pidl/pm_to_blib
source/coverage
source/st
+source/samba.info
=== modified file 'source/torture/config.mk'
--- a/source/torture/config.mk 2007-01-22 18:16:01 +
+++ b/source/torture/config.mk 2007-01-22 23:40:54 +
@@ -336,20 +336,18 @@
GCOV_FLAGS = -ftest-coverage -fprofile-arcs
GCOV_LIBS = -lgcov
-gcov:
+test_cov:
@$(MAKE) test \
HOSTCC_CFLAGS=$(HOSTCC_CFLAGS) $(GCOV_FLAGS) \
CFLAGS=$(CFLAGS) $(GCOV_FLAGS) \
LDFLAGS=$(LDFLAGS) $(GCOV_FLAGS) $(GCOV_LIBS)
+
+gcov: test_cov
for I in $(sort $(dir $(ALL_OBJS))); \
do $(GCOV) -p -o $$I $$I/*.c; \
done
-lcov:
- @$(MAKE) test \
- HOSTCC_CFLAGS=$(HOSTCC_CFLAGS) $(GCOV_FLAGS) \
- CFLAGS=$(CFLAGS) $(GCOV_FLAGS) \
- LDFLAGS=$(LDFLAGS) $(GCOV_FLAGS) $(GCOV_LIBS)
- rm **/{lex,parse}.{gcda,gcno}
+lcov: test_cov
+ rm heimdal/lib/*/{lex,parse}.{gcda,gcno}
lcov --base-directory `pwd` --directory . --capture --output-file
samba.info
genhtml -o coverage samba.info
Rev 11289: Wait a bit so smbd doesn't have to be killed in file:///home/jelmer/bzr.samba/4.0-perlselftest/
revno: 11289
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij [EMAIL PROTECTED]
branch nick: 4.0-perlselftest
timestamp: Tue 2007-01-23 00:49:29 +0100
message:
Wait a bit so smbd doesn't have to be killed
modified:
source/script/tests/selftest.pl svn-v2:[EMAIL PROTECTED]
=== modified file 'source/script/tests/selftest.pl'
--- a/source/script/tests/selftest.pl 2007-01-22 22:55:34 +
+++ b/source/script/tests/selftest.pl 2007-01-22 23:49:29 +
@@ -293,7 +293,7 @@
my $total = $#todo + 1;
my $i = 0;
$| = 1;
-my $result = {};
+$result = {};
foreach (@todo) {
$i++;
@@ -318,6 +318,8 @@
close(DATA);
+sleep(2);
+
my $failed = $? 8;
if (-f $ENV{PIDDIR}/smbd.pid ) {
Rev 11290: Merge upstream in file:///home/jelmer/bzr.samba/4.0-perlselftest/
revno: 11290
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij [EMAIL PROTECTED]
branch nick: 4.0-perlselftest
timestamp: Tue 2007-01-23 00:50:24 +0100
message:
Merge upstream
modified:
.bzrignore svn-v2:[EMAIL PROTECTED]
source/dsdb/samdb/ldb_modules/schema_fsmo.c svn-v2:[EMAIL PROTECTED]
source/setup/provision_templates.ldif svn-v2:[EMAIL PROTECTED]
source/torture/config.mk svn-v2:[EMAIL PROTECTED]
testprogs/blackbox/test_smbclient.sh svn-v2:[EMAIL PROTECTED]
revno: 11286.1.6
merged: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij [EMAIL PROTECTED]
branch nick: SAMBA_4_0
timestamp: Tue 2007-01-23 00:40:54 +0100
message:
Fix lcov
revno: 11286.1.5
merged: svn-v2:[EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: jelmer
timestamp: Mon 2007-01-22 23:38:55 +
message:
Add ignore entries
revno: 11286.1.4.1.1
merged: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij [EMAIL PROTECTED]
branch nick: SAMBA_4_0
timestamp: Tue 2007-01-23 00:35:49 +0100
message:
Add ignore entries
revno: 11286.1.4
merged: svn-v2:[EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: abartlet
timestamp: Mon 2007-01-22 23:09:07 +
message:
Inspired by the lcov output, check the PASSWD_FILE and
--authentication-file options to smbclient.
Andrew Bartlett
revno: 11286.1.3
merged: svn-v2:[EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: metze
timestamp: Mon 2007-01-22 19:07:57 +
message:
a value of FF isn't stored as
schemaInfo
so we need to use it as value if nothing is stored
metze
revno: 11286.1.2
merged: svn-v2:[EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: metze
timestamp: Mon 2007-01-22 18:56:44 +
message:
cn and instanceType are autogenerated values, later we need to remove
them from all
ldif files, but for now only the ones used by the NET-API-BECOME-DC test
metze
revno: 11286.1.1
merged: svn-v2:[EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: jelmer
timestamp: Mon 2007-01-22 18:24:24 +
message:
Add tests
=== modified file '.bzrignore'
--- a/.bzrignore2007-01-22 22:55:34 +
+++ b/.bzrignore2007-01-22 23:50:24 +
@@ -150,4 +150,14 @@
source/heimdal/lib/roken/err.h
source/scripting/ejs/ejsnet/proto.h
source/heimdal/lib/hx509/asn1_*.c
+*.gcno
+*.gcda
source/bin/shared/*.so*
+*.1
+*.3
+*.8
+source/pidl/blib
+source/pidl/pm_to_blib
+source/coverage
+source/st
+source/samba.info
=== modified file 'source/dsdb/samdb/ldb_modules/schema_fsmo.c'
--- a/source/dsdb/samdb/ldb_modules/schema_fsmo.c 2007-01-18 01:31:09
+
+++ b/source/dsdb/samdb/ldb_modules/schema_fsmo.c 2007-01-22 19:07:57
+
@@ -42,6 +42,7 @@
struct ldb_result *schema_res;
const struct ldb_val *prefix_val;
const struct ldb_val *info_val;
+ struct ldb_val info_val_default;
struct ldb_result *a_res;
struct ldb_result *c_res;
uint32_t i;
@@ -116,10 +117,13 @@
}
info_val = ldb_msg_find_ldb_val(schema_res-msgs[0], schemaInfo);
if (!info_val) {
- ldb_debug_set(module-ldb, LDB_DEBUG_FATAL,
- schema_fsmo_init: no schemaInfo attribute
found\n);
- talloc_free(mem_ctx);
- return LDB_ERR_CONSTRAINT_VIOLATION;
+ info_val_default =
strhex_to_data_blob(FF);
+ if (!info_val_default.data) {
+ ldb_oom(module-ldb);
+ return LDB_ERR_OPERATIONS_ERROR;
+ }
+ talloc_steal(mem_ctx, info_val_default.data);
+ info_val = info_val_default;
}
status = dsdb_load_oid_mappings_ldb(schema, prefix_val, info_val);
=== modified file 'source/setup/provision_templates.ldif'
--- a/source/setup/provision_templates.ldif 2007-01-05 16:12:30 +
+++ b/source/setup/provision_templates.ldif 2007-01-22 18:56:44
Build status as of Tue Jan 23 00:00:02 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-01-22 00:00:42.0 + +++ /home/build/master/cache/broken_results.txt 2007-01-23 00:00:09.0 + @@ -1,22 +1,22 @@ -Build status as of Mon Jan 22 00:00:02 2007 +Build status as of Tue Jan 23 00:00:02 2007 Build counts: Tree Total Broken Panic SOC 0 0 0 build_farm 0 0 0 -ccache 34 7 0 +ccache 35 7 0 ctdb 0 0 0 distcc 3 0 0 -ldb 32 3 0 -libreplace 30 2 0 -lorikeet-heimdal 29 17 0 -ppp 16 0 0 -rsync34 7 0 +ldb 33 3 0 +libreplace 31 2 0 +lorikeet-heimdal 30 17 0 +ppp 17 0 0 +rsync35 7 0 samba0 0 0 samba-docs 0 0 0 -samba4 32 14 1 -samba_3_034 18 0 -smb-build30 30 0 -talloc 34 0 0 -tdb 32 2 0 +samba4 33 15 3 +samba_3_035 18 0 +smb-build31 31 0 +talloc 35 0 0 +tdb 33 2 0
svn commit: samba r20960 - in branches/SAMBA_4_0/source/lib/events: .
Author: tridge
Date: 2007-01-23 00:06:33 + (Tue, 23 Jan 2007)
New Revision: 20960
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20960
Log:
attempt to fix a valgrind error in the signals backend.
This also reduces the static data in the signal backend when not using
signals to 4 bytes.
Modified:
branches/SAMBA_4_0/source/lib/events/events_signal.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/events/events_signal.c
===
--- branches/SAMBA_4_0/source/lib/events/events_signal.c2007-01-22
23:38:55 UTC (rev 20959)
+++ branches/SAMBA_4_0/source/lib/events/events_signal.c2007-01-23
00:06:33 UTC (rev 20960)
@@ -45,7 +45,7 @@
/*
the poor design of signals means that this table must be static global
*/
-static struct {
+static struct sig_state {
struct signal_event *sig_handlers[NUM_SIGNALS];
struct sigaction *oldact[NUM_SIGNALS];
struct sigcounter signal_count[NUM_SIGNALS];
@@ -56,7 +56,7 @@
siginfo_t *sig_info[NUM_SIGNALS];
struct sigcounter sig_blocked[NUM_SIGNALS];
#endif
-} sig_state;
+} *sig_state;
/*
return number of sigcounter events not processed yet
@@ -75,10 +75,10 @@
static void signal_handler(int signum)
{
char c = 0;
- SIG_INCREMENT(sig_state.signal_count[signum]);
- SIG_INCREMENT(sig_state.got_signal);
+ SIG_INCREMENT(sig_state-signal_count[signum]);
+ SIG_INCREMENT(sig_state-got_signal);
/* doesn't matter if this pipe overflows */
- write(sig_state.pipe_hack[1], c, 1);
+ write(sig_state-pipe_hack[1], c, 1);
}
#ifdef SA_SIGINFO
@@ -87,8 +87,8 @@
*/
static void signal_handler_info(int signum, siginfo_t *info, void *uctx)
{
- uint32_t count = sig_count(sig_state.signal_count[signum]);
- sig_state.sig_info[signum][count] = *info;
+ uint32_t count = sig_count(sig_state-signal_count[signum]);
+ sig_state-sig_info[signum][count] = *info;
signal_handler(signum);
@@ -100,7 +100,7 @@
sigemptyset(set);
sigaddset(set, signum);
sigprocmask(SIG_BLOCK, set, NULL);
- SIG_INCREMENT(sig_state.sig_blocked[signum]);
+ SIG_INCREMENT(sig_state-sig_blocked[signum]);
}
}
#endif
@@ -111,15 +111,15 @@
static int signal_event_destructor(struct signal_event *se)
{
se-event_ctx-num_signal_handlers--;
- DLIST_REMOVE(sig_state.sig_handlers[se-signum], se);
- if (sig_state.sig_handlers[se-signum] == NULL) {
+ DLIST_REMOVE(sig_state-sig_handlers[se-signum], se);
+ if (sig_state-sig_handlers[se-signum] == NULL) {
/* restore old handler, if any */
- sigaction(se-signum, sig_state.oldact[se-signum], NULL);
- sig_state.oldact[se-signum] = NULL;
+ sigaction(se-signum, sig_state-oldact[se-signum], NULL);
+ sig_state-oldact[se-signum] = NULL;
#ifdef SA_SIGINFO
if (se-sa_flags SA_SIGINFO) {
- talloc_free(sig_state.sig_info[se-signum]);
- sig_state.sig_info[se-signum] = NULL;
+ talloc_free(sig_state-sig_info[se-signum]);
+ sig_state-sig_info[se-signum] = NULL;
}
#endif
}
@@ -134,7 +134,7 @@
{
char c[16];
/* its non-blocking, doesn't matter if we read too much */
- read(sig_state.pipe_hack[0], c, sizeof(c));
+ read(sig_state-pipe_hack[0], c, sizeof(c));
}
/*
@@ -154,6 +154,15 @@
return NULL;
}
+ /* the sig_state needs to be on a global context as it can last across
+ multiple event contexts */
+ if (sig_state == NULL) {
+ sig_state = talloc_zero(talloc_autofree_context(), struct
sig_state);
+ if (sig_state == NULL) {
+ return NULL;
+ }
+ }
+
se = talloc(mem_ctx?mem_ctx:ev, struct signal_event);
if (se == NULL) return NULL;
@@ -164,7 +173,7 @@
se-sa_flags= sa_flags;
/* only install a signal handler if not already installed */
- if (sig_state.sig_handlers[signum] == NULL) {
+ if (sig_state-sig_handlers[signum] == NULL) {
struct sigaction act;
ZERO_STRUCT(act);
act.sa_handler = signal_handler;
@@ -173,40 +182,40 @@
if (sa_flags SA_SIGINFO) {
act.sa_handler = NULL;
act.sa_sigaction = signal_handler_info;
- if (sig_state.sig_info[signum] == NULL) {
- sig_state.sig_info[signum] = talloc_array(ev,
siginfo_t, SA_INFO_QUEUE_COUNT);
- if (sig_state.sig_info[signum] == NULL) {
+ if (sig_state-sig_info[signum] == NULL) {
+
svn commit: samba r20961 - in branches/SAMBA_4_0: . source/torture
Author: jelmer
Date: 2007-01-23 00:26:03 + (Tue, 23 Jan 2007)
New Revision: 20961
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20961
Log:
Fix lcov
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/.bzrignore
branches/SAMBA_4_0/source/torture/config.mk
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
- [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
+ [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
Modified: branches/SAMBA_4_0/.bzrignore
===
--- branches/SAMBA_4_0/.bzrignore 2007-01-23 00:06:33 UTC (rev 20960)
+++ branches/SAMBA_4_0/.bzrignore 2007-01-23 00:26:03 UTC (rev 20961)
@@ -160,3 +160,4 @@
source/pidl/pm_to_blib
source/coverage
source/st
+source/samba.info
Modified: branches/SAMBA_4_0/source/torture/config.mk
===
--- branches/SAMBA_4_0/source/torture/config.mk 2007-01-23 00:06:33 UTC (rev
20960)
+++ branches/SAMBA_4_0/source/torture/config.mk 2007-01-23 00:26:03 UTC (rev
20961)
@@ -336,20 +336,18 @@
GCOV_FLAGS = -ftest-coverage -fprofile-arcs
GCOV_LIBS = -lgcov
-gcov:
+test_cov:
@$(MAKE) test \
HOSTCC_CFLAGS=$(HOSTCC_CFLAGS) $(GCOV_FLAGS) \
CFLAGS=$(CFLAGS) $(GCOV_FLAGS) \
LDFLAGS=$(LDFLAGS) $(GCOV_FLAGS) $(GCOV_LIBS)
+
+gcov: test_cov
for I in $(sort $(dir $(ALL_OBJS))); \
do $(GCOV) -p -o $$I $$I/*.c; \
done
-lcov:
- @$(MAKE) test \
- HOSTCC_CFLAGS=$(HOSTCC_CFLAGS) $(GCOV_FLAGS) \
- CFLAGS=$(CFLAGS) $(GCOV_FLAGS) \
- LDFLAGS=$(LDFLAGS) $(GCOV_FLAGS) $(GCOV_LIBS)
- rm **/{lex,parse}.{gcda,gcno}
+lcov: test_cov
+ rm heimdal/lib/*/{lex,parse}.{gcda,gcno}
lcov --base-directory `pwd` --directory . --capture --output-file
samba.info
genhtml -o coverage samba.info
Rev 11294: Fix lcov in file:///home/jelmer/bzr.samba/SAMBA_4_0/
revno: 11294
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij [EMAIL PROTECTED]
branch nick: SAMBA_4_0
timestamp: Tue 2007-01-23 01:34:03 +0100
message:
Fix lcov
added:
source/torture/local/tdr.c tdr.c-20070123003352-k85r3plvk2m9x4dy-1
modified:
source/torture/local/config.mk svn-v2:[EMAIL PROTECTED]
source/torture/local/local.c svn-v2:[EMAIL PROTECTED]
=== added file 'source/torture/local/tdr.c'
--- a/source/torture/local/tdr.c1970-01-01 00:00:00 +
+++ b/source/torture/local/tdr.c2007-01-23 00:34:03 +
@@ -0,0 +1,61 @@
+/*
+ Unix SMB/CIFS implementation.
+ test suite for basic tdr functions
+
+ Copyright (C) Jelmer Vernooij 2007
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include includes.h
+#include torture/torture.h
+#include lib/tdr/tdr.h
+
+static bool test_push_uint8(struct torture_context *tctx)
+{
+ uint8_t v = 4;
+ struct tdr_push *tdr = talloc_zero(tctx, struct tdr_push);
+
+ torture_assert_ntstatus_ok(tctx, tdr_push_uint8(tdr, v), push
failed);
+ torture_assert_int_equal(tctx, tdr-data.length, 1, length incorrect);
+ torture_assert_int_equal(tctx, tdr-data.data[0], 4, data incorrect);
+ return true;
+}
+
+static bool test_pull_uint8(struct torture_context *tctx)
+{
+ uint8_t d = 2;
+ uint8_t l;
+ struct tdr_pull tdr;
+ tdr.data.data = d;
+ tdr.data.length = 1;
+ tdr.offset = 0;
+ tdr.flags = 0;
+ torture_assert_ntstatus_ok(tctx, tdr_pull_uint8(tdr, tctx, l),
+ pull failed);
+ torture_assert_int_equal(tctx, 1, tdr.offset,
+offset invalid);
+ return true;
+}
+
+struct torture_suite *torture_local_tdr(TALLOC_CTX *mem_ctx)
+{
+ struct torture_suite *suite = torture_suite_create(mem_ctx, TDR);
+
+ torture_suite_add_simple_test(suite, pull_uint8, test_pull_uint8);
+ torture_suite_add_simple_test(suite, push_uint8, test_push_uint8);
+
+ return suite;
+}
=== modified file 'source/torture/local/config.mk'
--- a/source/torture/local/config.mk2006-11-12 02:49:05 +
+++ b/source/torture/local/config.mk2007-01-23 00:34:03 +
@@ -26,12 +26,14 @@
util_file.o \
sddl.o \
ndr.o \
+ tdr.o \
event.o \
local.o \
dbspeed.o \
torture.o
PUBLIC_DEPENDENCIES = \
RPC_NDR_ECHO \
+ TDR \
LIBCLI_SMB \
MESSAGING \
ICONV \
=== modified file 'source/torture/local/local.c'
--- a/source/torture/local/local.c 2006-10-25 14:58:05 +
+++ b/source/torture/local/local.c 2007-01-23 00:34:03 +
@@ -40,6 +40,7 @@
torture_local_resolve,
torture_local_sddl,
torture_local_ndr,
+ torture_local_tdr,
torture_local_event,
torture_local_torture,
torture_local_dbspeed,
Rev 11294: Fix lcov in file:///home/jelmer/bzr.samba/SAMBA_4_0/
revno: 11294
revision-id: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij [EMAIL PROTECTED]
branch nick: SAMBA_4_0
timestamp: Tue 2007-01-23 01:35:46 +0100
message:
Fix lcov
added:
source/torture/local/tdr.c tdr.c-20070123003352-k85r3plvk2m9x4dy-1
modified:
source/torture/local/config.mk svn-v2:[EMAIL PROTECTED]
source/torture/local/local.c svn-v2:[EMAIL PROTECTED]
=== added file 'source/torture/local/tdr.c'
--- a/source/torture/local/tdr.c1970-01-01 00:00:00 +
+++ b/source/torture/local/tdr.c2007-01-23 00:35:46 +
@@ -0,0 +1,61 @@
+/*
+ Unix SMB/CIFS implementation.
+ test suite for basic tdr functions
+
+ Copyright (C) Jelmer Vernooij 2007
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include includes.h
+#include torture/torture.h
+#include lib/tdr/tdr.h
+
+static bool test_push_uint8(struct torture_context *tctx)
+{
+ uint8_t v = 4;
+ struct tdr_push *tdr = talloc_zero(tctx, struct tdr_push);
+
+ torture_assert_ntstatus_ok(tctx, tdr_push_uint8(tdr, v), push
failed);
+ torture_assert_int_equal(tctx, tdr-data.length, 1, length incorrect);
+ torture_assert_int_equal(tctx, tdr-data.data[0], 4, data incorrect);
+ return true;
+}
+
+static bool test_pull_uint8(struct torture_context *tctx)
+{
+ uint8_t d = 2;
+ uint8_t l;
+ struct tdr_pull tdr;
+ tdr.data.data = d;
+ tdr.data.length = 1;
+ tdr.offset = 0;
+ tdr.flags = 0;
+ torture_assert_ntstatus_ok(tctx, tdr_pull_uint8(tdr, tctx, l),
+ pull failed);
+ torture_assert_int_equal(tctx, 1, tdr.offset,
+offset invalid);
+ return true;
+}
+
+struct torture_suite *torture_local_tdr(TALLOC_CTX *mem_ctx)
+{
+ struct torture_suite *suite = torture_suite_create(mem_ctx, TDR);
+
+ torture_suite_add_simple_test(suite, pull_uint8, test_pull_uint8);
+ torture_suite_add_simple_test(suite, push_uint8, test_push_uint8);
+
+ return suite;
+}
=== modified file 'source/torture/local/config.mk'
--- a/source/torture/local/config.mk2006-11-12 02:49:05 +
+++ b/source/torture/local/config.mk2007-01-23 00:35:46 +
@@ -26,12 +26,14 @@
util_file.o \
sddl.o \
ndr.o \
+ tdr.o \
event.o \
local.o \
dbspeed.o \
torture.o
PUBLIC_DEPENDENCIES = \
RPC_NDR_ECHO \
+ TDR \
LIBCLI_SMB \
MESSAGING \
ICONV \
=== modified file 'source/torture/local/local.c'
--- a/source/torture/local/local.c 2006-10-25 14:58:05 +
+++ b/source/torture/local/local.c 2007-01-23 00:35:46 +
@@ -40,6 +40,7 @@
torture_local_resolve,
torture_local_sddl,
torture_local_ndr,
+ torture_local_tdr,
torture_local_event,
torture_local_torture,
torture_local_dbspeed,
svn commit: samba r20962 - in branches/SAMBA_4_0: . source/torture/local
Author: jelmer
Date: 2007-01-23 00:39:12 + (Tue, 23 Jan 2007)
New Revision: 20962
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20962
Log:
Fix lcov
Added:
branches/SAMBA_4_0/source/torture/local/tdr.c
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/torture/local/config.mk
branches/SAMBA_4_0/source/torture/local/local.c
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
- [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
+ [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
Modified: branches/SAMBA_4_0/source/torture/local/config.mk
===
--- branches/SAMBA_4_0/source/torture/local/config.mk 2007-01-23 00:26:03 UTC
(rev 20961)
+++ branches/SAMBA_4_0/source/torture/local/config.mk 2007-01-23 00:39:12 UTC
(rev 20962)
@@ -26,12 +26,14 @@
util_file.o \
sddl.o \
ndr.o \
+ tdr.o \
event.o \
local.o \
dbspeed.o \
torture.o
PUBLIC_DEPENDENCIES = \
RPC_NDR_ECHO \
+ TDR \
LIBCLI_SMB \
MESSAGING \
ICONV \
Modified: branches/SAMBA_4_0/source/torture/local/local.c
===
--- branches/SAMBA_4_0/source/torture/local/local.c 2007-01-23 00:26:03 UTC
(rev 20961)
+++ branches/SAMBA_4_0/source/torture/local/local.c 2007-01-23 00:39:12 UTC
(rev 20962)
@@ -40,6 +40,7 @@
torture_local_resolve,
torture_local_sddl,
torture_local_ndr,
+ torture_local_tdr,
torture_local_event,
torture_local_torture,
torture_local_dbspeed,
Added: branches/SAMBA_4_0/source/torture/local/tdr.c
===
--- branches/SAMBA_4_0/source/torture/local/tdr.c 2007-01-23 00:26:03 UTC
(rev 20961)
+++ branches/SAMBA_4_0/source/torture/local/tdr.c 2007-01-23 00:39:12 UTC
(rev 20962)
@@ -0,0 +1,61 @@
+/*
+ Unix SMB/CIFS implementation.
+ test suite for basic tdr functions
+
+ Copyright (C) Jelmer Vernooij 2007
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include includes.h
+#include torture/torture.h
+#include lib/tdr/tdr.h
+
+static bool test_push_uint8(struct torture_context *tctx)
+{
+ uint8_t v = 4;
+ struct tdr_push *tdr = talloc_zero(tctx, struct tdr_push);
+
+ torture_assert_ntstatus_ok(tctx, tdr_push_uint8(tdr, v), push
failed);
+ torture_assert_int_equal(tctx, tdr-data.length, 1, length incorrect);
+ torture_assert_int_equal(tctx, tdr-data.data[0], 4, data incorrect);
+ return true;
+}
+
+static bool test_pull_uint8(struct torture_context *tctx)
+{
+ uint8_t d = 2;
+ uint8_t l;
+ struct tdr_pull tdr;
+ tdr.data.data = d;
+ tdr.data.length = 1;
+ tdr.offset = 0;
+ tdr.flags = 0;
+ torture_assert_ntstatus_ok(tctx, tdr_pull_uint8(tdr, tctx, l),
+ pull failed);
+ torture_assert_int_equal(tctx, 1, tdr.offset,
+offset invalid);
+ return true;
+}
+
+struct torture_suite *torture_local_tdr(TALLOC_CTX *mem_ctx)
+{
+ struct torture_suite *suite = torture_suite_create(mem_ctx, TDR);
+
+ torture_suite_add_simple_test(suite, pull_uint8, test_pull_uint8);
+
Rev 46: merge fixes from samba4 in http://samba.org/~tridge/ctdb
revno: 46 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: tridge timestamp: Tue 2007-01-23 11:38:45 +1100 message: merge fixes from samba4 modified: common/ctdb.c ctdb.c-20061127094323-t50f58d65iaao5of-2 common/ctdb_call.c ctdb_call.c-20061128065342-to93h6eejj5kon81-1 common/ctdb_ltdb.c ctdb_ltdb.c-20061128065342-to93h6eejj5kon81-2 include/ctdb.h ctdb.h-20061117234101-o3qt14umlg9en8z0-11 include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13 tcp/tcp_connect.c tcp_connect.c-20061128004937-x70q1cu5xzg5g2tm-1 tcp/tcp_init.c tcp_init.c-20061128004937-x70q1cu5xzg5g2tm-2 tcp/tcp_io.c tcp_io.c-20061128004937-x70q1cu5xzg5g2tm-3 Diff too large for email (507, the limit is 200).
Rev 11295: remove unused functions, run LOCAL-TDR by default in file:///home/jelmer/bzr.samba/SAMBA_4_0/
revno: 11295
revision-id: [EMAIL PROTECTED]
parent: svn-v2:[EMAIL PROTECTED]
committer: Jelmer Vernooij [EMAIL PROTECTED]
branch nick: SAMBA_4_0
timestamp: Tue 2007-01-23 02:24:04 +0100
message:
remove unused functions, run LOCAL-TDR by default
modified:
.bzrignore svn-v2:[EMAIL PROTECTED]
source/libcli/raw/rawacl.c svn-v2:[EMAIL PROTECTED]
source/librpc/ndr/ndr.csvn-v2:[EMAIL PROTECTED]
source/script/tests/test_local.sh svn-v2:[EMAIL PROTECTED]
=== modified file '.bzrignore'
--- a/.bzrignore2007-01-23 00:26:03 +
+++ b/.bzrignore2007-01-23 01:24:04 +
@@ -161,3 +161,4 @@
source/coverage
source/st
source/samba.info
+source/pidl/cover_db
=== modified file 'source/libcli/raw/rawacl.c'
--- a/source/libcli/raw/rawacl.c2006-03-16 00:23:11 +
+++ b/source/libcli/raw/rawacl.c2007-01-23 01:24:04 +
@@ -131,12 +131,12 @@
nt.in.params.data = params;
nt.in.params.length = 8;
- ndr = ndr_push_init();
+ ndr = ndr_push_init_ctx(NULL);
if (!ndr) return NULL;
status = ndr_push_security_descriptor(ndr, NDR_SCALARS|NDR_BUFFERS,
io-set_secdesc.in.sd);
if (!NT_STATUS_IS_OK(status)) {
- ndr_push_free(ndr);
+ talloc_free(ndr);
return NULL;
}
@@ -144,7 +144,7 @@
req = smb_raw_nttrans_send(tree, nt);
- ndr_push_free(ndr);
+ talloc_free(ndr);
return req;
}
=== modified file 'source/librpc/ndr/ndr.c'
--- a/source/librpc/ndr/ndr.c 2006-10-16 14:32:07 +
+++ b/source/librpc/ndr/ndr.c 2007-01-23 01:24:04 +
@@ -134,20 +134,6 @@
return ndr;
}
-
-/* create a ndr_push structure, ready for some marshalling */
-_PUBLIC_ struct ndr_push *ndr_push_init(void)
-{
- return ndr_push_init_ctx(NULL);
-}
-
-/* free a ndr_push structure */
-_PUBLIC_ void ndr_push_free(struct ndr_push *ndr)
-{
- talloc_free(ndr);
-}
-
-
/* return a DATA_BLOB structure for the current ndr_push marshalled data */
_PUBLIC_ DATA_BLOB ndr_push_blob(struct ndr_push *ndr)
{
=== modified file 'source/script/tests/test_local.sh'
--- a/source/script/tests/test_local.sh 2006-10-28 05:21:11 +
+++ b/source/script/tests/test_local.sh 2007-01-23 01:24:04 +
@@ -4,7 +4,7 @@
local_tests=$local_tests LOCAL-IDTREE LOCAL-EVENT
local_tests=$local_tests LOCAL-SOCKET LOCAL-MESSAGING LOCAL-IRPC
local_tests=$local_tests LOCAL-NDR LOCAL-BINDING LOCAL-FILE LOCAL-REGISTRY
-local_tests=$local_tests LOCAL-SDDL LOCAL-PAC LOCAL-DBSPEED
+local_tests=$local_tests LOCAL-SDDL LOCAL-PAC LOCAL-DBSPEED LOCAL-TDR
local_tests=$local_tests LOCAL-NTLMSSP LOCAL-CRYPTO-MD4
local_tests=$local_tests LOCAL-CRYPTO-MD5 LOCAL-CRYPTO-HMACMD5
local_tests=$local_tests LOCAL-CRYPTO-SHA1 LOCAL-CRYPTO-HMACSHA1
svn commit: samba r20963 - in branches/SAMBA_4_0: . source/libcli/raw source/librpc/ndr source/script/tests
Author: jelmer
Date: 2007-01-23 01:29:17 + (Tue, 23 Jan 2007)
New Revision: 20963
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20963
Log:
remove unused functions, run LOCAL-TDR by default
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/.bzrignore
branches/SAMBA_4_0/source/libcli/raw/rawacl.c
branches/SAMBA_4_0/source/librpc/ndr/ndr.c
branches/SAMBA_4_0/source/script/tests/test_local.sh
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:merge
- [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
+ [EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
[EMAIL PROTECTED]
Modified: branches/SAMBA_4_0/.bzrignore
===
--- branches/SAMBA_4_0/.bzrignore 2007-01-23 00:39:12 UTC (rev 20962)
+++ branches/SAMBA_4_0/.bzrignore 2007-01-23 01:29:17 UTC (rev 20963)
@@ -161,3 +161,4 @@
source/coverage
source/st
source/samba.info
+source/pidl/cover_db
Modified: branches/SAMBA_4_0/source/libcli/raw/rawacl.c
===
--- branches/SAMBA_4_0/source/libcli/raw/rawacl.c 2007-01-23 00:39:12 UTC
(rev 20962)
+++ branches/SAMBA_4_0/source/libcli/raw/rawacl.c 2007-01-23 01:29:17 UTC
(rev 20963)
@@ -131,12 +131,12 @@
nt.in.params.data = params;
nt.in.params.length = 8;
- ndr = ndr_push_init();
+ ndr = ndr_push_init_ctx(NULL);
if (!ndr) return NULL;
status = ndr_push_security_descriptor(ndr, NDR_SCALARS|NDR_BUFFERS,
io-set_secdesc.in.sd);
if (!NT_STATUS_IS_OK(status)) {
- ndr_push_free(ndr);
+ talloc_free(ndr);
return NULL;
}
@@ -144,7 +144,7 @@
req = smb_raw_nttrans_send(tree, nt);
- ndr_push_free(ndr);
+ talloc_free(ndr);
return req;
}
Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr.c
===
--- branches/SAMBA_4_0/source/librpc/ndr/ndr.c 2007-01-23 00:39:12 UTC (rev
20962)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr.c 2007-01-23 01:29:17 UTC (rev
20963)
@@ -134,20 +134,6 @@
return ndr;
}
-
-/* create a ndr_push structure, ready for some marshalling */
-_PUBLIC_ struct ndr_push *ndr_push_init(void)
-{
- return ndr_push_init_ctx(NULL);
-}
-
-/* free a ndr_push structure */
-_PUBLIC_ void ndr_push_free(struct ndr_push *ndr)
-{
- talloc_free(ndr);
-}
-
-
/* return a DATA_BLOB structure for the current ndr_push marshalled data */
_PUBLIC_ DATA_BLOB ndr_push_blob(struct ndr_push *ndr)
{
Modified: branches/SAMBA_4_0/source/script/tests/test_local.sh
===
--- branches/SAMBA_4_0/source/script/tests/test_local.sh2007-01-23
00:39:12 UTC (rev 20962)
+++ branches/SAMBA_4_0/source/script/tests/test_local.sh2007-01-23
01:29:17 UTC (rev 20963)
@@ -4,7 +4,7 @@
local_tests=$local_tests LOCAL-IDTREE LOCAL-EVENT
local_tests=$local_tests LOCAL-SOCKET LOCAL-MESSAGING LOCAL-IRPC
local_tests=$local_tests LOCAL-NDR LOCAL-BINDING LOCAL-FILE LOCAL-REGISTRY
-local_tests=$local_tests LOCAL-SDDL LOCAL-PAC LOCAL-DBSPEED
+local_tests=$local_tests LOCAL-SDDL LOCAL-PAC LOCAL-DBSPEED LOCAL-TDR
local_tests=$local_tests LOCAL-NTLMSSP LOCAL-CRYPTO-MD4
local_tests=$local_tests LOCAL-CRYPTO-MD5 LOCAL-CRYPTO-HMACMD5
local_tests=$local_tests LOCAL-CRYPTO-SHA1 LOCAL-CRYPTO-HMACSHA1
svn commit: samba r20964 - in branches/SAMBA_4_0/source/libnet: .
Author: abartlet
Date: 2007-01-23 01:33:31 + (Tue, 23 Jan 2007)
New Revision: 20964
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20964
Log:
Show the domain name we figured out, rather than a null pointer (in
some error cases)
Andrew Bartlett
Modified:
branches/SAMBA_4_0/source/libnet/libnet_join.c
Changeset:
Modified: branches/SAMBA_4_0/source/libnet/libnet_join.c
===
--- branches/SAMBA_4_0/source/libnet/libnet_join.c 2007-01-23 01:29:17 UTC
(rev 20963)
+++ branches/SAMBA_4_0/source/libnet/libnet_join.c 2007-01-23 01:33:31 UTC
(rev 20964)
@@ -117,7 +117,7 @@
if (!NT_STATUS_IS_OK(status)) {
r-out.error_string = talloc_asprintf(r,
Connection to DRSUAPI pipe of PDC of
domain '%s' failed: %s,
- r-in.domain_name,
+ r-out.domain_name,
nt_errstr(status));
talloc_free(tmp_ctx);
return status;
svn commit: samba r20965 - in branches: SAMBA_3_0/source SAMBA_3_0_24/source
Author: jpeach Date: 2007-01-23 03:03:24 + (Tue, 23 Jan 2007) New Revision: 20965 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20965 Log: Fix spelling. Modified: branches/SAMBA_3_0/source/configure.in branches/SAMBA_3_0_24/source/configure.in Changeset: Modified: branches/SAMBA_3_0/source/configure.in === --- branches/SAMBA_3_0/source/configure.in 2007-01-23 01:33:31 UTC (rev 20964) +++ branches/SAMBA_3_0/source/configure.in 2007-01-23 03:03:24 UTC (rev 20965) @@ -5863,7 +5863,7 @@ MODULE_idmap_nss=STATIC AC_ARG_WITH(static-modules, -[ --with-static-modules=MODULES Comma-seperated list of names of modules to statically link in], +[ --with-static-modules=MODULES Comma-separated list of names of modules to statically link in], [ if test $withval; then for i in `echo $withval | sed -e 's/,/ /g'` do @@ -5872,7 +5872,7 @@ fi ]) AC_ARG_WITH(shared-modules, -[ --with-shared-modules=MODULES Comma-seperated list of names of modules to build shared], +[ --with-shared-modules=MODULES Comma-separated list of names of modules to build shared], [ if test $withval; then for i in `echo $withval | sed -e 's/,/ /g'` do Modified: branches/SAMBA_3_0_24/source/configure.in === --- branches/SAMBA_3_0_24/source/configure.in 2007-01-23 01:33:31 UTC (rev 20964) +++ branches/SAMBA_3_0_24/source/configure.in 2007-01-23 03:03:24 UTC (rev 20965) @@ -5839,7 +5839,7 @@ MODULE_idmap_tdb=STATIC AC_ARG_WITH(static-modules, -[ --with-static-modules=MODULES Comma-seperated list of names of modules to statically link in], +[ --with-static-modules=MODULES Comma-separated list of names of modules to statically link in], [ if test $withval; then for i in `echo $withval | sed -e 's/,/ /g'` do @@ -5848,7 +5848,7 @@ fi ]) AC_ARG_WITH(shared-modules, -[ --with-shared-modules=MODULES Comma-seperated list of names of modules to build shared], +[ --with-shared-modules=MODULES Comma-separated list of names of modules to build shared], [ if test $withval; then for i in `echo $withval | sed -e 's/,/ /g'` do
svn commit: samba r20966 - in branches: SAMBA_3_0/source/smbd SAMBA_3_0_24/source/smbd
Author: jpeach
Date: 2007-01-23 04:12:51 + (Tue, 23 Jan 2007)
New Revision: 20966
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=20966
Log:
Only attempt to reload the config file atfer the fork point if we
are in daemon mode. If we are in inetd mode, there's really no point
in rechecking it so soon.
Modified:
branches/SAMBA_3_0/source/smbd/server.c
branches/SAMBA_3_0_24/source/smbd/server.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/server.c
===
--- branches/SAMBA_3_0/source/smbd/server.c 2007-01-23 03:03:24 UTC (rev
20965)
+++ branches/SAMBA_3_0/source/smbd/server.c 2007-01-23 04:12:51 UTC (rev
20966)
@@ -1065,8 +1065,12 @@
init_modules();
- /* possibly reload the services file. */
- reload_services(True);
+ /* Possibly reload the services file. Only worth doing in
+* daemon mode. In inetd mode, we know we only just loaded this.
+*/
+ if (is_daemon) {
+ reload_services(True);
+ }
if (!init_account_policy()) {
DEBUG(0,(Could not open account policy tdb.\n));
Modified: branches/SAMBA_3_0_24/source/smbd/server.c
===
--- branches/SAMBA_3_0_24/source/smbd/server.c 2007-01-23 03:03:24 UTC (rev
20965)
+++ branches/SAMBA_3_0_24/source/smbd/server.c 2007-01-23 04:12:51 UTC (rev
20966)
@@ -1055,8 +1055,12 @@
init_modules();
- /* possibly reload the services file. */
- reload_services(True);
+ /* Possibly reload the services file. Only worth doing in
+* daemon mode. In inetd mode, we know we only just loaded this.
+*/
+ if (is_daemon) {
+ reload_services(True);
+ }
if (!init_account_policy()) {
DEBUG(0,(Could not open account policy tdb.\n));
