[Samba] Samba in VirtualBox
Hello there, currently I have Windows on my machine because I need it for school. And because of my small hard disc (only 80 GB) I cannot install Linux. I have a magazine about Linux with an introduction to Samba. That's why I wanted to try out Samba. I downloaded VirtualBox and installed Archlinux. Samba is installed and I created a shared folder on Windows and on my Archlinux, but I could'nt find them in the network. Neither with Windows nor with Linux. I found out that my Archlinux is in another network than my normal clients. It is in 10.0.2.0 and my pcs are in 192.168.2.0. With Arch can ping the Windows clients with their normal IP (192.168.2.108, 192.168.2.106 etc.). But I cannot ping Arch on my Windows clients (with the IP 10.0.2.15). I also found out that I can access the router control with a browser in Arch with 10.0.2.3 which is normally 192.168.2.1. Is there any way to get in the same network so I can test/use Samba with my VirtualBox? Regards Christian Wansart -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba in VirtualBox
On Thursday January 1 2009 09:45:06 Christian Wansart wrote: Is there any way to get in the same network so I can test/use Samba with my VirtualBox? Yes. This is OT to Samba, read the VirtualBox documentation or ask their forums and/or mailing list. Search for Host Networking. If you downloaded VBox 2.1, then you have it way easiest ;-) Regards, Norberto -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
RE: [Samba] Samba in VirtualBox
Is there any way to get in the same network so I can test/use Samba with my VirtualBox? First off, the vbox users list is by far the more appropriate forum to ask this question; your issue is not directly related to Samba at all. Secondly I'm very confident that if you google for 'VirtualBox bridge' you'll find the answers you're looking for: http://samiux.wordpress.com/2007/07/11/bridge-network-interface-on-virtualbox/ http://www.virtualbox.org/wiki/Advanced_Networking_Linux Ping doesn't work with VirtualBox networking: http://www.virtualbox.org/wiki/User_FAQ Good luck, Rubin -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] Samba performance issue
Hello, I sent the following message to the Debian folks. They don't think that the Debian packaging could be responsible for the issue described there. Well, I'm not completely convinced that we will have very useful input for you. I don't really see any reason for this to be caused by the Debian packaging. To check this, why not compile samba from sources, install it in /usr/local and run the same tests? I also recommend you bring this problem in the samba users mailing lists (samba@lists.samba.org seems appropriate). I must say I didn't try to compile it from the upstream sources for many reasons. Anyway, I think that there is poor chances for the issue to be related with the Debian package. Thank you in advance for your advices ;) Happy new year ! (yeah, it depends on where you are in the world !!) Fabien -- Hello, sorry to write directly to you, but after long hours spent trying to solve this strange problem, I thought it could be handled better by speaking directly with you. I hope I'm not wrong... While testing samba speed on my file server, using a fully tested gigabyte ethernet connexion, I encontered some very strange performance problems. I had big speed differences when using samba locally, or via the network (gigabyte). Mb stands for Mbytes. * My server config : - AMD X2 4200+ - 2 Go RAM - 4 x 500 Go -- RAID5 - Gigabyte connection - Debian ETCH - debian package : Samba 3.0.24 (I also tried to backport the testing version = 3.2.5 but the results were exactly the same) * My samba share folder is a partition of my RAID 5 (reading : 170 Mb/s writing : 90 Mb/s). * Here are my benchmarks (nearly the same from Linux or Windows) : - Reading via ftp on the server (no samba) from a Gigabyte client : = 120Mb/s - Reading on the samba server from a Gigabyte client = 35Mb/s - Writting via ftp on the server (no samba) from a Gigabyte client : = 90Mb/s - Writing on the samba server from a Gigabyte client : = 40Mb/s I also noticed that if I try to read/write on the samba server from more than just one client, the results is exactly the same : the server bandwith limit is 35(up)/40(down) Mb/s. /!\ When I mount the samba partition localy (on the server) I can read at 115 Mb/s or write at 90 Mb/s, which is the good behavior. I tried MS Windows and Linux (etch) smbfs clients. I did a lot of testing, using a 1Go RAM disk on both sides to avoid disks problems, and got the same test results. Do you think that the problem could come from the Debian package ? I investigated google a lot and found very few people reporting this strange behavior (mainly from ubuntu forums). I am pretty sure that several (every ?) people, at least from debian, are concerned. I think that they just didn't notice the speed problem (35Mo/s is still quite nice to be noticeable). I found some people trying to tweak the samba buffers : they only got a little better speed (+ 5Mo/s). My smb.conf file is attached. Thanks for your help. Cheers, Fabien [global] workgroup = MSHOME server string = zeus interfaces = eth1 bind interfaces only = Yes security = SHARE guest account = sambauser name resolve order = host wins bcast load printers = No os level = 0 preferred master = No local master = No domain master = No invalid users = root force group = sambashare [private_data] comment = private_data path = /data1 read only = No create mask = 0770 directory mask = 0770 [common_data] comment = common_data path = /data2 read only = No create mask = 0775 directory mask = 0775 guest ok = Yes -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Samba performance issue
On Thu, Jan 01, 2009 at 07:35:06PM +0100, Fabien wrote: * My server config : - AMD X2 4200+ - 2 Go RAM - 4 x 500 Go -- RAID5 - Gigabyte connection - Debian ETCH - debian package : Samba 3.0.24 (I also tried to backport the testing version = 3.2.5 but the results were exactly the same) Can you try the smbclient from 3.2.5 to get a large file and see if that performs better? Thanks, Volker pgptHifpmfoVo.pgp Description: PGP signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Re: Sorting directory lists [SOLVED]
2008/12/31 Volker Lendecke volker.lende...@sernet.de: It will not compile on some c compilers, in dirsort_opendir you define source_directory after a statement. Same for dp. Thanks for the tips. Now fixed. In dirsort_readdir you might want to implement a check based on fstat if the directory has changed since you read it. It might take a while before smbd actually does the readdir call. You might want to throw away the cached contents. You might want to look at vfs_syncops for information how to get a directory fd. I've implemented this so that it does an fstat on readdir and re-loads the cache if necessary (if the mtime has changed). I've used dirfd() to get at the previously opened directory stream. This works on my system and, from what I can see from various manual pages, I think it should work on other systems too. I released a 0.2 version of the vfs module. http://code.google.com/p/samba-dirsort-vfs/downloads/list It would be good if we got this in git format-patch format :-) I've cloned the samba repo and am in the process of massaging my vfs changes into it. Will send a patch to this list once I have completed that. Many thanks for the feedback, Andy -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] Re: Sorting directory lists [SOLVED]
Please find attached a patch to add the dirsort vfs to the samba source tree.
Andy
From 41ef00bc4a8f1d3c80f0043307109ace8bbb2b49 Mon Sep 17 00:00:00 2001
From: Andy Kelk ak...@mopoke.co.uk
Date: Fri, 2 Jan 2009 10:08:07 +1100
Subject: [PATCH] Add new vfs (dirsort) which allows a directory list to be sorted
---
source3/Makefile.in |5 +
source3/configure.in |3 +-
source3/modules/vfs_dirsort.c | 179 +
3 files changed, 186 insertions(+), 1 deletions(-)
create mode 100644 source3/modules/vfs_dirsort.c
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 49f576f..15574ee 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -653,6 +653,7 @@ VFS_ACL_TDB_OBJ = modules/vfs_acl_tdb.o
VFS_SMB_TRAFFIC_ANALYZER_OBJ = modules/vfs_smb_traffic_analyzer.o
VFS_ONEFS_OBJ = modules/vfs_onefs.o modules/onefs_acl.o modules/onefs_system.o \
modules/onefs_open.o
+VFS_DIRSORT_OBJ = modules/vfs_dirsort.o
PLAINTEXT_AUTH_OBJ = auth/pampass.o auth/pass_check.o
@@ -2548,6 +2549,10 @@ bin/securi...@shlibext@: $(BINARY_PREREQS) libgpo/gpext/security.o
@echo Building plugin $@
@$(SHLD_MODULE) libgpo/gpext/security.o
+bin/dirso...@shlibext@: $(BINARY_PREREQS) $(VFS_DIRSORT_OBJ)
+ @echo Building plugin $@
+ @$(SHLD_MODULE) $(VFS_DIRSORT_OBJ)
+
#
## IdMap NSS plugins
diff --git a/source3/configure.in b/source3/configure.in
index fc3cb26..5630465 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -399,7 +399,7 @@ dnl These have to be built static:
default_static_modules=pdb_smbpasswd pdb_tdbsam rpc_lsarpc rpc_samr rpc_winreg rpc_initshutdown rpc_dssetup rpc_wkssvc rpc_svcctl2 rpc_ntsvcs rpc_netlogon rpc_netdfs rpc_srvsvc rpc_spoolss rpc_eventlog2 auth_sam auth_unix auth_winbind auth_server auth_domain auth_builtin auth_netlogond vfs_default nss_info_template
dnl These are preferably build shared, and static if dlopen() is not available
-default_shared_modules=vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy vfs_shadow_copy2 charset_CP850 charset_CP437 auth_script vfs_readahead vfs_xattr_tdb vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb vfs_smb_traffic_analyzer
+default_shared_modules=vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap vfs_expand_msdfs vfs_shadow_copy vfs_shadow_copy2 charset_CP850 charset_CP437 auth_script vfs_readahead vfs_xattr_tdb vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb vfs_smb_traffic_analyzer vfs_dirsort
if test x$developer = xyes; then
default_static_modules=$default_static_modules rpc_rpcecho
@@ -6161,6 +6161,7 @@ SMB_MODULE(vfs_acl_xattr, \$(VFS_ACL_XATTR_OBJ), bin/acl_xattr.$SHLIBEXT, VFS)
SMB_MODULE(vfs_acl_tdb, \$(VFS_ACL_TDB_OBJ), bin/acl_tdb.$SHLIBEXT, VFS)
SMB_MODULE(vfs_smb_traffic_analyzer, \$(VFS_SMB_TRAFFIC_ANALYZER_OBJ), bin/smb_traffic_analyzer.$SHLIBEXT, VFS)
SMB_MODULE(vfs_onefs, \$(VFS_ONEFS), bin/onefs.$SHLIBEXT, VFS)
+SMB_MODULE(vfs_dirsort, \$(VFS_DIRSORT_OBJ), bin/dirsort.$SHLIBEXT, VFS)
SMB_SUBSYSTEM(VFS,smbd/vfs.o)
diff --git a/source3/modules/vfs_dirsort.c b/source3/modules/vfs_dirsort.c
new file mode 100644
index 000..45f5b65
--- /dev/null
+++ b/source3/modules/vfs_dirsort.c
@@ -0,0 +1,179 @@
+/*
+ * VFS module to provide a sorted directory list.
+ *
+ * Copyright (C) Andy Kelk (a...@mopoke.co.uk), 2009
+ *
+ *
+ * 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 3 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, see http://www.gnu.org/licenses/.
+ */
+
+#include includes.h
+
+static int compare_dirent (const void *a, const void *b)
+{
+ const SMB_STRUCT_DIRENT *da = (const SMB_STRUCT_DIRENT *) a;
+ const SMB_STRUCT_DIRENT *db = (const SMB_STRUCT_DIRENT *) b;
+ return strcmp(da-d_name, db-d_name);
+}
+
+struct dirsort_privates {
+ long pos;
+ SMB_STRUCT_DIRENT *directory_list;
+ long count;
+ time_t mtime;
+ SMB_STRUCT_DIR *dirp;
+ int fd;
+};
+
+static void free_dirsort_privates(void **datap)
+{
+ struct dirsort_privates *data = (struct dirsort_privates *) *datap;
+ SAFE_FREE(data-directory_list);
+ SAFE_FREE(data);
+ *datap = NULL;
+
+ return;
+}
+
+static void open_and_sort_dir (vfs_handle_struct *handle)
+{
+ SMB_STRUCT_DIRENT *dp;
+ struct stat dir_stat;
+ long current_pos;
+
[Samba] Extend samba schema to eDirectory
Hi all ! Is possible to have in samba schema for ldap using objectClass=Volume or objectClass=Resource, to have volumes in my ldap to manage them from my ldap ? Everything I found is about bindind eDirectory like LDAP from Samba ! Not doing like eDirectory in LDAP for Samba ! :( If you have some idea or if you think that this message is more appropriate to OpenLDAP list !? Thank's PS : My English is not good, so I hope my French touch is nice :) -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] How workstation get authenticated in DC
Dear Friends, I use LDAP as the samba backend passwd in RHEL. After adding some index to LDAP, some workstation lost the trust relationship with the domain controller. The solution is to re-join the workstation to the domain, but I do not know why workstation lost the trust relationship. When I re-join the workstation to domain, I find that the workstation LDAP entry change/add the attribute sambaNTPassword. Therefore, would you please instruct which script is called to modify the attribute sambaNTPassword when I add a workstation to domain? I also want to know how PC make authentication at DC, where PC stores its password (used to authenticate itself during authentication). You explanation is highly appreciated! Happy New Year 2009! Best Regards, Jacky Wu/UFL - ICIL -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
[Samba] net getlocalsid: is this a bug?
I noticed the following: Suppose that we have a server called SMALLSERVER working as a PDC for SMALLDOMAIN**. When I enter net getlocalsid I get the following output: SID for domain SMALLSERVER is: S-1-5-21-x-x-x But when I enter net getdomainsid I get: SID for local machine SMALLSERVER is: S-1-5-21-x-x-x SID for domain SMALLDOMAIN is: S-1-5-21--x-x-x Is this a bug or is it by design? It is somewhat confusing. Shouldn't the output of net getlocalsid be SID for *local machine* SMALLSERVER instead of SID for domain SMALLSERVER? Maybe I am being picky but that got me confused for a while when trying to debug a malfunctioning server... Thank you! -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/listinfo/samba
Re: [Samba] net getlocalsid: is this a bug?
On Friday 02 January 2009 05:16:29 Miguel Medalha wrote: I noticed the following: Suppose that we have a server called SMALLSERVER working as a PDC for SMALLDOMAIN**. When I enter net getlocalsid I get the following output: SID for domain SMALLSERVER is: S-1-5-21-x-x-x But when I enter net getdomainsid I get: SID for local machine SMALLSERVER is: S-1-5-21-x-x-x SID for domain SMALLDOMAIN is: S-1-5-21--x-x-x Is this a bug or is it by design? It is somewhat confusing. Shouldn't the output of net getlocalsid be SID for *local machine* SMALLSERVER instead of SID for domain SMALLSERVER? Maybe I am being picky but that got me confused for a while when trying to debug a malfunctioning server... IIRC the domain's SID is the SID of the domain's PDC, for NT4 style domains. Cheers, Kai -- Kai Blin WorldForge developer http://www.worldforge.org/ Wine developerhttp://wiki.winehq.org/KaiBlin Samba team member http://www.samba.org/samba/team/ -- Will code for cotton. signature.asc Description: This is a digitally signed message part. -- 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 master updated - 74ea79cb8fa42b1bc13ac2bd9450beb13ad1cd5e
The branch, master has been updated via 74ea79cb8fa42b1bc13ac2bd9450beb13ad1cd5e (commit) from 4d82f69f884c0c9105d7c1cc53a1235e26222fbc (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 74ea79cb8fa42b1bc13ac2bd9450beb13ad1cd5e Author: Volker Lendecke v...@samba.org Date: Thu Jan 1 13:28:38 2009 +0100 The Tru64 shell doesn't like (*) in a case statement --- Summary of changes: source3/autogen.sh |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/autogen.sh b/source3/autogen.sh index 61316a8..1a33eb2 100755 --- a/source3/autogen.sh +++ b/source3/autogen.sh @@ -4,11 +4,11 @@ while true; do case $1 in - (--version-file) + --version-file) VERSION_FILE=$2 shift 2 ;; - (*) + *) break ;; esac -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - e551f43b4b690d92cbf00a510e6c79a497d91464
The branch, master has been updated
via e551f43b4b690d92cbf00a510e6c79a497d91464 (commit)
from 74ea79cb8fa42b1bc13ac2bd9450beb13ad1cd5e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e551f43b4b690d92cbf00a510e6c79a497d91464
Author: Volker Lendecke v...@samba.org
Date: Thu Jan 1 18:16:42 2009 +0100
Remove two pointless globals
---
Summary of changes:
source3/lib/ldb/tools/ldbadd.c| 13 ++---
source3/lib/ldb/tools/ldbmodify.c | 12 ++--
2 files changed, 12 insertions(+), 13 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/ldb/tools/ldbadd.c b/source3/lib/ldb/tools/ldbadd.c
index 4dde2a1..155395e 100644
--- a/source3/lib/ldb/tools/ldbadd.c
+++ b/source3/lib/ldb/tools/ldbadd.c
@@ -35,8 +35,6 @@
#include ldb/include/includes.h
#include ldb/tools/cmdline.h
-static int failures;
-
static void usage(void)
{
printf(Usage: ldbadd options ldif...\n);
@@ -53,7 +51,8 @@ static void usage(void)
/*
add records from an opened file
*/
-static int process_file(struct ldb_context *ldb, FILE *f, int *count)
+static int process_file(struct ldb_context *ldb, FILE *f, int *count,
+ int *failures)
{
struct ldb_ldif *ldif;
int ret = LDB_SUCCESS;
@@ -71,7 +70,7 @@ static int process_file(struct ldb_context *ldb, FILE *f, int
*count)
if (ret != LDB_SUCCESS) {
fprintf(stderr, ERR: \%s\ on DN %s\n,
ldb_errstring(ldb), ldb_dn_linearize(ldb,
ldif-msg-dn));
- failures++;
+ (*failures)++;
} else {
(*count)++;
}
@@ -86,7 +85,7 @@ static int process_file(struct ldb_context *ldb, FILE *f, int
*count)
int main(int argc, const char **argv)
{
struct ldb_context *ldb;
- int i, ret=0, count=0;
+ int i, ret=0, count=0, failures=0;
struct ldb_cmdline *options;
ldb_global_init();
@@ -96,7 +95,7 @@ int main(int argc, const char **argv)
options = ldb_cmdline_process(ldb, argc, argv, usage);
if (options-argc == 0) {
- ret = process_file(ldb, stdin, count);
+ ret = process_file(ldb, stdin, count, failures);
} else {
for (i=0;ioptions-argc;i++) {
const char *fname = options-argv[i];
@@ -106,7 +105,7 @@ int main(int argc, const char **argv)
perror(fname);
exit(1);
}
- ret = process_file(ldb, f, count);
+ ret = process_file(ldb, f, count, failures);
fclose(f);
}
}
diff --git a/source3/lib/ldb/tools/ldbmodify.c
b/source3/lib/ldb/tools/ldbmodify.c
index 368b4cf..f12387a 100644
--- a/source3/lib/ldb/tools/ldbmodify.c
+++ b/source3/lib/ldb/tools/ldbmodify.c
@@ -35,8 +35,6 @@
#include ldb/include/includes.h
#include ldb/tools/cmdline.h
-static int failures;
-
static void usage(void)
{
printf(Usage: ldbmodify options ldif...\n);
@@ -52,7 +50,8 @@ static void usage(void)
/*
process modifies for one file
*/
-static int process_file(struct ldb_context *ldb, FILE *f, int *count)
+static int process_file(struct ldb_context *ldb, FILE *f, int *count,
+ int *failures)
{
struct ldb_ldif *ldif;
int ret = LDB_SUCCESS;
@@ -73,7 +72,7 @@ static int process_file(struct ldb_context *ldb, FILE *f, int
*count)
if (ret != LDB_SUCCESS) {
fprintf(stderr, ERR: \%s\ on DN %s\n,
ldb_errstring(ldb), ldb_dn_linearize(ldb,
ldif-msg-dn));
- failures++;
+ (*failures)++;
} else {
(*count)++;
}
@@ -87,6 +86,7 @@ int main(int argc, const char **argv)
{
struct ldb_context *ldb;
int count=0;
+ int failures=0;
int i, ret=LDB_SUCCESS;
struct ldb_cmdline *options;
@@ -97,7 +97,7 @@ int main(int argc, const char **argv)
options = ldb_cmdline_process(ldb, argc, argv, usage);
if (options-argc == 0) {
- ret = process_file(ldb, stdin, count);
+ ret = process_file(ldb, stdin, count, failures);
} else {
for (i=0;ioptions-argc;i++) {
const char *fname = options-argv[i];
@@ -107,7 +107,7 @@ int main(int argc, const char **argv)
perror(fname);
exit(1);
}
- ret = process_file(ldb, f, count);
+ ret = process_file(ldb, f, count, failures);
[SCM] Samba Shared Repository - branch master updated - 707a5a41b5818b7a59027d16abdce9f57be9cdcd
The branch, master has been updated
via 707a5a41b5818b7a59027d16abdce9f57be9cdcd (commit)
via bf34e998f967a2e9c3528b61a825569378b480af (commit)
from e551f43b4b690d92cbf00a510e6c79a497d91464 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 707a5a41b5818b7a59027d16abdce9f57be9cdcd
Author: Volker Lendecke v...@samba.org
Date: Thu Jan 1 19:55:20 2009 +0100
Remove a global variable
commit bf34e998f967a2e9c3528b61a825569378b480af
Author: Volker Lendecke v...@samba.org
Date: Thu Jan 1 19:47:40 2009 +0100
fix some nonempty blank lines
---
Summary of changes:
source3/libsmb/smb_share_modes.c | 43 ++---
1 files changed, 25 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/smb_share_modes.c b/source3/libsmb/smb_share_modes.c
index 16b3b10..af3f7b0 100644
--- a/source3/libsmb/smb_share_modes.c
+++ b/source3/libsmb/smb_share_modes.c
@@ -1,7 +1,7 @@
/*
Samba share mode database library external interface library.
Used by non-Samba products needing access to the Samba share mode db.
-
+
Copyright (C) Jeremy Allison 2005 - 2006
sharemodes_procid functions (C) Copyright (C) Volker Lendecke 2005
@@ -9,17 +9,17 @@
** NOTE! The following LGPL license applies to this module only.
** This does NOT imply that all of Samba is released
** under the LGPL
-
+
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 3 of the License, or (at your option) any later version.
-
+
This library 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
Lesser General Public License for more details.
-
+
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, see http://www.gnu.org/licenses/.
*/
@@ -92,16 +92,16 @@ int smb_share_mode_db_close(struct smbdb_ctx *db_ctx)
return ret;
}
-static TDB_DATA get_locking_key(uint64_t dev, uint64_t ino)
+static TDB_DATA get_locking_key(struct locking_key *lk, uint64_t dev,
+ uint64_t ino)
{
- static struct locking_key lk;
TDB_DATA ld;
- memset(lk, '\0', sizeof(struct locking_key));
- lk.dev = (SMB_DEV_T)dev;
- lk.inode = (SMB_INO_T)ino;
- ld.dptr = (uint8 *)lk;
- ld.dsize = sizeof(lk);
+ memset(lk, '\0', sizeof(*lk));
+ lk-dev = (SMB_DEV_T)dev;
+ lk-inode = (SMB_INO_T)ino;
+ ld.dptr = (uint8 *)lk;
+ ld.dsize = sizeof(*lk);
return ld;
}
@@ -113,14 +113,17 @@ int smb_lock_share_mode_entry(struct smbdb_ctx *db_ctx,
uint64_t dev,
uint64_t ino)
{
- return tdb_chainlock(db_ctx-smb_tdb, get_locking_key(dev, ino));
+ struct locking_key lk;
+ return tdb_chainlock(db_ctx-smb_tdb, get_locking_key(lk, dev, ino));
}
-
+
int smb_unlock_share_mode_entry(struct smbdb_ctx *db_ctx,
uint64_t dev,
uint64_t ino)
{
- return tdb_chainunlock(db_ctx-smb_tdb, get_locking_key(dev, ino));
+ struct locking_key lk;
+ return tdb_chainunlock(db_ctx-smb_tdb,
+ get_locking_key(lk, dev, ino));
}
/*
@@ -172,6 +175,7 @@ int smb_get_share_mode_entries(struct smbdb_ctx *db_ctx,
struct smb_share_mode_entry **pp_list,
unsigned char *p_delete_on_close)
{
+ struct locking_key lk;
TDB_DATA db_data;
struct smb_share_mode_entry *list = NULL;
int num_share_modes = 0;
@@ -183,7 +187,7 @@ int smb_get_share_mode_entries(struct smbdb_ctx *db_ctx,
*pp_list = NULL;
*p_delete_on_close = 0;
- db_data = tdb_fetch(db_ctx-smb_tdb, get_locking_key(dev, ino));
+ db_data = tdb_fetch(db_ctx-smb_tdb,
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3313-g3577e58
The branch, v3-2-test has been updated via 3577e583eeabb0555dc1ec1dd231ca835d90d307 (commit) from ce0a7974c5e5032893fa80fbc710edfc29353413 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 3577e583eeabb0555dc1ec1dd231ca835d90d307 Author: Volker Lendecke v...@samba.org Date: Thu Jan 1 22:05:03 2009 +0100 Fix bug 5913. Never seen this to be a problem, but it doesn't hurt either :-) --- Summary of changes: source/lib/ldb/include/ldb.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/lib/ldb/include/ldb.h b/source/lib/ldb/include/ldb.h index 0a74574..3891c1c 100644 --- a/source/lib/ldb/include/ldb.h +++ b/source/lib/ldb/include/ldb.h @@ -991,7 +991,7 @@ int ldb_search(struct ldb_context *ldb, const struct ldb_dn *base, enum ldb_scope scope, const char *expression, - const char * const *attrs, struct ldb_result **res); + const char * const *attrs, struct ldb_result **_res); /* * a useful search function where you can easily define the expression and -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4763-g8f2d513
The branch, v3-3-test has been updated via 8f2d5137852fd3f2a376a7fa71f1a5c8b947bd37 (commit) from 675c4d836ec328320994bc1632a14ac5597bbdf8 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 8f2d5137852fd3f2a376a7fa71f1a5c8b947bd37 Author: Volker Lendecke v...@samba.org Date: Thu Jan 1 22:05:03 2009 +0100 Fix bug 5913. Never seen this to be a problem, but it doesn't hurt either :-) --- Summary of changes: source/lib/ldb/include/ldb.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/lib/ldb/include/ldb.h b/source/lib/ldb/include/ldb.h index 0a74574..3891c1c 100644 --- a/source/lib/ldb/include/ldb.h +++ b/source/lib/ldb/include/ldb.h @@ -991,7 +991,7 @@ int ldb_search(struct ldb_context *ldb, const struct ldb_dn *base, enum ldb_scope scope, const char *expression, - const char * const *attrs, struct ldb_result **res); + const char * const *attrs, struct ldb_result **_res); /* * a useful search function where you can easily define the expression and -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 7458111ea4cf33b2a093e5edfb3b42ebfdc330c5
The branch, master has been updated via 7458111ea4cf33b2a093e5edfb3b42ebfdc330c5 (commit) from 707a5a41b5818b7a59027d16abdce9f57be9cdcd (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 7458111ea4cf33b2a093e5edfb3b42ebfdc330c5 Author: Volker Lendecke v...@samba.org Date: Thu Jan 1 22:05:03 2009 +0100 Fix bug 5913. Never seen this to be a problem, but it doesn't hurt either :-) --- Summary of changes: source3/lib/ldb/include/ldb.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/lib/ldb/include/ldb.h b/source3/lib/ldb/include/ldb.h index 0a74574..3891c1c 100644 --- a/source3/lib/ldb/include/ldb.h +++ b/source3/lib/ldb/include/ldb.h @@ -991,7 +991,7 @@ int ldb_search(struct ldb_context *ldb, const struct ldb_dn *base, enum ldb_scope scope, const char *expression, - const char * const *attrs, struct ldb_result **res); + const char * const *attrs, struct ldb_result **_res); /* * a useful search function where you can easily define the expression and -- Samba Shared Repository
Build status as of Fri Jan 2 00:00:02 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-01-01 00:00:10.0 + +++ /home/build/master/cache/broken_results.txt 2009-01-02 00:00:49.0 + @@ -1,23 +1,23 @@ -Build status as of Thu Jan 1 00:00:02 2009 +Build status as of Fri Jan 2 00:00:02 2009 Build counts: Tree Total Broken Panic build_farm 0 0 0 -ccache 30 7 0 +ccache 31 7 0 ctdb 0 0 0 distcc 1 0 0 -ldb 31 31 0 -libreplace 30 12 0 +ldb 30 31 0 +libreplace 28 12 0 lorikeet-heimdal 28 19 0 pidl 18 2 0 ppp 12 0 0 -rsync30 12 0 +rsync31 12 0 samba-docs 0 0 0 samba-gtk5 5 0 -samba_3_X_devel 27 25 1 +samba_3_X_devel 27 23 1 samba_3_X_test 27 22 0 -samba_4_0_test 30 28 2 +samba_4_0_test 30 27 2 smb-build29 7 0 talloc 31 31 0 -tdb 29 11 0 +tdb 29 12 0
