[Samba] force close files, preferably through Computer Management
If I open Computer Management on Windows XP and connect to my Samba file server, I can see a list of what files are open by users. I need to force some files closed. If this was a Windows file server, I could just highlight the files, right-click, and choose Close Open File but I get Accessed is Denied on the Samba server. This is Samba 3.0.25b on CentOS 5, by the way. Is there a way I can configure the server to allow me access to do this? Alternatively, if anyone knows of another way to close just these few files, that would be helpful. James Dinkel -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Re: Migrate Windows 2000 (Active Directory Integrated) Domainto Samba
Charles Marcus [EMAIL PROTECTED] wrote in message news:[EMAIL PROTECTED] I read everywhere about migrating an NT4 domain, but nowhere says you can do the same with a Windows 2000 (NOT mixed mode) domain... This client does NOT currently use AD for anything special (GPO, etc). Is this possible? Advised? -- Best regards, Charles Samba 3.x cannot migrate data from Windows 200x. This is one of the proposed features of Samba 4.x which is currently in development. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Help removing many users
Hi Ryan Why don't you migrate your smbpasswd file to tdb? This could be done pdbedit -i smbpasswd:/etc/samba/smbpasswd -e tdbsam:/etc/samba/smbpasswd.tdb in smb.conf change passdb backend to passdb backend = tdbsam:/etc/samba/smbpasswd.tdb voila -- Rune Tønnesen Venlig Hilsen/Best Regards -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Mike Eggleston wrote: On Fri, 04 Jan 2008, Ryan Novosielski might have said: Can anyone brighter than me think of an easy way to remove MANY users from an smbpasswd file (I have a list of users that can be removed, some of which may already be missing, some of which may be present)? I cannot use smbpasswd -x in a loop. Is there some easy way to do this? I'm aware that you cannot use smbpasswd in a loop creating the accounts because you have to type in the password, but removing the accounts? What's the issue with using smbpasswd in a loop to remove the accounts? I actually thought of something that will work for this, but the background of my situation is that my smbpasswd file has gotten too large. It has gotten so large that it actually cannot be changed because it is always locked for reading (too many clients, too large a file). Therefore, I currently cannot change the file so smbpasswd -x fails. What I'm trying now, that is working but is painfully slow, is copying the smbpasswd file elsewhere and acting on the copy with smbpasswd -c and -x. It will probably run half a day to remove thousands of people, but we'll see. - -- _ _ _ _ ___ _ _ _ |Y#| | | |\/| | \ |\ | | |Ryan Novosielski - Systems Programmer II |$| |__| | | |__/ | \| _| |[EMAIL PROTECTED] - 973/972.0922 (2-0922) \__/ Univ. of Med. and Dent.|IST/AST - NJMS Medical Science Bldg - C630 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFHfqfFmb+gadEcsb4RAtI+AJ4isi2gFAAIHkhqJjOTvfx6B35iZwCgsHvs geidnzAVXiJaqFlqlPH+fqw= =R66o -END PGP SIGNATURE- -- 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] Samba not seeing any interfaces
I've built samba for an embedded mips platform. Since this is an embedded platform, it's possible that some critical file that samba needs is missing but stracing the daemons doesn't reveal anything strange. It's running 2.4.34 kernel. Samba is failing to find any interfaces. [2000/01/02 10:55:01, 3] nmbd/nmbd.c:main(759) Opening sockets 137 [2000/01/02 10:55:01, 10] lib/util_sock.c:open_socket_in(839) bind succeeded on port 137 [2000/01/02 10:55:01, 10] lib/util_sock.c:open_socket_in(839) bind succeeded on port 138 [2000/01/02 10:55:01, 5] lib/util_sock.c:print_socket_options(206) socket option SO_KEEPALIVE = 0 (bunch of print stuff). [2000/01/02 10:55:01, 3] nmbd/nmbd.c:open_sockets(615) open_sockets: Broadcast sockets opened. [2000/01/02 10:55:01, 2] lib/interface.c:interpret_interface(130) can't determine netmask for 192.168.128.199 [2000/01/02 10:55:01, 0] lib/interface.c:load_interfaces(229) WARNING: no network interfaces found [2000/01/02 10:55:01, 0] nmbd/nmbd_subnetdb.c:create_subnets(190) create_subnets: No local interfaces ! [2000/01/02 10:55:01, 0] nmbd/nmbd_subnetdb.c:create_subnets(191) create_subnets: Waiting for an interface to appear ... [2000/01/02 10:55:06, 2] lib/interface.c:interpret_interface(130) can't determine netmask for 192.168.128.199 [2000/01/02 10:55:06, 0] lib/interface.c:load_interfaces(229) WARNING: no network interfaces found [2000/01/02 10:55:11, 2] lib/interface.c:interpret_interface(130) can't determine netmask for 192.168.128.199 [2000/01/02 10:55:11, 0] lib/interface.c:load_interfaces(229) WARNING: no network interfaces found [2000/01/02 10:55:16, 2] lib/interface.c:interpret_interface(130) can't determine netmask for 192.168.128.199 and this repeats forever. My smb.conf: #=== Global Settings = [global] syslog = 0 syslog only = yes workgroup = seiner.lan server string = OpenWrt Samba Server max log size = 50 security = share encrypt passwords = yes smb passwd file = /etc/samba/smbpasswd guest account = nobody local master = yes name resolve order = lmhosts hosts bcast log file = /var/log/samba/log.smbd # hosts allow = 127. interfaces = 192.168.128.199 === I've tried eth0.1 192.168.0.0./255.255.0.0 eth* and probably some others # bind interfaces only = false # 192.168.1.1/255.255.255.0 socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba not seeing any interfaces
Yan Seiner wrote: I've built samba for an embedded mips platform. Since this is an embedded platform, it's possible that some critical file that samba needs is missing but stracing the daemons doesn't reveal anything strange. It's running 2.4.34 kernel. Samba is failing to find any interfaces. [2000/01/02 10:55:01, 3] nmbd/nmbd.c:main(759) Opening sockets 137 [2000/01/02 10:55:01, 10] lib/util_sock.c:open_socket_in(839) bind succeeded on port 137 [2000/01/02 10:55:01, 10] lib/util_sock.c:open_socket_in(839) bind succeeded on port 138 [2000/01/02 10:55:01, 5] lib/util_sock.c:print_socket_options(206) socket option SO_KEEPALIVE = 0 (bunch of print stuff). [2000/01/02 10:55:01, 3] nmbd/nmbd.c:open_sockets(615) open_sockets: Broadcast sockets opened. [2000/01/02 10:55:01, 2] lib/interface.c:interpret_interface(130) can't determine netmask for 192.168.128.199 [2000/01/02 10:55:01, 0] lib/interface.c:load_interfaces(229) WARNING: no network interfaces found [2000/01/02 10:55:01, 0] nmbd/nmbd_subnetdb.c:create_subnets(190) create_subnets: No local interfaces ! [2000/01/02 10:55:01, 0] nmbd/nmbd_subnetdb.c:create_subnets(191) create_subnets: Waiting for an interface to appear ... [2000/01/02 10:55:06, 2] lib/interface.c:interpret_interface(130) can't determine netmask for 192.168.128.199 [2000/01/02 10:55:06, 0] lib/interface.c:load_interfaces(229) WARNING: no network interfaces found [2000/01/02 10:55:11, 2] lib/interface.c:interpret_interface(130) can't determine netmask for 192.168.128.199 [2000/01/02 10:55:11, 0] lib/interface.c:load_interfaces(229) WARNING: no network interfaces found [2000/01/02 10:55:16, 2] lib/interface.c:interpret_interface(130) can't determine netmask for 192.168.128.199 and this repeats forever. My smb.conf: #=== Global Settings = [global] syslog = 0 syslog only = yes workgroup = seiner.lan server string = OpenWrt Samba Server max log size = 50 security = share encrypt passwords = yes smb passwd file = /etc/samba/smbpasswd guest account = nobody local master = yes name resolve order = lmhosts hosts bcast log file = /var/log/samba/log.smbd # hosts allow = 127. interfaces = 192.168.128.199 === I've tried eth0.1 192.168.0.0./255.255.0.0 eth* and probably some others # bind interfaces only = false # 192.168.1.1/255.255.255.0 socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 I added some debug lines to the interface.c routines. It turns out that get_interfaces returns -1 - eventhough there is an interfaces = line in smb.conf. From looking at the code, this is not handled at all in interface.c. [2008/01/05 15:11:46, 0] lib/interface.c:interpret_interface(108) checking interface eth* [2008/01/05 15:11:46, 0] lib/interface.c:interpret_interface(110) checking for interface name checking for DNS name WARNING: no network interfaces found found -1 interfaces Any idea why the kernel wouldn't return any interfaces? --Yan -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Samba 4 Alpha - Compile on Debian etch
Hi I keep getting the following errors when I do ./configure: configure: WARNING: No python-config found Developer mode: no Automatic dependencies: no (install GNU make = 3.81 and see --enable-automatic-dependencies) Building shared libraries: yes Using shared libraries internally: no (specify --enable-dso) To run binaries without installing, set the following environment variable: LD_LIBRARY_PATH=./bin/shared I have set and exported LD_LIBRARY_PATH -- Regards Chris Robinson W: www.krc.org.uk/chris E: [EMAIL PROTECTED] T: 01708 757516/874112 F: 020 7099 6814 M: 07887 98 33 55 -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Odd, slow Windows XP client download behavior
I recently set up a Samba server (3.0.24-6etch9) on my debian etch system. While accessing its shares through 1GBit Ethernet with a Windows XP SP2 client there's some real odd behavior: In one direction (uploading files from WinXP - debian) the speed is just great, no matter what, around 35MiB/s. In the other direction (downloading a file WinXP - debian) it idles at around 120KiB/s which is, of course, unbearable. Now, interestingly, when I have an upload running the former slow download speed just explodes and is right up there at 20MiB/s (with the upload dropping to 20MiB/s). If I stop the upload, the download retreats back to 120KiB/s instantly. Btw, the FTP speed is fine in both directions, 30 - 50 MiB/s. Playing around with the global settings in smb.conf brought no relief whatsoever (TCP_NODELAY, SO_SNDBUF etc) and a different samba version (3.0.26a-18) didn't help either. Then, I had a friend bring over his Windows Vista machine, which accessed my Samba share without any of the above described problems at 30 MiB/s in both directions. So I decided my WinXP machine must be the main problem. Today I thought I found the solution but it was merely a step in the right direction (if even that): When I disable OpLocks in the Windows Registry according to Windows KB article 296264 (disabling them in the shares part of smb.conf has the same effect), the download speed turns out to be 35MiB/s. But the performance is still not satisfiable: The download speed reaches the 35MiB/s only after some sort of delay which proved to be quite annoying because it slows down executing files, playing movies, skipping through movies, etc. considerably. Now again, the interesting part: This delay doesn't occur at all, when I have an upload running at the same time. Files open instantly, I can skip through a movie like it was on my local hard drive, etc. Now I don't know what else to try to get my WinXP to communicate correctly with the samba server, do you have any suggestions? Kind regards, Chris -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Different Max Protocol for different Clients?
How can I setup samba 3.0 to habe different Max Protocol settings for an Vista-Box and Win98-Clients? For some reason Vista seems to work with Max Protocol=lanman2 only. For Win98-Clients this does mangle all long filenames, Max Protocol=NT1 is required here. Elmar -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Odd, slow Windows XP client download behavior
Now I don't know what else to try to get my WinXP to communicate correctly with the samba server, do you have any suggestions? Kind regards, Chris Dear Chris With Realteks networkscard there have been reported problems, with use of the driver provided by microsoft update. You might improve your networkspeed on your XP computer be using the driver provided by the manufacturer of your NIC. -- Rune Tønnesen Bedste Hilsner/Best Regards -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Odd, slow Windows XP client download behavior
When you browse the Samba shares, is this fast, or does it take some time for the shares to open in explorer? If yes? then: I had a problem the other day on Etch/Samba, I had an old DNS server that was no longer running listed in my DHCP3 set-up, having the dud DNS server listed was causing access to Samba shares to be very sluggish. So try some pings from the Samba box, and double check that it is resolving DNS queries properly and without any delay. Regards Andreas Chris wrote: I recently set up a Samba server (3.0.24-6etch9) on my debian etch system. While accessing its shares through 1GBit Ethernet with a Windows XP SP2 client there's some real odd behavior: In one direction (uploading files from WinXP - debian) the speed is just great, no matter what, around 35MiB/s. In the other direction (downloading a file WinXP - debian) it idles at around 120KiB/s which is, of course, unbearable. Now, interestingly, when I have an upload running the former slow download speed just explodes and is right up there at 20MiB/s (with the upload dropping to 20MiB/s). If I stop the upload, the download retreats back to 120KiB/s instantly. Btw, the FTP speed is fine in both directions, 30 - 50 MiB/s. Playing around with the global settings in smb.conf brought no relief whatsoever (TCP_NODELAY, SO_SNDBUF etc) and a different samba version (3.0.26a-18) didn't help either. Then, I had a friend bring over his Windows Vista machine, which accessed my Samba share without any of the above described problems at 30 MiB/s in both directions. So I decided my WinXP machine must be the main problem. Today I thought I found the solution but it was merely a step in the right direction (if even that): When I disable OpLocks in the Windows Registry according to Windows KB article 296264 (disabling them in the shares part of smb.conf has the same effect), the download speed turns out to be 35MiB/s. But the performance is still not satisfiable: The download speed reaches the 35MiB/s only after some sort of delay which proved to be quite annoying because it slows down executing files, playing movies, skipping through movies, etc. considerably. Now again, the interesting part: This delay doesn't occur at all, when I have an upload running at the same time. Files open instantly, I can skip through a movie like it was on my local hard drive, etc. Now I don't know what else to try to get my WinXP to communicate correctly with the samba server, do you have any suggestions? Kind regards, Chris -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Multiple mounts instead of remounting?
I'm having issues trying to remount any shares using samba. Super Short version mount -o remount /some_windows_share creates a duplicate mount instead of properly remounting. Full details... I have many shares served off of NT4 boxes, mounted via samba on a linux box (RHEL 4). Since long dormant (12 hour) shares from one server in particular always have problems for a few seconds when accessing files, I altered my scripts to mount -o remount. I expected it would freshen the mount. Instead of doing a remount however, it appears to be mounting _over_ the original. Not really what I wanted. Any idea why it's doing this? I wanted to avoid doing an unmount then a mount, as some of these scripts may, on ocasion, be run in parallel. I know at least on local drives remounting while in use (at least for read operations), doesn't appear to cause problems.. Thanks, Kyle -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: Fw: [Samba] printer admin option replacement on stand alone (not domain) print server running version 3.0.25
Hi Vickie I have been following your thread in the samba list - and I think I am wrestling with a similar problem. I want to upload windows printer drivers to a workgroup samba server. My samba is also 3.0.25. on a Centos 5.1 server. I have put the enable privilege = yes into smb.conf - and restarted samba. However - unlike you - when I try the command: #net rpc rights grant 'rhc' SePrintOperatorPrivilege And give the root password, I get the error: Failed to grant privileges for rhc (NT_STATUS_ACCESS_DENIED) rhc is a user on both the linux server and a windows client machine - though I must admit I am confused about how the two user5 groups relate to each other in a workgroup samba setup. Curiously - if I attempt to grant the right to a non-existent user - I do not get an error. Since you seem to be trying to achieve the same thing - you may have encountered similar problems. Can you throw any light on this problem? Thanks Richard. Vickie L. Kidder wrote: Thanks to those who responded to my original question. I ran this command and it accepted it after I provided the root password. # net rpc rights grant 'vlkidder' SePrintOperatorPrivilege Checked to see if 'vlkidder' had printer admin privilege and it seems ok. # net rpc rights list accounts Password: BUILTIN\Print Operators No privileges assigned SMBTEST\vlkidder SePrintOperatorPrivilege BUILTIN\Account Operators No privileges assigned BUILTIN\Backup Operators No privileges assigned BUILTIN\Server Operators No privileges assigned BUILTIN\Administrators SeMachineAccountPrivilege SeTakeOwnershipPrivilege SeBackupPrivilege SeRestorePrivilege SeRemoteShutdownPrivilege SePrintOperatorPrivilege SeAddUsersPrivilege SeDiskOperatorPrivilege Everyone No privileges assigned After using the Printer Wizard from Windows to upload the driver, it goes through the process of copying the driver files to the [print$] directory, but there is still an error in my log file. _spoolss_addprinterdriver: Failed to send message about upgrading driver []! [2007/12/27 15:59:26, 1] smbd/service.c:close_cnum(1230) vlkidder-06212 (10.1.3.8) closed connection to service print$ I'm trying to upload print drivers to a stand-alone samba server running version 3.0.25. The server is part of a workgroup (not domain). My log files show messages that it cannot update the driver. Before I had the printer admin option set in my smb.conf file to allow a non-root user to do the printer admin and everything worked fine. I have read the Samba How To Notes section on important changes since 3.x, it says the following. Group mappings are essential only if the Samba server is running as a PDC/BDC. Stand-alone servers do not require these group mappings.. Can anyone help me to understand what I need to do to allow a non-root user to perform printer admin functions on a stand-alone server? -- 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] Odd, slow Windows XP client download behavior
-Original Message- From: Rune Tønnesen With Realteks networkscard there have been reported problems, with use of the driver provided by microsoft update. You might improve your networkspeed on your XP computer be using the driver provided by the manufacturer of your NIC. My XP machine uses the onboard Marvell Yukon 88E8053 PCI-E Gigabit Ethernet Controller with driver version 10.51.1.3, provided by Marvell, which is the latest I know of. -Original Message- From: Andreas Baitis When you browse the Samba shares, is this fast, or does it take some time for the shares to open in explorer? Browsing is fast, there is no noticeable difference between the Vista machine and my XP client. There's also no noticeable difference in browsing speed between having oplocks turned on/off . -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Re: Migrate Windows 2000 (Active Directory Integrated) Domainto Samba
Jamrock wrote: Charles Marcus [EMAIL PROTECTED] wrote in message news:[EMAIL PROTECTED] I read everywhere about migrating an NT4 domain, but nowhere says you can do the same with a Windows 2000 (NOT mixed mode) domain... This client does NOT currently use AD for anything special (GPO, etc). Is this possible? Advised? Samba 3.x cannot migrate data from Windows 200x. This is one of the proposed features of Samba 4.x which is currently in development. Yeah, pretty much figured that out... oh well, guess I'll just have to redo the domain from scratch... glad its only about 50 machines/users... Thanks -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1104-g7576539
The branch, v3-2-test has been updated
via 757653966fc1384159bd2d57c5670cd8af0cae96 (commit)
from 7e8e91aeb3795d26ae8591665981bc42d8b6122f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 757653966fc1384159bd2d57c5670cd8af0cae96
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Sat Jan 5 00:23:35 2008 -0800
Add general '-e' option to enable smb encryption
on tools.
Jeremy.
---
Summary of changes:
source/client/smbspool.c | 21 +-
source/include/popt_common.h |1 +
source/lib/popt_common.c |6
source/lib/util.c| 14 -
source/libsmb/clidfs.c | 58 +++---
source/libsmb/clifsinfo.c| 33 ++
source/rpcclient/rpcclient.c | 12
source/utils/net.c | 63 -
source/utils/net_help.c |1 +
source/utils/smbcacls.c | 37
10 files changed, 189 insertions(+), 57 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/client/smbspool.c b/source/client/smbspool.c
index 4270eb4..e7df22c 100644
--- a/source/client/smbspool.c
+++ b/source/client/smbspool.c
@@ -47,7 +47,9 @@ static struct cli_state *smb_complete_connection(const char
*, const char *,int
static struct cli_state*smb_connect(const char *, const char *, int,
const char *, const char *, const char *, const char *);
static int smb_print(struct cli_state *, char *, FILE *);
static char * uri_unescape_alloc(const char *);
-
+#if 0
+static bool smb_encrypt;
+#endif
/*
* 'main()' - Main entry for SMB backend.
@@ -468,6 +470,23 @@ static struct cli_state
return NULL;
}
+#if 0
+ /* Need to work out how to specify this on the URL. */
+ if (smb_encrypt)
+ {
+if (!cli_cm_force_encryption(cli,
+ username,
+ password,
+ workgroup,
+ share))
+{
+ fprintf(stderr, ERROR: encryption setup failed\n);
+ cli_shutdown(cli);
+ return NULL;
+}
+ }
+#endif
+
return cli;
}
diff --git a/source/include/popt_common.h b/source/include/popt_common.h
index 1d3cc57..9e5503f 100644
--- a/source/include/popt_common.h
+++ b/source/include/popt_common.h
@@ -49,6 +49,7 @@ struct user_auth_info {
bool got_pass;
bool use_kerberos;
int signing_state;
+ bool smb_encrypt;
};
#endif /* _POPT_COMMON_H */
diff --git a/source/lib/popt_common.c b/source/lib/popt_common.c
index b3a84a6..5a9d39d 100644
--- a/source/lib/popt_common.c
+++ b/source/lib/popt_common.c
@@ -414,6 +414,7 @@ static void get_credentials_file(const char *file)
* -N,--no-pass
* -S,--signing
* -P --machine-pass
+ * -e --encrypt
*/
@@ -532,6 +533,10 @@ static void popt_common_credentials_callback(poptContext
con,
case 'N':
set_cmdline_auth_info_password();
break;
+ case 'e':
+ set_cmdline_auth_info_smb_encrypt();
+ break;
+
}
}
@@ -543,5 +548,6 @@ struct poptOption popt_common_credentials[] = {
{ authentication-file, 'A', POPT_ARG_STRING, NULL, 'A', Get the
credentials from a file, FILE },
{ signing, 'S', POPT_ARG_STRING, NULL, 'S', Set the client signing
state, on|off|required },
{machine-pass, 'P', POPT_ARG_NONE, NULL, 'P', Use stored machine
account password },
+ {encrypt, 'e', POPT_ARG_NONE, NULL, 'e', Encrypt SMB transport (UNIX
extended servers only) },
POPT_TABLEEND
};
diff --git a/source/lib/util.c b/source/lib/util.c
index 7f8a297..81b9fc8 100644
--- a/source/lib/util.c
+++ b/source/lib/util.c
@@ -289,7 +289,8 @@ static struct user_auth_info cmdline_auth_info = {
NULL, /* password */
false, /* got_pass */
false, /* use_kerberos */
- Undefined /* signing state */
+ Undefined, /* signing state */
+ false /* smb_encrypt */
};
const char *get_cmdline_auth_info_username(void)
@@ -362,11 +363,22 @@ void set_cmdline_auth_info_use_krb5_ticket(void)
cmdline_auth_info.got_pass = true;
}
+/* This should only be used by lib/popt_common.c JRA */
+bool set_cmdline_auth_info_smb_encrypt(void)
+{
+ cmdline_auth_info.smb_encrypt = true;
+}
+
bool get_cmdline_auth_info_got_pass(void)
{
return cmdline_auth_info.got_pass;
}
+bool get_cmdline_auth_info_smb_encrypt(void)
+{
+ return cmdline_auth_info.smb_encrypt;
+}
+
bool get_cmdline_auth_info_copy(struct user_auth_info *info)
{
*info = cmdline_auth_info;
diff --git a/source/libsmb/clidfs.c b/source/libsmb/clidfs.c
index 7800d10..77419b4 100644
--- a/source/libsmb/clidfs.c
+++
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1105-g7b0826a
The branch, v3-2-test has been updated
via 7b0826aeec284fb129dc1101a5eae2ca96c7cfb6 (commit)
from 757653966fc1384159bd2d57c5670cd8af0cae96 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 7b0826aeec284fb129dc1101a5eae2ca96c7cfb6
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Sat Jan 5 00:41:48 2008 -0800
Fix args to cli_force_encryption.
Jeremy.
---
Summary of changes:
source/utils/net.c |3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/utils/net.c b/source/utils/net.c
index 5931609..586ea2f 100644
--- a/source/utils/net.c
+++ b/source/utils/net.c
@@ -202,8 +202,7 @@ NTSTATUS connect_to_service(struct cli_state **c,
nt_status = cli_force_encryption(*c,
opt_user_name,
opt_password,
- opt_workgroup,
- service_name);
+ opt_workgroup);
if (NT_STATUS_EQUAL(nt_status,NT_STATUS_NOT_SUPPORTED)) {
d_printf(Encryption required and
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1109-g0475bdc
The branch, v3-2-test has been updated
via 0475bdcf44d21bbdefb57f15d403c91c44d8d90a (commit)
via 07d47996f9535731ccdc1792c405c8bee1a082ae (commit)
via f97b1247c1053f47aef64be95ab9b3c3d8702c8a (commit)
via ef1bbcdfb98da185c07005dd7810039f99f0685f (commit)
from 7b0826aeec284fb129dc1101a5eae2ca96c7cfb6 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 0475bdcf44d21bbdefb57f15d403c91c44d8d90a
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Sat Jan 5 00:51:50 2008 -0800
Add -e to smbget.
Jeremy.
commit 07d47996f9535731ccdc1792c405c8bee1a082ae
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Sat Jan 5 00:51:18 2008 -0800
Add the options smb_encrypt_level to set the requested
encrypt level and smb_encrypt_on to query it.
Jeremy.
commit f97b1247c1053f47aef64be95ab9b3c3d8702c8a
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Sat Jan 5 00:50:03 2008 -0800
Fix -e for smbcquotas.
Jeremy.
commit ef1bbcdfb98da185c07005dd7810039f99f0685f
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Sat Jan 5 00:46:04 2008 -0800
Use the common -e option not the custom one.
Jeremy.
---
Summary of changes:
source/client/client.c |2 +-
source/include/libsmb_internal.h |7 +++
source/libsmb/libsmbclient.c | 98 ++
source/utils/smbcquotas.c| 35 +
source/utils/smbget.c| 12 +
5 files changed, 142 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/client/client.c b/source/client/client.c
index a5e4a38..46f0560 100644
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -4598,7 +4598,6 @@ static int do_message_op(void)
{ port, 'p', POPT_ARG_INT, port, 'p', Port to connect to,
PORT },
{ grepable, 'g', POPT_ARG_NONE, NULL, 'g', Produce grepable
output },
{ browse, 'B', POPT_ARG_NONE, NULL, 'B', Browse SMB servers
using DNS },
- { encrypt, 'e', POPT_ARG_NONE, NULL, 'e', Encrypt SMB
transport (UNIX extended servers only) },
POPT_COMMON_SAMBA
POPT_COMMON_CONNECTION
POPT_COMMON_CREDENTIALS
@@ -4834,6 +4833,7 @@ static int do_message_op(void)
calling_name = talloc_strdup(frame, global_myname() );
}
+ smb_encrypt = get_cmdline_auth_info_smb_encrypt();
init_names();
if(new_name_resolve_order)
diff --git a/source/include/libsmb_internal.h b/source/include/libsmb_internal.h
index 19a3edc..dbc1154 100644
--- a/source/include/libsmb_internal.h
+++ b/source/include/libsmb_internal.h
@@ -106,6 +106,13 @@ struct smbc_internal_data {
* and retrieved with smbc_option_set() and smbc_option_get().
*/
void * _user_data;
+
+/*
+ * Should we attempt UNIX smb encryption ?
+ * Set to 0 if we should never attempt, set to 1 if
+ * encryption requested, set to 2 if encryption required.
+ */
+int _smb_encryption_level;
};
diff --git a/source/libsmb/libsmbclient.c b/source/libsmb/libsmbclient.c
index 2ff2830..da8f1e3 100644
--- a/source/libsmb/libsmbclient.c
+++ b/source/libsmb/libsmbclient.c
@@ -6,6 +6,7 @@
Copyright (C) John Terpstra 2000
Copyright (C) Tom Jansen (Ninja ISD) 2002
Copyright (C) Derrell Lipman 2003, 2004
+ Copyright (C) Jeremy Allison 2007, 2008
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
@@ -739,6 +740,12 @@ smbc_server(SMBCCTX *context,
password, strlen(password)+1);
}
+ /*
+* We don't need to renegotiate encryption
+* here as the encryption context is not per
+* tid.
+*/
+
if (! cli_send_tconX(srv-cli, share, ?,
password, strlen(password)+1)) {
@@ -903,6 +910,30 @@ smbc_server(SMBCCTX *context,
DEBUG(4,( tconx ok\n));
+ if (context-internal-_smb_encryption_level) {
+ /* Attempt UNIX smb encryption. */
+ if (!NT_STATUS_IS_OK(cli_force_encryption(c,
+ username_used,
+ password,
+ workgroup))) {
+
+ /*
+* context-internal-_smb_encryption_level == 1
+* means don't fail if encryption can't be negotiated,
+* == 2 means fail if encryption can't be negotiated.
+
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1110-g45ae90b
The branch, v3-2-test has been updated
via 45ae90b77e53cd0cdf50939528dac4d2ca39b5c5 (commit)
from 0475bdcf44d21bbdefb57f15d403c91c44d8d90a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 45ae90b77e53cd0cdf50939528dac4d2ca39b5c5
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Sat Jan 5 01:16:09 2008 -0800
Fix missing return - should be void.
Jeremy.
---
Summary of changes:
source/lib/util.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/util.c b/source/lib/util.c
index 81b9fc8..c69a145 100644
--- a/source/lib/util.c
+++ b/source/lib/util.c
@@ -364,7 +364,7 @@ void set_cmdline_auth_info_use_krb5_ticket(void)
}
/* This should only be used by lib/popt_common.c JRA */
-bool set_cmdline_auth_info_smb_encrypt(void)
+void set_cmdline_auth_info_smb_encrypt(void)
{
cmdline_auth_info.smb_encrypt = true;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1111-g3e32053
The branch, v3-2-test has been updated via 3e3205309b75edf7d29633525adfdceb5f8856eb (commit) from 45ae90b77e53cd0cdf50939528dac4d2ca39b5c5 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 3e3205309b75edf7d29633525adfdceb5f8856eb Author: Jeremy Allison [EMAIL PROTECTED] Date: Sat Jan 5 01:17:33 2008 -0800 Fix %d / size_t printf arg missmatch. Jeremy. --- Summary of changes: source/smbd/blocking.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source/smbd/blocking.c b/source/smbd/blocking.c index 4196316..4e0d528 100644 --- a/source/smbd/blocking.c +++ b/source/smbd/blocking.c @@ -238,9 +238,9 @@ bool push_blocking_lock_request( struct byte_range_lock *br_lck, set_lock_msg = True; } - DEBUG(3,(push_blocking_lock_request: lock request length=%d blocked with + DEBUG(3,(push_blocking_lock_request: lock request length=%u blocked with expiry time (%u sec. %u usec) (+%d msec) for fnum = %d, name = %s\n, - length, (unsigned int)blr-expire_time.tv_sec, + (unsigned int)length, (unsigned int)blr-expire_time.tv_sec, (unsigned int)blr-expire_time.tv_usec, lock_timeout, blr-fsp-fnum, blr-fsp-fsp_name )); -- Samba Shared Repository
svn commit: samba r26665 - in branches/SAMBA_4_0: . source/lib/registry/tests
Author: jelmer Date: 2008-01-05 13:59:53 + (Sat, 05 Jan 2008) New Revision: 26665 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26665 Log: registry: Fix tests on bigendian machines. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/lib/registry/tests/hive.c Changeset: Property changes on: branches/SAMBA_4_0 ___ Name: bzr:revision-info ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/source/lib/registry/tests/hive.c === --- branches/SAMBA_4_0/source/lib/registry/tests/hive.c 2008-01-04 15:41:29 UTC (rev 26664) +++ branches/SAMBA_4_0/source/lib/registry/tests/hive.c 2008-01-05 13:59:53 UTC (rev 26665) @@ -186,8 +186,10 @@ torture_assert_int_equal(tctx, value.length, 4, value length); torture_assert_int_equal(tctx, type, REG_DWORD, value type); - torture_assert(tctx, memcmp(value.data, data, 4) == 0, value data); + torture_assert_int_equal(tctx, data, IVAL(value.data, 0), +value data); + return true; } @@ -250,7 +252,9 @@ torture_assert_int_equal(tctx, value.length, 4, value length); torture_assert_int_equal(tctx, type, REG_DWORD, value type); - torture_assert(tctx, memcmp(value.data, data, 4) == 0, value data); + + + torture_assert_int_equal(tctx, data, IVAL(value.data, 0), value data); error = hive_get_value_by_index(mem_ctx, subkey, 1, name, type, value);
svn commit: samba r26666 - in branches/SAMBA_4_0: . source/scripting/python
Author: jelmer Date: 2008-01-05 14:00:07 + (Sat, 05 Jan 2008) New Revision: 2 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=2 Log: python: Prefer newer Python versions as they use const properly. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/scripting/python/config.m4 Changeset: Property changes on: branches/SAMBA_4_0 ___ Name: bzr:revision-info ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/source/scripting/python/config.m4 === --- branches/SAMBA_4_0/source/scripting/python/config.m42008-01-05 13:59:53 UTC (rev 26665) +++ branches/SAMBA_4_0/source/scripting/python/config.m42008-01-05 14:00:07 UTC (rev 2) @@ -13,7 +13,12 @@ AC_MSG_WARN([No python found]) fi -AC_PATH_PROG([PYTHON_CONFIG],[python[$PYTHON_VERSION]-config]) +if test -z $PYTHON_VERSION; then + AC_PATH_PROGS([PYTHON_CONFIG], [python2.6-config python2.5-config python2.4-config python-config]) +else + AC_PATH_PROG([PYTHON_CONFIG], [python[$PYTHON_VERSION]-config]) +fi + if test -z $PYTHON_CONFIG; then working_python=no AC_MSG_WARN([No python-config found])
svn commit: samba r26667 - in branches/SAMBA_4_0: . source/pidl/lib/Parse/Pidl/Samba4
Author: jelmer
Date: 2008-01-05 14:00:12 + (Sat, 05 Jan 2008)
New Revision: 26667
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26667
Log:
pidl/python: Don't generate casts anymore; this will generate warnings with
older Pythons, but will be a lot cleaner with newer versions.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Python.pm
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Python.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Python.pm
2008-01-05 14:00:07 UTC (rev 2)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/Python.pm
2008-01-05 14:00:12 UTC (rev 26667)
@@ -123,11 +123,11 @@
$self-pidl(static PyTypeObject $type-{NAME}_ObjectType = {);
$self-indent;
$self-pidl(PyObject_HEAD_INIT(NULL) 0,);
- $self-pidl(.tp_name = (char *)\$type-{NAME}\,);
+ $self-pidl(.tp_name = \$type-{NAME}\,);
$self-pidl(.tp_basicsize = sizeof($type-{NAME}_Object),);
- $self-pidl(.tp_dealloc = py_$type-{NAME}_dealloc,);
- $self-pidl(.tp_getattr = py_$type-{NAME}_getattr,);
- $self-pidl(.tp_setattr = py_$type-{NAME}_setattr,);
+ $self-pidl(.tp_dealloc = (destructor)py_$type-{NAME}_dealloc,);
+ $self-pidl(.tp_getattr = (getattrfunc)py_$type-{NAME}_getattr,);
+ $self-pidl(.tp_setattr = (setattrfunc)py_$type-{NAME}_setattr,);
$self-deindent;
$self-pidl(};);
@@ -219,7 +219,7 @@
$fn_name =~ s/^$interface-{NAME}_//;
- $self-pidl({ (char *)\$fn_name\,
(PyCFunction)py_$d-{NAME}, METH_VARARGS|METH_KEYWORDS, NULL },);
+ $self-pidl({ \$fn_name\, (PyCFunction)py_$d-{NAME},
METH_VARARGS|METH_KEYWORDS, NULL },);
}
$self-pidl({ NULL, NULL, 0, NULL });
$self-deindent;
@@ -248,7 +248,7 @@
$self-pidl(static PyTypeObject $interface-{NAME}_InterfaceType = {);
$self-indent;
$self-pidl(PyObject_HEAD_INIT(NULL) 0,);
- $self-pidl(.tp_name = (char *)\$interface-{NAME}\,);
+ $self-pidl(.tp_name = \$interface-{NAME}\,);
$self-pidl(.tp_basicsize =
sizeof($interface-{NAME}_InterfaceObject),);
$self-pidl(.tp_dealloc = interface_$interface-{NAME}_dealloc,);
$self-pidl(.tp_getattr = interface_$interface-{NAME}_getattr,);
@@ -313,7 +313,7 @@
$self-indent;
foreach my $x (@$ndr) {
next if ($x-{TYPE} ne INTERFACE);
- $self-pidl({ (char *)\$x-{NAME}\,
(PyCFunction)interface_$x-{NAME}, METH_VARARGS|METH_KEYWORDS, NULL },);
+ $self-pidl({ \$x-{NAME}\,
(PyCFunction)interface_$x-{NAME}, METH_VARARGS|METH_KEYWORDS, NULL },);
foreach my $d (@{$x-{TYPES}}) {
next if has_property($d, nopython);
@@ -324,7 +324,7 @@
$fn_name =~ s/^$x-{NAME}_//;
$fn_name =~ s/^$basename\_//;
- $self-pidl({ (char *)\$fn_name\,
(PyCFunction)py_$d-{NAME}, METH_VARARGS|METH_KEYWORDS, NULL },);
+ $self-pidl({ \$fn_name\,
(PyCFunction)py_$d-{NAME}, METH_VARARGS|METH_KEYWORDS, NULL },);
}
}
@@ -338,7 +338,7 @@
$self-pidl({);
$self-indent;
$self-pidl(PyObject *m;);
- $self-pidl(m = Py_InitModule((char *)\$basename\,
$basename\_methods););
+ $self-pidl(m = Py_InitModule(\$basename\, $basename\_methods););
foreach (keys %{$self-{constants}}) {
# FIXME: Handle non-string constants
$self-pidl(PyModule_AddObject(m, \$_\,
PyString_FromString( . $self-{constants}-{$_}-[1] . )););
svn commit: samba r26668 - in branches/SAMBA_4_0: . source/lib/tdb
Author: jelmer
Date: 2008-01-05 15:36:26 + (Sat, 05 Jan 2008)
New Revision: 26668
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26668
Log:
tdb/python: Fix default value of open_flags for tdb.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/lib/tdb/tdb.i
branches/SAMBA_4_0/source/lib/tdb/tdb_wrap.c
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/lib/tdb/tdb.i
===
--- branches/SAMBA_4_0/source/lib/tdb/tdb.i 2008-01-05 14:00:12 UTC (rev
26667)
+++ branches/SAMBA_4_0/source/lib/tdb/tdb.i 2008-01-05 15:36:26 UTC (rev
26668)
@@ -122,7 +122,7 @@
$1 = TDB_DEFAULT;
}
-%typemap(default,noblock=1) int open_flags {
+%typemap(default,noblock=1) int flags {
$1 = O_RDWR;
}
Modified: branches/SAMBA_4_0/source/lib/tdb/tdb_wrap.c
===
--- branches/SAMBA_4_0/source/lib/tdb/tdb_wrap.c2008-01-05 14:00:12 UTC
(rev 26667)
+++ branches/SAMBA_4_0/source/lib/tdb/tdb_wrap.c2008-01-05 15:36:26 UTC
(rev 26668)
@@ -2823,6 +2823,7 @@
arg2 = 0;
arg3 = TDB_DEFAULT;
+ arg4 = O_RDWR;
arg5 = 0600;
if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char
*)O|:new_Tdb,kwnames,obj0,obj1,obj2,obj3,obj4)) SWIG_fail;
res1 = SWIG_AsCharPtrAndSize(obj0, buf1, NULL, alloc1);
svn commit: samba r26669 - in branches/SAMBA_4_0: . source/ldap_server source/lib/events source/libcli/raw source/libnet source/wrepl_server
Author: jelmer
Date: 2008-01-05 15:36:33 + (Sat, 05 Jan 2008)
New Revision: 26669
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26669
Log:
Janitorial: Remove uses of global_loadparm.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/ldap_server/ldap_server.c
branches/SAMBA_4_0/source/ldap_server/ldap_server.h
branches/SAMBA_4_0/source/lib/events/events.c
branches/SAMBA_4_0/source/libcli/raw/clisocket.c
branches/SAMBA_4_0/source/libcli/raw/rawacl.c
branches/SAMBA_4_0/source/libcli/raw/rawnegotiate.c
branches/SAMBA_4_0/source/libnet/libnet_become_dc.c
branches/SAMBA_4_0/source/libnet/libnet_vampire.c
branches/SAMBA_4_0/source/wrepl_server/wrepl_in_connection.c
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/ldap_server/ldap_server.c
===
--- branches/SAMBA_4_0/source/ldap_server/ldap_server.c 2008-01-05 15:36:26 UTC
(rev 26668)
+++ branches/SAMBA_4_0/source/ldap_server/ldap_server.c 2008-01-05 15:36:33 UTC
(rev 26669)
@@ -345,7 +345,7 @@
conn-connection = c;
conn-service = ldapsrv_service;
conn-sockets.raw = c-socket;
- conn-lp_ctx = global_loadparm;
+ conn-lp_ctx = ldapsrv_service-task-lp_ctx;
c-private= conn;
@@ -523,6 +523,8 @@
ldap_service = talloc_zero(task, struct ldapsrv_service);
if (ldap_service == NULL) goto failed;
+ ldap_service-task = task;
+
ldap_service-tls_params = tls_initialise(ldap_service, task-lp_ctx);
if (ldap_service-tls_params == NULL) goto failed;
Modified: branches/SAMBA_4_0/source/ldap_server/ldap_server.h
===
--- branches/SAMBA_4_0/source/ldap_server/ldap_server.h 2008-01-05 15:36:26 UTC
(rev 26668)
+++ branches/SAMBA_4_0/source/ldap_server/ldap_server.h 2008-01-05 15:36:33 UTC
(rev 26669)
@@ -65,6 +65,7 @@
struct ldapsrv_service {
struct tls_params *tls_params;
+ struct task_server *task;
};
#include ldap_server/proto.h
Modified: branches/SAMBA_4_0/source/lib/events/events.c
===
--- branches/SAMBA_4_0/source/lib/events/events.c 2008-01-05 15:36:26 UTC
(rev 26668)
+++ branches/SAMBA_4_0/source/lib/events/events.c 2008-01-05 15:36:33 UTC
(rev 26669)
@@ -103,11 +103,8 @@
{
#if _SAMBA_BUILD_
init_module_fn static_init[] = { STATIC_LIBEVENTS_MODULES };
- init_module_fn *shared_init;
if (event_backends) return;
- shared_init = load_samba_modules(NULL, global_loadparm, events);
run_init_functions(static_init);
- run_init_functions(shared_init);
#else
bool events_standard_init(void);
bool events_select_init(void);
Modified: branches/SAMBA_4_0/source/libcli/raw/clisocket.c
===
--- branches/SAMBA_4_0/source/libcli/raw/clisocket.c2008-01-05 15:36:26 UTC
(rev 26668)
+++ branches/SAMBA_4_0/source/libcli/raw/clisocket.c2008-01-05 15:36:33 UTC
(rev 26669)
@@ -83,7 +83,7 @@
ctx = socket_connect_multi_send(state, host_addr,
state-num_ports, state-ports,
- lp_resolve_context(global_loadparm),
+ resolve_ctx,
state-ctx-event_ctx);
if (ctx == NULL) goto failed;
ctx-async.fn = smbcli_sock_connect_recv_conn;
Modified: branches/SAMBA_4_0/source/libcli/raw/rawacl.c
===
--- branches/SAMBA_4_0/source/libcli/raw/rawacl.c 2008-01-05 15:36:26 UTC
(rev 26668)
+++ branches/SAMBA_4_0/source/libcli/raw/rawacl.c 2008-01-05 15:36:33 UTC
(rev 26669)
@@ -77,8 +77,7 @@
nt.out.data.length = IVAL(nt.out.params.data, 0);
- ndr = ndr_pull_init_blob(nt.out.data, mem_ctx,
-lp_iconv_convenience(global_loadparm));
+ ndr = ndr_pull_init_blob(nt.out.data, mem_ctx, NULL);
if (!ndr) {
return NT_STATUS_INVALID_PARAMETER;
}
@@ -136,7 +135,7 @@
nt.in.params.data = params;
nt.in.params.length = 8;
- ndr = ndr_push_init_ctx(NULL, lp_iconv_convenience(global_loadparm));
+ ndr = ndr_push_init_ctx(NULL, NULL);
if (!ndr) return NULL;
ndr_err = ndr_push_security_descriptor(ndr, NDR_SCALARS|NDR_BUFFERS,
io-set_secdesc.in.sd);
Modified: branches/SAMBA_4_0/source/libcli/raw/rawnegotiate.c
===
--- branches/SAMBA_4_0/source/libcli/raw/rawnegotiate.c
svn commit: samba r26670 - in branches/SAMBA_4_0: . source/libcli/smb_composite source/nbt_server/wins source/ntptr/simple_ldb source/ntvfs/common
Author: jelmer
Date: 2008-01-05 15:36:37 + (Sat, 05 Jan 2008)
New Revision: 26670
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26670
Log:
Janitorial: Remove global_loadparm uses.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/libcli/smb_composite/fsinfo.c
branches/SAMBA_4_0/source/nbt_server/wins/winswack.c
branches/SAMBA_4_0/source/ntptr/simple_ldb/ntptr_simple_ldb.c
branches/SAMBA_4_0/source/ntvfs/common/opendb_tdb.c
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/libcli/smb_composite/fsinfo.c
===
--- branches/SAMBA_4_0/source/libcli/smb_composite/fsinfo.c 2008-01-05
15:36:33 UTC (rev 26669)
+++ branches/SAMBA_4_0/source/libcli/smb_composite/fsinfo.c 2008-01-05
15:36:37 UTC (rev 26670)
@@ -153,11 +153,11 @@
state-connect-in.fallback_to_anonymous = false;
state-connect-in.workgroup= io-in.workgroup;
- lp_smbcli_options(global_loadparm, state-connect-in.options);
+ state-connect-in.options = tree-session-transport-options;
c-state = COMPOSITE_STATE_IN_PROGRESS;
state-stage = FSINFO_CONNECT;
- c-event_ctx = talloc_reference(c,
tree-session-transport-socket-event.ctx);
+ c-event_ctx = talloc_reference(c,
tree-session-transport-socket-event.ctx);
c-private_data = state;
state-creq = smb_composite_connect_send(state-connect, state,
Modified: branches/SAMBA_4_0/source/nbt_server/wins/winswack.c
===
--- branches/SAMBA_4_0/source/nbt_server/wins/winswack.c2008-01-05
15:36:33 UTC (rev 26669)
+++ branches/SAMBA_4_0/source/nbt_server/wins/winswack.c2008-01-05
15:36:37 UTC (rev 26670)
@@ -306,7 +306,7 @@
s-req = req;
s-io.in.nbtd_server= nbtd_server;
- s-io.in.nbt_port = lp_nbt_port(global_loadparm);
+ s-io.in.nbt_port = lp_nbt_port(nbtd_server-task-lp_ctx);
s-io.in.event_ctx = msg-ev;
s-io.in.name = req-in.name;
s-io.in.num_addresses = req-in.num_addrs;
Modified: branches/SAMBA_4_0/source/ntptr/simple_ldb/ntptr_simple_ldb.c
===
--- branches/SAMBA_4_0/source/ntptr/simple_ldb/ntptr_simple_ldb.c
2008-01-05 15:36:33 UTC (rev 26669)
+++ branches/SAMBA_4_0/source/ntptr/simple_ldb/ntptr_simple_ldb.c
2008-01-05 15:36:37 UTC (rev 26670)
@@ -175,7 +175,7 @@
os.build=
dcesrv_common_get_version_build(mem_ctx, server-ntptr-lp_ctx);
os.extra_string = ;
- ndr_err = ndr_push_struct_blob(blob, mem_ctx,
lp_iconv_convenience(global_loadparm), os,
(ndr_push_flags_fn_t)ndr_push_spoolss_OSVersion);
+ ndr_err = ndr_push_struct_blob(blob, mem_ctx,
lp_iconv_convenience(server-ntptr-lp_ctx), os,
(ndr_push_flags_fn_t)ndr_push_spoolss_OSVersion);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
return WERR_GENERAL_FAILURE;
}
@@ -195,7 +195,7 @@
os_ex.unknown2 = 0;
os_ex.unknown3 = 0;
- ndr_err = ndr_push_struct_blob(blob, mem_ctx,
lp_iconv_convenience(global_loadparm), os_ex,
(ndr_push_flags_fn_t)ndr_push_spoolss_OSVersionEx);
+ ndr_err = ndr_push_struct_blob(blob, mem_ctx,
lp_iconv_convenience(server-ntptr-lp_ctx), os_ex,
(ndr_push_flags_fn_t)ndr_push_spoolss_OSVersionEx);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
return WERR_GENERAL_FAILURE;
}
Modified: branches/SAMBA_4_0/source/ntvfs/common/opendb_tdb.c
===
--- branches/SAMBA_4_0/source/ntvfs/common/opendb_tdb.c 2008-01-05 15:36:33 UTC
(rev 26669)
+++ branches/SAMBA_4_0/source/ntvfs/common/opendb_tdb.c 2008-01-05 15:36:37 UTC
(rev 26670)
@@ -205,7 +205,7 @@
blob.data = dbuf.dptr;
blob.length = dbuf.dsize;
- ndr_err = ndr_pull_struct_blob(blob, lck,
lp_iconv_convenience(global_loadparm), file,
(ndr_pull_flags_fn_t)ndr_pull_opendb_file);
+ ndr_err = ndr_pull_struct_blob(blob, lck,
lp_iconv_convenience(lck-odb-ntvfs_ctx-lp_ctx), file,
(ndr_pull_flags_fn_t)ndr_pull_opendb_file);
free(dbuf.dptr);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
return ndr_map_error2ntstatus(ndr_err);
@@ -233,7 +233,7 @@
return NT_STATUS_OK;
}
- ndr_err = ndr_push_struct_blob(blob, lck,
lp_iconv_convenience(global_loadparm), file,
(ndr_push_flags_fn_t)ndr_push_opendb_file);
+ ndr_err = ndr_push_struct_blob(blob, lck,
svn commit: samba r26671 - in branches/SAMBA_4_0: . source source/selftest source/torture/rap
Author: jelmer
Date: 2008-01-05 19:03:36 + (Sat, 05 Jan 2008)
New Revision: 26671
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26671
Log:
rap: Convert the RAP tests to the new torture API and run them by default.
We don't have a server-side implementation of netservergetinfo yet, so it is
marked as known failing.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/samba4-knownfail
branches/SAMBA_4_0/source/selftest/samba4_tests.sh
branches/SAMBA_4_0/source/torture/rap/rap.c
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/samba4-knownfail
===
--- branches/SAMBA_4_0/source/samba4-knownfail 2008-01-05 15:36:37 UTC (rev
26670)
+++ branches/SAMBA_4_0/source/samba4-knownfail 2008-01-05 19:03:36 UTC (rev
26671)
@@ -33,3 +33,4 @@
RPC-NETLOGON.*.GetTrustPasswords
BASE-CHARSET.*.Testing partial surrogate
.*NET-API-DELSHARE.* # DelShare isn't implemented yet
+RAP.*netservergetinfo
Modified: branches/SAMBA_4_0/source/selftest/samba4_tests.sh
===
--- branches/SAMBA_4_0/source/selftest/samba4_tests.sh 2008-01-05 15:36:37 UTC
(rev 26670)
+++ branches/SAMBA_4_0/source/selftest/samba4_tests.sh 2008-01-05 19:03:36 UTC
(rev 26671)
@@ -190,6 +190,11 @@
plantest $t dc $VALGRIND $smb4torture $ADDARGS //\$SERVER/tmp
-U\$USERNAME%\$PASSWORD $t
done
+rap=`$smb4torture --list | grep ^RAP- | xargs`
+for t in $rap; do
+plantest $t dc $VALGRIND $smb4torture $ADDARGS //\$SERVER/IPC\\\$
-U\$USERNAME%\$PASSWORD $t
+done
+
# Tests against the NTVFS CIFS backend
for t in $base $raw; do
plantest ntvfs.cifs.$t dc $VALGRIND $smb4torture //\$NETBIOSNAME/cifs
-U\$USERNAME%\$PASSWORD $t
Modified: branches/SAMBA_4_0/source/torture/rap/rap.c
===
--- branches/SAMBA_4_0/source/torture/rap/rap.c 2008-01-05 15:36:37 UTC (rev
26670)
+++ branches/SAMBA_4_0/source/torture/rap/rap.c 2008-01-05 19:03:36 UTC (rev
26671)
@@ -3,6 +3,7 @@
test suite for various RAP operations
Copyright (C) Volker Lendecke 2004
Copyright (C) Tim Potter 2005
+ 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
@@ -311,17 +312,17 @@
return result;
}
-static bool test_netshareenum(struct smbcli_tree *tree)
+static bool test_netshareenum(struct torture_context *tctx,
+ struct smbcli_state *cli)
{
struct rap_NetShareEnum r;
int i;
- TALLOC_CTX *tmp_ctx = talloc_new(tree);
r.in.level = 1;
r.in.bufsize = 8192;
- if (!NT_STATUS_IS_OK(smbcli_rap_netshareenum(tree, tmp_ctx, r)))
- return false;
+ torture_assert_ntstatus_ok(tctx,
+ smbcli_rap_netshareenum(cli-tree, tctx, r), );
for (i=0; ir.out.count; i++) {
printf(%s %d %s\n, r.out.info[i].info1.name,
@@ -329,8 +330,6 @@
r.out.info[i].info1.comment);
}
- talloc_free(tmp_ctx);
-
return true;
}
@@ -409,11 +408,11 @@
return result;
}
-static bool test_netserverenum(struct smbcli_tree *tree)
+static bool test_netserverenum(struct torture_context *tctx,
+ struct smbcli_state *cli)
{
struct rap_NetServerEnum2 r;
int i;
- TALLOC_CTX *tmp_ctx = talloc_new(tree);
r.in.level = 0;
r.in.bufsize = 8192;
@@ -421,8 +420,8 @@
r.in.servertype = 0x8000;
r.in.domain = NULL;
- if (!NT_STATUS_IS_OK(smbcli_rap_netserverenum2(tree, tmp_ctx, r)))
- return false;
+ torture_assert_ntstatus_ok(tctx,
+ smbcli_rap_netserverenum2(cli-tree, tctx, r), );
for (i=0; ir.out.count; i++) {
switch (r.in.level) {
@@ -437,8 +436,6 @@
}
}
- talloc_free(tmp_ctx);
-
return true;
}
@@ -501,74 +498,28 @@
return result;
}
-static bool test_netservergetinfo(struct smbcli_tree *tree)
+static bool test_netservergetinfo(struct torture_context *tctx,
+ struct smbcli_state *cli)
{
struct rap_WserverGetInfo r;
bool res = true;
- TALLOC_CTX *mem_ctx;
- if (!(mem_ctx = talloc_new(tree))) {
- return false;
- }
-
r.in.bufsize = 0x;
r.in.level = 0;
- res = NT_STATUS_IS_OK(smbcli_rap_netservergetinfo(tree, mem_ctx, r));
+ torture_assert_ntstatus_ok(tctx, smbcli_rap_netservergetinfo(cli-tree,
tctx, r), );
svn commit: samba r26672 - in branches/SAMBA_4_0: . source/cldap_server source/dsdb/repl source/kdc source/ldap_server source/nbt_server source/ntvfs/ipc source/ntvfs/sysdep source/rpc_server source/s
Author: jelmer Date: 2008-01-05 19:03:43 + (Sat, 05 Jan 2008) New Revision: 26672 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26672 Log: Janitorial: Remove uses of global_loadparm. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/cldap_server/cldap_server.c branches/SAMBA_4_0/source/dsdb/repl/drepl_service.c branches/SAMBA_4_0/source/kdc/kdc.c branches/SAMBA_4_0/source/ldap_server/ldap_server.c branches/SAMBA_4_0/source/nbt_server/nbt_server.c branches/SAMBA_4_0/source/ntvfs/ipc/ipc_rap.c branches/SAMBA_4_0/source/ntvfs/ipc/rap_server.c branches/SAMBA_4_0/source/ntvfs/ipc/vfs_ipc.c branches/SAMBA_4_0/source/ntvfs/sysdep/sys_notify.c branches/SAMBA_4_0/source/rpc_server/service_rpc.c branches/SAMBA_4_0/source/smb_server/smb2/fileio.c branches/SAMBA_4_0/source/smb_server/smb_server.c branches/SAMBA_4_0/source/smbd/process_model.h branches/SAMBA_4_0/source/smbd/process_single.c branches/SAMBA_4_0/source/smbd/process_standard.c branches/SAMBA_4_0/source/smbd/process_thread.c branches/SAMBA_4_0/source/smbd/service_stream.c branches/SAMBA_4_0/source/smbd/service_task.c branches/SAMBA_4_0/source/torture/util_smb.c branches/SAMBA_4_0/source/web_server/web_server.c branches/SAMBA_4_0/source/winbind/wb_server.c branches/SAMBA_4_0/source/wrepl_server/wrepl_in_connection.c branches/SAMBA_4_0/source/wrepl_server/wrepl_server.c Changeset: Sorry, the patch is too large (815 lines) to include; please use WebSVN to see it! WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26672
svn commit: samba r26675 - in branches/SAMBA_4_0: . source/script
Author: jelmer
Date: 2008-01-05 21:29:25 + (Sat, 05 Jan 2008)
New Revision: 26675
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=26675
Log:
mkproto: Add --all argument, fix some perl warnings.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/script/mkproto.pl
Changeset:
Property changes on: branches/SAMBA_4_0
___
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/script/mkproto.pl
===
--- branches/SAMBA_4_0/source/script/mkproto.pl 2008-01-05 19:33:11 UTC (rev
26674)
+++ branches/SAMBA_4_0/source/script/mkproto.pl 2008-01-05 21:29:25 UTC (rev
26675)
@@ -17,14 +17,15 @@
my $public_file = undef;
my $private_file = undef;
+my $all_file = undef;
my $public_define = undef;
my $private_define = undef;
my $_public = ;
my $_private = ;
my $public_data = \$_public;
my $private_data = \$_private;
-my $builddir = undef;
-my $srcdir = undef;
+my $builddir = .;
+my $srcdir = .;
sub public($)
{
@@ -55,6 +56,7 @@
GetOptions(
'public=s' = sub { my ($f,$v) = @_; $public_file = $v; },
+ 'all=s' = sub { my ($f,$v) = @_; $public_file = $v; $private_file =
$v; },
'private=s' = sub { my ($f,$v) = @_; $private_file = $v; },
'define=s' = sub {
my ($f,$v) = @_;
@@ -93,9 +95,9 @@
sub file_load($)
{
-my($filename) = shift;
+my($filename) = @_;
local(*INPUTFILE);
-open(INPUTFILE, $filename) || return undef;
+open(INPUTFILE, $filename) or return undef;
my($saved_delim) = $/;
undef $/;
my($data) = INPUTFILE;
@@ -231,7 +233,7 @@
print_header(\public, $public_define);
-if ($public_file ne $private_file) {
+if (defined($private_file) and defined($public_file) and $public_file ne
$private_file) {
print_header(\private, $private_define);
private(/* this file contains prototypes for functions that .
@@ -251,7 +253,7 @@
process_file(\public, \private, $_) foreach (@ARGV);
print_footer(\public, $public_define);
-if ($public_file ne $private_file) {
+if (defined($private_file) and $public_file ne $private_file) {
print_footer(\private, $private_define);
}
@@ -263,15 +265,12 @@
print STDOUT $$private_data;
}
-my $old_public_data = file_load($public_file);
-my $old_private_data = file_load($private_file);
-
mkpath(dirname($public_file), 0, 0755);
open(PUBLIC, $public_file) or die(Can't open `$public_file': $!);
print PUBLIC $$public_data;
close(PUBLIC);
-if ($public_file ne $private_file) {
+if (defined($private_file) and $public_file ne $private_file) {
mkpath(dirname($private_file), 0, 0755);
open(PRIVATE, $private_file) or die(Can't open `$private_file':
$!);
print PRIVATE $$private_data;
Build status as of Sun Jan 6 00:00:02 2008
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2008-01-05 00:00:40.0 + +++ /home/build/master/cache/broken_results.txt 2008-01-06 00:00:58.0 + @@ -1,4 +1,4 @@ -Build status as of Sat Jan 5 00:00:02 2008 +Build status as of Sun Jan 6 00:00:02 2008 Build counts: Tree Total Broken Panic @@ -7,20 +7,20 @@ ccache 27 8 0 ctdb 0 0 0 distcc 1 0 0 -ldb 27 11 0 +ldb 27 12 0 libreplace 26 13 0 lorikeet-heimdal 23 14 0 pidl 17 5 0 -ppp 9 6 0 +ppp 9 7 0 python 0 0 0 rsync27 10 0 samba-docs 0 0 0 samba-gtk3 3 0 -samba4 24 17 7 +samba4 24 19 8 samba_3_21 0 0 samba_3_2_test 26 12 0 samba_4_0_test 0 0 0 smb-build25 3 0 talloc 27 7 0 -tdb 26 4 0 +tdb 27 5 0
Rev 723: ensure tdb log messages appear in ctdbd logs in http://samba.org/~tridge/ctdb
revno: 723
revision-id:[EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge.stable
timestamp: Sun 2008-01-06 12:35:49 +1100
message:
ensure tdb log messages appear in ctdbd logs
modified:
lib/util/db_wrap.c db_wrap.c-20070125041102-mfc39bu6uof09lw6-1
lib/util/debug.c debug.c-20070417155854-2i3crb0irl716qft-1
lib/util/debug.h debug.h-20070417155854-2i3crb0irl716qft-2
=== modified file 'lib/util/db_wrap.c'
--- a/lib/util/db_wrap.c2007-07-10 05:29:31 +
+++ b/lib/util/db_wrap.c2008-01-06 01:35:49 +
@@ -44,6 +44,18 @@
return 0;
}
+static void log_fn(struct tdb_context *tdb, enum tdb_debug_level level, const
char *fmt, ...)
+{
+ if (level = TDB_DEBUG_ERROR) {
+ va_list ap;
+
+ va_start(ap, fmt);
+ do_debug_v(fmt, ap);
+ va_end(ap);
+ }
+}
+
+
/*
wrapped connection to a tdb database
to close just talloc_free() the tdb_wrap pointer
@@ -53,6 +65,10 @@
int open_flags, mode_t mode)
{
struct tdb_wrap *w;
+ struct tdb_logging_context log_ctx;
+
+ log_ctx.log_fn = log_fn;
+ log_ctx.log_private = NULL;
for (w=tdb_list;w;w=w-next) {
if (strcmp(name, w-name) == 0) {
@@ -67,8 +83,8 @@
w-name = talloc_strdup(w, name);
- w-tdb = tdb_open(name, hash_size, tdb_flags,
- open_flags, mode);
+ w-tdb = tdb_open_ex(name, hash_size, tdb_flags,
+open_flags, mode, log_ctx, NULL);
if (w-tdb == NULL) {
talloc_free(w);
return NULL;
=== modified file 'lib/util/debug.c'
--- a/lib/util/debug.c 2007-08-07 03:40:13 +
+++ b/lib/util/debug.c 2008-01-06 01:35:49 +
@@ -22,17 +22,14 @@
#include unistd.h
-void do_debug(const char *format, ...)
+void do_debug_v(const char *format, va_list ap)
{
struct timeval t;
- va_list ap;
char *s = NULL;
struct tm *tm;
char tbuf[100];
- va_start(ap, format);
vasprintf(s, format, ap);
- va_end(ap);
t = timeval_current();
tm = localtime(t.tv_sec);
@@ -43,3 +40,12 @@
fflush(stderr);
free(s);
}
+
+void do_debug(const char *format, ...)
+{
+ va_list ap;
+
+ va_start(ap, format);
+ do_debug_v(format, ap);
+ va_end(ap);
+}
=== modified file 'lib/util/debug.h'
--- a/lib/util/debug.h 2007-07-10 05:29:31 +
+++ b/lib/util/debug.h 2008-01-06 01:35:49 +
@@ -17,4 +17,5 @@
along with this program; if not, see http://www.gnu.org/licenses/.
*/
+void do_debug_v(const char *format, va_list ap);
void do_debug(const char *format, ...) PRINTF_ATTRIBUTE(1, 2);
Rev 722: - added tdb_add_flags() and tdb_remove_flags() in http://samba.org/~tridge/ctdb
revno: 722
revision-id:[EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge.stable
timestamp: Sun 2008-01-06 12:33:57 +1100
message:
- added tdb_add_flags() and tdb_remove_flags()
- make freelist merging more paranoid
- fixed TDB_DATA_STAART() (broken by earlier commit)
modified:
lib/tdb/common/freelist.c freelist.c-20070220022425-m1wibgjq7n5hahs6-4
lib/tdb/common/tdb.c tdb.c-20070220022425-m1wibgjq7n5hahs6-9
lib/tdb/common/tdb_private.h
tdb_private.h-20070220022425-m1wibgjq7n5hahs6-10
lib/tdb/include/tdb.h tdb.h-20070125040949-7t3f5zdl1q4z9hyv-101
=== modified file 'lib/tdb/common/freelist.c'
--- a/lib/tdb/common/freelist.c 2008-01-05 01:09:00 +
+++ b/lib/tdb/common/freelist.c 2008-01-06 01:33:57 +
@@ -138,7 +138,7 @@
#endif
/* Look left */
- if (offset - sizeof(tdb_off_t) =
TDB_DATA_START(tdb-header.hash_size)) {
+ if (offset - sizeof(tdb_off_t) TDB_DATA_START(tdb-header.hash_size))
{
tdb_off_t left = offset - sizeof(tdb_off_t);
struct list_struct l;
tdb_off_t leftsize;
@@ -156,7 +156,8 @@
left = offset - leftsize;
- if (left TDB_DATA_START(tdb-header.hash_size)) {
+ if (leftsize offset ||
+ left TDB_DATA_START(tdb-header.hash_size)) {
goto update;
}
=== modified file 'lib/tdb/common/tdb.c'
--- a/lib/tdb/common/tdb.c 2008-01-05 06:41:41 +
+++ b/lib/tdb/common/tdb.c 2008-01-06 01:33:57 +
@@ -666,6 +666,16 @@
return tdb-flags;
}
+void tdb_add_flags(struct tdb_context *tdb, unsigned flags)
+{
+ tdb-flags |= flags;
+}
+
+void tdb_remove_flags(struct tdb_context *tdb, unsigned flags)
+{
+ tdb-flags = ~flags;
+}
+
/*
enable sequence number handling on an open tdb
=== modified file 'lib/tdb/common/tdb_private.h'
--- a/lib/tdb/common/tdb_private.h 2008-01-05 06:41:41 +
+++ b/lib/tdb/common/tdb_private.h 2008-01-06 01:33:57 +
@@ -58,7 +58,7 @@
#define TDB_BAD_MAGIC(r) ((r)-magic != TDB_MAGIC !TDB_DEAD(r))
#define TDB_HASH_TOP(hash) (FREELIST_TOP + (BUCKET(hash)+1)*sizeof(tdb_off_t))
#define TDB_HASHTABLE_SIZE(tdb) ((tdb-header.hash_size+1)*sizeof(tdb_off_t))
-#define TDB_DATA_START(hash_size) TDB_HASH_TOP(hash_size)
+#define TDB_DATA_START(hash_size) (TDB_HASH_TOP(hash_size-1) +
sizeof(tdb_off_t))
#define TDB_RECOVERY_HEAD offsetof(struct tdb_header, recovery_start)
#define TDB_SEQNUM_OFSoffsetof(struct tdb_header, sequence_number)
#define TDB_PAD_BYTE 0x42
=== modified file 'lib/tdb/include/tdb.h'
--- a/lib/tdb/include/tdb.h 2008-01-05 06:41:41 +
+++ b/lib/tdb/include/tdb.h 2008-01-06 01:33:57 +
@@ -135,6 +135,8 @@
int tdb_hash_size(struct tdb_context *tdb);
size_t tdb_map_size(struct tdb_context *tdb);
int tdb_get_flags(struct tdb_context *tdb);
+void tdb_add_flags(struct tdb_context *tdb, unsigned flag);
+void tdb_remove_flags(struct tdb_context *tdb, unsigned flag);
void tdb_enable_seqnum(struct tdb_context *tdb);
void tdb_increment_seqnum_nonblock(struct tdb_context *tdb);
@@ -153,6 +155,7 @@
void tdb_dump_all(struct tdb_context *tdb);
int tdb_printfreelist(struct tdb_context *tdb);
int tdb_validate_freelist(struct tdb_context *tdb, int *pnum_entries);
+int tdb_wipe_all(struct tdb_context *tdb);
extern TDB_DATA tdb_null;
Rev 725: change default tunables to cope with larger dbs in http://samba.org/~tridge/ctdb
revno: 725
revision-id:[EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge.stable
timestamp: Sun 2008-01-06 12:36:58 +1100
message:
change default tunables to cope with larger dbs
modified:
server/ctdb_tunables.c
ctdb_tunables.c-20070604095258-4m34d7cm1qa7yos9-1
=== modified file 'server/ctdb_tunables.c'
--- a/server/ctdb_tunables.c2008-01-04 22:36:53 +
+++ b/server/ctdb_tunables.c2008-01-06 01:36:58 +
@@ -28,10 +28,10 @@
{ SeqnumFrequency, 1, offsetof(struct ctdb_tunable,
seqnum_frequency) },
{ ControlTimeout, 60, offsetof(struct ctdb_tunable,
control_timeout) },
{ TraverseTimeout, 20, offsetof(struct ctdb_tunable,
traverse_timeout) },
- { KeepaliveInterval,2, offsetof(struct ctdb_tunable,
keepalive_interval) },
+ { KeepaliveInterval,5, offsetof(struct ctdb_tunable,
keepalive_interval) },
{ KeepaliveLimit, 5, offsetof(struct ctdb_tunable,
keepalive_limit) },
{ MaxLACount, 7, offsetof(struct ctdb_tunable,
max_lacount) },
- { RecoverTimeout, 5, offsetof(struct ctdb_tunable,
recover_timeout) },
+ { RecoverTimeout, 30, offsetof(struct ctdb_tunable,
recover_timeout) },
{ RecoverInterval, 1, offsetof(struct ctdb_tunable,
recover_interval) },
{ ElectionTimeout, 3, offsetof(struct ctdb_tunable,
election_timeout) },
{ TakeoverTimeout, 5, offsetof(struct ctdb_tunable,
takeover_timeout) },
Rev 724: non-persistent databases don't need sync transactions in http://samba.org/~tridge/ctdb
revno: 724
revision-id:[EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge.stable
timestamp: Sun 2008-01-06 12:36:30 +1100
message:
non-persistent databases don't need sync transactions
modified:
server/ctdb_ltdb_server.c
ctdb_ltdb_server.c-20070607120348-7r182h0nlqxysyss-1
=== modified file 'server/ctdb_ltdb_server.c'
--- a/server/ctdb_ltdb_server.c 2008-01-04 22:36:53 +
+++ b/server/ctdb_ltdb_server.c 2008-01-06 01:36:30 +
@@ -246,7 +246,7 @@
ctdb_db-ltdb = tdb_wrap_open(ctdb, ctdb_db-db_path,
ctdb-tunable.database_hash_size,
-
persistent?TDB_DEFAULT:TDB_CLEAR_IF_FIRST,
+ persistent? TDB_DEFAULT :
TDB_CLEAR_IF_FIRST | TDB_NOSYNC,
O_CREAT|O_RDWR, 0666);
if (ctdb_db-ltdb == NULL) {
DEBUG(0,(Failed to open tdb '%s'\n, ctdb_db-db_path));
Rev 726: new simpler and much faster recovery code based on tdb transactions in http://samba.org/~tridge/ctdb
revno: 726 revision-id:[EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: tridge.stable timestamp: Sun 2008-01-06 12:38:01 +1100 message: new simpler and much faster recovery code based on tdb transactions modified: client/ctdb_client.c ctdb_client.c-20070411010216-3kd8v37k61steeya-1 include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13 server/ctdb_control.c ctdb_control.c-20070426122724-j6gkpiofhbwdin63-1 server/ctdb_freeze.c ctdb_freeze.c-20070512051503-935zdtyuqknqnhmo-1 server/ctdb_recover.c ctdb_recover.c-20070503002147-admmfgt1oj6gexfo-1 server/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1 Diff too large for email (1640, the limit is 200).
Rev 728: new rpm version in http://samba.org/~tridge/ctdb
revno: 728
revision-id:[EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell [EMAIL PROTECTED]
branch nick: tridge.stable
timestamp: Sun 2008-01-06 13:25:17 +1100
message:
new rpm version
modified:
packaging/RPM/ctdb.specctdb.spec-20070527204758-biuh7znabuwan3zn-3
=== modified file 'packaging/RPM/ctdb.spec'
--- a/packaging/RPM/ctdb.spec 2008-01-04 22:52:53 +
+++ b/packaging/RPM/ctdb.spec 2008-01-06 02:25:17 +
@@ -5,7 +5,7 @@
Packager: Samba Team [EMAIL PROTECTED]
Name: ctdb
Version: 1.0
-Release: 19
+Release: 20
Epoch: 0
License: GNU GPL version 3
Group: System Environment/Daemons
@@ -117,6 +117,8 @@
%{_includedir}/ctdb_private.h
%changelog
+* Sun Jan 06 2008 : Version 1.0.20
+ - new transaction based recovery code
* Sat Jan 05 2008 : Version 1.0.19
- fixed non-master bug
- big speedup in recovery for large databases
Rev 727: added paranoid transaction ids in http://samba.org/~tridge/ctdb
revno: 727 revision-id:[EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell [EMAIL PROTECTED] branch nick: tridge.stable timestamp: Sun 2008-01-06 13:24:55 +1100 message: added paranoid transaction ids modified: include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13 server/ctdb_control.c ctdb_control.c-20070426122724-j6gkpiofhbwdin63-1 server/ctdb_freeze.c ctdb_freeze.c-20070512051503-935zdtyuqknqnhmo-1 server/ctdb_recoverd.c recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1 Diff too large for email (209, the limit is 200).
