[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 618af83 vfs_prealloc: Remove call to gpfs_prealloc
via 627a98d lib: Fix a typo
from 080ec0f s3: smbclient: Allinfo leaves the file handle open.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 618af83d1bd07b12a9acc88b0d2111cab7a8bb2b
Author: Christof Schmitt
Date: Tue Feb 10 13:36:17 2015 -0700
vfs_prealloc: Remove call to gpfs_prealloc
Calling gpfs_prealloc changes the actual size of the file, and this
should not be done implicitly. Also this code does not compile due to
the missing dependency to the gpfs library. The best way solution here
is probably removing the call to gpfs_prealloc. The vfs_gpfs module
already implements the call to gpfs_prelloc when this can be done
safely.
Signed-off-by: Christof Schmitt
Reviewed-by: Jeremy Allison
Autobuild-User(master): Jeremy Allison
Autobuild-Date(master): Wed Feb 11 02:03:09 CET 2015 on sn-devel-104
commit 627a98d095f660fdb98e81c495a4395bf18094df
Author: Volker Lendecke
Date: Tue Feb 10 20:11:54 2015 +
lib: Fix a typo
Signed-off-by: Volker Lendecke
Reviewed-by: Jeremy Allison
---
Summary of changes:
source3/lib/util_str.c | 2 +-
source3/modules/vfs_prealloc.c | 9 -
2 files changed, 1 insertion(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index 3de64c6..a2d5997 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -910,7 +910,7 @@ uint64_t conv_str_size(const char * str)
}
/* Append an sprintf'ed string. Double buffer size on demand. Usable without
- * error checking in between. The indiation that something weird happened is
+ * error checking in between. The indication that something weird happened is
* string==NULL */
void sprintf_append(TALLOC_CTX *mem_ctx, char **string, ssize_t *len,
diff --git a/source3/modules/vfs_prealloc.c b/source3/modules/vfs_prealloc.c
index 4ba27a6..7b96d36 100644
--- a/source3/modules/vfs_prealloc.c
+++ b/source3/modules/vfs_prealloc.c
@@ -49,17 +49,12 @@
#define lock_type struct flock64
#endif
-#ifdef HAVE_GPFS
-#include "gpfs_gpl.h"
-#endif
-
#define MODULE "prealloc"
static int module_debug;
static int preallocate_space(int fd, off_t size)
{
int err;
-#ifndef HAVE_GPFS
lock_type fl = {0};
if (size <= 0) {
@@ -85,10 +80,6 @@ static int preallocate_space(int fd, off_t size)
err = -1;
errno = ENOSYS;
#endif
-#else /* GPFS uses completely different interface */
- err = gpfs_prealloc(fd, (gpfs_off64_t)0, (gpfs_off64_t)size);
-#endif
-
if (err) {
DEBUG(module_debug,
("%s: preallocate failed on fd=%d size=%lld: %s\n",
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 080ec0f s3: smbclient: Allinfo leaves the file handle open. from b3d5d03 smbd: Fix a typo https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 080ec0f7d9735b27138deb5f91a397935f089f02 Author: Jeremy Allison Date: Tue Feb 10 09:32:11 2015 -0800 s3: smbclient: Allinfo leaves the file handle open. https://bugzilla.samba.org/show_bug.cgi?id=11094 Signed-off-by: Jeremy Allison Reviewed-by: Volker Lendecke Autobuild-User(master): Volker Lendecke Autobuild-Date(master): Tue Feb 10 23:28:46 CET 2015 on sn-devel-104 --- Summary of changes: source3/client/client.c | 1 + 1 file changed, 1 insertion(+) Changeset truncated at 500 lines: diff --git a/source3/client/client.c b/source3/client/client.c index 5d70897..1458cf2 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -1816,6 +1816,7 @@ static int do_allinfo(const char *name) } TALLOC_FREE(snapshots); + cli_close(cli, fnum); return 0; } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-1-test updated
The branch, v4-1-test has been updated via 1872ddc printing/cups: pack requested-attributes with IPP_TAG_KEYWORD from fe52bd4 s3:smb2_server: protect against integer wrap with "smb2 max credits = 65535" https://git.samba.org/?p=samba.git;a=shortlog;h=v4-1-test - Log - commit 1872ddcf069d2f5503277c584e7cffa4bce3887f Author: David Disseldorp Date: Tue Feb 3 19:26:42 2015 +0100 printing/cups: pack requested-attributes with IPP_TAG_KEYWORD The CUPS IPP_GET_JOBS requested-attributes array indicates which job attributes the caller would like in the cupsd response. Until now, Samba has packed these attributes with a IPP_TAG_NAME format tag. In recent versions of CUPS, this results in the IPP_GET_JOBS response only including the job-id and job-printer-uri fields, even with JobPrivateValues=none configured. Bug: https://bugzilla.samba.org/show_bug.cgi?id=10808 Signed-off-by: David Disseldorp Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Tue Feb 10 01:38:58 CET 2015 on sn-devel-104 (cherry picked from commit 2f4998113e539ea4ba6fb0a72ba6ac25c9d74bd6) Autobuild-User(v4-1-test): Karolin Seeger Autobuild-Date(v4-1-test): Tue Feb 10 23:20:58 CET 2015 on sn-devel-104 --- Summary of changes: source3/printing/print_cups.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Changeset truncated at 500 lines: diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c index 6c1e9ce..6cdeba3 100644 --- a/source3/printing/print_cups.c +++ b/source3/printing/print_cups.c @@ -1155,7 +1155,7 @@ static int cups_queue_get(const char *sharename, ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, "attributes-natural-language", NULL, language->language); -ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_NAME, +ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes", (sizeof(jattrs) / sizeof(jattrs[0])), NULL, jattrs); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated
The branch, v4-0-test has been updated via 40b9149 printing/cups: pack requested-attributes with IPP_TAG_KEYWORD from 9f56abb s3:smb2_server: protect against integer wrap with "smb2 max credits = 65535" https://git.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log - commit 40b914955f6b6ee7eac2a77327d686cb81dc13e3 Author: David Disseldorp Date: Tue Feb 3 19:26:42 2015 +0100 printing/cups: pack requested-attributes with IPP_TAG_KEYWORD The CUPS IPP_GET_JOBS requested-attributes array indicates which job attributes the caller would like in the cupsd response. Until now, Samba has packed these attributes with a IPP_TAG_NAME format tag. In recent versions of CUPS, this results in the IPP_GET_JOBS response only including the job-id and job-printer-uri fields, even with JobPrivateValues=none configured. Bug: https://bugzilla.samba.org/show_bug.cgi?id=10808 Signed-off-by: David Disseldorp Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Tue Feb 10 01:38:58 CET 2015 on sn-devel-104 (cherry picked from commit 2f4998113e539ea4ba6fb0a72ba6ac25c9d74bd6) Autobuild-User(v4-0-test): Karolin Seeger Autobuild-Date(v4-0-test): Tue Feb 10 23:14:19 CET 2015 on sn-devel-104 --- Summary of changes: source3/printing/print_cups.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Changeset truncated at 500 lines: diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c index 9a47843..766e35e 100644 --- a/source3/printing/print_cups.c +++ b/source3/printing/print_cups.c @@ -1155,7 +1155,7 @@ static int cups_queue_get(const char *sharename, ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, "attributes-natural-language", NULL, language->language); -ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_NAME, +ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes", (sizeof(jattrs) / sizeof(jattrs[0])), NULL, jattrs); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via b3d5d03 smbd: Fix a typo
via 72f3630 smbd: Fix a typo
via 7121466 smbd: Make "check_veto_path" static
from c8c2c85 Update mailing list references to point at lists.samba.org
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b3d5d0319d844038e62119755dbbedd701931ccc
Author: Volker Lendecke
Date: Tue Feb 10 17:26:47 2015 +0100
smbd: Fix a typo
Signed-off-by: Volker Lendecke
Reviewed-by: David Disseldorp
Autobuild-User(master): David Disseldorp
Autobuild-Date(master): Tue Feb 10 20:27:32 CET 2015 on sn-devel-104
commit 72f3630e3f8eb76ffe0cf0db396bb945f2a760ef
Author: Volker Lendecke
Date: Mon Feb 9 14:42:23 2015 +
smbd: Fix a typo
http://www.oxfordlearnersdictionaries.com/definition/english/veto_2 says
it's
vetoed, not vetod
Signed-off-by: Volker Lendecke
Reviewed-by: David Disseldorp
commit 71214665df13610fe29c96a20927dc931ec4f8d2
Author: Volker Lendecke
Date: Mon Feb 9 14:42:08 2015 +
smbd: Make "check_veto_path" static
Signed-off-by: Volker Lendecke
Reviewed-by: David Disseldorp
---
Summary of changes:
source3/smbd/filename.c | 4 ++--
source3/smbd/msdfs.c| 2 +-
source3/smbd/proto.h| 1 -
3 files changed, 3 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index e632796..0fdc09d 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -1012,10 +1012,10 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
}
/
- Ensure a path is not vetod.
+ Ensure a path is not vetoed.
/
-NTSTATUS check_veto_path(connection_struct *conn, const char *name)
+static NTSTATUS check_veto_path(connection_struct *conn, const char *name)
{
if (IS_VETO_PATH(conn, name)) {
/* Is it not dot or dot dot. */
diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c
index bbf353d..3bd8a09 100644
--- a/source3/smbd/msdfs.c
+++ b/source3/smbd/msdfs.c
@@ -296,7 +296,7 @@ static NTSTATUS create_conn_struct_as_root(TALLOC_CTX *ctx,
set_conn_connectpath(conn, connpath);
/*
-* New code to check if there's a share security descripter
+* New code to check if there's a share security descriptor
* added from NT server manager. This is done after the
* smb.conf checks are done as we need a uid and token. JRA.
*
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 121682c..26a199c 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -327,7 +327,6 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
const char *orig_path,
struct smb_filename **smb_fname,
uint32_t ucf_flags);
-NTSTATUS check_veto_path(connection_struct *conn, const char *name);
NTSTATUS check_name(connection_struct *conn, const char *name);
int get_real_filename(connection_struct *conn, const char *path,
const char *name, TALLOC_CTX *mem_ctx,
--
Samba Shared Repository
Re: [SCM] Samba Shared Repository - branch master updated
Hi Andrew,
> - Log -
> commit c8c2c850d47a6cdaee5afd84c8ebaa03586c1277
> Author: Andrew Bartlett
> Date: Tue Feb 10 12:26:56 2015 +1300
>
> Update mailing list references to point at lists.samba.org
>
> The mailing lists are on lists.samba.org, but there are many references
> that use the shorthand of samba.org
>
> Some references to samba@ have been changed to samba-technical@ where
> this make more sense.
>
> Signed-off-by: Andrew Bartlett
> Reviewed-by: Garming Sam
>
> Autobuild-User(master): Andrew Bartlett
> Autobuild-Date(master): Tue Feb 10 07:08:28 CET 2015 on sn-devel-104
Can you prepare backports of this for our current release branches?
v4-{0,1,2}-test?
Thanks!
metze
signature.asc
Description: OpenPGP digital signature
