[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 02dcf05 heimdal: fixed -Werror=format error in com_err from b93e6ef s3:smbd: add a optional_support helper variable to reply_tcon_and_X() http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 02dcf059149174beab3528d201fd36e313ba5ee5 Author: Andrew Tridgell tri...@samba.org Date: Thu Aug 2 14:59:37 2012 +1000 heimdal: fixed -Werror=format error in com_err This needs to be merged upstream Autobuild-User(master): Andrew Tridgell tri...@samba.org Autobuild-Date(master): Thu Aug 2 08:59:24 CEST 2012 on sn-devel-104 --- Summary of changes: source4/heimdal/lib/com_err/error.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/heimdal/lib/com_err/error.c b/source4/heimdal/lib/com_err/error.c index 6864e87..bf046da 100644 --- a/source4/heimdal/lib/com_err/error.c +++ b/source4/heimdal/lib/com_err/error.c @@ -65,7 +65,7 @@ com_right_r(struct et_list *list, long code, char *str, size_t len) const char *msg = p-table-msgs[code - p-table-base]; #ifdef LIBINTL char domain[12 + 20]; - snprintf(domain, sizeof(domain), heim_com_err%d, p-table-base); + snprintf(domain, sizeof(domain), heim_com_err%ld, p-table-base); #endif strlcpy(str, dgettext(domain, msg), len); return str; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via e956253 s4:torture: send the TCONX_FLAG_EXTENDED_RESPONSE flag
via 95b64f0 s4:libcli: send the TCONX_FLAG_EXTENDED_RESPONSE flag
from 02dcf05 heimdal: fixed -Werror=format error in com_err
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e9562530d91ba66f9e60886ce0125eb146a15ce5
Author: Stefan Metzmacher me...@samba.org
Date: Thu Aug 2 08:48:11 2012 +0200
s4:torture: send the TCONX_FLAG_EXTENDED_RESPONSE flag
metze
Autobuild-User(master): Stefan Metzmacher me...@samba.org
Autobuild-Date(master): Thu Aug 2 10:54:18 CEST 2012 on sn-devel-104
commit 95b64f08a331aec2b520d43c2c4dda49ccc44e84
Author: Stefan Metzmacher me...@samba.org
Date: Thu Aug 2 08:48:11 2012 +0200
s4:libcli: send the TCONX_FLAG_EXTENDED_RESPONSE flag
metze
---
Summary of changes:
source4/libcli/cliconnect.c|2 +-
source4/libcli/smb_composite/connect.c |4 ++--
source4/libcli/util/clilsa.c |2 +-
source4/torture/raw/context.c |6 +++---
source4/torture/raw/lock.c |2 +-
source4/torture/raw/notify.c |2 +-
source4/torture/rpc/samba3rpc.c|2 +-
source4/torture/util_smb.c |2 +-
8 files changed, 11 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/libcli/cliconnect.c b/source4/libcli/cliconnect.c
index 45d8d2a..d680a7e 100644
--- a/source4/libcli/cliconnect.c
+++ b/source4/libcli/cliconnect.c
@@ -124,7 +124,7 @@ NTSTATUS smbcli_tconX(struct smbcli_state *cli, const char
*sharename,
/* setup a tree connect */
tcon.generic.level = RAW_TCON_TCONX;
- tcon.tconx.in.flags = 0;
+ tcon.tconx.in.flags = TCONX_FLAG_EXTENDED_RESPONSE;
if (cli-transport-negotiate.sec_mode NEGOTIATE_SECURITY_USER_LEVEL)
{
tcon.tconx.in.password = data_blob(NULL, 0);
} else if (cli-transport-negotiate.sec_mode
NEGOTIATE_SECURITY_CHALLENGE_RESPONSE) {
diff --git a/source4/libcli/smb_composite/connect.c
b/source4/libcli/smb_composite/connect.c
index 80ce556..3453ec9 100644
--- a/source4/libcli/smb_composite/connect.c
+++ b/source4/libcli/smb_composite/connect.c
@@ -110,7 +110,7 @@ static NTSTATUS connect_session_setup_anon(struct
composite_context *c,
/* connect to a share using a tree connect */
state-io_tcon-generic.level = RAW_TCON_TCONX;
- state-io_tcon-tconx.in.flags = 0;
+ state-io_tcon-tconx.in.flags = TCONX_FLAG_EXTENDED_RESPONSE;
state-io_tcon-tconx.in.password = data_blob(NULL, 0);
state-io_tcon-tconx.in.path = talloc_asprintf(state-io_tcon,
@@ -195,7 +195,7 @@ static NTSTATUS connect_session_setup(struct
composite_context *c,
/* connect to a share using a tree connect */
state-io_tcon-generic.level = RAW_TCON_TCONX;
- state-io_tcon-tconx.in.flags = 0;
+ state-io_tcon-tconx.in.flags = TCONX_FLAG_EXTENDED_RESPONSE;
state-io_tcon-tconx.in.password = data_blob(NULL, 0);
state-io_tcon-tconx.in.path = talloc_asprintf(state-io_tcon,
diff --git a/source4/libcli/util/clilsa.c b/source4/libcli/util/clilsa.c
index 4a81457..2720a50 100644
--- a/source4/libcli/util/clilsa.c
+++ b/source4/libcli/util/clilsa.c
@@ -68,7 +68,7 @@ static NTSTATUS smblsa_connect(struct smbcli_state *cli)
/* connect to IPC$ */
tcon.generic.level = RAW_TCON_TCONX;
- tcon.tconx.in.flags = 0;
+ tcon.tconx.in.flags = TCONX_FLAG_EXTENDED_RESPONSE;
tcon.tconx.in.password = data_blob(NULL, 0);
tcon.tconx.in.path = ipc$;
tcon.tconx.in.device = IPC;
diff --git a/source4/torture/raw/context.c b/source4/torture/raw/context.c
index d9d7820..e10e775 100644
--- a/source4/torture/raw/context.c
+++ b/source4/torture/raw/context.c
@@ -292,7 +292,7 @@ static bool test_tree(struct torture_context *tctx, struct
smbcli_state *cli)
tree = smbcli_tree_init(cli-session, tctx, false);
tcon.generic.level = RAW_TCON_TCONX;
- tcon.tconx.in.flags = 0;
+ tcon.tconx.in.flags = TCONX_FLAG_EXTENDED_RESPONSE;
tcon.tconx.in.password = data_blob(NULL, 0);
tcon.tconx.in.path = talloc_asprintf(tctx, %s\\%s, host, share);
tcon.tconx.in.device = A:;
@@ -412,7 +412,7 @@ static bool test_tree_ulogoff(struct torture_context *tctx,
struct smbcli_state
torture_comment(tctx, create a tree context on the with vuid1\n);
tree = smbcli_tree_init(session1, tctx, false);
tcon.generic.level = RAW_TCON_TCONX;
- tcon.tconx.in.flags = 0;
+ tcon.tconx.in.flags = TCONX_FLAG_EXTENDED_RESPONSE;
tcon.tconx.in.password = data_blob(NULL, 0);
tcon.tconx.in.path = talloc_asprintf(tctx, %s\\%s, host,
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 1e5098d s3-pysmbd: Add hook for get_nt_acl()
via 64f494d s3-pysmbd: fix DEBUG
via e5686a4 s3-pysmbd: Add my copyright
via 55a0d66 s3-pysmbd: Add set_nt_acl() function based on parts of
vfstest
via b041d29 s3-pypassdb: Fix wrapper for pdb_domain_info to return
correct dns_{domain,forest}
from e956253 s4:torture: send the TCONX_FLAG_EXTENDED_RESPONSE flag
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1e5098d5e1bb4dd2df6af690ade1b4b52a8d
Author: Andrew Bartlett abart...@samba.org
Date: Thu Aug 2 15:16:13 2012 +1000
s3-pysmbd: Add hook for get_nt_acl()
Autobuild-User(master): Andrew Bartlett abart...@samba.org
Autobuild-Date(master): Thu Aug 2 13:27:55 CEST 2012 on sn-devel-104
commit 64f494de5e8e468a3adde62b02843d734d6cc483
Author: Andrew Bartlett abart...@samba.org
Date: Thu Aug 2 13:36:55 2012 +1000
s3-pysmbd: fix DEBUG
commit e5686a4cf0931d8a89ed8f5922fd00d93b7893ea
Author: Andrew Bartlett abart...@samba.org
Date: Thu Aug 2 13:36:43 2012 +1000
s3-pysmbd: Add my copyright
commit 55a0d6606c76463296188582c52821a7607ade7b
Author: Andrew Bartlett abart...@samba.org
Date: Thu Aug 2 13:35:24 2012 +1000
s3-pysmbd: Add set_nt_acl() function based on parts of vfstest
This will allow us to set the full NT ACL on a file, using the VFS
layer, during provision of the AD DC.
Andrew Bartlett
commit b041d29c116a5d93b70a2cea5f808e81b9e12556
Author: Andrew Bartlett abart...@samba.org
Date: Thu Aug 2 18:05:03 2012 +1000
s3-pypassdb: Fix wrapper for pdb_domain_info to return correct
dns_{domain,forest}
---
Summary of changes:
source3/passdb/py_passdb.c |4 +-
source3/smbd/pysmbd.c | 143 +++-
source3/wscript_build |2 +-
3 files changed, 144 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/passdb/py_passdb.c b/source3/passdb/py_passdb.c
index 7043ce6..bd332e1 100644
--- a/source3/passdb/py_passdb.c
+++ b/source3/passdb/py_passdb.c
@@ -1368,8 +1368,8 @@ static PyObject *py_pdb_domain_info(pytalloc_Object
*self, PyObject *args)
}
PyDict_SetItemString(py_domain_info, name,
PyString_FromString(domain_info-name));
- PyDict_SetItemString(py_domain_info, dns_domain,
PyString_FromString(domain_info-name));
- PyDict_SetItemString(py_domain_info, dns_forest,
PyString_FromString(domain_info-name));
+ PyDict_SetItemString(py_domain_info, dns_domain,
PyString_FromString(domain_info-dns_domain));
+ PyDict_SetItemString(py_domain_info, dns_forest,
PyString_FromString(domain_info-dns_forest));
PyDict_SetItemString(py_domain_info, dom_sid,
pytalloc_steal(dom_sid_Type, sid));
PyDict_SetItemString(py_domain_info, guid, pytalloc_steal(guid_Type,
guid));
diff --git a/source3/smbd/pysmbd.c b/source3/smbd/pysmbd.c
index 5badb3a..9a44d25 100644
--- a/source3/smbd/pysmbd.c
+++ b/source3/smbd/pysmbd.c
@@ -1,9 +1,13 @@
/*
Unix SMB/CIFS implementation.
- SMB NT Security Descriptor / Unix permission conversion.
+ Set NT and POSIX ACLs and other VFS operations from Python
+
+ Copyrigyt (C) Andrew Bartlett 2012
Copyright (C) Jeremy Allison 1994-2009.
Copyright (C) Andreas Gruenbacher 2002.
Copyright (C) Simo Sorce i...@samba.org 2009.
+ Copyright (C) Simo Sorce 2002
+ Copyright (C) Eric Lorimer 2002
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -23,6 +27,9 @@
#include smbd/smbd.h
#include Python.h
#include libcli/util/pyerrors.h
+#include librpc/rpc/pyrpc_util.h
+#include pytalloc.h
+#include system/filesys.h
extern const struct generic_mapping file_generic_mapping;
@@ -58,7 +65,7 @@ static NTSTATUS set_sys_acl_no_snum(const char *fname,
ret = SMB_VFS_SYS_ACL_SET_FILE( conn, fname, acltype, theacl);
if (ret != 0) {
status = map_nt_error_from_unix_common(ret);
- DEBUG(0,(get_nt_acl_no_snum: fset_nt_acl returned zero.\n));
+ DEBUG(0,(set_nt_acl_no_snum: fset_nt_acl returned zero.\n));
}
conn_free(conn);
@@ -66,6 +73,83 @@ static NTSTATUS set_sys_acl_no_snum(const char *fname,
return status;
}
+static NTSTATUS set_nt_acl_no_snum(const char *fname,
+ uint32 security_info_sent, const struct
security_descriptor *sd)
+{
+ TALLOC_CTX *frame = talloc_stackframe();
+ connection_struct *conn;
+ NTSTATUS status = NT_STATUS_OK;
+ files_struct *fsp;
+ struct smb_filename *smb_fname = NULL;
+ int flags;
+
+ conn = talloc_zero(frame, connection_struct);
+ if (conn == NULL)
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via 6f5cfa2 WHATSNEW: Remove Major enhancements section. from a7e0d4a WHATSNEW: Add changes since 3.5.16. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit 6f5cfa259dfb5501db21163982ad4397c254a9c9 Author: Karolin Seeger ksee...@samba.org Date: Thu Aug 2 19:26:06 2012 +0200 WHATSNEW: Remove Major enhancements section. Karolin --- Summary of changes: WHATSNEW.txt |4 1 files changed, 0 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 06c1f77..e95acf1 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -6,10 +6,6 @@ This is the latest stable release of Samba 3.5. -Major enhancements in Samba 3.5.17 include: - -o - Changes since 3.5.16: - -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 8dde55c build: fix typo
from 1e5098d s3-pysmbd: Add hook for get_nt_acl()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 8dde55c7fb55f3a03c222609d7340db8056c3365
Author: Andrew Bartlett abart...@samba.org
Date: Fri Aug 3 10:00:56 2012 +1000
build: fix typo
Autobuild-User(master): Andrew Bartlett abart...@samba.org
Autobuild-Date(master): Fri Aug 3 03:56:38 CEST 2012 on sn-devel-104
---
Summary of changes:
dynconfig/wscript |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/dynconfig/wscript b/dynconfig/wscript
index 2a60a2a..44e8f19 100755
--- a/dynconfig/wscript
+++ b/dynconfig/wscript
@@ -269,7 +269,7 @@ def set_options(opt):
fhs_help = Use FHS-compliant paths (default no)\n
fhs_help += You should consider using this together with:\n
-fhs_help += --prefix=/usr --sysconfdir=/etc --locatestatedir=/var
+fhs_help += --prefix=/usr --sysconfdir=/etc --localstatedir=/var
opt_group.add_option('--enable-fhs', help=fhs_help,
action=store_true, dest='ENABLE_FHS', default=False)
--
Samba Shared Repository
