[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 7d7e33c Add tests for talloc_memlimit
via a33a78c Add memory limiting capability to talloc
from 7859490 Ensure the masks don't conflict with the ACL checks.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 7d7e33c624875a9694fcebdde942147ac3bf5f74
Author: Simo Sorce
Date: Sat Sep 22 16:35:21 2012 -0400
Add tests for talloc_memlimit
Autobuild-User(master): Simo Sorce
Autobuild-Date(master): Fri Oct 5 07:36:38 CEST 2012 on sn-devel-104
commit a33a78c302fde61fdb7a6e71669f19be2cf5c836
Author: Simo Sorce
Date: Sat Sep 22 16:15:47 2012 -0400
Add memory limiting capability to talloc
By calling talloc_set_memlimit() we can now set a max memory limit
for a whole talloc hierarchy.
ANy attempt to allocate memory beyond the max allowed for the whole
hierarchy wil cause an allocation failure.
Stealing memory correctly accounts for used memory in the old and the new
hierarchy but exceeding the memory limit in the new parent will not cause
a failure.
---
Summary of changes:
...oc-util-2.0.6.sigs => pytalloc-util-2.0.8.sigs} |0
.../ABI/{talloc-2.0.3.sigs => talloc-2.0.8.sigs} |1 +
lib/talloc/talloc.c| 277 +---
lib/talloc/talloc.h| 19 ++
lib/talloc/testsuite.c | 172
lib/talloc/wscript |2 +-
6 files changed, 431 insertions(+), 40 deletions(-)
copy lib/talloc/ABI/{pytalloc-util-2.0.6.sigs => pytalloc-util-2.0.8.sigs}
(100%)
copy lib/talloc/ABI/{talloc-2.0.3.sigs => talloc-2.0.8.sigs} (98%)
Changeset truncated at 500 lines:
diff --git a/lib/talloc/ABI/pytalloc-util-2.0.6.sigs
b/lib/talloc/ABI/pytalloc-util-2.0.8.sigs
similarity index 100%
copy from lib/talloc/ABI/pytalloc-util-2.0.6.sigs
copy to lib/talloc/ABI/pytalloc-util-2.0.8.sigs
diff --git a/lib/talloc/ABI/talloc-2.0.3.sigs b/lib/talloc/ABI/talloc-2.0.8.sigs
similarity index 98%
copy from lib/talloc/ABI/talloc-2.0.3.sigs
copy to lib/talloc/ABI/talloc-2.0.8.sigs
index 6e236d5..15a9e95 100644
--- a/lib/talloc/ABI/talloc-2.0.3.sigs
+++ b/lib/talloc/ABI/talloc-2.0.8.sigs
@@ -43,6 +43,7 @@ talloc_report_full: void (const void *, FILE *)
talloc_set_abort_fn: void (void (*)(const char *))
talloc_set_log_fn: void (void (*)(const char *))
talloc_set_log_stderr: void (void)
+talloc_set_memlimit: int (const void *, size_t)
talloc_set_name: const char *(const void *, const char *, ...)
talloc_set_name_const: void (const void *, const char *)
talloc_show_parents: void (const void *, FILE *)
diff --git a/lib/talloc/talloc.c b/lib/talloc/talloc.c
index 18ee548..afc44b3 100644
--- a/lib/talloc/talloc.c
+++ b/lib/talloc/talloc.c
@@ -71,6 +71,7 @@
#define TALLOC_FLAG_LOOP 0x02
#define TALLOC_FLAG_POOL 0x04 /* This is a talloc pool */
#define TALLOC_FLAG_POOLMEM 0x08 /* This is allocated in a pool */
+
#define TALLOC_MAGIC_REFERENCE ((const char *)1)
/* by default we abort when given a bad pointer (such as when talloc_free() is
called
@@ -221,12 +222,50 @@ static struct {
TC_UNDEFINE_GROW_VALGRIND_CHUNK(_tc, _new_size); \
} while (0)
+#define TALLOC_MEMLIMIT_CHECK(limit, size) do { \
+ struct talloc_memlimit *l; \
+ for (l = limit; l != NULL; l = l->upper) { \
+ if (l->max_size != 0 && \
+ ((l->max_size <= l->cur_size) || \
+(l->max_size - l->cur_size < TC_HDR_SIZE+size))) { \
+ errno = ENOMEM; \
+ return NULL; \
+ } \
+ } \
+} while(0)
+
+#define TALLOC_MEMLIMIT_UPDATE(limit, o_size, n_size) do { \
+ struct talloc_memlimit *l; \
+ ssize_t d; \
+ if (o_size == 0) { \
+ d = n_size + TC_HDR_SIZE; \
+ } else { \
+ d = n_size - o_size; \
+ } \
+ for (l = limit; l != NULL; l = l->upper) { \
+ ssize_t new_size = l->cur_size + d; \
+ if (new_size < 0) { \
+ talloc_abort("cur_size memlimit counter not correct!");
\
+ errno = EINVAL; \
+ return NULL; \
+ } \
+ l->cur_size = new_size; \
+ } \
+} while(0)
+
struct talloc_reference_handle {
struct talloc_reference_handle *next, *prev;
void *ptr;
const char *location;
};
+struct talloc_memlimit {
+ struct talloc_chunk *parent;
+ struct talloc_memlimit *upper;
+ size_t max_size;
+ size_t cur_size;
+};
+
typedef int (*talloc_destructor_t)(void *);
struct talloc_chunk {
@@ -239,6 +278,15 @@ struct talloc_chunk {
unsigned flags;
/*
+* limit semantics:
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 7859490 Ensure the masks don't conflict with the ACL checks. via 18e07f1 Update WHATSNEW.txt with removed parameters. via db62a15 Remove the parameters: via 7622aa1 Remove all uses of lp_security_mask/lp_force_security_mode/lp_dir_security_mask/lp_force_dir_security_mode and replace with the normal masks. Now these parameters can be removed. via 92fee00 Revert "Add functions to programatically set the security mask and directory security mask parameters." via 3f5a3b6 Revert "When creating a new file/directory, we need to obey the create mask/directory mask parameters." from 1bf209d html docs: Remove link to Using Samba. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 78594909b8b22bd07978922b1c85dfd6f6456963 Author: Jeremy Allison Date: Thu Oct 4 13:50:51 2012 -0700 Ensure the masks don't conflict with the ACL checks. Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Fri Oct 5 00:36:40 CEST 2012 on sn-devel-104 commit 18e07f118c0d79b20a89e5fb566025bf88f72e63 Author: Jeremy Allison Date: Thu Oct 4 12:03:27 2012 -0700 Update WHATSNEW.txt with removed parameters. commit db62a159b8833a4f1aee0c9733fd263b6d239d53 Author: Jeremy Allison Date: Wed Oct 3 16:04:18 2012 -0700 Remove the parameters: security mask force security mode directory security mask force directory security mode and update the docs. commit 7622aa16adeb00bf161a6dd07664c37125391272 Author: Jeremy Allison Date: Wed Oct 3 14:49:01 2012 -0700 Remove all uses of lp_security_mask/lp_force_security_mode/lp_dir_security_mask/lp_force_dir_security_mode and replace with the normal masks. Now these parameters can be removed. commit 92fee007bbc0a5ab3a16c8f1521478d4813d0b79 Author: Jeremy Allison Date: Wed Oct 3 13:59:43 2012 -0700 Revert "Add functions to programatically set the security mask and directory security mask parameters." This reverts commit 8f0ecbbbeebff0174579a78827d384067cd4cbb7. Not now needed as part of the move to remove security mask parameters. commit 3f5a3b60e267d8342a95fff54428f0b13086ff77 Author: Jeremy Allison Date: Wed Oct 3 13:58:53 2012 -0700 Revert "When creating a new file/directory, we need to obey the create mask/directory mask parameters." This reverts commit c251a6b0442abc13bc8be4ff8de324c1d7706a78. Remove this as we're planning to remove the security mask, directory security mask parameters and only use create mask/directory mask. --- Summary of changes: WHATSNEW.txt |4 ++ docs-xml/smbdotconf/security/createmask.xml|5 +-- docs-xml/smbdotconf/security/directorymask.xml |8 ++-- .../smbdotconf/security/directorysecuritymask.xml | 32 ++--- docs-xml/smbdotconf/security/forcecreatemode.xml |6 +++ .../smbdotconf/security/forcedirectorymode.xml |6 +++ .../security/forcedirectorysecuritymode.xml| 38 ++- docs-xml/smbdotconf/security/forcesecuritymode.xml | 38 +++- docs-xml/smbdotconf/security/securitymask.xml | 33 ++--- examples/scripts/shares/python/smbparm.py |4 -- lib/param/param_functions.c|4 -- lib/param/param_table.c| 36 -- selftest/target/Samba3.pm |3 +- selftest/target/Samba4.pm |3 +- source3/include/proto.h|6 --- source3/param/loadparm.c | 18 - source3/smbd/open.c| 15 source3/smbd/posix_acls.c | 16 source3/smbd/trans2.c | 14 +-- 19 files changed, 51 insertions(+), 238 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index c62676e..f1089db 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -114,9 +114,12 @@ smb.conf changes client signing Changed default default dcerpc endpoint servers New dgram port New 0 + directory security mask Removed display charset Removed dns forwarder New dns update command New + force security mode Removed + force directory security mode Removed homedir map Changed default auto.home kernel share modes New Yes kpasswd portNew 0 @@ -134,6 +137,7 @@ smb.conf changes
[SCM] Samba Shared Repository - branch v4-0-test updated
The branch, v4-0-test has been updated
via 56ffe75 waf: Build pam_smbpass module only if enabled.
via 17c22a1 s3fs-smbd: Make sure the registry is set up before we init
printing.
from c4cb4c4 docs: Remove duplicate synonym min protocol.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit 56ffe755f788fb225eb695343fa6ec47f6729ead
Author: Andreas Schneider
Date: Tue Oct 2 14:25:40 2012 +0200
waf: Build pam_smbpass module only if enabled.
(cherry picked from commit fb3cf6c24270d22dad8ac9a1c12e8d77c8189f11)
Signed-off-by: Andreas Schneider
Fix bug #9244 - The option --with-pam_smbpass doens't work.
Autobuild-User(v4-0-test): Karolin Seeger
Autobuild-Date(v4-0-test): Thu Oct 4 18:50:33 CEST 2012 on sn-devel-104
commit 17c22a120c7abe34f59a5b9c61d77a9009e687b2
Author: Andreas Schneider
Date: Tue Oct 2 15:51:08 2012 +0200
s3fs-smbd: Make sure the registry is set up before we init printing.
(cherry picked from commit 50de2c9bbbc25074f022b4b2cf9d49f8e9a53e01)
Signed-off-by: Andreas Schneider
Fix bug #9245 - Printing backend is initialized before the winreg pipe is
set
up.
---
Summary of changes:
source3/pam_smbpass/wscript_build |3 ++-
source3/smbd/server.c |8
source3/wscript |3 +++
3 files changed, 9 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/pam_smbpass/wscript_build
b/source3/pam_smbpass/wscript_build
index 70b21d5..a2a2d01 100644
--- a/source3/pam_smbpass/wscript_build
+++ b/source3/pam_smbpass/wscript_build
@@ -10,5 +10,6 @@ if bld.CONFIG_SET('WITH_PAM_MODULES'):
LIBNTLMSSP LIBTSOCKET''',
cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR,
realname='pam_smbpass.so',
-install_path='${PAMMODULESDIR}'
+install_path='${PAMMODULESDIR}',
+enabled=bld.env.with_pam_smbpass
)
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 90bbb62..7dad13b 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1471,6 +1471,10 @@ extern void build_options(bool screen);
}
}
+ if (!dcesrv_ep_setup(ev_ctx, msg_ctx)) {
+ exit(1);
+ }
+
/* only start other daemons if we are running as a daemon
* -- bad things will happen if smbd is launched via inetd
* and we fork a copy of ourselves here */
@@ -1495,10 +1499,6 @@ extern void build_options(bool screen);
}
}
- if (!dcesrv_ep_setup(ev_ctx, msg_ctx)) {
- exit(1);
- }
-
if (!is_daemon) {
int sock;
diff --git a/source3/wscript b/source3/wscript
index 18f84f8..2662edd 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -754,6 +754,9 @@ int i; i = PAM_RADIO_TYPE;
conf.DEFINE('WITH_PAM', 1)
conf.DEFINE('WITH_PAM_MODULES', 1)
+if Options.options.with_pam_smbpass:
+conf.env.with_pam_smbpass = True
+
seteuid = False
#
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated
The branch, v4-0-test has been updated via c4cb4c4 docs: Remove duplicate synonym min protocol. via 5aabd6c smb.conf(5): Add basic documentation for 'server min protocol'. via bb82ac2 html docs: Remove link to Using Samba. from 42d2af9 Fix net rpc share allowedusers to work with 2008r2 http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log - commit c4cb4c411573682fe203f2f654878fbca2bb98e7 Author: Karolin Seeger Date: Thu Oct 4 10:00:44 2012 +0200 docs: Remove duplicate synonym min protocol. Karolin (cherry picked from commit c627ba145e18c3fb91ca6da730541dd1f119c4d0) The last 2 patches address bug #9243 - Duplicate synonym 'min protocol'. Autobuild-User(v4-0-test): Karolin Seeger Autobuild-Date(v4-0-test): Thu Oct 4 16:42:57 CEST 2012 on sn-devel-104 commit 5aabd6cf88d799ebbd4fc3a56686e34833083fae Author: Jelmer Vernooij Date: Wed Sep 26 15:55:04 2012 -0700 smb.conf(5): Add basic documentation for 'server min protocol'. Conflicts: docs-xml/smbdotconf/protocol/serverminprotocol.xml (cherry picked from commit b97c257f3af942d0767226793fa705940caad8dd) commit bb82ac2d46d0cc0a833fef68cbb6bd02c976 Author: Karolin Seeger Date: Thu Oct 4 11:43:20 2012 +0200 html docs: Remove link to Using Samba. Thanks to Christian Perrier for reporting! Fix bug #7826 - HTML docs index file still points to Using Samba. Karolin Autobuild-User(master): Karolin Seeger Autobuild-Date(master): Thu Oct 4 13:48:00 CEST 2012 on sn-devel-104 (cherry picked from commit 1bf209dd7e5a0f0001b3d1e3798093772bbd3fd3) --- Summary of changes: docs-xml/htmldocs.html |4 docs-xml/smbdotconf/protocol/serverminprotocol.xml | 16 +++- 2 files changed, 3 insertions(+), 17 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/htmldocs.html b/docs-xml/htmldocs.html index 44fcc0f..6fb9e73 100644 --- a/docs-xml/htmldocs.html +++ b/docs-xml/htmldocs.html @@ -23,10 +23,6 @@ This book provides example configurations, it documents key aspects of Microsoft Windows networking, provides in-depth insight into the important configuration of Samba-3, and helps to put all of these into a useful framework. - Using Samba, 2nd Edition - Using Samba, Second Edition is a comprehensive guide to Samba administration. It covers all versions of Samba from 2.0 to 2.2, including selected features from an alpha version of 3.0, as well as the SWAT graphical configuration tool. Updated for Windows 2000, ME, and XP, the book also explores Samba's new role as a primary domain controller and domain member server, its support for the use of Windows NT/2000/XP authentication and filesystem security on the host Unix system, and accessing shared files and printers from Unix clients. - - Man pages The Samba man pages in HTML. diff --git a/docs-xml/smbdotconf/protocol/serverminprotocol.xml b/docs-xml/smbdotconf/protocol/serverminprotocol.xml index d313908..40566ce 100644 --- a/docs-xml/smbdotconf/protocol/serverminprotocol.xml +++ b/docs-xml/smbdotconf/protocol/serverminprotocol.xml @@ -3,22 +3,12 @@ type="string" developer="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc";> +min protocol -The value of the parameter (a string) is the -lowest SMB protocol dialect than Samba will support. Please refer -to the -parameter for a list of valid protocol names and a brief description -of each. You may also wish to refer to the C source code in -source/smbd/negprot.c for a listing of known protocol -dialects supported by clients. - -If you are viewing this parameter as a security measure, you should -also refer to the parameter. Otherwise, you should never need -to change this parameter. + This setting controls the minimum protocol version that the server will allow the client to use. -server min protocol -min protocol +server max protocol LANMAN1 NT1 -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated via e521734 html docs: Remove link to Using Samba. from 157b88d Fix bug #7781 (Samba transforms "ShareName" to lowercase when adding new share via MMC) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log - commit e521734eda77b483594452a878acfadabbd08c2d Author: Karolin Seeger Date: Thu Oct 4 11:43:20 2012 +0200 html docs: Remove link to Using Samba. Thanks to Christian Perrier for reporting! Fix bug #7826 - HTML docs index file still points to Using Samba. Karolin Autobuild-User(master): Karolin Seeger Autobuild-Date(master): Thu Oct 4 13:48:00 CEST 2012 on sn-devel-104 (cherry picked from commit 1bf209dd7e5a0f0001b3d1e3798093772bbd3fd3) --- Summary of changes: docs-xml/htmldocs.html |4 1 files changed, 0 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/htmldocs.html b/docs-xml/htmldocs.html index 44fcc0f..6fb9e73 100644 --- a/docs-xml/htmldocs.html +++ b/docs-xml/htmldocs.html @@ -23,10 +23,6 @@ This book provides example configurations, it documents key aspects of Microsoft Windows networking, provides in-depth insight into the important configuration of Samba-3, and helps to put all of these into a useful framework. - Using Samba, 2nd Edition - Using Samba, Second Edition is a comprehensive guide to Samba administration. It covers all versions of Samba from 2.0 to 2.2, including selected features from an alpha version of 3.0, as well as the SWAT graphical configuration tool. Updated for Windows 2000, ME, and XP, the book also explores Samba's new role as a primary domain controller and domain member server, its support for the use of Windows NT/2000/XP authentication and filesystem security on the host Unix system, and accessing shared files and printers from Unix clients. - - Man pages The Samba man pages in HTML. -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via 178266e html docs: Remove link to Using Samba. from 7b2acf8 s3:quota: don't force the block size to 512 http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit 178266e6bc6d8d0b1dfd2269626c6da5b279b555 Author: Karolin Seeger Date: Thu Oct 4 11:43:20 2012 +0200 html docs: Remove link to Using Samba. Thanks to Christian Perrier for reporting! Fix bug #7826 - HTML docs index file still points to Using Samba. Karolin Autobuild-User(master): Karolin Seeger Autobuild-Date(master): Thu Oct 4 13:48:00 CEST 2012 on sn-devel-104 (cherry picked from commit 1bf209dd7e5a0f0001b3d1e3798093772bbd3fd3) --- Summary of changes: docs-xml/htmldocs.html |4 1 files changed, 0 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/htmldocs.html b/docs-xml/htmldocs.html index 44fcc0f..6fb9e73 100644 --- a/docs-xml/htmldocs.html +++ b/docs-xml/htmldocs.html @@ -23,10 +23,6 @@ This book provides example configurations, it documents key aspects of Microsoft Windows networking, provides in-depth insight into the important configuration of Samba-3, and helps to put all of these into a useful framework. - Using Samba, 2nd Edition - Using Samba, Second Edition is a comprehensive guide to Samba administration. It covers all versions of Samba from 2.0 to 2.2, including selected features from an alpha version of 3.0, as well as the SWAT graphical configuration tool. Updated for Windows 2000, ME, and XP, the book also explores Samba's new role as a primary domain controller and domain member server, its support for the use of Windows NT/2000/XP authentication and filesystem security on the host Unix system, and accessing shared files and printers from Unix clients. - - Man pages The Samba man pages in HTML. -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 1bf209d html docs: Remove link to Using Samba. via c627ba1 docs: Remove duplicate synonym min protocol. from 50de2c9 s3fs-smbd: Make sure the registry is set up before we init printing. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 1bf209dd7e5a0f0001b3d1e3798093772bbd3fd3 Author: Karolin Seeger Date: Thu Oct 4 11:43:20 2012 +0200 html docs: Remove link to Using Samba. Thanks to Christian Perrier for reporting! Fix bug #7826 - HTML docs index file still points to Using Samba. Karolin Autobuild-User(master): Karolin Seeger Autobuild-Date(master): Thu Oct 4 13:48:00 CEST 2012 on sn-devel-104 commit c627ba145e18c3fb91ca6da730541dd1f119c4d0 Author: Karolin Seeger Date: Thu Oct 4 10:00:44 2012 +0200 docs: Remove duplicate synonym min protocol. Karolin --- Summary of changes: docs-xml/htmldocs.html |4 docs-xml/smbdotconf/protocol/serverminprotocol.xml |1 - 2 files changed, 0 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/htmldocs.html b/docs-xml/htmldocs.html index 44fcc0f..6fb9e73 100644 --- a/docs-xml/htmldocs.html +++ b/docs-xml/htmldocs.html @@ -23,10 +23,6 @@ This book provides example configurations, it documents key aspects of Microsoft Windows networking, provides in-depth insight into the important configuration of Samba-3, and helps to put all of these into a useful framework. - Using Samba, 2nd Edition - Using Samba, Second Edition is a comprehensive guide to Samba administration. It covers all versions of Samba from 2.0 to 2.2, including selected features from an alpha version of 3.0, as well as the SWAT graphical configuration tool. Updated for Windows 2000, ME, and XP, the book also explores Samba's new role as a primary domain controller and domain member server, its support for the use of Windows NT/2000/XP authentication and filesystem security on the host Unix system, and accessing shared files and printers from Unix clients. - - Man pages The Samba man pages in HTML. diff --git a/docs-xml/smbdotconf/protocol/serverminprotocol.xml b/docs-xml/smbdotconf/protocol/serverminprotocol.xml index ba08665..58323b5 100644 --- a/docs-xml/smbdotconf/protocol/serverminprotocol.xml +++ b/docs-xml/smbdotconf/protocol/serverminprotocol.xml @@ -9,7 +9,6 @@ server max protocol -min protocol CORE NT1 -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated
The branch, v4-0-test has been updated via 42d2af9 Fix net rpc share allowedusers to work with 2008r2 via f480cc4 s3-docs: Fix opening and ending tag mismatch in Samba3-HOWTO (Bug #9235) via f3e6072 docs: Remove Win9X/WinMe mentions from TOSHARG-PDC (cherry picked from commit e3f554a99f3871eabac35db1ba3236772ef58f64) via 2fe3c52 docs: Add mention of AD DC support in TOSHARG-PDC (cherry picked from commit f82affaa6defef52696f69f114143cfb80fee241) via 1e672c2 docs: Explain the no-domain-logons restriction applies to all HOME editions (cherry picked from commit 6fcb95bad7db8f970ae6c74f1fdd7b4c2a41f25c) via eae9db6 docs: Remove references to default paramters in TOSHARG-PDC (cherry picked from commit 3be323c6110f1a241f86aacb94c8ff1ba69351c5) from 1a0c013 s4 dns: Fix return code for deleted records http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log - commit 42d2af97e1a106fc07ed65168652b533bacb9059 Author: Jeremy Allison Date: Thu Oct 4 10:56:12 2012 +0200 Fix net rpc share allowedusers to work with 2008r2 The RAP NetShareEnum command was removed in 2008r2, so use the RPC equivalent instead. Bug: https://bugzilla.samba.org/show_bug.cgi?id=8966 Author: Jeremy Allison Autobuild-User(v4-0-test): Karolin Seeger Autobuild-Date(v4-0-test): Thu Oct 4 12:41:16 CEST 2012 on sn-devel-104 commit f480cc4b01daf59426a171729accc2bfcb5d4ae0 Author: Björn Baumbach Date: Tue Oct 2 10:53:15 2012 +0200 s3-docs: Fix opening and ending tag mismatch in Samba3-HOWTO (Bug #9235) Signed-off-by: Stefan Metzmacher (cherry picked from commit f5a7bc26648e5edd2d0958c50a4432f14f5ce727) The last 5 patches address bug #9235 - Opening and ending tag mismatch in Samba3-HOWTO/TOSHARG-PDC.xml. commit f3e6072de827a5badfde7bf1a0de0c88e58cf336 Author: Andrew Bartlett Date: Sun Sep 23 04:55:20 2012 +1000 docs: Remove Win9X/WinMe mentions from TOSHARG-PDC (cherry picked from commit e3f554a99f3871eabac35db1ba3236772ef58f64) commit 2fe3c5270eb78f4f5e61bea7799bcdd214f8da8f Author: Andrew Bartlett Date: Sun Sep 23 04:54:24 2012 +1000 docs: Add mention of AD DC support in TOSHARG-PDC (cherry picked from commit f82affaa6defef52696f69f114143cfb80fee241) commit 1e672c2e6de3c858f606858344f6bd9e6938 Author: Andrew Bartlett Date: Sun Sep 23 04:53:55 2012 +1000 docs: Explain the no-domain-logons restriction applies to all HOME editions (cherry picked from commit 6fcb95bad7db8f970ae6c74f1fdd7b4c2a41f25c) commit eae9db624a69ba77c5f0ea046ec1a7ec72aabfae Author: Andrew Bartlett Date: Sun Sep 23 04:52:56 2012 +1000 docs: Remove references to default paramters in TOSHARG-PDC (cherry picked from commit 3be323c6110f1a241f86aacb94c8ff1ba69351c5) --- Summary of changes: docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml | 387 ++--- source3/utils/net_rpc.c | 81 --- 2 files changed, 115 insertions(+), 353 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml b/docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml index a2461b7..f2f3a30 100644 --- a/docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml +++ b/docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml @@ -144,15 +144,17 @@ account). Refer to Domain Membership for mo -The following functionalities are new to the Samba-3 release: +The following functionalities are an overview of some of the features +in the Samba-4 release: accountbackend - Samba-3 supports the use of a choice of backends that may be used in which user, group and machine - accounts may be stored. Multiple passwd backends can be used in combination, either as additive backend - data sets, or as fail-over data sets. + Samba-4 supports the use of a choice of backends that may be used in which user, group and machine + accounts may be stored, but only when acting as a classic + (NT4) domain controller, + but not when it is acting as an Active Directory Domain Controller. @@ -162,16 +164,20 @@ The following functionalities are new to the Samba-3 release: scalability reliability An LDAP passdb backend confers the benefit that the account backend can be distributed and replicated, - which is of great value because it confers scalability and provides a high degree of reliability. + which is of great value because it confers scalability and + provides a high degree of reliability. This may be used when + Samba-4 is acting as an classic (NT4-like) domain controller, + but not when it is acting as an Active Directory Domain Controller. interdomaintrustaccount trust accountinterdomain
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 50de2c9 s3fs-smbd: Make sure the registry is set up before we init
printing.
via fb3cf6c waf: Build pam_smbpass module only if enabled.
from 100d38d tdb: add -e option to tdbdump (and docment it).
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 50de2c9bbbc25074f022b4b2cf9d49f8e9a53e01
Author: Andreas Schneider
Date: Tue Oct 2 15:51:08 2012 +0200
s3fs-smbd: Make sure the registry is set up before we init printing.
Autobuild-User(master): Andreas Schneider
Autobuild-Date(master): Thu Oct 4 12:06:29 CEST 2012 on sn-devel-104
commit fb3cf6c24270d22dad8ac9a1c12e8d77c8189f11
Author: Andreas Schneider
Date: Tue Oct 2 14:25:40 2012 +0200
waf: Build pam_smbpass module only if enabled.
---
Summary of changes:
source3/pam_smbpass/wscript_build |3 ++-
source3/smbd/server.c |8
source3/wscript |3 +++
3 files changed, 9 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/pam_smbpass/wscript_build
b/source3/pam_smbpass/wscript_build
index 70b21d5..a2a2d01 100644
--- a/source3/pam_smbpass/wscript_build
+++ b/source3/pam_smbpass/wscript_build
@@ -10,5 +10,6 @@ if bld.CONFIG_SET('WITH_PAM_MODULES'):
LIBNTLMSSP LIBTSOCKET''',
cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR,
realname='pam_smbpass.so',
-install_path='${PAMMODULESDIR}'
+install_path='${PAMMODULESDIR}',
+enabled=bld.env.with_pam_smbpass
)
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 90bbb62..7dad13b 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1471,6 +1471,10 @@ extern void build_options(bool screen);
}
}
+ if (!dcesrv_ep_setup(ev_ctx, msg_ctx)) {
+ exit(1);
+ }
+
/* only start other daemons if we are running as a daemon
* -- bad things will happen if smbd is launched via inetd
* and we fork a copy of ourselves here */
@@ -1495,10 +1499,6 @@ extern void build_options(bool screen);
}
}
- if (!dcesrv_ep_setup(ev_ctx, msg_ctx)) {
- exit(1);
- }
-
if (!is_daemon) {
int sock;
diff --git a/source3/wscript b/source3/wscript
index 765f761..e4898ef 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -762,6 +762,9 @@ int i; i = PAM_RADIO_TYPE;
conf.DEFINE('WITH_PAM', 1)
conf.DEFINE('WITH_PAM_MODULES', 1)
+if Options.options.with_pam_smbpass:
+conf.env.with_pam_smbpass = True
+
seteuid = False
#
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 7b2acf8 s3:quota: don't force the block size to 512
from 0efdbc5 Fix net rpc share allowedusers to work with 2008r2
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 7b2acf8abe50f20302e7e296dc0ccb5e0c7963de
Author: Björn Jacke
Date: Thu Sep 6 10:23:50 2012 +0200
s3:quota: don't force the block size to 512
there is no point in forcing the block size to 512 when curblocks is 1. This
will only lead to false quota reporting. See bug #3272
(cherry picked from commit d6cc08b9eeb9de17bc0e610d6cf6dba13c5c8222)
---
Summary of changes:
source3/smbd/quotas.c |3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/quotas.c b/source3/smbd/quotas.c
index 4151662..45d87c7 100644
--- a/source3/smbd/quotas.c
+++ b/source3/smbd/quotas.c
@@ -746,9 +746,6 @@ static bool nfs_quotas(char *nfspath, uid_t euser_id,
uint64_t *bsize, uint64_t
*bsize = gqr.getquota_rslt_u.gqr_rquota.rq_bsize;
*dsize = D.dqb_bsoftlimit;
- if (D.dqb_curblocks == 1)
- *bsize = 512;
-
if (D.dqb_curblocks > D.dqb_bsoftlimit) {
*dfree = 0;
*dsize = D.dqb_curblocks;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 0efdbc5 Fix net rpc share allowedusers to work with 2008r2
from a0f6877 s3-smbd: Move housekeeping to the background process.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 0efdbc565fe64ab87bda4c9632a701e3115d7b23
Author: Jeremy Allison
Date: Thu Oct 4 10:56:12 2012 +0200
Fix net rpc share allowedusers to work with 2008r2
The RAP NetShareEnum command was removed in 2008r2, so use the RPC
equivalent
instead.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=8966
Author: Jeremy Allison
---
Summary of changes:
source3/utils/net_rpc.c | 81 +-
1 files changed, 44 insertions(+), 37 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index e5330aa..c0d52ed 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -4902,28 +4902,6 @@ static void show_userlist(struct rpc_pipe_client
*pipe_hnd,
return;
}
-struct share_list {
- int num_shares;
- char **shares;
-};
-
-static void collect_share(const char *name, uint32 m,
- const char *comment, void *state)
-{
- struct share_list *share_list = (struct share_list *)state;
-
- if (m != STYPE_DISKTREE)
- return;
-
- share_list->num_shares += 1;
- share_list->shares = SMB_REALLOC_ARRAY(share_list->shares, char *,
share_list->num_shares);
- if (!share_list->shares) {
- share_list->num_shares = 0;
- return;
- }
- share_list->shares[share_list->num_shares-1] = SMB_STRDUP(name);
-}
-
/**
* List shares on a remote RPC server, including the security descriptors.
*
@@ -4949,16 +4927,21 @@ static NTSTATUS rpc_share_allowedusers_internals(struct
net_context *c,
int argc,
const char **argv)
{
- int ret;
bool r;
- uint32 i;
FILE *f;
+ NTSTATUS nt_status = NT_STATUS_OK;
+ uint32_t total_entries = 0;
+ uint32_t resume_handle = 0;
+ uint32_t preferred_len = 0x;
+ uint32_t i;
+ struct dcerpc_binding_handle *b = NULL;
+ struct srvsvc_NetShareInfoCtr info_ctr;
+ struct srvsvc_NetShareCtr1 ctr1;
+ WERROR result;
struct user_token *tokens = NULL;
int num_tokens = 0;
- struct share_list share_list;
-
if (argc == 0) {
f = stdin;
} else {
@@ -4983,22 +4966,47 @@ static NTSTATUS rpc_share_allowedusers_internals(struct
net_context *c,
for (i=0; ibinding_handle;
+
+ /* Issue the NetShareEnum RPC call and retrieve the response */
+ nt_status = dcerpc_srvsvc_NetShareEnumAll(b,
+ talloc_tos(),
+ pipe_hnd->desthost,
+ &info_ctr,
+ preferred_len,
+ &total_entries,
+ &resume_handle,
+ &result);
+
+ /* Was it successful? */
+ if (!NT_STATUS_IS_OK(nt_status)) {
+ /* Nope. Go clean up. */
+ goto done;
+ }
- ret = cli_RNetShareEnum(cli, collect_share, &share_list);
+ if (!W_ERROR_IS_OK(result)) {
+ /* Nope. Go clean up. */
+ nt_status = werror_to_ntstatus(result);
+ goto done;
+ }
- if (ret == -1) {
- DEBUG(0, ("Error returning browse list: %s\n",
- cli_errstr(cli)));
+ if (total_entries == 0) {
goto done;
}
- for (i = 0; i < share_list.num_shares; i++) {
- char *netname = share_list.shares[i];
+/* For each returned entry... */
+ for (i = 0; i < info_ctr.ctr.ctr1->count; i++) {
+ const char *netname = info_ctr.ctr.ctr1->array[i].name;
- if (netname[strlen(netname)-1] == '$')
+ if (info_ctr.ctr.ctr1->array[i].type != STYPE_DISKTREE) {
continue;
+ }
d_printf("%s\n", netname);
@@ -5010,9 +5018,8 @@ static NTSTATUS rpc_share_allowedusers_internals(struct
net_context *c,
free_user_token(&tokens[i].token);
}
SAFE_FREE(tokens);
- SAFE_FREE(share_list.shares);
- return NT_STATUS_OK;
+ return nt_status;
}
static int rpc_share_allowedusers(struct net_context *c, int argc,
--
Samba Shared Repository
