[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via ede2fa8 heimdal:lib/wind: include stdlib.h at the end
from 326d174 heimdal:lib/wind: make sure errorlist_table.c includes
config.h as first header
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit ede2fa8e6925cd9f88d762049a4c65c4e130c2da
Author: Stefan Metzmacher me...@samba.org
Date: Sun Jun 17 14:18:49 2012 +0200
heimdal:lib/wind: include stdlib.h at the end
This makes sure config.h gets includes first.
This should fix the build on AIX.
metze
Autobuild-User(master): Stefan Metzmacher me...@samba.org
Autobuild-Date(master): Sun Jun 17 16:16:24 CEST 2012 on sn-devel-104
---
Summary of changes:
source4/heimdal/lib/wind/gen-bidi.py |2 +-
source4/heimdal/lib/wind/gen-combining.py |2 +-
source4/heimdal/lib/wind/gen-normalize.py |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/heimdal/lib/wind/gen-bidi.py
b/source4/heimdal/lib/wind/gen-bidi.py
index 70abb1e..21839c2 100644
--- a/source4/heimdal/lib/wind/gen-bidi.py
+++ b/source4/heimdal/lib/wind/gen-bidi.py
@@ -70,8 +70,8 @@ extern const size_t _wind_l_table_size;
bidi_c.file.write(
'''
-#include stdlib.h
#include bidi_table.h
+#include stdlib.h
''')
diff --git a/source4/heimdal/lib/wind/gen-combining.py
b/source4/heimdal/lib/wind/gen-combining.py
index cc692fd..86cbc6d 100644
--- a/source4/heimdal/lib/wind/gen-combining.py
+++ b/source4/heimdal/lib/wind/gen-combining.py
@@ -73,8 +73,8 @@ extern const size_t _wind_combining_table_size;
combining_c.file.write(
'''
-#include stdlib.h
#include combining_table.h
+#include stdlib.h
const struct translation _wind_combining_table[] = {
''')
diff --git a/source4/heimdal/lib/wind/gen-normalize.py
b/source4/heimdal/lib/wind/gen-normalize.py
index c076088..9b3553c 100644
--- a/source4/heimdal/lib/wind/gen-normalize.py
+++ b/source4/heimdal/lib/wind/gen-normalize.py
@@ -97,8 +97,8 @@ extern const unsigned short _wind_canon_next_table[];
normalize_c.file.write(
'''
-#include stdlib.h
#include normalize_table.h
+#include stdlib.h
const struct translation _wind_normalize_table[] = {
''')
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via fc42ea0 s3:smbd: use fsp_persistent_id() as persistent_file_id part for SMB2 (bug #8995) via cb5a0b1 s3:smbd: add a fsp_persistent_id() function via 8c11594 s3:smbd: try to make fsp-fh-gen_id as globally unique as possible via a411223 Revert s3:smbd: set req-smb2req-compat_chain_fsp in file_fsp() via 9980779 s3:smb2_ioctl: make use of file_fsp_smb2() via f3049c6 s3:smb2_lock: make use of file_fsp_smb2() via b7da435 s3:smb2_write: make use of file_fsp_smb2() via 770ea1c s3:smb2_read: make use of file_fsp_smb2() via 742dd9d s3:smb2_notify: make use of file_fsp_smb2() via d4b4cc3 3:smb2_setinfo: make use of file_fsp_smb2() via e49840f s3:smb2_getinfo: make use of file_fsp_smb2() via 45d6159 s3:smb2_find: make use of file_fsp_smb2() via 416bb94 s3:smb2_break: make use of file_fsp_smb2() via feed8c0 s3:smb2_close: make use of file_fsp_smb2() via 3ade960 s3:smb2_flush: make use of file_fsp_smb2() via 6334f80 s3:smbd: add file_fsp_smb2() via 46d293d s3:smb2_write: pass fsp-fnum to init_strict_lock_struct() via 0afc959 s3:smb2_read: pass fsp-fnum to init_strict_lock_struct() via c47b3ff s3:smb2_lock: use fsp-fnum as locking context via 09dde2e s3:smb2_lock: use smb2req-compat_chain_fsp instead of looking it up again via 6ed9df5 s3:smbd: set req-smb2req-compat_chain_fsp in file_fsp() from 0ace3ca Part 2 of fix for bug #8998 - Notify code can miss a ChDir. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit fc42ea02c7af66ddf5af61d444fdfe5e348d05e2 Author: Stefan Metzmacher me...@samba.org Date: Wed Jun 13 12:13:01 2012 +0200 s3:smbd: use fsp_persistent_id() as persistent_file_id part for SMB2 (bug #8995) It seems to be important to have unique persistent file ids, because windows clients seem to index files by server_guid + persistent_file_id. Which may break, if we just have a 16-bit range per connection and the client connects multiple times. Based on code from Ira Cooper. Use fsp-fh-gen_id as the persistent fileid in SMB2. metze Autobuild-User(master): Stefan Metzmacher me...@samba.org Autobuild-Date(master): Thu Jun 14 22:04:13 CEST 2012 on sn-devel-104 Signed-off-by: Jeremy Allison j...@samba.org commit cb5a0b1bc311667818ab45bb1837dc67a241a379 Author: Stefan Metzmacher me...@samba.org Date: Thu Jun 14 10:32:43 2012 +0200 s3:smbd: add a fsp_persistent_id() function This calculates a 64-bit value that most likely uniquely identifies the files_struct globally to the server. * 32-bit random gen_id * 16-bit truncated open_time * 16-bit fnum (valatile_id) Based on code from Ira Cooper. Use fsp-fh-gen_id as the persistent fileid in SMB2. Pair-Programmed-With: Michael Adam ob...@samba.org metze Signed-off-by: Jeremy Allison j...@samba.org commit 8c1159461a0c5a948cd04cdf969e54e1fa83387e Author: Stefan Metzmacher me...@samba.org Date: Wed Jun 13 12:11:51 2012 +0200 s3:smbd: try to make fsp-fh-gen_id as globally unique as possible This makes sure the value is never 0, it's between 1 and UINT32_MAX. While fsp-fh-gen_id is 'unsigned long' currently (which might by 8 bytes), there's some oplock code which truncates it to uint32_t (using IVAL()). Which means we could reuse fsp-fh-gen_id as persistent file id until we have a final fix, which uses database. See bug #8995 for more details. Based on code from Ira Cooper. Ensure fsp-fh-gen_id starts from a random point. We will use this as the SMB2 persistent_id. metze Signed-off-by: Jeremy Allison j...@samba.org commit a41122337cb72fdc3f16d77396a3e68bf53c1c03 Author: Stefan Metzmacher me...@samba.org Date: Sat Jun 9 11:11:26 2012 +0200 Revert s3:smbd: set req-smb2req-compat_chain_fsp in file_fsp() This reverts commit c2716a7d5ccf78f9716b703c22e6cf4d4f179656. This is not needed anymore, as we have file_fsp_smb2() now. metze Autobuild-User(master): Stefan Metzmacher me...@samba.org Autobuild-Date(master): Sun Jun 10 18:04:21 CEST 2012 on sn-devel-104 Signed-off-by: Jeremy Allison j...@samba.org commit 99807792d743b7f258f0d433689b6231b260bddf Author: Stefan Metzmacher me...@samba.org Date: Fri Jun 15 13:42:27 2012 -0700 s3:smb2_ioctl: make use of file_fsp_smb2() metze Signed-off-by: Jeremy Allison j...@samba.org commit f3049c6cafc252a19db84636765674300ff4162b Author: Stefan Metzmacher me...@samba.org Date: Fri Jun 8 11:57:21 2012 +0200 s3:smb2_lock: make use of file_fsp_smb2() metze Signed-off-by: Jeremy Allison j...@samba.org commit
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via dfa5366 Fix for bug #8998 - Notify code can miss a ChDir.
from c615d8e Fix bug #8994 - winbind normalize names.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit dfa5366a6ee418d6292c1832520c0c1bd974af49
Author: Volker Lendecke volker.lende...@sernet.de
Date: Thu Jun 14 12:07:33 2012 -0700
Fix for bug #8998 - Notify code can miss a ChDir.
---
Summary of changes:
source3/smbd/notify.c | 55
1 files changed, 41 insertions(+), 14 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c
index a53f3fb..1f664d0 100644
--- a/source3/smbd/notify.c
+++ b/source3/smbd/notify.c
@@ -366,28 +366,55 @@ 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)) {
+ DEBUG(1, (Can't get parent dirname, giving up\n));
+ 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) {
+ DEBUG(1, (vfs_GetWd failed!\n));
+ goto done;
+ }
+ if (vfs_ChDir(conn, conn-connectpath) == -1) {
+ DEBUG(1, (Could not chdir to connect path!\n));
+ 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 = NULL;
+
+ 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
