Re: [Samba] Samba 4 provisioning error on Ubuntu 12.04
Hai, I did this install yesterday, bug is already reported in ubuntu. This is simple to resolve. first apt-get build-dep samba4 install these dependecies. apt-get install samba4 chmod +x /usr/share/samba/setoption.pl edit /var/lib/dpkg/status and search for package: samba4 replace half-configured with installed remove /etc/samba/smb.conf /usr/share/samba/setup/provision --realm=DOMAIN.LOCAL --domain=DOMAIN --adminpass='YourPassword' --server-role=dc and read, for the extra things. http://www.matrix44.net/cms/notes/gnulinux/samba-4-ad-domain-with-ubuntu-12-04 nice howto to install samba4 on ubuntu. Did my install in 5 min. AD nicely up and running. Louis -Oorspronkelijk bericht- Van: abart...@samba.org [mailto:samba-boun...@lists.samba.org] Namens Andrew Bartlett Verzonden: 2012-06-15 03:44 Aan: zoolook CC: samba@lists.samba.org Onderwerp: Re: [Samba] Samba 4 provisioning error on Ubuntu 12.04 On Thu, 2012-06-14 at 16:58 -0300, zoolook wrote: Hello, 2012/6/14 todd kman tkma...@yahoo.com: I looked up ACL and how to get them supported and tried the following: sudo apt-get install attr Almost. Install libattr1-dev We need that, but also libacl1-dev Andrew Bartlett -- Andrew Bartlett http://samba.org/~abartlet/ Authentication Developer, Samba Team http://samba.org -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba 4 provisioning error on Ubuntu 12.04
On 15/06/12 07:20, L.P.H. van Belle wrote: Hai, I did this install yesterday, bug is already reported in ubuntu. This is simple to resolve. first apt-get build-dep samba4 install these dependecies. apt-get install samba4 chmod +x /usr/share/samba/setoption.pl edit /var/lib/dpkg/status and search for package: samba4 replace half-configured with installed remove /etc/samba/smb.conf /usr/share/samba/setup/provision --realm=DOMAIN.LOCAL --domain=DOMAIN --adminpass='YourPassword' --server-role=dc and read, for the extra things. http://www.matrix44.net/cms/notes/gnulinux/samba-4-ad-domain-with-ubuntu-12-04 nice howto to install samba4 on ubuntu. Did my install in 5 min. AD nicely up and running. Louis -Oorspronkelijk bericht- Van: abart...@samba.org [mailto:samba-boun...@lists.samba.org] Namens Andrew Bartlett Verzonden: 2012-06-15 03:44 Aan: zoolook CC: samba@lists.samba.org Onderwerp: Re: [Samba] Samba 4 provisioning error on Ubuntu 12.04 On Thu, 2012-06-14 at 16:58 -0300, zoolook wrote: Hello, 2012/6/14 todd kmantkma...@yahoo.com: I looked up ACL and how to get them supported and tried the following: sudo apt-get install attr Almost. Install libattr1-dev We need that, but also libacl1-dev Andrew Bartlett -- Andrew Bartlett http://samba.org/~abartlet/ Authentication Developer, Samba Team http://samba.org -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba The OP is trying to compile the latest Samba4 from git (beta2), not install an old version (alpha18) via apt-get. Having said that, this may be the quickest way for him to install it, if he just wants to try it. There is no problem compiling Samba4 on Ubuntu 12.04, it just takes longer. Rowland -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] User cannot get into own directory with 700 permissions
If I create a directory with 700 permissions owned by me with the group set to my primary group I *cannot* get into the directory from my windows machine. I can of course get into it from unix If however I set the mode to 740, I can get into it from windows Samba version is 3.6.5 running on Debian squeeze and is installed from the backports repository. Below is a snippet of the log file at log level 5 from when I try to access the directory 700_dir_cfowler_staff any help much appreciated! [2012/06/15 10:24:25.700630, 3] smbd/process.c:1467(switch_message) switch message SMBntcreateX (pid 5978) conn 0x7fab011282a0 [2012/06/15 10:24:25.700932, 4] smbd/uid.c:351(change_to_user) Skipping user change - already user [2012/06/15 10:24:25.701045, 5] smbd/filename.c:257(unix_convert) unix_convert called on file test2/700_dir_cfowler_staff [2012/06/15 10:24:25.701178, 5] smbd/files.c:126(file_new) allocated file structure 10381, fnum = 14477 (3 used) [2012/06/15 10:24:25.701296, 3] smbd/dosmode.c:159(unix_mode) unix_mode(test2/700_dir_cfowler_staff) returning 0740 [2012/06/15 10:24:25.701445, 4] smbd/open.c:2069(open_file_ntcreate) calling open_file with flags=0x0 flags2=0x0 mode=0740, access_mask = 0x81, open_access_mask = 0x81 [2012/06/15 10:24:25.701655, 5] smbd/files.c:464(file_free) freed files structure 14477 (2 used) [2012/06/15 10:24:25.701770, 5] smbd/open.c:2597(open_directory) open_directory: opening directory test2/700_dir_cfowler_staff, access_mask = 0x81, share_access = 0x7 create_options = 0x0, create_disposition = 0x1, file_attributes = 0x10 [2012/06/15 10:24:25.701960, 3] smbd/error.c:81(error_packet_set) error packet at smbd/error.c(161) cmd=162 (SMBntcreateX) NT_STATUS_ACCESS_DENIED [global] workgroup = FOO realm = FOO.BAR.COM interfaces = eth0, lo bind interfaces only = Yes security = DOMAIN log file = /var/log/samba/samba.log.%m unix extensions = No idmap config * : backend = tdb wide links = Yes log level = 5 [homes] comment = Home directories (%h) read only = No create mask = 0750 browseable = No -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba 4 provisioning error on Ubuntu 12.04
ah from sources... then . http://spore.sodgeit.de/sporeblog-samba4EN.html very easy also. installer script, tested this also, and works also ok ( for me ) just change in the installer alfa20 to beta1 ( in samba4.sh ) samba-4.0.0beta1.tar.gz Greetz, Louis -Oorspronkelijk bericht- Van: rpe...@f2s.com [mailto:samba-boun...@lists.samba.org] Namens Rowland Penny Verzonden: 2012-06-15 10:41 Aan: samba@lists.samba.org Onderwerp: Re: [Samba] Samba 4 provisioning error on Ubuntu 12.04 On 15/06/12 07:20, L.P.H. van Belle wrote: Hai, I did this install yesterday, bug is already reported in ubuntu. This is simple to resolve. first apt-get build-dep samba4 install these dependecies. apt-get install samba4 chmod +x /usr/share/samba/setoption.pl edit /var/lib/dpkg/status and search for package: samba4 replace half-configured with installed remove /etc/samba/smb.conf /usr/share/samba/setup/provision --realm=DOMAIN.LOCAL --domain=DOMAIN --adminpass='YourPassword' --server-role=dc and read, for the extra things. http://www.matrix44.net/cms/notes/gnulinux/samba-4-ad-domain-wi th-ubuntu-12-04 nice howto to install samba4 on ubuntu. Did my install in 5 min. AD nicely up and running. Louis -Oorspronkelijk bericht- Van: abart...@samba.org [mailto:samba-boun...@lists.samba.org] Namens Andrew Bartlett Verzonden: 2012-06-15 03:44 Aan: zoolook CC: samba@lists.samba.org Onderwerp: Re: [Samba] Samba 4 provisioning error on Ubuntu 12.04 On Thu, 2012-06-14 at 16:58 -0300, zoolook wrote: Hello, 2012/6/14 todd kmantkma...@yahoo.com: I looked up ACL and how to get them supported and tried the following: sudo apt-get install attr Almost. Install libattr1-dev We need that, but also libacl1-dev Andrew Bartlett -- Andrew Bartlett http://samba.org/~abartlet/ Authentication Developer, Samba Team http://samba.org -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba The OP is trying to compile the latest Samba4 from git (beta2), not install an old version (alpha18) via apt-get. Having said that, this may be the quickest way for him to install it, if he just wants to try it. There is no problem compiling Samba4 on Ubuntu 12.04, it just takes longer. Rowland -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba 4 provisioning error on Ubuntu 12.04
On 15/06/12 12:58, L.P.H. van Belle wrote: ah from sources... then . http://spore.sodgeit.de/sporeblog-samba4EN.html very easy also. installer script, tested this also, and works also ok ( for me ) just change in the installer alfa20 to beta1 ( in samba4.sh ) samba-4.0.0beta1.tar.gz Greetz, Louis -Oorspronkelijk bericht- Van: rpe...@f2s.com [mailto:samba-boun...@lists.samba.org] Namens Rowland Penny Verzonden: 2012-06-15 10:41 Aan: samba@lists.samba.org Onderwerp: Re: [Samba] Samba 4 provisioning error on Ubuntu 12.04 On 15/06/12 07:20, L.P.H. van Belle wrote: Hai, I did this install yesterday, bug is already reported in ubuntu. This is simple to resolve. first apt-get build-dep samba4 install these dependecies. apt-get install samba4 chmod +x /usr/share/samba/setoption.pl edit /var/lib/dpkg/status and search for package: samba4 replace half-configured with installed remove /etc/samba/smb.conf /usr/share/samba/setup/provision --realm=DOMAIN.LOCAL --domain=DOMAIN --adminpass='YourPassword' --server-role=dc and read, for the extra things. http://www.matrix44.net/cms/notes/gnulinux/samba-4-ad-domain-wi th-ubuntu-12-04 nice howto to install samba4 on ubuntu. Did my install in 5 min. AD nicely up and running. Louis -Oorspronkelijk bericht- Van: abart...@samba.org [mailto:samba-boun...@lists.samba.org] Namens Andrew Bartlett Verzonden: 2012-06-15 03:44 Aan: zoolook CC: samba@lists.samba.org Onderwerp: Re: [Samba] Samba 4 provisioning error on Ubuntu 12.04 On Thu, 2012-06-14 at 16:58 -0300, zoolook wrote: Hello, 2012/6/14 todd kmantkma...@yahoo.com: I looked up ACL and how to get them supported and tried the following: sudo apt-get install attr Almost. Install libattr1-dev We need that, but also libacl1-dev Andrew Bartlett -- Andrew Bartlett http://samba.org/~abartlet/ Authentication Developer, Samba Team http://samba.org -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba The OP is trying to compile the latest Samba4 from git (beta2), not install an old version (alpha18) via apt-get. Having said that, this may be the quickest way for him to install it, if he just wants to try it. There is no problem compiling Samba4 on Ubuntu 12.04, it just takes longer. Rowland -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba I am not sure if it will work with beta1 upwards, the template smb.conf is missing the following two lines: dcerpc endpoint servers = epmapper, wkssvc, rpcecho, samr, netlogon, lsarpc, spoolss, drsuapi, dssetup, unixinfo, browser, eventlog6, backupkey, dnsserver server services = rpc, nbt, wrepl, ldap, cldap, kdc, drepl, winbind, ntp_signd, kcc, dnsupdate, s3fs Rowland -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Access to NFSv4 Filesystem
Hi, i've been spending quite some time on figuring out how to setup samba to access user data on a NFSv4 share that is secured by kerberos. User home directories reside on this network filesystem. kdc01.fqdn:/users/ on /home type nfs4 (rw,sec=krb5,addr=w.x.y.1,clientaddr=w.x.y.2) setting up samba for kerberos, i followed these descriptions: https://help.ubuntu.com/community/Samba/Kerberos security setting: security = user (i checked out the ads setup, too, but with the same result) My current setup is working when 'kerberos security' is switched off for the NFSv4 mount. Therefore i think kerberos authentication is working. The Problem is: Samba should open a pam session, getting a kerberos ticket for the user to access the data. Which configuration steps are required to accomplish this? Or is it totally insane to do that? I did not want to setup an Samba share on the actual File Server. Is this the only way to do that? Cheers, rfs -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Linux domain member server: Win group does not map to UNIX group
Hi, all I've installed Version 3.5.10-0.109.el5_8 from the samba3x RPM for Win7 compatibility. We are predominately a Linux shop and have only a handful of Win7 (Pro/Ultimate) dual-boot workstations for running things like Photoshop, etc We run a fairly minimal LDAP backend for Linux auth/automount (no SASL backend) and have not implemented a full Samba schema - i am waiting to build an OpenLDAP 2.4 server with bells+whistles later and will integrate Samba account mgmt into that. Don't want to kill off our mission-critical auth system The PDC makes use of LDAP groups/users available to it without any problem, and then i create corresponding tdbsam users for Windows access and added mappings btwn LDAP and Windows domain groups with net groupmap add ntgroup. The PDC also currently houses users' nethomes, which we share out. Anything created by a user under Windows in their homedir has correct user/group permissions under Linux. Nice. However, on a domain member server sharing out production data, i am unable to pick up the LDAP GID (UID is OK), so when viewed from the Linux CLI, users' files/dirs are owned by [user] : domain user, instead of the mapped group. Here's what i have tried on the member server: - added the same net groupmap mappings as exist on the PDC - disabled winbind (didn't seem to be doing any good) - implemented idmap backend = nss with idmap config DOMAIN : backend = nss idmap config DOMAIN : range = 1100- but no luck. If anyone can point me succinctly in the right direction, i would surely appreciate it regards, -- csawyer -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba 64 bit compilation
This is probably a compiler question rather than a Samba question. For GCC, I believe that you want to pass the m64 flag to CPPFLAGS, CFLAGS and other environmental variables. On 06/15/12 08:44, prabu.muru...@emc.com wrote: It is for Solaris 9 and 10 Sparc machines. Thanks, Prabu -Original Message- From: Gaiseric Vandal [mailto:gaiseric.van...@gmail.com] Sent: Thursday, June 14, 2012 2:49 AM To: Murugan, Prabu; Samba Subject: Re: Samba 64 bit compilation Which platform? If on Solaris 10 sparc, GCC (either from Sun or sunfreeware.com) should be 64-bit by default. GCC from Sunfreeware for Solaris 10 x86 will compile 32-bit by default. For Solaris, you are better off using Sun Studio and Dmake. Actually, you are better off just using the compiled version from Oracle/Sun. On 06/13/12 02:08, prabu.muru...@emc.com wrote: Hi, Have tried to compile samba 64 bit. By default it is compiling 32 bit. Google doesn't give much info about it. Please share your experience on 64bit samba. Thanks, Prabu -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba 4 provisioning error on Ubuntu 12.04
On Fri, 2012-06-15 at 13:36 +0100, Rowland Penny wrote: On 15/06/12 12:58, L.P.H. van Belle wrote: ah from sources... then . http://spore.sodgeit.de/sporeblog-samba4EN.html very easy also. installer script, tested this also, and works also ok ( for me ) just change in the installer alfa20 to beta1 ( in samba4.sh ) samba-4.0.0beta1.tar.gz Greetz, Louis -Oorspronkelijk bericht- Van: rpe...@f2s.com [mailto:samba-boun...@lists.samba.org] Namens Rowland Penny Verzonden: 2012-06-15 10:41 Aan: samba@lists.samba.org Onderwerp: Re: [Samba] Samba 4 provisioning error on Ubuntu 12.04 On 15/06/12 07:20, L.P.H. van Belle wrote: Hai, I did this install yesterday, bug is already reported in ubuntu. This is simple to resolve. first apt-get build-dep samba4 install these dependecies. apt-get install samba4 chmod +x /usr/share/samba/setoption.pl edit /var/lib/dpkg/status and search for package: samba4 replace half-configured with installed remove /etc/samba/smb.conf /usr/share/samba/setup/provision --realm=DOMAIN.LOCAL --domain=DOMAIN --adminpass='YourPassword' --server-role=dc and read, for the extra things. http://www.matrix44.net/cms/notes/gnulinux/samba-4-ad-domain-wi th-ubuntu-12-04 nice howto to install samba4 on ubuntu. Did my install in 5 min. AD nicely up and running. Louis -Oorspronkelijk bericht- Van: abart...@samba.org [mailto:samba-boun...@lists.samba.org] Namens Andrew Bartlett Verzonden: 2012-06-15 03:44 Aan: zoolook CC: samba@lists.samba.org Onderwerp: Re: [Samba] Samba 4 provisioning error on Ubuntu 12.04 On Thu, 2012-06-14 at 16:58 -0300, zoolook wrote: Hello, 2012/6/14 todd kmantkma...@yahoo.com: I looked up ACL and how to get them supported and tried the following: sudo apt-get install attr Almost. Install libattr1-dev We need that, but also libacl1-dev Andrew Bartlett -- Andrew Bartlett http://samba.org/~abartlet/ Authentication Developer, Samba Team http://samba.org -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba The OP is trying to compile the latest Samba4 from git (beta2), not install an old version (alpha18) via apt-get. Having said that, this may be the quickest way for him to install it, if he just wants to try it. There is no problem compiling Samba4 on Ubuntu 12.04, it just takes longer. Rowland -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba I am not sure if it will work with beta1 upwards, the template smb.conf is missing the following two lines: dcerpc endpoint servers = epmapper, wkssvc, rpcecho, samr, netlogon, lsarpc, spoolss, drsuapi, dssetup, unixinfo, browser, eventlog6, backupkey, dnsserver server services = rpc, nbt, wrepl, ldap, cldap, kdc, drepl, winbind, ntp_signd, kcc, dnsupdate, s3fs These lines are only needed to enable the new 's3fs' default file server. This will soon (very soon) be the default, no smb.conf required. Andrew Bartlett -- Andrew Bartletthttp://samba.org/~abartlet/ Authentication Developer, Samba Team http://samba.org -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 8cca7b0 s3:smb2_server: remember the request_time on an incoming
request
via d8b3687 s3:smbd: remember the request_time on an incoming request
via 59733d9 heimdal:lib/hdb: config.h needs to be the first header
via 8d3a291 auth.idl: mark confidential attributes as [noprint]
from b27f888 s3:vfs: change files_struct.fnum from int to uint64_t
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 8cca7b09ad349e8d549eb326cdd2362cf3843773
Author: Stefan Metzmacher me...@samba.org
Date: Wed Apr 11 16:54:17 2012 +0200
s3:smb2_server: remember the request_time on an incoming request
metze
Autobuild-User(master): Stefan Metzmacher me...@samba.org
Autobuild-Date(master): Fri Jun 15 09:17:33 CEST 2012 on sn-devel-104
commit d8b3687fcbb2ac37bf93b23301da4bf4d79301f6
Author: Stefan Metzmacher me...@samba.org
Date: Wed Apr 11 16:54:17 2012 +0200
s3:smbd: remember the request_time on an incoming request
metze
commit 59733d911bf9010c7356641d171667a09fc32afb
Author: Stefan Metzmacher me...@samba.org
Date: Thu Jun 14 22:15:24 2012 +0200
heimdal:lib/hdb: config.h needs to be the first header
This should fix build problems on AIX.
metze
commit 8d3a2914d8dfae4b9e4e9537aea87748d5456bb4
Author: Stefan Metzmacher me...@samba.org
Date: Thu Jun 14 17:52:23 2012 +0200
auth.idl: mark confidential attributes as [noprint]
We should allow NDR_PRINT_DEBUG() to log them.
TODO: we could add some more magic which logs it at level 100.
metze
---
Summary of changes:
librpc/idl/auth.idl|8
source3/include/vfs.h |2 ++
source3/smbd/globals.h |2 ++
source3/smbd/process.c |4
source3/smbd/smb2_glue.c |1 +
source3/smbd/smb2_server.c |2 ++
source4/heimdal/lib/hdb/hdb_locl.h |4 ++--
7 files changed, 17 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/idl/auth.idl b/librpc/idl/auth.idl
index 2451d2b..b0494f9 100644
--- a/librpc/idl/auth.idl
+++ b/librpc/idl/auth.idl
@@ -83,8 +83,8 @@ interface auth
uint32 num_sids;
[size_is(num_sids)] dom_sid sids[*];
auth_user_info *info;
- DATA_BLOB user_session_key;
- DATA_BLOB lm_session_key;
+ [noprint] DATA_BLOB user_session_key;
+ [noprint] DATA_BLOB lm_session_key;
} auth_user_info_dc;
typedef [public] struct {
@@ -104,13 +104,13 @@ interface auth
* Bottom line, it is not the same as the session keys in info3.
*/
- DATA_BLOB session_key;
+ [noprint] DATA_BLOB session_key;
[value(NULL), ignore] cli_credentials *credentials;
} auth_session_info;
typedef [public] struct {
auth_session_info *session_info;
- DATA_BLOB exported_gssapi_credentials;
+ [noprint] DATA_BLOB exported_gssapi_credentials;
} auth_session_info_transport;
}
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 723eb6c..e6a9ef4 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -399,6 +399,8 @@ struct smb_request {
* Request list for chained requests, we're part of it.
*/
struct smb_request **chain;
+
+ struct timeval request_time;
};
/*
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index a0d5be0..8113b8e 100644
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -379,6 +379,8 @@ struct smbd_smb2_request {
bool cancelled;
bool compound_related;
+ struct timeval request_time;
+
/* fake smb1 request. */
struct smb_request *smb1req;
struct files_struct *compat_chain_fsp;
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 5e26826..9e1abb2 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -517,12 +517,16 @@ static bool init_smb_request(struct smb_request *req,
uint32_t seqnum)
{
size_t req_size = smb_len(inbuf) + 4;
+
/* Ensure we have at least smb_size bytes. */
if (req_size smb_size) {
DEBUG(0,(init_smb_request: invalid request size %u\n,
(unsigned int)req_size ));
return false;
}
+
+ req-request_time = timeval_current();
+
req-cmd= CVAL(inbuf, smb_com);
req-flags2 = SVAL(inbuf, smb_flg2);
req-smbpid = SVAL(inbuf, smb_pid);
diff --git a/source3/smbd/smb2_glue.c b/source3/smbd/smb2_glue.c
index 360a73a..a71679f 100644
--- a/source3/smbd/smb2_glue.c
+++
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 9afd4be s3-build: Do not write loadparm generated files into the build tree via 8e31d97 s3-lib: Convert lib/events.c to modern tevent names via bf3235f docs: document new server role values via 60b6348 s3-auth: rework default auth methods around the lp_server_role() parameter via 67bdf4f lib/param: Use server role = 'standalone server' to be consistant with member server via 11db5b1 lib/param: make security=domain and security=ads conflict with being a DC via b8815dc lib/param: Create a seperate server role for active directory domain controller via b9a75d8 s3-auth: Merge SEC_DOMAIN and SEC_ADS cases in creating the default auth module list via 5df459a s3-auth: Fix system info3 return to be just SID_NT_SYSTEM via 9b3cf96 s3-auth: Fix system token generation not to dereference pointer as an integer via f0c5800 s3-auth: Give the SYSTEM token all privileges from 8cca7b0 s3:smb2_server: remember the request_time on an incoming request http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 9afd4be688429d7bb344087cb3eda876f18e19f9 Author: Andrew Bartlett abart...@samba.org Date: Fri Jun 15 12:34:28 2012 +1000 s3-build: Do not write loadparm generated files into the build tree We need to keep these files away from where waf might see them. Andrew Bartlett Autobuild-User(master): Andrew Bartlett abart...@samba.org Autobuild-Date(master): Fri Jun 15 11:10:14 CEST 2012 on sn-devel-104 commit 8e31d97c8b62d34aff5d52bfe46dbcc5805dae03 Author: Andrew Bartlett abart...@samba.org Date: Mon Jun 11 14:53:20 2012 +1000 s3-lib: Convert lib/events.c to modern tevent names commit bf3235f8c6159e238226bef59f39c46ecc6888d8 Author: Andrew Bartlett abart...@samba.org Date: Mon Jun 11 11:40:17 2012 +1000 docs: document new server role values commit 60b63482441deee2d6db523bd295caf21af187ad Author: Andrew Bartlett abart...@samba.org Date: Mon Jun 11 10:51:47 2012 +1000 s3-auth: rework default auth methods around the lp_server_role() parameter To cover all the enum values, ROLE_ACTIVE_DIRECTORY_DOMAIN_CONTROLLER is mapped to the samba4 auth module, and this is no longer required to be specified in fileserver.conf. Andrew Bartlett commit 67bdf4fa11f097144a831b51c424bdac3618a927 Author: Andrew Bartlett abart...@samba.org Date: Mon Jun 11 10:50:08 2012 +1000 lib/param: Use server role = 'standalone server' to be consistant with member server standalne is left as an alias. Andrew Bartlett commit 11db5b1f3321b3d5b73bb16f4030111c9a35fbbe Author: Andrew Bartlett abart...@samba.org Date: Mon Jun 11 10:40:32 2012 +1000 lib/param: make security=domain and security=ads conflict with being a DC This simplifies our supported configurations down to those that we test and expect to work. security=domain and domain logons = yes has never made much sense, and security=ads and domain logons = yes was only ever used in early experiments for our AD support using smbd. The correct way to be an AD DC is to set server role = active directory domain controller Andrew Bartlett commit b8815dc23d36468cce9b615335ed62f119eb8f35 Author: Andrew Bartlett abart...@samba.org Date: Sun Jun 10 22:08:20 2012 +1000 lib/param: Create a seperate server role for active directory domain controller This will allow us to detect from the smb.conf if this is a Samba4 AD DC which will allow smarter handling of (for example) accidentially starting smbd rather than samba. To cope with upgrades from existing Samba4 installs, 'domain controller' is a synonym of 'active directory domain controller' and new parameters 'classic primary domain controller' and 'classic backup domain controller' are added. Andrew Bartlett commit b9a75d8438470065633c1ff69c653eaa799d5718 Author: Andrew Bartlett abart...@samba.org Date: Sun Jun 10 16:05:58 2012 +1000 s3-auth: Merge SEC_DOMAIN and SEC_ADS cases in creating the default auth module list commit 5df459aed7f9f85a9eb15a16b1ad5a8bbdd1df5a Author: Andrew Bartlett abart...@samba.org Date: Thu Jun 14 09:35:10 2012 +1000 s3-auth: Fix system info3 return to be just SID_NT_SYSTEM The SID for the SYSTEM token should be a fixed value, and not the administrator. Note however that it will be replaced by the SID of sec_initial_uid() by the create_local_token() code. Fixing this requires fixes the other parts of the code that cannot cope with a token of just SID_NT_SYSTEM. Andrew Bartlett commit 9b3cf96fb042429eaf79ede426e406ea1fa32079 Author: Andrew Bartlett abart...@samba.org Date: Thu Jun 14 09:30:37 2012 +1000 s3-auth: Fix system token generation not to
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 1d9ff7d dbwrap: dbwrap_trans_store_uint32-dbwrap_trans_store_uint32_bystring via 64fec46 dbwrap: dbwrap_trans_store_int32-dbwrap_trans_store_int32_bystring via 07d6c25 dbwrap: dbwrap_trans_change_int32_atomic-dbwrap_trans_change_int32_atomic_bystring via 8b99d40 dbwrap: dbwrap_change_int32_atomic-dbwrap_change_int32_atomic_bystring via 9275d57 dbwrap: dbwrap_trans_change_uint32_atomic-dbwrap_trans_change_uint32_atomic_bystring via 37ad03f dbwrap: dbwrap_change_uint32_atomic-dbwrap_change_uint32_atomic_bystring via 8f94ecb dbwrap: dbwrap_store_uint32-dbwrap_store_uint32_bystring via 7f19a5a dbwrap: dbwrap_fetch_uint32-dbwrap_fetch_uint32_bystring via 749314f dbwrap: dbwrap_store_int32-dbwrap_store_int32_bystring via 737c0a5 dbwrap: dbwrap_fetch_int32-dbwrap_fetch_int32_bystring from 9afd4be s3-build: Do not write loadparm generated files into the build tree http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 1d9ff7d3bc111f83f8ae45277c0507c4306c0c01 Author: Volker Lendecke v...@samba.org Date: Fri Jun 15 09:51:21 2012 +0200 dbwrap: dbwrap_trans_store_uint32-dbwrap_trans_store_uint32_bystring Signed-off-by: Michael Adam ob...@samba.org Autobuild-User(master): Michael Adam ob...@samba.org Autobuild-Date(master): Fri Jun 15 14:20:04 CEST 2012 on sn-devel-104 commit 64fec465c15fea77313643636d82d2c14115f434 Author: Volker Lendecke v...@samba.org Date: Fri Jun 15 09:48:20 2012 +0200 dbwrap: dbwrap_trans_store_int32-dbwrap_trans_store_int32_bystring Signed-off-by: Michael Adam ob...@samba.org commit 07d6c25525ca3b0d3a4e179f1048818f78cccf9d Author: Volker Lendecke v...@samba.org Date: Fri Jun 15 09:45:18 2012 +0200 dbwrap: dbwrap_trans_change_int32_atomic-dbwrap_trans_change_int32_atomic_bystring Signed-off-by: Michael Adam ob...@samba.org commit 8b99d40520875ad89e14d9397cff902f8198fd25 Author: Volker Lendecke v...@samba.org Date: Fri Jun 15 09:43:13 2012 +0200 dbwrap: dbwrap_change_int32_atomic-dbwrap_change_int32_atomic_bystring Signed-off-by: Michael Adam ob...@samba.org commit 9275d571d9d0bb4b7927245256aa4510b9e7c43d Author: Volker Lendecke v...@samba.org Date: Fri Jun 15 09:20:25 2012 +0200 dbwrap: dbwrap_trans_change_uint32_atomic-dbwrap_trans_change_uint32_atomic_bystring Signed-off-by: Michael Adam ob...@samba.org commit 37ad03f91d28c39533ece09384a12e63603c3e8a Author: Volker Lendecke v...@samba.org Date: Fri Jun 15 09:18:17 2012 +0200 dbwrap: dbwrap_change_uint32_atomic-dbwrap_change_uint32_atomic_bystring Signed-off-by: Michael Adam ob...@samba.org commit 8f94ecbb90f3efedc3e379853dd71369d53cb1f7 Author: Volker Lendecke v...@samba.org Date: Fri Jun 15 09:09:57 2012 +0200 dbwrap: dbwrap_store_uint32-dbwrap_store_uint32_bystring Signed-off-by: Michael Adam ob...@samba.org commit 7f19a5ab52ac6ecb380a49ec14072d0fd501f9db Author: Volker Lendecke v...@samba.org Date: Thu Jun 14 20:39:27 2012 +0200 dbwrap: dbwrap_fetch_uint32-dbwrap_fetch_uint32_bystring Signed-off-by: Michael Adam ob...@samba.org commit 749314fcf99cef4a1a162d622e10b6eb8998938f Author: Volker Lendecke v...@samba.org Date: Thu Jun 14 20:30:16 2012 +0200 dbwrap: dbwrap_store_int32-dbwrap_store_int32_bystring Signed-off-by: Michael Adam ob...@samba.org commit 737c0a54731803c84f0f29d96dd40ac819aec3e8 Author: Volker Lendecke v...@samba.org Date: Thu Jun 14 20:26:28 2012 +0200 dbwrap: dbwrap_fetch_int32-dbwrap_fetch_int32_bystring Signed-off-by: Michael Adam ob...@samba.org --- Summary of changes: lib/dbwrap/dbwrap.h | 54 +-- lib/dbwrap/dbwrap_util.c| 54 +-- source3/lib/sharesec.c | 16 source3/passdb/account_pol.c| 11 +++--- source3/passdb/pdb_tdb.c| 31 + source3/passdb/secrets.c|4 +- source3/registry/reg_backend_db.c |9 +++-- source3/torture/test_dbwrap_watch.c |2 +- source3/torture/test_idmap_tdb_common.c |6 ++- source3/torture/torture.c |4 +- source3/utils/dbwrap_tool.c |8 ++-- source3/utils/net_idmap.c |6 ++- source3/utils/net_idmap_check.c |4 +- source3/utils/net_registry_check.c | 11 +++--- source3/winbindd/idmap_autorid.c| 17 + source3/winbindd/idmap_tdb.c| 25 -- source3/winbindd/idmap_tdb_common.c |4 +- 17 files changed, 146 insertions(+), 120 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/dbwrap/dbwrap.h
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via 0370f02 Add univention as vendor from 89fb278 Update Xtended Internet record http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit 0370f02bb7c0a074aab34c84763c2853c3344dac Author: Lars Müller l...@samba.org Date: Fri Jun 15 15:41:32 2012 +0200 Add univention as vendor --- Summary of changes: vendors/index.html |3 +++ vendors/univention.html | 30 ++ vendors/univention.png | Bin 0 - 11569 bytes 3 files changed, 33 insertions(+), 0 deletions(-) create mode 100644 vendors/univention.html create mode 100644 vendors/univention.png Changeset truncated at 500 lines: diff --git a/vendors/index.html b/vendors/index.html index 17beda4..9206ef9 100755 --- a/vendors/index.html +++ b/vendors/index.html @@ -76,6 +76,9 @@ see the A HREF=/samba/support/Samba Support/A page. !--#include virtual=suse.html -- hrbr +!--#include virtual=univention.html -- + +hrbr !--#include virtual=hp3000.html -- hrbr diff --git a/vendors/univention.html b/vendors/univention.html new file mode 100644 index 000..2190662 --- /dev/null +++ b/vendors/univention.html @@ -0,0 +1,30 @@ +h2Univention/h2 + +a href=http://www.univention.de/en/; + img src=univention.png alt=Univention style=float:left;margin:5px / +/a + +pUnivention is a leading European provider of Open Source products for the +cost-efficient operation and effective administration of IT infrastructures. +At the heart of our offer is the Linux infrastructure solution Univention +Corporate Server (UCS). UCS is a modern enterprise Linux distribution with an +integrated Open Source solution for identity and infrastructure management, +which makes efficient, centrally controlled administration possible even in +challenging environments â both in companies and in the cloud./p + +pThe core product UCS is complemented with, among other things, products +building on it for the cross-platform administration of thin clients, an Open +Source desktop for professional users and an integrated server and desktop +virtualization solution. Thanks to the supplied connectors, the products are +ideal for use with for example the Microsoft Active Directory, integrate +perfectly in existing infrastructures and allow simple migration./p + +pAn increasing number of software manufacturers, including the groupware +manufacturers Open-Xchange, Zarafa and Kolab Systems, ECM manufacturers and +suppliers of VolP solutions offer optimised packages for operation with UCS, +which can be integrated in the UCS management system among other things. UCS +is thus the Open Source integration platform for IT infrastructure operation +and management./p + +pMore information, a downloadable version and an online demo is available at +the a href=http://www.univention.de/en/;univention web site/a. diff --git a/vendors/univention.png b/vendors/univention.png new file mode 100644 index 000..13e50d4 Binary files /dev/null and b/vendors/univention.png differ -- Samba Website Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via d7b0e9a s3-lib: Fix conversion of lib/events.c to modern tevent
names
from 1d9ff7d dbwrap:
dbwrap_trans_store_uint32-dbwrap_trans_store_uint32_bystring
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit d7b0e9a42a424de4b0409d3c55834e6118342f3b
Author: Andrew Bartlett abart...@samba.org
Date: Fri Jun 15 21:52:35 2012 +1000
s3-lib: Fix conversion of lib/events.c to modern tevent names
This corrects an error in 8e31d97c8b62d34aff5d52bfe46dbcc5805dae03.
Andrew Bartlett
Autobuild-User(master): Andrew Bartlett abart...@samba.org
Autobuild-Date(master): Fri Jun 15 16:25:20 CEST 2012 on sn-devel-104
---
Summary of changes:
source3/lib/events.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/events.c b/source3/lib/events.c
index 64ea3ad..72fd40e 100644
--- a/source3/lib/events.c
+++ b/source3/lib/events.c
@@ -456,7 +456,7 @@ struct tevent_context *s3_tevent_context_init(TALLOC_CTX
*mem_ctx)
}
struct idle_event {
- struct timed_event *te;
+ struct tevent_timer *te;
struct timeval interval;
char *name;
bool (*handler)(const struct timeval *now, void *private_data);
@@ -464,7 +464,7 @@ struct idle_event {
};
static void smbd_idle_event_handler(struct tevent_context *ctx,
- struct timer_event *te,
+ struct tevent_timer *te,
struct timeval now,
void *private_data)
{
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 3c94ba5 s3-winbindd: fix the build of idmap_ad modules.
from d7b0e9a s3-lib: Fix conversion of lib/events.c to modern tevent
names
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 3c94ba500707ff171e09c000e451d72cdf4a8776
Author: Günther Deschner g...@samba.org
Date: Thu Jun 14 12:55:55 2012 +0200
s3-winbindd: fix the build of idmap_ad modules.
Guenther
Autobuild-User(master): Günther Deschner g...@samba.org
Autobuild-Date(master): Fri Jun 15 18:16:11 CEST 2012 on sn-devel-104
---
Summary of changes:
source3/winbindd/wscript_build |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build
index d9b4d34..86d50ee 100644
--- a/source3/winbindd/wscript_build
+++ b/source3/winbindd/wscript_build
@@ -42,12 +42,13 @@ bld.SAMBA3_SUBSYSTEM('IDMAP_HASH',
bld.SAMBA3_SUBSYSTEM('IDMAP_AD',
source=IDMAP_AD_SRC,
-deps='ads',
+deps='ads nss_info',
vars=locals(),
enabled=bld.env.HAVE_LDAP)
bld.SAMBA3_MODULE('idmap_ad',
subsystem='idmap',
+ allow_undefined_symbols=True,
source='',
deps='IDMAP_AD',
init_function='',
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 6440720 selftest/flapping: mark samba4.nss.test using winbind(s3dc) as flakey via 917612a docs-xml: vfs_gpfs: add comment per share option via 3eba94c docs-xml: vfs_gpfs: fix typo via 54b6d29 docs-xml: add gpfs:acl option to vfs_gpfs man page via 289255c s3:vfs_gpfs: add gpfs:acl option via 442cb66 dbwrap: Remove an unnecessary ZERO_STRUCT from 3c94ba5 s3-winbindd: fix the build of idmap_ad modules. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 6440720de3123c17baa99b31a3a72f5dba938873 Author: Stefan Metzmacher me...@samba.org Date: Fri Jun 15 18:30:43 2012 +0200 selftest/flapping: mark samba4.nss.test using winbind(s3dc) as flakey I saw this at least 10 times in the last weeks. [1425/1517 in 1h12m22s] samba4.nss.test using winbind(s3dc) UNEXPECTED(failure): samba4.nss.test using winbind(s3dc).run nsstest(s3dc) REASON: _StringException: _StringException: ERROR setpwent: NSS_STATUS=-1 1 (nss_errno=0) ERROR getpwent: NSS_STATUS=-1 1 (nss_errno=0) ERROR endpwent: NSS_STATUS=-1 1 (nss_errno=0) ERROR setgrent: NSS_STATUS=-1 1 (nss_errno=0) ERROR getgrent: NSS_STATUS=-1 1 (nss_errno=0) ERROR endgrent: NSS_STATUS=-1 1 (nss_errno=0) ERROR Non existent user gave error -1 ERROR Non existent uid gave error -1 ERROR Non existent group gave error -1 ERROR Non existent gid gave error -1 total_errors=10 FAILED (1 failures, 0 errors and 0 unexpected successes in 0 testsuites) metze Autobuild-User(master): Stefan Metzmacher me...@samba.org Autobuild-Date(master): Fri Jun 15 20:24:11 CEST 2012 on sn-devel-104 commit 917612a26fc567323e266762b895e09047cf40aa Author: Björn Baumbach b...@sernet.de Date: Fri Jun 15 12:33:32 2012 +0200 docs-xml: vfs_gpfs: add comment per share option Signed-off-by: Stefan Metzmacher me...@samba.org commit 3eba94c0f170a998e2c779c03c39e48848c605d4 Author: Björn Baumbach b...@sernet.de Date: Fri Jun 15 12:33:32 2012 +0200 docs-xml: vfs_gpfs: fix typo Signed-off-by: Stefan Metzmacher me...@samba.org commit 54b6d294eecbcd4b9b9965311a8886d06f4aff05 Author: Björn Baumbach b...@sernet.de Date: Fri Jun 15 12:33:32 2012 +0200 docs-xml: add gpfs:acl option to vfs_gpfs man page Signed-off-by: Stefan Metzmacher me...@samba.org commit 289255ce7379188177eaa5f4f8fa527cb909af24 Author: Björn Baumbach b...@sernet.de Date: Thu Jun 14 14:15:44 2012 +0200 s3:vfs_gpfs: add gpfs:acl option With gpfs:acl=no you can pass the acl calls to the next SMB_VFS module. Based on a patch from Hans-Dieter Schuster hans-dieter.schus...@ts.fujitsu.com Pair-Programmed-With: Stefan Metzmacher me...@samba.org commit 442cb66c16d50e76725799aa74a8877207de88ec Author: Volker Lendecke v...@samba.org Date: Tue Jun 5 11:28:44 2012 +0200 dbwrap: Remove an unnecessary ZERO_STRUCT We assign the only struct member one line down Signed-off-by: Stefan Metzmacher me...@samba.org --- Summary of changes: docs-xml/manpages-3/vfs_gpfs.8.xml | 24 ++- lib/dbwrap/dbwrap_rbt.c|1 - selftest/flapping |1 + source3/modules/vfs_gpfs.c | 81 4 files changed, 105 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/vfs_gpfs.8.xml b/docs-xml/manpages-3/vfs_gpfs.8.xml index 3635143..526d86d 100644 --- a/docs-xml/manpages-3/vfs_gpfs.8.xml +++ b/docs-xml/manpages-3/vfs_gpfs.8.xml @@ -50,6 +50,8 @@ paraThis module is stackable./para + paraSince Samba 4.0 all options are per share options./para + /refsect1 @@ -174,7 +176,7 @@ listitem para GPFS ACLs doesn't know about the 'APPEND' right. - This optionen lets Samba map the 'APPEND' right to 'WRITE'. + This option lets Samba map the 'APPEND' right to 'WRITE'. /para itemizedlist @@ -190,6 +192,26 @@ /varlistentry varlistentry + termgpfs:acl = [ yes | no ]/term + listitem + para + This option lets Samba use or ignore GPFS ACLs. + /para + + itemizedlist + listitempara + commandyes(default)/command - use GPFS ACLs. + /para/listitem + listitempara + commandno/command - do not use GPFS ACLs and pass everything + to the next SMB_VFS module. + /para/listitem + /itemizedlist + /listitem + + /varlistentry +
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 0ace3ca Part 2 of fix for bug #8998 - Notify code can miss a ChDir.
via 2b92491 Part 1 of fix for bug #8998 - Notify code can miss a ChDir.
from 6330936 Fix bug #8922.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 0ace3ca03df76a1c22e112ea41d491f90afc0f94
Author: Volker Lendecke volker.lende...@sernet.de
Date: Thu Jun 14 11:26:44 2012 -0700
Part 2 of fix for bug #8998 - Notify code can miss a ChDir.
Do a ChDir for notify_onelevel.
commit 2b92491ba7cc5fd541e3f8988ecf831c3949fb00
Author: Volker Lendecke volker.lende...@sernet.de
Date: Thu Jun 14 11:24:01 2012 -0700
Part 1 of fix for bug #8998 - Notify code can miss a ChDir.
Factor out notify_parent_dir.
---
Summary of changes:
source3/smbd/notify.c | 52 +++-
1 files changed, 38 insertions(+), 14 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c
index 24385c9..d9a28eb 100644
--- a/source3/smbd/notify.c
+++ b/source3/smbd/notify.c
@@ -345,28 +345,52 @@ void
remove_pending_change_notify_requests_by_fid(files_struct *fsp,
}
}
-void notify_fname(connection_struct *conn, uint32 action, uint32 filter,
- const char *path)
+static void notify_parent_dir(connection_struct *conn,
+ uint32 action, uint32 filter,
+ const char *path)
{
- char *fullpath;
+ struct smb_filename smb_fname_parent;
char *parent;
const char *name;
+ char *oldwd;
- if (path[0] == '.' path[1] == '/') {
- path += 2;
+ if (!parent_dirname(talloc_tos(), path, parent, name)) {
+ return;
}
- if (parent_dirname(talloc_tos(), path, parent, name)) {
- struct smb_filename smb_fname_parent;
- ZERO_STRUCT(smb_fname_parent);
- smb_fname_parent.base_name = parent;
+ ZERO_STRUCT(smb_fname_parent);
+ smb_fname_parent.base_name = parent;
- if (SMB_VFS_STAT(conn, smb_fname_parent) != -1) {
- notify_onelevel(conn-notify_ctx, action, filter,
- SMB_VFS_FILE_ID_CREATE(conn, smb_fname_parent.st),
- name);
- }
+ oldwd = vfs_GetWd(parent, conn);
+ if (oldwd == NULL) {
+ goto done;
+ }
+ if (vfs_ChDir(conn, conn-connectpath) == -1) {
+ goto done;
+ }
+
+ if (SMB_VFS_STAT(conn, smb_fname_parent) == -1) {
+ goto chdir_done;
+ }
+
+ notify_onelevel(conn-notify_ctx, action, filter,
+ SMB_VFS_FILE_ID_CREATE(conn, smb_fname_parent.st),
+ name);
+chdir_done:
+ vfs_ChDir(conn, oldwd);
+done:
+ TALLOC_FREE(parent);
+}
+
+void notify_fname(connection_struct *conn, uint32 action, uint32 filter,
+ const char *path)
+{
+ char *fullpath;
+
+ if (path[0] == '.' path[1] == '/') {
+ path += 2;
}
+ notify_parent_dir(conn, action, filter, path);
fullpath = talloc_asprintf(talloc_tos(), %s/%s, conn-connectpath,
path);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 7a723c6 build: Remove support for non-64bit sendfile()
from 6440720 selftest/flapping: mark samba4.nss.test using winbind(s3dc)
as flakey
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 7a723c6b386513ce58fe27469440bfc71debf685
Author: Andrew Bartlett abart...@samba.org
Date: Tue Jun 5 14:43:24 2012 +1000
build: Remove support for non-64bit sendfile()
Some early Linux 2.6 platforms can not handle sendfile and
_FILE_OFFSET_BITS == 64
This disables sendfile() on these platforms.
Andrew Bartlett
Autobuild-User(master): Andrew Bartlett abart...@samba.org
Autobuild-Date(master): Sat Jun 16 02:21:28 CEST 2012 on sn-devel-104
---
Summary of changes:
source3/configure.in | 18 --
source3/lib/sendfile.c | 87
source3/wscript| 15
3 files changed, 0 insertions(+), 120 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/configure.in b/source3/configure.in
index f2885d2..c521e2e 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -5484,28 +5484,10 @@ ssize_t nwritten = sendfile(tofd, fromfd, offset,
total);
],
samba_cv_HAVE_SENDFILE=yes,samba_cv_HAVE_SENDFILE=no)])
-# Try and cope with broken Linux sendfile
- AC_CACHE_CHECK([for broken linux sendfile
support],samba_cv_HAVE_BROKEN_LINUX_SENDFILE,[
- AC_TRY_LINK([\
-#if defined(_FILE_OFFSET_BITS) (_FILE_OFFSET_BITS == 64)
-#undef _FILE_OFFSET_BITS
-#endif
-#include sys/sendfile.h],
-[\
-int tofd, fromfd;
-off_t offset;
-size_t total;
-ssize_t nwritten = sendfile(tofd, fromfd, offset, total);
-],
-samba_cv_HAVE_BROKEN_LINUX_SENDFILE=yes,samba_cv_HAVE_BROKEN_LINUX_SENDFILE=no)])
-
if test x$samba_cv_HAVE_SENDFILE = xyes; then
AC_DEFINE(HAVE_SENDFILE,1,[Whether sendfile() is available])
AC_DEFINE(LINUX_SENDFILE_API,1,[Whether linux sendfile() API is
available])
AC_DEFINE(WITH_SENDFILE,1,[Whether sendfile() should be used])
- elif test x$samba_cv_HAVE_BROKEN_LINUX_SENDFILE = xyes; then
- AC_DEFINE(LINUX_BROKEN_SENDFILE_API,1,[Whether (linux)
sendfile() is broken])
- AC_DEFINE(WITH_SENDFILE,1,[Whether sendfile should be used])
else
AC_MSG_RESULT(no);
fi
diff --git a/source3/lib/sendfile.c b/source3/lib/sendfile.c
index a9607fa..196ef68 100644
--- a/source3/lib/sendfile.c
+++ b/source3/lib/sendfile.c
@@ -89,93 +89,6 @@ ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB
*header, off_t offset
return count + hdr_len;
}
-#elif defined(LINUX_BROKEN_SENDFILE_API)
-
-/*
- * We must use explicit 32 bit types here. This code path means Linux
- * won't do proper 64-bit sendfile. JRA.
- */
-
-extern int32 sendfile (int out_fd, int in_fd, int32 *offset, uint32 count);
-
-
-#ifndef MSG_MORE
-#define MSG_MORE 0x8000
-#endif
-
-ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, off_t
offset, size_t count)
-{
- size_t total=0;
- ssize_t ret;
- ssize_t hdr_len = 0;
- uint32 small_total = 0;
- int32 small_offset;
-
- /*
-* Fix for broken Linux 2.4 systems with no working sendfile64().
-* If the offset+count 2 GB then pretend we don't have the
-* system call sendfile at all. The upper layer catches this
-* and uses a normal read. JRA.
-*/
-
- if ((sizeof(off_t) = 8) (offset + count (off_t)0x7FFF)) {
- errno = ENOSYS;
- return -1;
- }
-
- /*
-* Send the header first.
-* Use MSG_MORE to cork the TCP output until sendfile is called.
-*/
-
- if (header) {
- hdr_len = header-length;
- while (total hdr_len) {
- ret = sys_send(tofd, header-data + total,hdr_len -
total, MSG_MORE);
- if (ret == -1)
- return -1;
- total += ret;
- }
- }
-
- small_total = (uint32)count;
- small_offset = (int32)offset;
-
- while (small_total) {
- int32 nwritten;
- do {
- nwritten = sendfile(tofd, fromfd, small_offset,
small_total);
-#if defined(EWOULDBLOCK)
- } while (nwritten == -1 (errno == EINTR || errno == EAGAIN
|| errno == EWOULDBLOCK));
-#else
- } while (nwritten == -1 (errno == EINTR || errno == EAGAIN));
-#endif
- if (nwritten == -1) {
- if (errno == ENOSYS || errno == EINVAL) {
- /* Ok - we're in a world of pain here. We just
sent
-* the header, but
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via d1d36d2 s4-selftest: Add tests for dbcheck on an old database that
needs repair
via fa223eb s4-dbcheck: Always specify the dhcheck control
via 72953b1 selftest: Add targetdir and tdbrestore parameters to
undump.sh
from 7a723c6 build: Remove support for non-64bit sendfile()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit d1d36d2563685a71874e5d584662dfd8de9418a5
Author: Andrew Bartlett abart...@samba.org
Date: Sat Jun 16 11:56:53 2012 +1000
s4-selftest: Add tests for dbcheck on an old database that needs repair
We changed a lot since alpha13, so there are lots of legitimate errors to
fix.
Andrew Bartlett
Autobuild-User(master): Andrew Bartlett abart...@samba.org
Autobuild-Date(master): Sat Jun 16 05:44:15 CEST 2012 on sn-devel-104
commit fa223eb26b07bba9e8055c35584886e6deb6e4a2
Author: Andrew Bartlett abart...@samba.org
Date: Sat Jun 16 11:51:22 2012 +1000
s4-dbcheck: Always specify the dhcheck control
This will then allow us to make schema modifications, overriding the
default ban.
Andrew Bartlett
commit 72953b1eb8fa42257c7f8eff603e04c953fac361
Author: Andrew Bartlett abart...@samba.org
Date: Sat Jun 16 11:06:59 2012 +1000
selftest: Add targetdir and tdbrestore parameters to undump.sh
---
Summary of changes:
source4/scripting/python/samba/dbchecker.py |1 +
source4/selftest/provisions/undump.sh | 27 ++---
source4/selftest/tests.py |2 +
testprogs/blackbox/dbcheck-alpha13.sh | 42 +++
4 files changed, 67 insertions(+), 5 deletions(-)
create mode 100755 testprogs/blackbox/dbcheck-alpha13.sh
Changeset truncated at 500 lines:
diff --git a/source4/scripting/python/samba/dbchecker.py
b/source4/scripting/python/samba/dbchecker.py
index 95be1ce..72d0604 100644
--- a/source4/scripting/python/samba/dbchecker.py
+++ b/source4/scripting/python/samba/dbchecker.py
@@ -118,6 +118,7 @@ class dbcheck(object):
if self.verbose:
self.report(self.samdb.write_ldif(m, ldb.CHANGETYPE_MODIFY))
try:
+controls = controls + [local_oid:%s:0 %
dsdb.DSDB_CONTROL_DBCHECK]
self.samdb.modify(m, controls=controls, validate=validate)
except Exception, err:
self.report(%s : %s % (msg, err))
diff --git a/source4/selftest/provisions/undump.sh
b/source4/selftest/provisions/undump.sh
index 07408b7..7ffea3e 100755
--- a/source4/selftest/provisions/undump.sh
+++ b/source4/selftest/provisions/undump.sh
@@ -1,18 +1,35 @@
#!/bin/sh
# undump a provision directory
-[ $# -eq 1 ] || {
-echo Usage: undump.sh DIRECTORY
+[ $# -gt 0 ] || {
+echo Usage: undump.sh DIRECTORY [TARGETDIR] [TDBRESTORE]
exit 1
}
+
+TDBRESTORE=tdbrestore
+[ $# -lt 3 ] || {
+TDBRESTORE=$3
+}
+
+
dirbase=$1
-for f in $(find $dirbase -name '*.dump'); do
-dname=$(dirname $f)
+
+TARGETDIR=`pwd`/$dirbase
+
+cd $dirbase
+
+[ $# -lt 2 ] || {
+TARGETDIR=$2
+}
+
+for f in $(find . -name '*.dump'); do
+dname=$TARGETDIR/$(dirname $f)
+mkdir -p $dname
bname=$(basename $f .dump)
outname=$dname/$bname
echo Restoring $outname
rm -f $outname
-bin/tdbrestore $outname $f || {
+$TDBRESTORE $outname $f || {
echo Failed to restore $outname
exit 1
}
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 8e868dc..ece0325 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -463,6 +463,8 @@ for env in [dc, fl2000dc, fl2003dc, fl2008r2dc]:
# isn't available on DCs with Windows 2000 domain function level -
# therefore skip it in that configuration
plantestsuite(samba4.ldap.passwords.python(%s) % env, env, [python,
os.path.join(samba4srcdir, dsdb/tests/python/passwords.py), $SERVER,
'-U$USERNAME%$PASSWORD', -W$DOMAIN])
+
+plantestsuite(samba4.blackbox.dbcheck.alpha13, none , [PYTHON=%s %
python, os.path.join(bbdir, dbcheck-alpha13.sh), '$PREFIX_ABS/provision',
configuration])
planpythontestsuite(dc:local, samba.tests.upgradeprovisionneeddc)
planpythontestsuite(none, samba.tests.upgradeprovision)
planpythontestsuite(none, samba.tests.xattr)
diff --git a/testprogs/blackbox/dbcheck-alpha13.sh
b/testprogs/blackbox/dbcheck-alpha13.sh
new file mode 100755
index 000..00cb97a
--- /dev/null
+++ b/testprogs/blackbox/dbcheck-alpha13.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+if [ $# -lt 1 ]; then
+cat EOF
+Usage: dbcheck.sh PREFIX
+EOF
+exit 1;
+fi
+
+PREFIX_ABS=$1
+shift 1
+
+. `dirname $0`/subunit.sh
+
+alpha13() {
+ if test -x $BINDIR/tdbrestore;
+ then
+ `dirname $0`/../../source4/selftest/provisions/undump.sh `dirname
$0`/../../source4/selftest/provisions/alpha13
