[SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated -
1844a7be04eaa31e36fbc7a2e49eba516cb20ab8
Michael Adam
obnox at samba.org
Mon Jul 6 11:16:54 GMT 2009
The branch, v3-4-ctdb has been updated
discards c8db89e64995ff8778bae2b182b9c45d1873febe (commit)
discards d92cbdea17a41bfcb9656a9681f9621dbc863e5c (commit)
discards 82208f5fbe47bed8d754454b9077d161e8996258 (commit)
discards 2fb5ea2dac24ceb4636bb5a985adb046959236d5 (commit)
discards eb8f4e959cb656a972a6de489b557fbf16efa724 (commit)
discards 3254db440f95d50b238d68906ea73ec44aebb585 (commit)
discards 169f69edbc7e25bf74af507485bf3207dbe32d99 (commit)
discards 9c488264dc9d8bf6df276e4c34864bb7dc890c28 (commit)
discards 980a8b9c4bfe49fae5db91d0c687059e7bc3464c (commit)
discards 9e87271948374a16e3d80ee068703c4fb7b41fac (commit)
discards 248a3ba4b6366be659d2e0ae8d69574964c740a0 (commit)
discards 9d8f325d0966f2aaf82b1447dae5e76484153633 (commit)
discards d4263a98263950bc0062f04c5d60a7abb5fb1057 (commit)
discards 69ad18389d5ed3ce9b9e08480cc273171341f644 (commit)
discards 8ad950e75d74b75478130475e0d0e5eb1d821a6a (commit)
discards 93914f447c491710b83c3541189261162fa049d9 (commit)
discards cda0ec7da7d490a1fc8df27443e21d65f31162af (commit)
discards c87e41167a7fb0f642349a0cb41c2bbfe619432d (commit)
discards 1fee563dbfacc4daf1c1ca4e57e66b2a910c7fe9 (commit)
discards af69dfdc4c62477364a4aca41bac4289602766b9 (commit)
discards 90cab10ac3bf65845786fe8c2d2c71018eb77967 (commit)
discards 44f21987cb1f54143a25959d1cb6322a188dfa1c (commit)
discards 54c1f8c0c49eb92ad0d35d0af1f1af3489c848f2 (commit)
discards d577f10331ee935efa263091737d327ed1d19b7a (commit)
discards 46ca188cca943d94e8756f910963af966b5e6547 (commit)
discards f396e590c8d865ac3322332b16ec72073ee15bb0 (commit)
discards eddac3fe077f1ad19d5d98b6e9a1ae103b01e86c (commit)
discards 5fbbdd284e8eab91b8e8151da41f9207e2405847 (commit)
via 1844a7be04eaa31e36fbc7a2e49eba516cb20ab8 (commit)
via 49e0d351fe48b15d81ec334868ed96f5a1d6cf90 (commit)
via f3fec89beb1b7419ab5cd400cb1c6dd9d8e92392 (commit)
via 01757a2a8fb1b8b20c6e01176b9a8a8a3ecac4e5 (commit)
via b45f30c39eb7ced23eef08c72ee342b08bd15832 (commit)
via 05912bf1769553cd2428c7052736be4a6aea8f53 (commit)
via 631087534fcfe95863f44eb9785e5e1164ff9ef2 (commit)
via 1a141805e306ec240551f69e9335d5d67fb04e37 (commit)
via 46751cbb11bce6bd3490f29685c78a15560cb072 (commit)
via f11a2d4586abbffff8f1e93e60ddb3f37cc3b81d (commit)
via d1bd3c2cd1c14f23ddf11571b7154fb2ef012b1e (commit)
via 3a08e589cce587e631a43c2b50356e61a1974a73 (commit)
via 19a656bf6f8678495ef8d29eef852e4523a4d9e5 (commit)
via a8f7a08658c78e287d6eb62d9741288f771d3d73 (commit)
via 10e3748d62d1ff4f4783cd652e23d074f45e914c (commit)
via ca2c65b3b584bd8122d23747b241dc205806a96d (commit)
via 68959548a900fbfc070d9e30163cf372a640d2d1 (commit)
via 3aa1c9d476a148e7db55b698df6c38db6bd4a4c9 (commit)
via 901c609148bdfd5d793be2793c7198d983bc843b (commit)
via 9143e5bbe0751cee964523ad65b33ac1cf005aed (commit)
via ec3ee8d4511f304217d980fa9590ccae907d6731 (commit)
via d7f97d0baa243e09963d4201f5bbee85cd477f2a (commit)
via c0688cd8bddd4b2e3360f337bc11efaa428f5d9f (commit)
via b7e4a36e1e65d4383994702823a2d2549944f8d0 (commit)
via 5b93068bc629fe4f7429482cc0b96bb0e23e4b1f (commit)
via 10ccf32db7ef02e93ca47f754cecdd4409533654 (commit)
via c57298c7432922bf755643a1cd97195ebfe9b313 (commit)
via 4735bf0e744e1015eeb5a9ef6e744011183d9e30 (commit)
via 09411113d8f6b2389b3763bad24bcfdb61b0508c (commit)
via f0d67b6e119d719c2540eadce5849d3200dea2d0 (commit)
via ebe56e6872228fcbd81ead598eb2c5b1738b7f4c (commit)
via 8446843ec43cd61e548dda7032f26020240d872d (commit)
via 7c0f1fd01ba355f234f411426b00285c824691b2 (commit)
via 250e253f755954ff96c14ed29d6107d344a1c427 (commit)
via d08f8595b15144513febe089f2ba0c322dba9ea9 (commit)
via 3c8e5d5339ec246bca846aee48ecfba74c7d7c69 (commit)
from c8db89e64995ff8778bae2b182b9c45d1873febe (commit)
http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-4-ctdb
- Log -----------------------------------------------------------------
commit 1844a7be04eaa31e36fbc7a2e49eba516cb20ab8
Author: Michael Adam <obnox at samba.org>
Date: Wed Jul 1 11:06:34 2009 +0200
packaging(RHEL-CTDB): disable the merged build.
Michael
commit 49e0d351fe48b15d81ec334868ed96f5a1d6cf90
Author: Michael Adam <obnox at samba.org>
Date: Fri Mar 20 00:47:45 2009 +0100
packaging(RHEL-CTDB): also pack libwbcient in winbind-32bit package
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
commit f3fec89beb1b7419ab5cd400cb1c6dd9d8e92392
Author: Michael Adam <obnox at samba.org>
Date: Fri Mar 20 00:30:35 2009 +0100
packaging(RHEL-CTDB): add new pam_winbind.mo to the common package
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
commit 01757a2a8fb1b8b20c6e01176b9a8a8a3ecac4e5
Author: Michael Adam <obnox at samba.org>
Date: Fri Mar 20 00:28:36 2009 +0100
packaging(RHEL-CTDB): add new binary sharesec to the client package.
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
commit b45f30c39eb7ced23eef08c72ee342b08bd15832
Author: Michael Adam <obnox at samba.org>
Date: Fri Mar 20 00:26:11 2009 +0100
packaging(RHEL-CTDB): add new binary ldbrename to the common rpm
Michael
Signed-off-by: Michael Adam <obnox at samba.org>
commit 05912bf1769553cd2428c7052736be4a6aea8f53
Author: Michael Adam <obnox at samba.org>
Date: Mon Jun 29 17:07:14 2009 +0200
packaging(RHEL-CTDB): fix location of nsswitch/ directory for install
This has been moved to the top level directory in 3.4.
Michael
commit 631087534fcfe95863f44eb9785e5e1164ff9ef2
Author: Michael Adam <obnox at samba.org>
Date: Mon Jun 29 17:05:00 2009 +0200
packaging(RHEL-CTDB): don't pass CFLAGS to make.
This breaks the build since 3.3 since it overwrites the CFLAGS
set by configure.
Michael
commit 1a141805e306ec240551f69e9335d5d67fb04e37
Author: Michael Adam <obnox at samba.org>
Date: Mon Jun 29 17:03:09 2009 +0200
packaging(RHEL-CTDB): don't "make proto" any more.
This has become unnecessary in 3.3
Michael
commit 46751cbb11bce6bd3490f29685c78a15560cb072
Author: Michael Adam <obnox at samba.org>
Date: Mon Jun 29 16:26:42 2009 +0200
s3:fix build of old linux quota system and other unixes' quota implementation
By fixing the use of struct stat_ex.
Michael
commit f11a2d4586abbffff8f1e93e60ddb3f37cc3b81d
Author: Michael Adam <obnox at samba.org>
Date: Mon Jun 29 16:11:13 2009 +0200
s3:lib/sysquotas: fix usage of SMB_STRUCT_STAT (struct stat_ex).
This fixes the build with quotas / configure time detection
of sys_quota interface.
Michael
commit d1bd3c2cd1c14f23ddf11571b7154fb2ef012b1e
Author: Michael Adam <obnox at samba.org>
Date: Mon Jun 29 13:19:48 2009 +0200
s3:nfsv4_acl.c: fix build with struct stat_ex.
Michael
commit 3a08e589cce587e631a43c2b50356e61a1974a73
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 23 23:09:09 2009 +0200
packaging(RHEL-CTDB):makerpms.sh: replace source/ by source3/
Michael
commit 19a656bf6f8678495ef8d29eef852e4523a4d9e5
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 23 23:06:40 2009 +0200
packaging(RHEL-CTDB):makespec.sh: fix detection of version
Michael
commit a8f7a08658c78e287d6eb62d9741288f771d3d73
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 23 22:41:51 2009 +0200
packaging(RHEL-CTDB): makeversion.sh: v3-4-test uses source3 instead of source
Michael
commit 10e3748d62d1ff4f4783cd652e23d074f45e914c
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 23 16:41:38 2009 +0200
adapt VERSION to be 3.4.0rc1-ctdb-1
following the versioning scheme of the v3-2-ctdb branch
Michael
commit ca2c65b3b584bd8122d23747b241dc205806a96d
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 21 09:49:12 2009 +0100
packaging(RHEL-CTDB): makerpms.sh: build winbind-32bit libs in the 64bit build
Michael
(cherry picked from commit a9a506b6640986548e2ae8540b7ae93960d6ece5)
commit 68959548a900fbfc070d9e30163cf372a640d2d1
Author: Michael Adam <obnox at samba.org>
Date: Tue Jan 20 19:47:28 2009 +0100
packaging(RHEL-CTDB): Build winbind-32bit package in the 64bit build
Michael
(cherry picked from commit f5cd88a25f360e6609dc5abe24247fab78af6854)
commit 3aa1c9d476a148e7db55b698df6c38db6bd4a4c9
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 21 11:03:34 2009 +0100
packaging(RHEL-CTDB): extend makespec.sh to extract VENDOR_PATCH from version.h
Michael
(cherry picked from commit fc122aa276bce379b492e5bdf52ab3e03bc3737f)
commit 901c609148bdfd5d793be2793c7198d983bc843b
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 21 10:24:31 2009 +0100
packaging(RHEL-CTDB): The former release number has basically moved into VERSION
Michael
commit 9143e5bbe0751cee964523ad65b33ac1cf005aed
Author: Volker Lendecke <vl at samba.org>
Date: Thu May 14 15:34:42 2009 +0200
Introduce "struct stat_ex" as a replacement for SMB_STRUCT_STAT
This patch introduces
struct stat_ex {
dev_t st_ex_dev;
ino_t st_ex_ino;
mode_t st_ex_mode;
nlink_t st_ex_nlink;
uid_t st_ex_uid;
gid_t st_ex_gid;
dev_t st_ex_rdev;
off_t st_ex_size;
struct timespec st_ex_atime;
struct timespec st_ex_mtime;
struct timespec st_ex_ctime;
struct timespec st_ex_btime; /* birthtime */
blksize_t st_ex_blksize;
blkcnt_t st_ex_blocks;
};
typedef struct stat_ex SMB_STRUCT_STAT;
It is really large because due to the friendly libc headers playing macro
tricks with fields like st_ino, so I renamed them to st_ex_xxx.
Why this change? To support birthtime, we already have quite a few #ifdef's at
places where it does not really belong. With a stat struct that we control, we
can consolidate the nanosecond timestamps and the birthtime deep in the VFS
stat calls.
At this moment it is triggered by a request to support the birthtime field for
GPFS. GPFS does not extend the system level struct stat, but instead has a
separate call that gets us the additional information beyond posix. Without
being able to do that within the VFS stat calls, that support would have to be
scattered around the main smbd code.
It will very likely break all the onefs modules, but I think the changes will
be reasonably easy to do.
commit ec3ee8d4511f304217d980fa9590ccae907d6731
Author: Michael Adam <obnox at samba.org>
Date: Wed Jan 28 13:34:34 2009 +0100
vfs_gpfs_prefetch: correctly return -1 on error condition in smbd_gpfs_fcntl()
Michael
commit d7f97d0baa243e09963d4201f5bbee85cd477f2a
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 28 11:44:26 2008 +0200
Add a gpfs_prefetch module
This can not go upstream yet because it uses the non-GPL libgpfs. So it will
not be compiled by default and will not be included in the SOFS RPMs. But upon
Sven's request, we include it in the git tree and the source RPMs, so that it
can be built for in-house tests.
commit c0688cd8bddd4b2e3360f337bc11efaa428f5d9f
Author: Volker Lendecke <vl at samba.org>
Date: Fri May 29 00:20:10 2009 +0200
Support getting gpfs birthtime
commit b7e4a36e1e65d4383994702823a2d2549944f8d0
Author: Mathias Dietz <mdietz at de.ibm.com>
Date: Wed May 27 12:03:12 2009 +0200
Store winattrs in GPFS
1. Store win attributes in gpfs instead of posix bits.
2. use of path based winattr calls of gpfs.
Signed-off-by: Mathias Dietz <mdietz at de.ibm.com>
commit 5b93068bc629fe4f7429482cc0b96bb0e23e4b1f
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 15 00:16:56 2008 +0100
Add the "net groupfilter" command
This is the start of a bad hack for even worse systems: Many Unix systems still
have the NGROUPS problem: A user can not be member of more than a very limited
number of groups. Solaris for example limits this to 16 by default. Many
Windows environments have a *LOT* more groups per user, some even go to
hundreds. Whether that is efficient is debatable, but it's there.
This patch implements the
"net groupfilter"
command with the "addsid", "delsid" and "list" subcommands. If any SIDs are
present according to "net groupfilter list" (they are stored in secrets.tdb),
then only the SIDs in that list are converted to GIDs for a user at login time.
This gives the Administrator the possibility to define a set of groups that are
used on the Unix box, making sure that no user is in more than NGROUPS of those
at a time.
This patch is incomplete in the sense that winbind is not aware of this, only
smbd. So it is kind of an emergency hack for smbd-only machines.
Volker
Signed-off-by: Michael Adam <obnox at samba.org>
commit 10ccf32db7ef02e93ca47f754cecdd4409533654
Author: Andrew Tridgell <tridge at samba.org>
Date: Mon Apr 21 18:41:32 2008 +0200
apply patch from v3-0-ctdb to special case root in libnss_winbind
This is needed to ensure the administrator can login to a node even
when ctdbd and winbindd are stuck
commit c57298c7432922bf755643a1cd97195ebfe9b313
Author: Michael Adam <obnox at samba.org>
Date: Tue Jun 16 16:03:41 2009 +0200
add README.v3-4-ctdb
Michael
commit 4735bf0e744e1015eeb5a9ef6e744011183d9e30
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Jul 3 13:08:06 2009 +0200
WHATSNEW: Update changes.
Karolin
commit 09411113d8f6b2389b3763bad24bcfdb61b0508c
Author: Michael Adam <obnox at samba.org>
Date: Fri Jul 3 11:35:11 2009 +0200
Revert "[s3]pidfile_create: use check is_default_dyn_CONFIGFILE() since we have it."
This reverts commit 1d3dcd1e420104c23769b691d0b8b7958d5c58a7.
This fixes Bug #6531 (Pid File creation.)
Usually, I would extend is_default_dyn_XYZ() so that it returns true
when dyn_XYZ has not been set yet or when its value is equal to the
compiled in default value XZY. But this would have a change in effect
in popt_common and torture.c: is_default_dyn_CONFIGFILE() is used
there to check whether the config file should be overwritten by the
contents of the environment variable SMB_CONF_PATH. Currently this
is only done when set_dyn_CONFIGFILE() had _not_ previously been called
at all, not even with the same value as the compiled in default.
Michael
(cherry picked from commit 914a14b3a9c9d922d2a5c1aa413945afa11cfd2a)
Signed-off-by: Michael Adam <obnox at samba.org>
commit f0d67b6e119d719c2540eadce5849d3200dea2d0
Author: Volker Lendecke <vl at samba.org>
Date: Tue Jun 30 11:42:15 2009 -0700
Fix bug #6431 - local groups from 3.0 setups no longer found.
Search for groups without group suffix, group suffix is only used for new entries.
(cherry picked from commit 91a8cb851e1919a337310e2c699d8fcf76a55060)
commit ebe56e6872228fcbd81ead598eb2c5b1738b7f4c
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Jul 3 09:47:32 2009 +0200
WHATSNEW: Update changes.
Karolin
commit 8446843ec43cd61e548dda7032f26020240d872d
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jun 30 16:03:11 2009 +0200
s3:util: let parent_dirname() correctly return toplevel filenames
metze
(cherry picked from commit a14efbadd53ac9678d75e6029f947d63cfa0c4e5)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
This addresses bug #6526.
commit 7c0f1fd01ba355f234f411426b00285c824691b2
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Jul 3 09:40:10 2009 +0200
WHATSNEW: Update changes and release date.
Karolin
commit 250e253f755954ff96c14ed29d6107d344a1c427
Author: Björn Jacke <bj at sernet.de>
Date: Wed Jun 10 12:31:07 2009 +0200
s3:pam_smbpass: fix build error on some Linux distros
This addresses bug #6459.
(cherry picked from commit 06a9678aad549d23583d860ecd57b221b25f15b6)
commit d08f8595b15144513febe089f2ba0c322dba9ea9
Author: Karolin Seeger <kseeger at samba.org>
Date: Thu Jul 2 08:32:05 2009 +0200
WHATSNEW: Update changes since 3.4.0rc1.
Karolin
commit 3c8e5d5339ec246bca846aee48ecfba74c7d7c69
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jul 1 16:58:14 2009 -0700
Fix bug #6520 time stamps - e.g. last mod time is not preserved when "unix extensions=yes" are set - and using latest cifs vfs client
Cancel out any pending "sticky" writes or "last write" changes when
doing a UNIX info level set.
Jeremy.
(cherry picked from commit b971860e01a3e616b0dd21990c054c8f8356f513)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 13 ++++++++++++-
source3/VERSION | 2 +-
source3/lib/pidfile.c | 2 +-
source3/lib/util.c | 2 +-
source3/pam_smbpass/support.c | 2 +-
source3/passdb/pdb_ldap.c | 16 ++++++++--------
source3/smbd/trans2.c | 34 +++++++++++++++++++++++++++++++---
7 files changed, 55 insertions(+), 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index a1ac150..9d45601 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,6 +1,6 @@
=============================
Release Notes for Samba 3.4.0
- July 1, 2009
+ July 3, 2009
=============================
@@ -206,9 +206,14 @@ Changes since 3.4.0rc1
----------------------
+o Jeremy Allison <jra at samba.org>
+ * BUG 6520: Fix time stamps when "unix extensions = yes".
+
+
o Michael Adam <obnox at samba.org>
* BUG 6509: Use gid (not uid) cache in fetch_gid_from_cache().
* BUG 6521: Fix building tevent_ntstatus without config.h.
+ * BUG 6531: Fix pid file name.
o Guenther Deschner <gd at samba.org>
@@ -217,9 +222,11 @@ o Guenther Deschner <gd at samba.org>
o Bjoern Jacke <bj at sernet.de>
* BUG 6497: Fix calling of 'test' in configure.
+ * BUG 6459: Fix build of pam_smbpass on some distributions.
o Volker Lendecke <vl at samba.org>
+ * BUG 6431: Local groups from 3.0 setups no longer found.
* BUG 6498: Add workaround for MS KB932762.
@@ -232,6 +239,10 @@ o Jim McDonough <jmcd at samba.org>
not.
+o Stefan Metzmacher <metze at samba.org>
+ * BUG 6526: Fix notifies in the share root directory.
+
+
o Bo Yang <boyang at samba.org>
* BUG 6499: Fix building of pam_smbpass.
diff --git a/source3/VERSION b/source3/VERSION
index 9984a37..37d5272 100644
--- a/source3/VERSION
+++ b/source3/VERSION
@@ -56,7 +56,7 @@ SAMBA_VERSION_PRE_RELEASE=
# e.g. SAMBA_VERSION_RC_RELEASE=1 #
# -> "3.0.0rc1" #
########################################################
-SAMBA_VERSION_RC_RELEASE=1
+SAMBA_VERSION_RC_RELEASE=
########################################################
# To mark SVN snapshots this should be set to 'yes' #
diff --git a/source3/lib/pidfile.c b/source3/lib/pidfile.c
index 37b36af..2c52d12 100644
--- a/source3/lib/pidfile.c
+++ b/source3/lib/pidfile.c
@@ -94,7 +94,7 @@ void pidfile_create(const char *program_name)
/* Add a suffix to the program name if this is a process with a
* none default configuration file name. */
- if (is_default_dyn_CONFIGFILE()) {
+ if (strcmp( CONFIGFILE, get_dyn_CONFIGFILE()) == 0) {
name = SMB_STRDUP(program_name);
} else {
short_configfile = strrchr( get_dyn_CONFIGFILE(), '/');
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 77cec0f..c81b80b 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -2336,7 +2336,7 @@ bool parent_dirname(TALLOC_CTX *mem_ctx, const char *dir, char **parent,
return False;
}
if (name) {
- *name = "";
+ *name = dir;
}
return True;
}
diff --git a/source3/pam_smbpass/support.c b/source3/pam_smbpass/support.c
index dabd57d..fa52c6d 100644
--- a/source3/pam_smbpass/support.c
+++ b/source3/pam_smbpass/support.c
@@ -105,7 +105,7 @@ void _log_err( pam_handle_t *pamh, int err, const char *format, ... )
}
strncpy(mod_format, tag, strlen(tag)+1);
- strncat(mod_format, format, strlen(format));
+ strlcat(mod_format, format, strlen(format)+1);
va_start(args, format);
vsyslog(err | LOG_AUTH, mod_format, args);
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 5cbe675..0886a10 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -2297,7 +2297,7 @@ static int ldapsam_search_one_group (struct ldapsam_privates *ldap_state,
attr_list = get_attr_list(NULL, groupmap_attr_list);
rc = smbldap_search(ldap_state->smbldap_state,
- lp_ldap_group_suffix (), scope,
+ lp_ldap_suffix (), scope,
filter, attr_list, 0, result);
TALLOC_FREE(attr_list);
@@ -2617,7 +2617,7 @@ static NTSTATUS ldapsam_enum_group_members(struct pdb_methods *methods,
goto done;
}
- rc = smbldap_search(conn, lp_ldap_group_suffix(),
+ rc = smbldap_search(conn, lp_ldap_suffix(),
LDAP_SCOPE_SUBTREE, filter, id_attrs, 0,
&result);
@@ -2865,7 +2865,7 @@ static NTSTATUS ldapsam_enum_group_memberships(struct pdb_methods *methods,
goto done;
}
- rc = smbldap_search(conn, lp_ldap_group_suffix(),
+ rc = smbldap_search(conn, lp_ldap_suffix(),
LDAP_SCOPE_SUBTREE, filter, attrs, 0, &result);
if (rc != LDAP_SUCCESS)
@@ -3323,7 +3323,7 @@ static NTSTATUS ldapsam_setsamgrent(struct pdb_methods *my_methods,
return NT_STATUS_NO_MEMORY;
}
attr_list = get_attr_list( NULL, groupmap_attr_list );
- rc = smbldap_search(ldap_state->smbldap_state, lp_ldap_group_suffix(),
+ rc = smbldap_search(ldap_state->smbldap_state, lp_ldap_suffix(),
LDAP_SCOPE_SUBTREE, filter,
attr_list, 0, &ldap_state->result);
TALLOC_FREE(attr_list);
@@ -3332,7 +3332,7 @@ static NTSTATUS ldapsam_setsamgrent(struct pdb_methods *my_methods,
DEBUG(0, ("ldapsam_setsamgrent: LDAP search failed: %s\n",
ldap_err2string(rc)));
DEBUG(3, ("ldapsam_setsamgrent: Query was: %s, %s\n",
- lp_ldap_group_suffix(), filter));
+ lp_ldap_suffix(), filter));
ldap_msgfree(ldap_state->result);
ldap_state->result = NULL;
TALLOC_FREE(filter);
@@ -3722,7 +3722,7 @@ static NTSTATUS ldapsam_alias_memberships(struct pdb_methods *methods,
return NT_STATUS_NO_MEMORY;
}
- rc = smbldap_search(ldap_state->smbldap_state, lp_ldap_group_suffix(),
+ rc = smbldap_search(ldap_state->smbldap_state, lp_ldap_suffix(),
LDAP_SCOPE_SUBTREE, filter, attrs, 0, &result);
if (rc != LDAP_SUCCESS)
@@ -4078,7 +4078,7 @@ static NTSTATUS ldapsam_lookup_rids(struct pdb_methods *methods,
}
rc = smbldap_search(ldap_state->smbldap_state,
- lp_ldap_group_suffix(),
+ lp_ldap_suffix(),
LDAP_SCOPE_SUBTREE, filter, ldap_attrs, 0,
&msg);
talloc_autofree_ldapmsg(mem_ctx, msg);
@@ -4680,7 +4680,7 @@ static bool ldapsam_search_grouptype(struct pdb_methods *methods,
state->connection = ldap_state->smbldap_state;
- state->base = talloc_strdup(search, lp_ldap_group_suffix());
+ state->base = talloc_strdup(search, lp_ldap_suffix());
state->connection = ldap_state->smbldap_state;
state->scope = LDAP_SCOPE_SUBTREE;
state->filter = talloc_asprintf(search, "(&(objectclass=%s)"
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index e7e207f..7227b29 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -4943,7 +4943,7 @@ NTSTATUS smb_set_file_time(connection_struct *conn,
if (setting_write_time) {
/*
- * This was a setfileinfo on an open file.
+ * This was a Windows setfileinfo on an open file.
* NT does this a lot. We also need to
* set the time here, as it can be read by
* FindFirst/FindNext and with the patch for bug #2045
@@ -6044,6 +6044,9 @@ static NTSTATUS smb_set_file_unix_basic(connection_struct *conn,
NTSTATUS status = NT_STATUS_OK;
bool delete_on_fail = False;
enum perm_type ptype;
+ files_struct *all_fsps = NULL;
+ bool modify_mtime = true;
+ struct file_id id;
ZERO_STRUCT(ft);
@@ -6192,13 +6195,38 @@ size = %.0f, uid = %u, gid = %u, raw perms = 0%o\n",
}
/* Deal with any time changes. */
+ id = vfs_file_id_from_sbuf(conn, psbuf);
+ for(all_fsps = file_find_di_first(id); all_fsps;
+ all_fsps = file_find_di_next(all_fsps)) {
+ /*
+ * We're setting the time explicitly for UNIX.
+ * Cancel any pending changes over all handles.
+ */
+ all_fsps->update_write_time_on_close = false;
+ TALLOC_FREE(all_fsps->update_write_time_event);
+ }
- return smb_set_file_time(conn,
+ /*
+ * Override the "setting_write_time"
+ * parameter here as it almost does what
+ * we need. Just remember if we modified
+ * mtime and send the notify ourselves.
+ */
+ if (null_timespec(ft.mtime)) {
+ modify_mtime = false;
+ }
+
+ status = smb_set_file_time(conn,
fsp,
fname,
psbuf,
&ft,
- true);
+ false);
+ if (modify_mtime) {
+ notify_fname(conn, NOTIFY_ACTION_MODIFIED,
+ FILE_NOTIFY_CHANGE_LAST_WRITE, fname);
+ }
+ return status;
}
/****************************************************************************
--
SAMBA-CTDB repository
More information about the samba-cvs
mailing list