[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha5-318-ge860fc1
The branch, v4-0-test has been updated
via e860fc171fd127d73df23336089c1479911953da (commit)
from 3bdc906eb63a494f0d8478c13f8330828aa2f725 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit e860fc171fd127d73df23336089c1479911953da
Author: Andrew Tridgell [EMAIL PROTECTED]
Date: Wed Aug 20 16:00:54 2008 +1000
don't overwrite fixed attributes with @ATTRIBUTES
---
Summary of changes:
source/lib/ldb/common/ldb_attributes.c |4
1 files changed, 4 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/ldb/common/ldb_attributes.c
b/source/lib/ldb/common/ldb_attributes.c
index 1e69f41..3b9d016 100644
--- a/source/lib/ldb/common/ldb_attributes.c
+++ b/source/lib/ldb/common/ldb_attributes.c
@@ -64,6 +64,10 @@ int ldb_schema_attribute_add_with_syntax(struct ldb_context
*ldb,
for (i = 0; i ldb-schema.num_attributes; i++) {
int cmp = ldb_attr_cmp(attribute, a[i].name);
if (cmp == 0) {
+ /* silently ignore attempts to overwrite fixed
attributes */
+ if (a[i].flags LDB_ATTR_FLAG_FIXED) {
+ return 0;
+ }
if (a[i].flags LDB_ATTR_FLAG_ALLOCATED) {
talloc_free(discard_const_p(char, a[i].name));
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3741-gc3dda37
The branch, v3-3-test has been updated via c3dda372241c4e7171aa928fe0a4f5889bcb21a8 (commit) from c30d73035dd202d0055ed7ede243e1703c4e9450 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit c3dda372241c4e7171aa928fe0a4f5889bcb21a8 Author: Steven Danneman [EMAIL PROTECTED] Date: Tue Aug 19 11:05:07 2008 -0700 Updated Doxyfile conf to doxygen version 1.5.3 * Removed deprecated configuration parameters * Silenced all warnings due to lack of doxygen comments * Reordered config parameters to match doxygen's canonical ordering --- Summary of changes: source/Doxyfile | 78 +-- 1 files changed, 47 insertions(+), 31 deletions(-) Changeset truncated at 500 lines: diff --git a/source/Doxyfile b/source/Doxyfile index c104078..9ade25c 100644 --- a/source/Doxyfile +++ b/source/Doxyfile @@ -1,7 +1,7 @@ -# Doxyfile 0.1 +# Doxyfile 1.5.3 #--- -# General configuration options +# Project related configuration options #--- PROJECT_NAME = Samba PROJECT_NUMBER = HEAD @@ -13,68 +13,84 @@ PROJECT_NUMBER = HEAD # doesn't mind variables being redefined. OUTPUT_DIRECTORY = dox - OUTPUT_LANGUAGE= English -EXTRACT_ALL= YES -EXTRACT_PRIVATE= YES -EXTRACT_STATIC = YES -HIDE_UNDOC_MEMBERS = NO -HIDE_UNDOC_CLASSES = NO +DOXYFILE_ENCODING = UTF-8 BRIEF_MEMBER_DESC = YES REPEAT_BRIEF = YES ALWAYS_DETAILED_SEC= NO FULL_PATH_NAMES= YES STRIP_FROM_PATH= $(PWD)/ +SHORT_NAMES= NO +JAVADOC_AUTOBRIEF = YES +INHERIT_DOCS = YES +TAB_SIZE = 8 +ALIASES= +OPTIMIZE_OUTPUT_FOR_C = YES +DISTRIBUTE_GROUP_DOC = NO +#--- +# Build related configuration options +#--- +EXTRACT_ALL= YES +EXTRACT_PRIVATE= YES +EXTRACT_STATIC = YES +EXTRACT_LOCAL_CLASSES = YES +HIDE_UNDOC_MEMBERS = NO +HIDE_UNDOC_CLASSES = NO INTERNAL_DOCS = YES -CLASS_DIAGRAMS = YES -SOURCE_BROWSER = YES -INLINE_SOURCES = YES -STRIP_CODE_COMMENTS= NO CASE_SENSE_NAMES = YES -SHORT_NAMES= NO HIDE_SCOPE_NAMES = YES -VERBATIM_HEADERS = YES SHOW_INCLUDE_FILES = YES -JAVADOC_AUTOBRIEF = YES -INHERIT_DOCS = YES INLINE_INFO= YES SORT_MEMBER_DOCS = NO -DISTRIBUTE_GROUP_DOC = NO -TAB_SIZE = 8 +SORT_BRIEF_DOCS= NO GENERATE_TODOLIST = YES GENERATE_TESTLIST = YES GENERATE_BUGLIST = YES -ALIASES= +GENERATE_DEPRECATEDLIST= YES ENABLED_SECTIONS = MAX_INITIALIZER_LINES = 30 -OPTIMIZE_OUTPUT_FOR_C = YES SHOW_USED_FILES= YES -REFERENCED_BY_RELATION = YES +SHOW_DIRECTORIES = YES #--- # configuration options related to warning and progress messages #--- QUIET = YES WARNINGS = NO WARN_IF_UNDOCUMENTED = NO +WARN_IF_DOC_ERROR = NO +WARN_NO_PARAMDOC = NO WARN_FORMAT= $file:$line: $text WARN_LOGFILE = #--- # configuration options related to the input files #--- INPUT = . +INPUT_ENCODING = UTF-8 FILE_PATTERNS = *.c \ *.h \ *.idl RECURSIVE = YES EXCLUDE= include/includes.h \ include/proto.h +EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = EXAMPLE_PATH = EXAMPLE_PATTERNS = +EXAMPLE_RECURSIVE = NO IMAGE_PATH = INPUT_FILTER = FILTER_SOURCE_FILES= NO #--- +# configuration options related to source browsing +#--- +SOURCE_BROWSER = YES +INLINE_SOURCES = YES +STRIP_CODE_COMMENTS= NO +REFERENCED_BY_RELATION = YES +REFERENCES_RELATION= YES +REFERENCES_LINK_SOURCE = YES +VERBATIM_HEADERS = YES +#--- # configuration options related to the alphabetical class index
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3767-gd3295d1
The branch, v3-devel has been updated via d3295d13aeb396377cb7fd46dcdb1f504f18efef (commit) from ab06efccf31fbc899536d2681a2076e6dfd65b9e (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel - Log - commit d3295d13aeb396377cb7fd46dcdb1f504f18efef Author: Steven Danneman [EMAIL PROTECTED] Date: Tue Aug 19 11:05:07 2008 -0700 Updated Doxyfile conf to doxygen version 1.5.3 * Removed deprecated configuration parameters * Silenced all warnings due to lack of doxygen comments * Reordered config parameters to match doxygen's canonical ordering --- Summary of changes: source/Doxyfile | 78 +-- 1 files changed, 47 insertions(+), 31 deletions(-) Changeset truncated at 500 lines: diff --git a/source/Doxyfile b/source/Doxyfile index c104078..9ade25c 100644 --- a/source/Doxyfile +++ b/source/Doxyfile @@ -1,7 +1,7 @@ -# Doxyfile 0.1 +# Doxyfile 1.5.3 #--- -# General configuration options +# Project related configuration options #--- PROJECT_NAME = Samba PROJECT_NUMBER = HEAD @@ -13,68 +13,84 @@ PROJECT_NUMBER = HEAD # doesn't mind variables being redefined. OUTPUT_DIRECTORY = dox - OUTPUT_LANGUAGE= English -EXTRACT_ALL= YES -EXTRACT_PRIVATE= YES -EXTRACT_STATIC = YES -HIDE_UNDOC_MEMBERS = NO -HIDE_UNDOC_CLASSES = NO +DOXYFILE_ENCODING = UTF-8 BRIEF_MEMBER_DESC = YES REPEAT_BRIEF = YES ALWAYS_DETAILED_SEC= NO FULL_PATH_NAMES= YES STRIP_FROM_PATH= $(PWD)/ +SHORT_NAMES= NO +JAVADOC_AUTOBRIEF = YES +INHERIT_DOCS = YES +TAB_SIZE = 8 +ALIASES= +OPTIMIZE_OUTPUT_FOR_C = YES +DISTRIBUTE_GROUP_DOC = NO +#--- +# Build related configuration options +#--- +EXTRACT_ALL= YES +EXTRACT_PRIVATE= YES +EXTRACT_STATIC = YES +EXTRACT_LOCAL_CLASSES = YES +HIDE_UNDOC_MEMBERS = NO +HIDE_UNDOC_CLASSES = NO INTERNAL_DOCS = YES -CLASS_DIAGRAMS = YES -SOURCE_BROWSER = YES -INLINE_SOURCES = YES -STRIP_CODE_COMMENTS= NO CASE_SENSE_NAMES = YES -SHORT_NAMES= NO HIDE_SCOPE_NAMES = YES -VERBATIM_HEADERS = YES SHOW_INCLUDE_FILES = YES -JAVADOC_AUTOBRIEF = YES -INHERIT_DOCS = YES INLINE_INFO= YES SORT_MEMBER_DOCS = NO -DISTRIBUTE_GROUP_DOC = NO -TAB_SIZE = 8 +SORT_BRIEF_DOCS= NO GENERATE_TODOLIST = YES GENERATE_TESTLIST = YES GENERATE_BUGLIST = YES -ALIASES= +GENERATE_DEPRECATEDLIST= YES ENABLED_SECTIONS = MAX_INITIALIZER_LINES = 30 -OPTIMIZE_OUTPUT_FOR_C = YES SHOW_USED_FILES= YES -REFERENCED_BY_RELATION = YES +SHOW_DIRECTORIES = YES #--- # configuration options related to warning and progress messages #--- QUIET = YES WARNINGS = NO WARN_IF_UNDOCUMENTED = NO +WARN_IF_DOC_ERROR = NO +WARN_NO_PARAMDOC = NO WARN_FORMAT= $file:$line: $text WARN_LOGFILE = #--- # configuration options related to the input files #--- INPUT = . +INPUT_ENCODING = UTF-8 FILE_PATTERNS = *.c \ *.h \ *.idl RECURSIVE = YES EXCLUDE= include/includes.h \ include/proto.h +EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = EXAMPLE_PATH = EXAMPLE_PATTERNS = +EXAMPLE_RECURSIVE = NO IMAGE_PATH = INPUT_FILTER = FILTER_SOURCE_FILES= NO #--- +# configuration options related to source browsing +#--- +SOURCE_BROWSER = YES +INLINE_SOURCES = YES +STRIP_CODE_COMMENTS= NO +REFERENCED_BY_RELATION = YES +REFERENCES_RELATION= YES +REFERENCES_LINK_SOURCE = YES +VERBATIM_HEADERS = YES +#--- # configuration options related to the alphabetical class index
svn commit: samba-web r1219 - in trunk/docs/FAQ: .
Author: kseeger Date: 2008-08-20 11:15:54 + (Wed, 20 Aug 2008) New Revision: 1219 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1219 Log: Version updates in FAQs. Karolin Modified: trunk/docs/FAQ/index.html Changeset: Modified: trunk/docs/FAQ/index.html === --- trunk/docs/FAQ/index.html 2008-08-19 12:31:02 UTC (rev 1218) +++ trunk/docs/FAQ/index.html 2008-08-20 11:15:54 UTC (rev 1219) @@ -64,22 +64,25 @@ h3Which Samba version should I run?/h3 pThe Samba 2.2 branch is no longer maintained. It's EOL was October 1, 2004./p +pThe Samba 3.0 branch has been turned into maintainance mode. There will be +only bug fix and security updates./p + pSamba4 is a development branch that hasn't yet had an initial release. If you are a developer wanting to play with the bleeding-edge of the work done on Samba, try a href=http://gitweb.samba.org/?p=samba.git;a=tree;h=v4-0-test;hb=v4-0-test;Samba4/a, which you'll obviously have to build yourself. You can also try a href=http://gitweb.samba.org/?p=samba.git;a=tree;h=v3-2-test;hb=v3-2-test;Samba 3.2/a in the -Git source tree, if you want to experiment with upcoming 3.2.x +Git source tree, if you want to experiment with upcoming 3.2.x features./p -pThe current stable, production Samba server is the Samba 3.0 branch. The -most recent release is always the recommended version for production use. +pThe current stable, production Samba server is the Samba 3.2 branch. The +most recent release is always the recommended version for production use. See the a href=/samba/historyrelease history/a page for an overview of current and past releases./p h3How do I verify a tarball with the GnuPG signature?/h3 -pUsing GnuPG, simply download the Samba source distribution, the tarball +pUsing GnuPG, simply download the Samba source distribution, the tarball signature, and the Samba distribution public key. Then run:/p pre
svn commit: samba-web r1220 - in trunk/docs/FAQ: .
Author: kseeger Date: 2008-08-20 11:29:10 + (Wed, 20 Aug 2008) New Revision: 1220 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1220 Log: More version updates in FAQ Karolin Modified: trunk/docs/FAQ/index.html Changeset: Modified: trunk/docs/FAQ/index.html === --- trunk/docs/FAQ/index.html 2008-08-20 11:15:54 UTC (rev 1219) +++ trunk/docs/FAQ/index.html 2008-08-20 11:29:10 UTC (rev 1220) @@ -67,12 +67,15 @@ pThe Samba 3.0 branch has been turned into maintainance mode. There will be only bug fix and security updates./p -pSamba4 is a development branch that hasn't yet had an initial release. If -you are a developer wanting to play with the bleeding-edge of the work done on -Samba, try a href=http://gitweb.samba.org/?p=samba.git;a=tree;h=v4-0-test;hb=v4-0-test;Samba4/a, -which you'll obviously have to build yourself. You can also try -a href=http://gitweb.samba.org/?p=samba.git;a=tree;h=v3-2-test;hb=v3-2-test;Samba 3.2/a in the -Git source tree, if you want to experiment with upcoming 3.2.x +pSamba4 is a development branch that hasn't yet had an initial release. If +you are a developer wanting to play with the bleeding-edge of the work done on +Samba, try a href=http://gitweb.samba.org/?p=samba.git;a=tree;h=v4-0-test;hb=v4-0-test;Samba4/a, +which you'll obviously have to build yourself. You can also try +a href=http://gitweb.samba.org/?p=samba.git;a=tree;h=v3-3-test;hb=v3-3-test;Samba 3.3/a in the +Git source tree, if you want to experiment with upcoming 3.3.x or +a +href=http://gitweb.samba.org/?p=samba.git;a=tree;h=v3-devel;hb=v3-devel;Samba +3.4/a Git source tree, if you want to experiment with upcoming 3.4.x features./p pThe current stable, production Samba server is the Samba 3.2 branch. The
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha5-330-ge51c0cf
The branch, v4-0-test has been updated
via e51c0cf62c91f79f703b17bcf37c4a6fa8107ae0 (commit)
via 6785684db3446c03d8061c8bb3d94889b443d7d5 (commit)
via f002f147d8a8a0b49389e30e611ff8b33dd077e1 (commit)
via bdff9728cc1c8b5fe5a29040e092a8e48603725b (commit)
via c3921c7b4e7a3b51b97a2afb688271a8ae403105 (commit)
via 77571cd7c74dfaa93e58f047530df369ae293ffd (commit)
via ce83f4bb596fad23000acc1f6691669e2f2cfe1b (commit)
via b01d7457fa5b3572989b821f04e023fd9abd0d52 (commit)
via a143806364051141604ebb40eb5a4ef72958b55f (commit)
via 71b0d64866eb1a4f6dc73eeb57b5f0fe5d8a5780 (commit)
via 38c4b2a3e9b316f390651297854de033ede0d128 (commit)
via a1cf2289dd4ff9a3f9cf61da680223193235e35f (commit)
from e860fc171fd127d73df23336089c1479911953da (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit e51c0cf62c91f79f703b17bcf37c4a6fa8107ae0
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Wed Aug 20 14:41:38 2008 +0200
pidl/NDR::Parser: pass typedefs through the ParseElement*Level() functions
metze
commit 6785684db3446c03d8061c8bb3d94889b443d7d5
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Wed Aug 20 14:41:05 2008 +0200
pidl/NDR: generate a LEVELS array for typedefs
metze
commit f002f147d8a8a0b49389e30e611ff8b33dd077e1
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Wed Aug 20 10:18:42 2008 +0200
pidl/NDR: correctly check for valid properties
grep($str, @array) returns the number of elements in @array!
We need grep(/^$str$/, @array) to the only the amount of matches.
Also fix unitialized vars for the error case.
metze
commit bdff9728cc1c8b5fe5a29040e092a8e48603725b
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Tue Aug 19 20:53:18 2008 +0200
pidl/NDR::Parser: pass $ndr to -start_flags() and -end_flags()
metze
commit c3921c7b4e7a3b51b97a2afb688271a8ae403105
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Tue Aug 19 20:51:27 2008 +0200
pidl/NDR::Parser: pass $ndr to ParseMemCtxPull*()
metze
commit 77571cd7c74dfaa93e58f047530df369ae293ffd
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Tue Aug 19 20:48:53 2008 +0200
pidl/NDR::Parser: pass $ndr to ParsePtrPush()
metze
commit ce83f4bb596fad23000acc1f6691669e2f2cfe1b
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Tue Aug 19 20:34:00 2008 +0200
pidl/NDR::Parser: use my $ndr = ndr in the remaining top functions
metze
commit b01d7457fa5b3572989b821f04e023fd9abd0d52
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Tue Aug 19 20:27:15 2008 +0200
pidl/NDR::Parser: pass down $ndr from the top functions
metze
commit a143806364051141604ebb40eb5a4ef72958b55f
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Tue Aug 19 20:12:03 2008 +0200
pidl/NDR::Parser: pass $ndr to -PRINT_FN_BLOB()
metze
commit 71b0d64866eb1a4f6dc73eeb57b5f0fe5d8a5780
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Tue Aug 19 13:24:05 2008 +0200
pidl/NDR::Parser: pass $ndr to -PUSH_FN_BLOB()
metze
commit 38c4b2a3e9b316f390651297854de033ede0d128
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Tue Aug 19 13:04:38 2008 +0200
pidl/NDR::Parser: pass $ndr to -PULL_FN_BODY()
metze
commit a1cf2289dd4ff9a3f9cf61da680223193235e35f
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Tue Aug 19 12:34:49 2008 +0200
pidl/NDR::Parser: use $ndr instead of ndr
metze
---
Summary of changes:
source/pidl/lib/Parse/Pidl/NDR.pm | 75 +++--
source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 506 ---
source/pidl/tests/samba-ndr.pl | 13 +-
3 files changed, 319 insertions(+), 275 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/pidl/lib/Parse/Pidl/NDR.pm
b/source/pidl/lib/Parse/Pidl/NDR.pm
index 1e45047..10bd297 100644
--- a/source/pidl/lib/Parse/Pidl/NDR.pm
+++ b/source/pidl/lib/Parse/Pidl/NDR.pm
@@ -287,6 +287,22 @@ sub GetElementLevelTable($$)
return $order;
}
+sub GetTypedefLevelTable($$$)
+{
+ my ($e, $data, $pointer_default) = @_;
+
+ my $order = [];
+
+ push (@$order, {
+ TYPE = TYPEDEF
+ });
+
+ my $i = 0;
+ foreach (@$order) { $_-{LEVEL_INDEX} = $i; $i+=1; }
+
+ return $order;
+}
+
#
# see if a type contains any deferred data
sub can_contain_deferred($)
@@ -575,6 +591,7 @@ sub ParseTypedef($$)
NAME = $d-{NAME},
TYPE = $d-{TYPE},
PROPERTIES = $d-{PROPERTIES},
+ LEVELS = GetTypedefLevelTable($d, $data, $pointer_default),
DATA = $data,
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha5-332-g925a206
The branch, v4-0-test has been updated
via 925a2066ffa18a86704a8ee1a7a6908e0cd65a2a (commit)
via 98d3568f079ea143214bcf5271b636313d6491c3 (commit)
from e51c0cf62c91f79f703b17bcf37c4a6fa8107ae0 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit 925a2066ffa18a86704a8ee1a7a6908e0cd65a2a
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Tue Aug 19 10:29:40 2008 +0200
ndr_compression: unify the common handling of mszip and xpress compression
metze
commit 98d3568f079ea143214bcf5271b636313d6491c3
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Mon Aug 18 17:10:59 2008 +0200
librpc/ndr: add support for Type Serialization Version 1 to subcontext
We use the header size 0xFC01 as magic for constructed types.
See [MS-RPCE] 2.2.6 Type Serialization Version 1 for more details.
metze
---
Summary of changes:
source/librpc/ndr/ndr.c | 115 -
source/librpc/ndr/ndr_compression.c | 140 --
2 files changed, 147 insertions(+), 108 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/ndr/ndr.c b/source/librpc/ndr/ndr.c
index 4085245..c5e4c44 100644
--- a/source/librpc/ndr/ndr.c
+++ b/source/librpc/ndr/ndr.c
@@ -394,6 +394,8 @@ _PUBLIC_ enum ndr_err_code ndr_pull_subcontext_start(struct
ndr_pull *ndr,
{
struct ndr_pull *subndr;
uint32_t r_content_size;
+ bool force_le = false;
+ bool force_be = false;
switch (header_size) {
case 0: {
@@ -426,6 +428,74 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_subcontext_start(struct ndr_pull *ndr,
r_content_size = content_size;
break;
}
+ case 0xFC01: {
+ /*
+* Common Type Header for the Serialization Stream
+* See [MS-RPCE] 2.2.6 Type Serialization Version 1
+*/
+ uint8_t version;
+ uint8_t drep;
+ uint16_t hdrlen;
+ uint32_t filler;
+ uint32_t content_size;
+ uint32_t reserved;
+
+ /* version */
+ NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, version));
+
+ if (version != 1) {
+ return ndr_pull_error(ndr, NDR_ERR_SUBCONTEXT,
+ Bad subcontext (PULL) Common
Type Header version %d != 1,
+ (int)version);
+ }
+
+ /*
+* 0x10 little endian
+* 0x00 big endian
+*/
+ NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, drep));
+ if (drep == 0x10) {
+ force_le = true;
+ } else if (drep == 0x00) {
+ force_be = true;
+ } else {
+ return ndr_pull_error(ndr, NDR_ERR_SUBCONTEXT,
+ Bad subcontext (PULL) Common
Type Header invalid drep 0x%02X,
+ (unsigned int)drep);
+ }
+
+ /* length of the Private Header for Constructed Type */
+ NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, hdrlen));
+ if (hdrlen != 8) {
+ return ndr_pull_error(ndr, NDR_ERR_SUBCONTEXT,
+ Bad subcontext (PULL) Common
Type Header length %d != 8,
+ (int)hdrlen);
+ }
+
+ /* filler should be ignored */
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, filler));
+
+ /*
+* Private Header for Constructed Type
+*/
+ /* length - will be updated latter */
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, content_size));
+ if (size_is = 0 size_is != content_size) {
+ return ndr_pull_error(ndr, NDR_ERR_SUBCONTEXT, Bad
subcontext (PULL) size_is(%d) mismatch content_size %d,
+ (int)size_is, (int)content_size);
+ }
+ /* the content size must be a multiple of 8 */
+ if ((content_size % 8) != 0) {
+ return ndr_pull_error(ndr, NDR_ERR_SUBCONTEXT,
+ Bad subcontext (PULL)
size_is(%d) not padded to 8 content_size %d,
+ (int)size_is, (int)content_size);
+ }
+ r_content_size = content_size;
+
+ /* reserved */
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, reserved));
+ break;
+ }
default:
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha5-335-g4b054ce
The branch, v4-0-test has been updated
via 4b054cee51c39c5430bcadd5c06a94dc3e6b0d8f (commit)
via 4e6937816f1563686d04da4ab00a46d4461401b9 (commit)
via 70a7b1f6c2e359102467ea270c2bb1efe736f64a (commit)
from 925a2066ffa18a86704a8ee1a7a6908e0cd65a2a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit 4b054cee51c39c5430bcadd5c06a94dc3e6b0d8f
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Tue Aug 19 10:36:24 2008 +0200
drsuapi: fix samba4 callers after drsuapi.idl changes
metze
commit 4e6937816f1563686d04da4ab00a46d4461401b9
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Tue Aug 19 10:35:15 2008 +0200
drsuapi.idl: readd type serialization headers to compressed
DsGetNCChangesCtr*
metze
commit 70a7b1f6c2e359102467ea270c2bb1efe736f64a
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Tue Aug 19 10:33:03 2008 +0200
ndr_compression: remove the type serialization handling from the
compression layer
metze
---
Summary of changes:
source/dsdb/repl/drepl_out_helpers.c | 20 +-
source/libnet/libnet_become_dc.c | 19 -
source/librpc/idl/drsuapi.idl| 16 +++---
source/librpc/ndr/ndr_compression.c | 36 --
source/torture/rpc/dssync.c | 15 -
5 files changed, 48 insertions(+), 58 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/dsdb/repl/drepl_out_helpers.c
b/source/dsdb/repl/drepl_out_helpers.c
index 3629a3b..80b398e 100644
--- a/source/dsdb/repl/drepl_out_helpers.c
+++ b/source/dsdb/repl/drepl_out_helpers.c
@@ -314,27 +314,35 @@ static void
dreplsrv_op_pull_source_get_changes_recv(struct rpc_request *req)
if (*r-out.level == 1) {
ctr_level = 1;
ctr1 = r-out.ctr.ctr1;
- } else if (*r-out.level == 2) {
+ } else if (*r-out.level == 2
+ r-out.ctr.ctr2.mszip1.ts) {
ctr_level = 1;
- ctr1 = r-out.ctr.ctr2.mszip1.ctr1;
+ ctr1 = r-out.ctr.ctr2.mszip1.ts-ctr1;
} else if (*r-out.level == 6) {
ctr_level = 6;
ctr6 = r-out.ctr.ctr6;
} else if (*r-out.level == 7
r-out.ctr.ctr7.level == 6
- r-out.ctr.ctr7.type == DRSUAPI_COMPRESSION_TYPE_MSZIP) {
+ r-out.ctr.ctr7.type == DRSUAPI_COMPRESSION_TYPE_MSZIP
+ r-out.ctr.ctr7.ctr.mszip6.ts) {
ctr_level = 6;
- ctr6 = r-out.ctr.ctr7.ctr.mszip6.ctr6;
+ ctr6 = r-out.ctr.ctr7.ctr.mszip6.ts-ctr6;
} else if (*r-out.level == 7
r-out.ctr.ctr7.level == 6
- r-out.ctr.ctr7.type == DRSUAPI_COMPRESSION_TYPE_XPRESS) {
+ r-out.ctr.ctr7.type == DRSUAPI_COMPRESSION_TYPE_XPRESS
+ r-out.ctr.ctr7.ctr.xpress6.ts) {
ctr_level = 6;
- ctr6 = r-out.ctr.ctr7.ctr.xpress6.ctr6;
+ ctr6 = r-out.ctr.ctr7.ctr.xpress6.ts-ctr6;
} else {
composite_error(c, werror_to_ntstatus(WERR_BAD_NET_RESP));
return;
}
+ if (!ctr1 !ctr6) {
+ composite_error(c, werror_to_ntstatus(WERR_BAD_NET_RESP));
+ return;
+ }
+
if (ctr_level == 6) {
if (!W_ERROR_IS_OK(ctr6-drs_error)) {
composite_error(c, werror_to_ntstatus(ctr6-drs_error));
diff --git a/source/libnet/libnet_become_dc.c b/source/libnet/libnet_become_dc.c
index 19391e7..332b041 100644
--- a/source/libnet/libnet_become_dc.c
+++ b/source/libnet/libnet_become_dc.c
@@ -2465,26 +2465,33 @@ static WERROR
becomeDC_drsuapi_pull_partition_recv(struct libnet_BecomeDC_state
if (*r-out.level == 1) {
ctr_level = 1;
ctr1 = r-out.ctr.ctr1;
- } else if (*r-out.level == 2) {
+ } else if (*r-out.level == 2
+ r-out.ctr.ctr2.mszip1.ts) {
ctr_level = 1;
- ctr1 = r-out.ctr.ctr2.mszip1.ctr1;
+ ctr1 = r-out.ctr.ctr2.mszip1.ts-ctr1;
} else if (*r-out.level == 6) {
ctr_level = 6;
ctr6 = r-out.ctr.ctr6;
} else if (*r-out.level == 7
r-out.ctr.ctr7.level == 6
- r-out.ctr.ctr7.type == DRSUAPI_COMPRESSION_TYPE_MSZIP) {
+ r-out.ctr.ctr7.type == DRSUAPI_COMPRESSION_TYPE_MSZIP
+ r-out.ctr.ctr7.ctr.mszip6.ts) {
ctr_level = 6;
- ctr6 = r-out.ctr.ctr7.ctr.mszip6.ctr6;
+ ctr6 = r-out.ctr.ctr7.ctr.mszip6.ts-ctr6;
} else if (*r-out.level == 7
r-out.ctr.ctr7.level == 6
- r-out.ctr.ctr7.type
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha5-337-gadbff0b
The branch, v4-0-test has been updated
via adbff0b0f92aa0742a8293071776b388879cbd8e (commit)
via 7d297f7fb7a3ac388390429db7cb16fa60d3f8c0 (commit)
from 4b054cee51c39c5430bcadd5c06a94dc3e6b0d8f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit adbff0b0f92aa0742a8293071776b388879cbd8e
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Tue Aug 19 08:51:45 2008 +0200
krb5pac.idl: make use of subcontext(0xFC01) to handle the type
Serialization header
Now we should be able to handle bigendian PAC_LOGON_INFO buffers.
metze
commit 7d297f7fb7a3ac388390429db7cb16fa60d3f8c0
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Tue Aug 19 13:23:09 2008 +0200
kdc/pac-glue: pull/push the logon_info via the PAC_INFO union
This prepares the next commit...
metze
---
Summary of changes:
source/kdc/pac-glue.c | 24 +---
source/librpc/idl/krb5pac.idl |6 +-
2 files changed, 14 insertions(+), 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/kdc/pac-glue.c b/source/kdc/pac-glue.c
index cab1446..bee271e 100644
--- a/source/kdc/pac-glue.c
+++ b/source/kdc/pac-glue.c
@@ -51,7 +51,7 @@ static krb5_error_code make_pac(krb5_context context,
struct auth_serversupplied_info *server_info,
krb5_pac *pac)
{
- struct PAC_LOGON_INFO_CTR logon_info;
+ union PAC_INFO info;
struct netr_SamInfo3 *info3;
krb5_data pac_data;
NTSTATUS nt_status;
@@ -59,7 +59,7 @@ static krb5_error_code make_pac(krb5_context context,
DATA_BLOB pac_out;
krb5_error_code ret;
- ZERO_STRUCT(logon_info);
+ ZERO_STRUCT(info);
nt_status = auth_convert_server_info_saminfo3(mem_ctx, server_info,
info3);
if (!NT_STATUS_IS_OK(nt_status)) {
@@ -67,15 +67,16 @@ static krb5_error_code make_pac(krb5_context context,
return EINVAL;
}
- logon_info.info = talloc_zero(mem_ctx, struct PAC_LOGON_INFO);
+ info.logon_info.info = talloc_zero(mem_ctx, struct PAC_LOGON_INFO);
if (!mem_ctx) {
return ENOMEM;
}
- logon_info.info-info3 = *info3;
+ info.logon_info.info-info3 = *info3;
- ndr_err = ndr_push_struct_blob(pac_out, mem_ctx, iconv_convenience,
logon_info,
-
(ndr_push_flags_fn_t)ndr_push_PAC_LOGON_INFO_CTR);
+ ndr_err = ndr_push_union_blob(pac_out, mem_ctx, iconv_convenience,
info,
+ PAC_TYPE_LOGON_INFO,
+ (ndr_push_flags_fn_t)ndr_push_PAC_INFO);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
nt_status = ndr_map_error2ntstatus(ndr_err);
DEBUG(1, (PAC (presig) push failed: %s\n,
nt_errstr(nt_status)));
@@ -162,7 +163,7 @@ krb5_error_code samba_kdc_reget_pac(void *priv,
krb5_context context,
krb5_data k5pac_in;
DATA_BLOB pac_in;
- struct PAC_LOGON_INFO_CTR logon_info;
+ union PAC_INFO info;
union netr_Validation validation;
struct auth_serversupplied_info *server_info_out;
@@ -191,9 +192,10 @@ krb5_error_code samba_kdc_reget_pac(void *priv,
krb5_context context,
return ENOMEM;
}
- ndr_err = ndr_pull_struct_blob(pac_in, mem_ctx,
private-iconv_convenience, logon_info,
-
(ndr_pull_flags_fn_t)ndr_pull_PAC_LOGON_INFO_CTR);
- if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err) || !logon_info.info) {
+ ndr_err = ndr_pull_union_blob(pac_in, mem_ctx,
private-iconv_convenience, info,
+ PAC_TYPE_LOGON_INFO,
+ (ndr_pull_flags_fn_t)ndr_pull_PAC_INFO);
+ if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err) || !info.logon_info.info) {
nt_status = ndr_map_error2ntstatus(ndr_err);
DEBUG(0,(can't parse the PAC LOGON_INFO: %s\n,
nt_errstr(nt_status)));
talloc_free(mem_ctx);
@@ -201,7 +203,7 @@ krb5_error_code samba_kdc_reget_pac(void *priv,
krb5_context context,
}
/* Pull this right into the normal auth sysstem structures */
- validation.sam3 = logon_info.info-info3;
+ validation.sam3 = info.logon_info.info-info3;
nt_status = make_server_info_netlogon_validation(mem_ctx,
,
3, validation,
diff --git a/source/librpc/idl/krb5pac.idl b/source/librpc/idl/krb5pac.idl
index b450908..ca0efae 100644
--- a/source/librpc/idl/krb5pac.idl
+++ b/source/librpc/idl/krb5pac.idl
@@ -45,10 +45,6 @@ interface krb5pac
} PAC_UNKNOWN_12;
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3768-g7b4c8a4
The branch, v3-devel has been updated
via 7b4c8a4e39f310eb450918fa841b0ea1b4af19f7 (commit)
from d3295d13aeb396377cb7fd46dcdb1f504f18efef (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit 7b4c8a4e39f310eb450918fa841b0ea1b4af19f7
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Tue Aug 19 16:34:50 2008 +0200
smbd: fix the handling of create_options to pass RAW-OPEN
Some of the bits generate INVALID_PARAMETER and some bits
are ignored when they come from a client, that's why we need
to use bits from the ignored range for our internal usage.
metze
---
Summary of changes:
source/include/smb.h | 15 +++
source/smbd/nttrans.c | 12
source/smbd/open.c|5 +
3 files changed, 28 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/smb.h b/source/include/smb.h
index b8ff34f..c8c4f8c 100644
--- a/source/include/smb.h
+++ b/source/include/smb.h
@@ -1330,12 +1330,19 @@ struct bitmap {
#define FILE_DELETE_ON_CLOSE 0x1000
#define FILE_OPEN_BY_FILE_ID 0x2000
-/* Private create options used by the ntcreatex processing code. From Samba4.
*/
-#define NTCREATEX_OPTIONS_PRIVATE_DENY_DOS 0x0100
-#define NTCREATEX_OPTIONS_PRIVATE_DENY_FCB 0x0200
+#define NTCREATEX_OPTIONS_MUST_IGNORE_MASK (0x008F0480)
+
+#define NTCREATEX_OPTIONS_INVALID_PARAM_MASK(0xFF100030)
+
+/*
+ * Private create options used by the ntcreatex processing code. From Samba4.
+ * We reuse some ignored flags for private use.
+ */
+#define NTCREATEX_OPTIONS_PRIVATE_DENY_DOS 0x0001
+#define NTCREATEX_OPTIONS_PRIVATE_DENY_FCB 0x0002
/* Private options for streams support */
-#define NTCREATEX_OPTIONS_PRIVATE_STREAM_DELETE 0x0400
+#define NTCREATEX_OPTIONS_PRIVATE_STREAM_DELETE 0x0004
/* Responses when opening a file. */
#define FILE_WAS_SUPERSEDED 0
diff --git a/source/smbd/nttrans.c b/source/smbd/nttrans.c
index 149e6ec..b695127 100644
--- a/source/smbd/nttrans.c
+++ b/source/smbd/nttrans.c
@@ -455,6 +455,12 @@ void reply_ntcreate_and_X(struct smb_request *req)
fname));
/*
+* we need to remove ignored bits when they come directly from the
client
+* because we reuse some of them for internal stuff
+*/
+ create_options = ~NTCREATEX_OPTIONS_MUST_IGNORE_MASK;
+
+ /*
* If it's an IPC, use the pipe handler.
*/
@@ -858,6 +864,12 @@ static void call_nt_transact_create(connection_struct
*conn,
allocation_size |= (((SMB_BIG_UINT)IVAL(params,16)) 32);
#endif
+ /*
+* we need to remove ignored bits when they come directly from the
client
+* because we reuse some of them for internal stuff
+*/
+ create_options = ~NTCREATEX_OPTIONS_MUST_IGNORE_MASK;
+
/* Ensure the data_len is correct for the sd and ea values given. */
if ((ea_len + sd_len data_count)
|| (ea_len data_count) || (sd_len data_count)
diff --git a/source/smbd/open.c b/source/smbd/open.c
index 03efd09..8b32907 100644
--- a/source/smbd/open.c
+++ b/source/smbd/open.c
@@ -2560,6 +2560,11 @@ NTSTATUS create_file_unixpath(connection_struct *conn,
goto fail;
}
+ if (create_options NTCREATEX_OPTIONS_INVALID_PARAM_MASK) {
+ status = NT_STATUS_INVALID_PARAMETER;
+ goto fail;
+ }
+
if (req == NULL) {
oplock_request |= INTERNAL_OPEN_ONLY;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3742-ga12cbcb
The branch, v3-3-test has been updated
via a12cbcb009a02ee23ec0b24c2fca5deaa0ba6412 (commit)
from c3dda372241c4e7171aa928fe0a4f5889bcb21a8 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit a12cbcb009a02ee23ec0b24c2fca5deaa0ba6412
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Tue Aug 19 16:34:50 2008 +0200
smbd: fix the handling of create_options to pass RAW-OPEN
Some of the bits generate INVALID_PARAMETER and some bits
are ignored when they come from a client, that's why we need
to use bits from the ignored range for our internal usage.
metze
(cherry picked from commit 7b4c8a4e39f310eb450918fa841b0ea1b4af19f7)
---
Summary of changes:
source/include/smb.h | 15 +++
source/smbd/nttrans.c | 12
source/smbd/open.c|5 +
3 files changed, 28 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/smb.h b/source/include/smb.h
index b8ff34f..c8c4f8c 100644
--- a/source/include/smb.h
+++ b/source/include/smb.h
@@ -1330,12 +1330,19 @@ struct bitmap {
#define FILE_DELETE_ON_CLOSE 0x1000
#define FILE_OPEN_BY_FILE_ID 0x2000
-/* Private create options used by the ntcreatex processing code. From Samba4.
*/
-#define NTCREATEX_OPTIONS_PRIVATE_DENY_DOS 0x0100
-#define NTCREATEX_OPTIONS_PRIVATE_DENY_FCB 0x0200
+#define NTCREATEX_OPTIONS_MUST_IGNORE_MASK (0x008F0480)
+
+#define NTCREATEX_OPTIONS_INVALID_PARAM_MASK(0xFF100030)
+
+/*
+ * Private create options used by the ntcreatex processing code. From Samba4.
+ * We reuse some ignored flags for private use.
+ */
+#define NTCREATEX_OPTIONS_PRIVATE_DENY_DOS 0x0001
+#define NTCREATEX_OPTIONS_PRIVATE_DENY_FCB 0x0002
/* Private options for streams support */
-#define NTCREATEX_OPTIONS_PRIVATE_STREAM_DELETE 0x0400
+#define NTCREATEX_OPTIONS_PRIVATE_STREAM_DELETE 0x0004
/* Responses when opening a file. */
#define FILE_WAS_SUPERSEDED 0
diff --git a/source/smbd/nttrans.c b/source/smbd/nttrans.c
index 149e6ec..b695127 100644
--- a/source/smbd/nttrans.c
+++ b/source/smbd/nttrans.c
@@ -455,6 +455,12 @@ void reply_ntcreate_and_X(struct smb_request *req)
fname));
/*
+* we need to remove ignored bits when they come directly from the
client
+* because we reuse some of them for internal stuff
+*/
+ create_options = ~NTCREATEX_OPTIONS_MUST_IGNORE_MASK;
+
+ /*
* If it's an IPC, use the pipe handler.
*/
@@ -858,6 +864,12 @@ static void call_nt_transact_create(connection_struct
*conn,
allocation_size |= (((SMB_BIG_UINT)IVAL(params,16)) 32);
#endif
+ /*
+* we need to remove ignored bits when they come directly from the
client
+* because we reuse some of them for internal stuff
+*/
+ create_options = ~NTCREATEX_OPTIONS_MUST_IGNORE_MASK;
+
/* Ensure the data_len is correct for the sd and ea values given. */
if ((ea_len + sd_len data_count)
|| (ea_len data_count) || (sd_len data_count)
diff --git a/source/smbd/open.c b/source/smbd/open.c
index 03efd09..8b32907 100644
--- a/source/smbd/open.c
+++ b/source/smbd/open.c
@@ -2560,6 +2560,11 @@ NTSTATUS create_file_unixpath(connection_struct *conn,
goto fail;
}
+ if (create_options NTCREATEX_OPTIONS_INVALID_PARAM_MASK) {
+ status = NT_STATUS_INVALID_PARAMETER;
+ goto fail;
+ }
+
if (req == NULL) {
oplock_request |= INTERNAL_OPEN_ONLY;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2939-g3366ac2
The branch, v3-2-test has been updated
via 3366ac2857820d87fb36a1357786a3564d258da5 (commit)
from 3d96409c115b3ad4ef29ff75e40b39a26e316afe (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 3366ac2857820d87fb36a1357786a3564d258da5
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Tue Aug 19 16:34:50 2008 +0200
smbd: fix the handling of create_options to pass RAW-OPEN
Some of the bits generate INVALID_PARAMETER and some bits
are ignored when they come from a client, that's why we need
to use bits from the ignored range for our internal usage.
metze
(cherry picked from commit 7b4c8a4e39f310eb450918fa841b0ea1b4af19f7)
---
Summary of changes:
source/include/smb.h | 15 +++
source/smbd/nttrans.c | 12
source/smbd/open.c|5 +
3 files changed, 28 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/smb.h b/source/include/smb.h
index cef6819..3c7058f 100644
--- a/source/include/smb.h
+++ b/source/include/smb.h
@@ -1377,12 +1377,19 @@ struct bitmap {
#define FILE_DELETE_ON_CLOSE 0x1000
#define FILE_OPEN_BY_FILE_ID 0x2000
-/* Private create options used by the ntcreatex processing code. From Samba4.
*/
-#define NTCREATEX_OPTIONS_PRIVATE_DENY_DOS 0x0100
-#define NTCREATEX_OPTIONS_PRIVATE_DENY_FCB 0x0200
+#define NTCREATEX_OPTIONS_MUST_IGNORE_MASK (0x008F0480)
+
+#define NTCREATEX_OPTIONS_INVALID_PARAM_MASK(0xFF100030)
+
+/*
+ * Private create options used by the ntcreatex processing code. From Samba4.
+ * We reuse some ignored flags for private use.
+ */
+#define NTCREATEX_OPTIONS_PRIVATE_DENY_DOS 0x0001
+#define NTCREATEX_OPTIONS_PRIVATE_DENY_FCB 0x0002
/* Private options for streams support */
-#define NTCREATEX_OPTIONS_PRIVATE_STREAM_DELETE 0x0400
+#define NTCREATEX_OPTIONS_PRIVATE_STREAM_DELETE 0x0004
/* Responses when opening a file. */
#define FILE_WAS_SUPERSEDED 0
diff --git a/source/smbd/nttrans.c b/source/smbd/nttrans.c
index ae7bd8b..0b48fa2 100644
--- a/source/smbd/nttrans.c
+++ b/source/smbd/nttrans.c
@@ -490,6 +490,12 @@ void reply_ntcreate_and_X(struct smb_request *req)
fname));
/*
+* we need to remove ignored bits when they come directly from the
client
+* because we reuse some of them for internal stuff
+*/
+ create_options = ~NTCREATEX_OPTIONS_MUST_IGNORE_MASK;
+
+ /*
* If it's an IPC, use the pipe handler.
*/
@@ -899,6 +905,12 @@ static void call_nt_transact_create(connection_struct
*conn,
allocation_size |= (((SMB_BIG_UINT)IVAL(params,16)) 32);
#endif
+ /*
+* we need to remove ignored bits when they come directly from the
client
+* because we reuse some of them for internal stuff
+*/
+ create_options = ~NTCREATEX_OPTIONS_MUST_IGNORE_MASK;
+
/* Ensure the data_len is correct for the sd and ea values given. */
if ((ea_len + sd_len data_count)
|| (ea_len data_count) || (sd_len data_count)
diff --git a/source/smbd/open.c b/source/smbd/open.c
index 2184e69..ea10cdc 100644
--- a/source/smbd/open.c
+++ b/source/smbd/open.c
@@ -2614,6 +2614,11 @@ NTSTATUS create_file_unixpath(connection_struct *conn,
goto fail;
}
+ if (create_options NTCREATEX_OPTIONS_INVALID_PARAM_MASK) {
+ status = NT_STATUS_INVALID_PARAMETER;
+ goto fail;
+ }
+
if (req == NULL) {
oplock_request |= INTERNAL_OPEN_ONLY;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-31-11-g5410ad4
The branch, v3-0-test has been updated
via 5410ad4f4eb0162806778833362a68804d69196e (commit)
from 6acd5c086b0019f54749a67756975b3c0ba35ac0 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test
- Log -
commit 5410ad4f4eb0162806778833362a68804d69196e
Author: Gerald (Jerry) Carter [EMAIL PROTECTED]
Date: Wed Aug 20 13:00:40 2008 -0500
nss_winbind: When returning NSS_UNAVAIL, squash errno to ENOENT
According to the GNU libc nss guide, we should always set
errno to ENOENT when returning NSS_UNAVAIL.
http://www.gnu.org/software/libtool/manual/libc/NSS-Modules-Interface.html#NSS-Modules-Interface
At least the MQ Series message queing service that runs
on WebSphere will fail if you return any other errno in this case.
(cherry picked from commit ee26664602445fa7798e2061f6bcbef0756d6528)
---
Summary of changes:
source/nsswitch/wb_common.c | 14 ++
1 files changed, 14 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/nsswitch/wb_common.c b/source/nsswitch/wb_common.c
index 563c386..bae54f2 100644
--- a/source/nsswitch/wb_common.c
+++ b/source/nsswitch/wb_common.c
@@ -182,11 +182,13 @@ static int winbind_named_pipe_sock(const char *dir)
/* Check permissions on unix socket directory */
if (lstat(dir, st) == -1) {
+ errno = ENOENT;
return -1;
}
if (!S_ISDIR(st.st_mode) ||
(st.st_uid != 0 st.st_uid != geteuid())) {
+ errno = ENOENT;
return -1;
}
@@ -210,6 +212,7 @@ static int winbind_named_pipe_sock(const char *dir)
the winbindd daemon is not running. */
if (lstat(path, st) == -1) {
+ errno = ENOENT;
return -1;
}
@@ -217,6 +220,7 @@ static int winbind_named_pipe_sock(const char *dir)
if (!S_ISSOCK(st.st_mode) ||
(st.st_uid != 0 st.st_uid != geteuid())) {
+ errno = ENOENT;
return -1;
}
@@ -363,6 +367,7 @@ int write_sock(void *buffer, int count, int recursing, int
need_priv)
restart:
if (winbind_open_pipe_sock(recursing, need_priv) == -1) {
+ errno = ENOENT;
return -1;
}
@@ -570,12 +575,18 @@ NSS_STATUS winbindd_send_request(int req_type, int
need_priv,
if (write_sock(request, sizeof(*request),
request-flags WBFLAG_RECURSE, need_priv) == -1) {
+ /* Set ENOENT for consistency. Required by some apps */
+ errno = ENOENT;
+
return NSS_STATUS_UNAVAIL;
}
if ((request-extra_len != 0)
(write_sock(request-extra_data.data, request-extra_len,
request-flags WBFLAG_RECURSE, need_priv) == -1)) {
+ /* Set ENOENT for consistency. Required by some apps */
+ errno = ENOENT;
+
return NSS_STATUS_UNAVAIL;
}
@@ -599,6 +610,9 @@ NSS_STATUS winbindd_get_response(struct winbindd_response
*response)
/* Wait for reply */
if (read_reply(response) == -1) {
+ /* Set ENOENT for consistency. Required by some apps */
+ errno = ENOENT;
+
return NSS_STATUS_UNAVAIL;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2940-g29b3972
The branch, v3-2-test has been updated
via 29b39723b82f363d32dc4678d6b71a78485c65ce (commit)
from 3366ac2857820d87fb36a1357786a3564d258da5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 29b39723b82f363d32dc4678d6b71a78485c65ce
Author: Gerald (Jerry) Carter [EMAIL PROTECTED]
Date: Wed Aug 20 13:00:40 2008 -0500
nss_winbind: When returning NSS_UNAVAIL, squash errno to ENOENT
According to the GNU libc nss guide, we should always set
errno to ENOENT when returning NSS_UNAVAIL.
http://www.gnu.org/software/libtool/manual/libc/NSS-Modules-Interface.html#NSS-Modules-Interface
At least the MQ Series message queing service that runs
on WebSphere will fail if you return any other errno in this case.
(cherry picked from commit ee26664602445fa7798e2061f6bcbef0756d6528)
---
Summary of changes:
source/nsswitch/wb_common.c | 20 ++--
1 files changed, 18 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/nsswitch/wb_common.c b/source/nsswitch/wb_common.c
index b113fc3..6e6d2bb 100644
--- a/source/nsswitch/wb_common.c
+++ b/source/nsswitch/wb_common.c
@@ -176,11 +176,13 @@ static int winbind_named_pipe_sock(const char *dir)
/* Check permissions on unix socket directory */
if (lstat(dir, st) == -1) {
+ errno = ENOENT;
return -1;
}
if (!S_ISDIR(st.st_mode) ||
(st.st_uid != 0 st.st_uid != geteuid())) {
+ errno = ENOENT;
return -1;
}
@@ -199,6 +201,7 @@ static int winbind_named_pipe_sock(const char *dir)
the winbindd daemon is not running. */
if (lstat(path, st) == -1) {
+ errno = ENOENT;
SAFE_FREE(path);
return -1;
}
@@ -208,6 +211,7 @@ static int winbind_named_pipe_sock(const char *dir)
if (!S_ISSOCK(st.st_mode) ||
(st.st_uid != 0 st.st_uid != geteuid())) {
+ errno = ENOENT;
return -1;
}
@@ -368,6 +372,7 @@ int winbind_write_sock(void *buffer, int count, int
recursing, int need_priv)
restart:
if (winbind_open_pipe_sock(recursing, need_priv) == -1) {
+ errno = ENOENT;
return -1;
}
@@ -564,7 +569,11 @@ NSS_STATUS winbindd_send_request(int req_type, int
need_priv,
if (winbind_write_sock(request, sizeof(*request),
request-wb_flags WBFLAG_RECURSE,
- need_priv) == -1) {
+ need_priv) == -1)
+ {
+ /* Set ENOENT for consistency. Required by some apps */
+ errno = ENOENT;
+
return NSS_STATUS_UNAVAIL;
}
@@ -572,7 +581,11 @@ NSS_STATUS winbindd_send_request(int req_type, int
need_priv,
(winbind_write_sock(request-extra_data.data,
request-extra_len,
request-wb_flags WBFLAG_RECURSE,
- need_priv) == -1)) {
+ need_priv) == -1))
+ {
+ /* Set ENOENT for consistency. Required by some apps */
+ errno = ENOENT;
+
return NSS_STATUS_UNAVAIL;
}
@@ -596,6 +609,9 @@ NSS_STATUS winbindd_get_response(struct winbindd_response
*response)
/* Wait for reply */
if (winbindd_read_reply(response) == -1) {
+ /* Set ENOENT for consistency. Required by some apps */
+ errno = ENOENT;
+
return NSS_STATUS_UNAVAIL;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3743-ga46d7ff
The branch, v3-3-test has been updated
via a46d7ffeef1807bafda15eb76ec74fcf41aae7f6 (commit)
from a12cbcb009a02ee23ec0b24c2fca5deaa0ba6412 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit a46d7ffeef1807bafda15eb76ec74fcf41aae7f6
Author: Gerald (Jerry) Carter [EMAIL PROTECTED]
Date: Wed Aug 20 13:00:40 2008 -0500
nss_winbind: When returning NSS_UNAVAIL, squash errno to ENOENT
According to the GNU libc nss guide, we should always set
errno to ENOENT when returning NSS_UNAVAIL.
http://www.gnu.org/software/libtool/manual/libc/NSS-Modules-Interface.html#NSS-Modules-Interface
At least the MQ Series message queing service that runs
on WebSphere will fail if you return any other errno in this case.
(cherry picked from commit ee26664602445fa7798e2061f6bcbef0756d6528)
---
Summary of changes:
source/nsswitch/wb_common.c | 20 ++--
1 files changed, 18 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/nsswitch/wb_common.c b/source/nsswitch/wb_common.c
index b113fc3..6e6d2bb 100644
--- a/source/nsswitch/wb_common.c
+++ b/source/nsswitch/wb_common.c
@@ -176,11 +176,13 @@ static int winbind_named_pipe_sock(const char *dir)
/* Check permissions on unix socket directory */
if (lstat(dir, st) == -1) {
+ errno = ENOENT;
return -1;
}
if (!S_ISDIR(st.st_mode) ||
(st.st_uid != 0 st.st_uid != geteuid())) {
+ errno = ENOENT;
return -1;
}
@@ -199,6 +201,7 @@ static int winbind_named_pipe_sock(const char *dir)
the winbindd daemon is not running. */
if (lstat(path, st) == -1) {
+ errno = ENOENT;
SAFE_FREE(path);
return -1;
}
@@ -208,6 +211,7 @@ static int winbind_named_pipe_sock(const char *dir)
if (!S_ISSOCK(st.st_mode) ||
(st.st_uid != 0 st.st_uid != geteuid())) {
+ errno = ENOENT;
return -1;
}
@@ -368,6 +372,7 @@ int winbind_write_sock(void *buffer, int count, int
recursing, int need_priv)
restart:
if (winbind_open_pipe_sock(recursing, need_priv) == -1) {
+ errno = ENOENT;
return -1;
}
@@ -564,7 +569,11 @@ NSS_STATUS winbindd_send_request(int req_type, int
need_priv,
if (winbind_write_sock(request, sizeof(*request),
request-wb_flags WBFLAG_RECURSE,
- need_priv) == -1) {
+ need_priv) == -1)
+ {
+ /* Set ENOENT for consistency. Required by some apps */
+ errno = ENOENT;
+
return NSS_STATUS_UNAVAIL;
}
@@ -572,7 +581,11 @@ NSS_STATUS winbindd_send_request(int req_type, int
need_priv,
(winbind_write_sock(request-extra_data.data,
request-extra_len,
request-wb_flags WBFLAG_RECURSE,
- need_priv) == -1)) {
+ need_priv) == -1))
+ {
+ /* Set ENOENT for consistency. Required by some apps */
+ errno = ENOENT;
+
return NSS_STATUS_UNAVAIL;
}
@@ -596,6 +609,9 @@ NSS_STATUS winbindd_get_response(struct winbindd_response
*response)
/* Wait for reply */
if (winbindd_read_reply(response) == -1) {
+ /* Set ENOENT for consistency. Required by some apps */
+ errno = ENOENT;
+
return NSS_STATUS_UNAVAIL;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3769-gee26664
The branch, v3-devel has been updated
via ee26664602445fa7798e2061f6bcbef0756d6528 (commit)
from 7b4c8a4e39f310eb450918fa841b0ea1b4af19f7 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit ee26664602445fa7798e2061f6bcbef0756d6528
Author: Gerald (Jerry) Carter [EMAIL PROTECTED]
Date: Wed Aug 20 13:00:40 2008 -0500
nss_winbind: When returning NSS_UNAVAIL, squash errno to ENOENT
According to the GNU libc nss guide, we should always set
errno to ENOENT when returning NSS_UNAVAIL.
http://www.gnu.org/software/libtool/manual/libc/NSS-Modules-Interface.html#NSS-Modules-Interface
At least the MQ Series message queing service that runs
on WebSphere will fail if you return any other errno in this case.
---
Summary of changes:
source/nsswitch/wb_common.c | 20 ++--
1 files changed, 18 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/nsswitch/wb_common.c b/source/nsswitch/wb_common.c
index b113fc3..6e6d2bb 100644
--- a/source/nsswitch/wb_common.c
+++ b/source/nsswitch/wb_common.c
@@ -176,11 +176,13 @@ static int winbind_named_pipe_sock(const char *dir)
/* Check permissions on unix socket directory */
if (lstat(dir, st) == -1) {
+ errno = ENOENT;
return -1;
}
if (!S_ISDIR(st.st_mode) ||
(st.st_uid != 0 st.st_uid != geteuid())) {
+ errno = ENOENT;
return -1;
}
@@ -199,6 +201,7 @@ static int winbind_named_pipe_sock(const char *dir)
the winbindd daemon is not running. */
if (lstat(path, st) == -1) {
+ errno = ENOENT;
SAFE_FREE(path);
return -1;
}
@@ -208,6 +211,7 @@ static int winbind_named_pipe_sock(const char *dir)
if (!S_ISSOCK(st.st_mode) ||
(st.st_uid != 0 st.st_uid != geteuid())) {
+ errno = ENOENT;
return -1;
}
@@ -368,6 +372,7 @@ int winbind_write_sock(void *buffer, int count, int
recursing, int need_priv)
restart:
if (winbind_open_pipe_sock(recursing, need_priv) == -1) {
+ errno = ENOENT;
return -1;
}
@@ -564,7 +569,11 @@ NSS_STATUS winbindd_send_request(int req_type, int
need_priv,
if (winbind_write_sock(request, sizeof(*request),
request-wb_flags WBFLAG_RECURSE,
- need_priv) == -1) {
+ need_priv) == -1)
+ {
+ /* Set ENOENT for consistency. Required by some apps */
+ errno = ENOENT;
+
return NSS_STATUS_UNAVAIL;
}
@@ -572,7 +581,11 @@ NSS_STATUS winbindd_send_request(int req_type, int
need_priv,
(winbind_write_sock(request-extra_data.data,
request-extra_len,
request-wb_flags WBFLAG_RECURSE,
- need_priv) == -1)) {
+ need_priv) == -1))
+ {
+ /* Set ENOENT for consistency. Required by some apps */
+ errno = ENOENT;
+
return NSS_STATUS_UNAVAIL;
}
@@ -596,6 +609,9 @@ NSS_STATUS winbindd_get_response(struct winbindd_response
*response)
/* Wait for reply */
if (winbindd_read_reply(response) == -1) {
+ /* Set ENOENT for consistency. Required by some apps */
+ errno = ENOENT;
+
return NSS_STATUS_UNAVAIL;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3771-gea9fc3b
The branch, v3-devel has been updated
via ea9fc3bea31b11e715d9524defc18b75e5943842 (commit)
via 43693ce6c678b961fa516bbf502af92f87cd5346 (commit)
from ee26664602445fa7798e2061f6bcbef0756d6528 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit ea9fc3bea31b11e715d9524defc18b75e5943842
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Aug 20 21:17:35 2008 +0200
libads: remove unused vars.
Guenther
commit 43693ce6c678b961fa516bbf502af92f87cd5346
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Aug 20 20:24:45 2008 +0200
fix another build warning.
Guenther
---
Summary of changes:
source/libads/ldap.c |3 ---
source/rpc_client/cli_pipe.c |4 ++--
2 files changed, 2 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libads/ldap.c b/source/libads/ldap.c
index b59dab1..eb45e3a 100644
--- a/source/libads/ldap.c
+++ b/source/libads/ldap.c
@@ -393,9 +393,6 @@ static NTSTATUS ads_lookup_site(void)
ADS_STRUCT *ads = NULL;
ADS_STATUS ads_status;
NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
- struct nbt_cldap_netlogon_5 cldap_reply;
-
- ZERO_STRUCT(cldap_reply);
ads = ads_init(lp_realm(), NULL, NULL);
if (!ads) {
diff --git a/source/rpc_client/cli_pipe.c b/source/rpc_client/cli_pipe.c
index ad2f512..41dde87 100644
--- a/source/rpc_client/cli_pipe.c
+++ b/source/rpc_client/cli_pipe.c
@@ -979,8 +979,8 @@ static NTSTATUS rpc_api_pipe(struct rpc_pipe_client *cli,
while(1) {
RPC_HDR rhdr;
- char *ret_data;
- uint32 ret_data_len;
+ char *ret_data = NULL;
+ uint32 ret_data_len = 0;
/* Ensure we have enough data for a pdu. */
ret = cli_pipe_get_current_pdu(cli, rhdr, current_pdu);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3745-g7d96c8c
The branch, v3-3-test has been updated
via 7d96c8ce5c49b031b5a9a60a9ad5252653577513 (commit)
via 1a85fce6e432bafed98856f22e0736489fa6f1f5 (commit)
from a46d7ffeef1807bafda15eb76ec74fcf41aae7f6 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 7d96c8ce5c49b031b5a9a60a9ad5252653577513
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Aug 20 21:17:35 2008 +0200
libads: remove unused vars.
Guenther
(cherry picked from commit ea9fc3bea31b11e715d9524defc18b75e5943842)
commit 1a85fce6e432bafed98856f22e0736489fa6f1f5
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Aug 20 20:24:45 2008 +0200
fix another build warning.
Guenther
(cherry picked from commit 43693ce6c678b961fa516bbf502af92f87cd5346)
---
Summary of changes:
source/libads/ldap.c |3 ---
source/rpc_client/cli_pipe.c |4 ++--
2 files changed, 2 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libads/ldap.c b/source/libads/ldap.c
index b59dab1..eb45e3a 100644
--- a/source/libads/ldap.c
+++ b/source/libads/ldap.c
@@ -393,9 +393,6 @@ static NTSTATUS ads_lookup_site(void)
ADS_STRUCT *ads = NULL;
ADS_STATUS ads_status;
NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
- struct nbt_cldap_netlogon_5 cldap_reply;
-
- ZERO_STRUCT(cldap_reply);
ads = ads_init(lp_realm(), NULL, NULL);
if (!ads) {
diff --git a/source/rpc_client/cli_pipe.c b/source/rpc_client/cli_pipe.c
index ad2f512..41dde87 100644
--- a/source/rpc_client/cli_pipe.c
+++ b/source/rpc_client/cli_pipe.c
@@ -979,8 +979,8 @@ static NTSTATUS rpc_api_pipe(struct rpc_pipe_client *cli,
while(1) {
RPC_HDR rhdr;
- char *ret_data;
- uint32 ret_data_len;
+ char *ret_data = NULL;
+ uint32 ret_data_len = 0;
/* Ensure we have enough data for a pdu. */
ret = cli_pipe_get_current_pdu(cli, rhdr, current_pdu);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2941-g2a5ae59
The branch, v3-2-test has been updated
via 2a5ae59f77c05c41c97747dee9bc8c196dfe6b89 (commit)
from 29b39723b82f363d32dc4678d6b71a78485c65ce (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 2a5ae59f77c05c41c97747dee9bc8c196dfe6b89
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Aug 20 20:24:45 2008 +0200
fix another build warning.
Guenther
(cherry picked from commit 43693ce6c678b961fa516bbf502af92f87cd5346)
---
Summary of changes:
source/rpc_client/cli_pipe.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/rpc_client/cli_pipe.c b/source/rpc_client/cli_pipe.c
index 425eb26..35256d7 100644
--- a/source/rpc_client/cli_pipe.c
+++ b/source/rpc_client/cli_pipe.c
@@ -823,8 +823,8 @@ static NTSTATUS rpc_api_pipe(struct rpc_pipe_client *cli,
while(1) {
RPC_HDR rhdr;
- char *ret_data;
- uint32 ret_data_len;
+ char *ret_data = NULL;
+ uint32 ret_data_len = 0;
/* Ensure we have enough data for a pdu. */
ret = cli_pipe_get_current_pdu(cli, rhdr, current_pdu);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3772-ga75055b
The branch, v3-devel has been updated
via a75055be5ff7ebe3476cfac86c6597a56a843c23 (commit)
from ea9fc3bea31b11e715d9524defc18b75e5943842 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit a75055be5ff7ebe3476cfac86c6597a56a843c23
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Aug 20 18:40:58 2008 +0200
fix build warning.
Guenther
---
Summary of changes:
source/nmbd/nmbd_processlogon.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/nmbd/nmbd_processlogon.c b/source/nmbd/nmbd_processlogon.c
index f7990de..474ae1c 100644
--- a/source/nmbd/nmbd_processlogon.c
+++ b/source/nmbd/nmbd_processlogon.c
@@ -434,7 +434,7 @@ reporting %s domain %s 0x%x ntversion=%x lm_nt token=%x
lm_20 token=%x\n,
char *component, *dc, *q1;
char *q_orig = q;
int str_offset;
- char *saveptr;
+ char *saveptr = NULL;
domain = get_mydnsdomname(talloc_tos());
if (!domain) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3746-gb0c63c0
The branch, v3-3-test has been updated
via b0c63c062fe90e4a4ec61ff5b5849e758834b8d7 (commit)
from 7d96c8ce5c49b031b5a9a60a9ad5252653577513 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit b0c63c062fe90e4a4ec61ff5b5849e758834b8d7
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Aug 20 18:40:58 2008 +0200
fix build warning.
Guenther
(cherry picked from commit a75055be5ff7ebe3476cfac86c6597a56a843c23)
---
Summary of changes:
source/nmbd/nmbd_processlogon.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/nmbd/nmbd_processlogon.c b/source/nmbd/nmbd_processlogon.c
index f7990de..474ae1c 100644
--- a/source/nmbd/nmbd_processlogon.c
+++ b/source/nmbd/nmbd_processlogon.c
@@ -434,7 +434,7 @@ reporting %s domain %s 0x%x ntversion=%x lm_nt token=%x
lm_20 token=%x\n,
char *component, *dc, *q1;
char *q_orig = q;
int str_offset;
- char *saveptr;
+ char *saveptr = NULL;
domain = get_mydnsdomname(talloc_tos());
if (!domain) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2942-gd0a4b9f
The branch, v3-2-test has been updated
via d0a4b9f69984ca5da0007af91013f1bc78dcbf2b (commit)
from 2a5ae59f77c05c41c97747dee9bc8c196dfe6b89 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit d0a4b9f69984ca5da0007af91013f1bc78dcbf2b
Author: Günther Deschner [EMAIL PROTECTED]
Date: Wed Aug 20 18:40:58 2008 +0200
fix build warning.
Guenther
(cherry picked from commit a75055be5ff7ebe3476cfac86c6597a56a843c23)
---
Summary of changes:
source/nmbd/nmbd_processlogon.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/nmbd/nmbd_processlogon.c b/source/nmbd/nmbd_processlogon.c
index 6e110dd..d99b535 100644
--- a/source/nmbd/nmbd_processlogon.c
+++ b/source/nmbd/nmbd_processlogon.c
@@ -399,7 +399,7 @@ reporting %s domain %s 0x%x ntversion=%x lm_nt token=%x
lm_20 token=%x\n,
char *component, *dc, *q1;
char *q_orig = q;
int str_offset;
- char *saveptr;
+ char *saveptr = NULL;
domain = get_mydnsdomname(talloc_tos());
if (!domain) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3776-g6ad2090
The branch, v3-devel has been updated via 6ad2090391a92ebe822b2d7b80e180c251dc8e7a (commit) via 702c0bc04668117e3521d687b9b5a87fd7e0f1b1 (commit) via c3c3dadcab81f0a1ae8834e85e7e80a3da6601fb (commit) via ead9b9d7167d999d73cf4111f3b321236aac2a15 (commit) from a75055be5ff7ebe3476cfac86c6597a56a843c23 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel - Log - commit 6ad2090391a92ebe822b2d7b80e180c251dc8e7a Author: Michael Adam [EMAIL PROTECTED] Date: Wed Aug 20 14:56:18 2008 +0200 build: fix bug #5590 by not linking in the static libs but the objects. Michael commit 702c0bc04668117e3521d687b9b5a87fd7e0f1b1 Author: Michael Adam [EMAIL PROTECTED] Date: Wed Aug 20 14:55:24 2008 +0200 build: fall down to the same place when using an internal lib statically. Michael commit c3c3dadcab81f0a1ae8834e85e7e80a3da6601fb Author: Michael Adam [EMAIL PROTECTED] Date: Wed Aug 20 14:47:26 2008 +0200 build: remove duplicated and hardcoded definition of LIBSMBSHAREMODES Michael commit ead9b9d7167d999d73cf4111f3b321236aac2a15 Author: Michael Adam [EMAIL PROTECTED] Date: Wed Aug 20 13:22:13 2008 +0200 build: rename LIBNETAPI_OBJ1 to LIBNETAPI_OBJ0 for consistency. Michael --- Summary of changes: source/Makefile.in | 10 -- source/m4/aclocal.m4 |4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/source/Makefile.in b/source/Makefile.in index 8e76dcf..d026e52 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -1824,7 +1824,7 @@ shlibs test_shlibs: @LIBADDNS_SHARED@ # #--- -LIBNETAPI_OBJ1 = lib/netapi/netapi.o \ +LIBNETAPI_OBJ0 = lib/netapi/netapi.o \ lib/netapi/cm.o \ librpc/gen_ndr/ndr_libnetapi.o \ lib/netapi/libnetapi.o \ @@ -1837,7 +1837,7 @@ LIBNETAPI_OBJ1 = lib/netapi/netapi.o \ lib/netapi/samr.o \ lib/netapi/sid.o -LIBNETAPI_OBJ = $(LIBNETAPI_OBJ1) $(LIBNET_OBJ) \ +LIBNETAPI_OBJ = $(LIBNETAPI_OBJ0) $(LIBNET_OBJ) \ $(LIBSMBCONF_OBJ) \ $(REG_SMBCONF_OBJ) \ $(PARAM_WITHOUT_REG_OBJ) $(LIB_NONSMBD_OBJ) \ @@ -1869,9 +1869,9 @@ $(LIBNETAPI_SHARED_TARGET): $(LIBNETAPI_SHARED_TARGET_SONAME) @rm -f $@ @ln -s -f `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` $@ -$(LIBNETAPI_STATIC_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ1) +$(LIBNETAPI_STATIC_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ0) @echo Linking non-shared library $@ - @-$(AR) -rc $@ $(LIBNETAPI_OBJ1) + @-$(AR) -rc $@ $(LIBNETAPI_OBJ0) libnetapi: $(LIBNETAPI) @@ -1989,8 +1989,6 @@ LIBSMBSHAREMODES=$(LIBSMBSHAREMODES_STATIC_TARGET) @LIBSMBSHAREMODES_SHARED@ #LIBSMBSHAREMODES_SYMS=$(srcdir)/exports/[EMAIL PROTECTED]@ LIBSMBSHAREMODES_HEADERS=$(srcdir)/include/smb_share_modes.h -LIBSMBSHAREMODES=bin/libsmbsharemodes.a @LIBSMBSHAREMODES_SHARED@ - $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @echo Linking shared library $@ @$(SHLD_DSO) $(LIBSMBSHAREMODES_OBJ) \ diff --git a/source/m4/aclocal.m4 b/source/m4/aclocal.m4 index 53ad46c..9a4213d 100644 --- a/source/m4/aclocal.m4 +++ b/source/m4/aclocal.m4 @@ -139,7 +139,7 @@ if eval test x$build_lib = xyes ; then LIBUC[_SHARED]=$LIBUC[_SHARED_TARGET] AC_MSG_RESULT(yes) if test x$USESHARED != xtrue -o x$[LINK_]LIBUC = xSTATIC ; then - LIBUC[_STATIC]=$LIBUC[_STATIC_TARGET] + enable_static=yes else LIBUC[_LIBS]=LIBLIBS fi @@ -152,7 +152,7 @@ else AC_MSG_RESULT(shared library not selected, but will supply static library) fi if test $enable_static = yes; then - LIBUC[_STATIC]=$LIBUC[_STATIC_TARGET] + LIBUC[_STATIC]=[\$\(]LIBUC[_OBJ0\)] fi m4_popdef([LIBNAME]) -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3780-g11458f9
The branch, v3-devel has been updated
via 11458f9a9ac17c68aa0496d2ade4b93d02e7ebcc (commit)
via f1d84e76bb6935e80b01d13414980f8de1f71824 (commit)
via 02d4b820fccfef1387f47db4bb5ade3dfd0d25bb (commit)
via d6fb6348a3672e915556dcb36c1a4999d4abae18 (commit)
from 6ad2090391a92ebe822b2d7b80e180c251dc8e7a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit 11458f9a9ac17c68aa0496d2ade4b93d02e7ebcc
Author: Michael Adam [EMAIL PROTECTED]
Date: Wed Aug 20 22:34:26 2008 +0200
gitignore: add libsmbsharemodes.syms - this is now generated
Michael
commit f1d84e76bb6935e80b01d13414980f8de1f71824
Author: Michael Adam [EMAIL PROTECTED]
Date: Wed Aug 20 15:09:27 2008 +0200
build: auto-generate symbols for libsmbsharemodes.
Michael
commit 02d4b820fccfef1387f47db4bb5ade3dfd0d25bb
Author: Michael Adam [EMAIL PROTECTED]
Date: Wed Aug 20 22:33:17 2008 +0200
gitignore: add libsmbclient.syms - this is now generated
Michael
commit d6fb6348a3672e915556dcb36c1a4999d4abae18
Author: Michael Adam [EMAIL PROTECTED]
Date: Wed Aug 20 15:06:02 2008 +0200
build: autogenerate symbols for libsmbclient.so
Michael
---
Summary of changes:
.gitignore |2 ++
source/Makefile.in | 14 ++
source/exports/libsmbclient.syms |4
source/exports/libsmbsharemodes.syms |3 ---
4 files changed, 12 insertions(+), 11 deletions(-)
delete mode 100644 source/exports/libsmbclient.syms
delete mode 100644 source/exports/libsmbsharemodes.syms
Changeset truncated at 500 lines:
diff --git a/.gitignore b/.gitignore
index 5e779f1..dcb8451 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,8 @@ source/cscope.out
source/torture.tdb
source/pkgconfig/*.pc
source/st
+source/exports/libsmbclient.syms
+source/exports/libsmbsharemodes.syms
source/exports/libnetapi.syms
source/exports/libtalloc.syms
source/exports/libtdb.syms
diff --git a/source/Makefile.in b/source/Makefile.in
index d026e52..923a600 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -1917,10 +1917,13 @@ [EMAIL PROTECTED]@
LIBSMBCLIENT_SHARED_TARGET_SONAME=$(LIBSMBCLIENT_SHARED_TARGET).$(LIBSMBCLIENT_SOVER)
[EMAIL PROTECTED]@
LIBSMBCLIENT=$(LIBSMBCLIENT_STATIC_TARGET) @LIBSMBCLIENT_SHARED@
-#LIBSMBCLIENT_SYMS=$(srcdir)/exports/[EMAIL PROTECTED]@
+LIBSMBCLIENT_SYMS=$(srcdir)/exports/[EMAIL PROTECTED]@
LIBSMBCLIENT_HEADERS=$(srcdir)/include/libsmbclient.h
-$(LIBSMBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ)
@LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
+$(LIBSMBCLIENT_SYMS): $(LIBSMBCLIENT_HEADERS)
+ @$(MKSYMS_SH) $(AWK) $@ $(LIBSMBCLIENT_HEADERS)
+
+$(LIBSMBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ)
$(LIBSMBCLIENT_SYMS) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
@echo Linking shared library $@
@$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) \
$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) $(LIBS) \
@@ -1986,10 +1989,13 @@ [EMAIL PROTECTED]@
LIBSMBSHAREMODES_SHARED_TARGET_SONAME=$(LIBSMBSHAREMODES_SHARED_TARGET).$(LIBSMBSHAREMODES_SOVER)
[EMAIL PROTECTED]@
LIBSMBSHAREMODES=$(LIBSMBSHAREMODES_STATIC_TARGET) @LIBSMBSHAREMODES_SHARED@
-#LIBSMBSHAREMODES_SYMS=$(srcdir)/exports/[EMAIL PROTECTED]@
+LIBSMBSHAREMODES_SYMS=$(srcdir)/exports/[EMAIL PROTECTED]@
LIBSMBSHAREMODES_HEADERS=$(srcdir)/include/smb_share_modes.h
-$(LIBSMBSHAREMODES_SHARED_TARGET_SONAME): $(BINARY_PREREQS)
$(LIBSMBSHAREMODES_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
+$(LIBSMBSHAREMODES_SYMS): $(LIBSMBSHAREMODES_HEADERS)
+ @$(MKSYMS_SH) $(AWK) $@ $(LIBSMBSHAREMODES_HEADERS)
+
+$(LIBSMBSHAREMODES_SHARED_TARGET_SONAME): $(BINARY_PREREQS)
$(LIBSMBSHAREMODES_OBJ) $(LIBSMBSHAREMODES_SYMS) @LIBTALLOC_SHARED@
@LIBTDB_SHARED@
@echo Linking shared library $@
@$(SHLD_DSO) $(LIBSMBSHAREMODES_OBJ) \
$(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
diff --git a/source/exports/libsmbclient.syms b/source/exports/libsmbclient.syms
deleted file mode 100644
index 3062e34..000
--- a/source/exports/libsmbclient.syms
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- global: smbc_*;
- local: *;
-};
diff --git a/source/exports/libsmbsharemodes.syms
b/source/exports/libsmbsharemodes.syms
deleted file mode 100644
index eb34bfc..000
--- a/source/exports/libsmbsharemodes.syms
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- global: *;
-};
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3782-ge5c4cbb
The branch, v3-devel has been updated via e5c4cbbf5a4b3e5db1732043a74cd1f4a5eec136 (commit) via fdf29c1cdf6b9bd1c6fb7a9f070084e0df5470bb (commit) from 11458f9a9ac17c68aa0496d2ade4b93d02e7ebcc (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel - Log - commit e5c4cbbf5a4b3e5db1732043a74cd1f4a5eec136 Author: Michael Adam [EMAIL PROTECTED] Date: Wed Aug 20 22:31:53 2008 +0200 gitignore: add examples/libsmbclient/tree Michael commit fdf29c1cdf6b9bd1c6fb7a9f070084e0df5470bb Author: Michael Adam [EMAIL PROTECTED] Date: Wed Aug 20 22:31:07 2008 +0200 gitignore: add lib/netapi/tests/Makefile Michael --- Summary of changes: .gitignore |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/.gitignore b/.gitignore index dcb8451..ca09083 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ source/include/stamp-h source/include/version.h source/Makefile source/lib/netapi/examples/Makefile +source/lib/netapi/tests/Makefile source/config.log source/config.status source/configure @@ -63,6 +64,7 @@ examples/libsmbclient/teststat3 examples/libsmbclient/testutime examples/libsmbclient/testwrite examples/libsmbclient/testtruncate +examples/libsmbclient/tree source/librpc/gen_ndr/cli_krb5pac.* source/librpc/gen_ndr/cli_messaging.* source/librpc/gen_ndr/cli_misc.* -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3771-g53cb5c7
The branch, v3-3-test has been updated
via 53cb5c7336d898c75915b9ab368069b087ca61f5 (commit)
via df01ba06121430ec7f151fa9ffc518425d9d7be6 (commit)
via fd83cc1b47e776263ea3f3cb12a17195f4f6847e (commit)
via 58628cb4bcf3417c8d242b556bb353ba0ebe6295 (commit)
via a0b90e42fe24e42b785111428836078b194728de (commit)
via f5c484caa57c6aff276118d7c901dda33d32cf3b (commit)
via d6e32fdef7a321081de6cffa6e25efe0245c40ee (commit)
via 8e19123bf0732974ce2df25cca4216b1bd17ca24 (commit)
via c46f0450e570074bf2530785cacb799e91f81435 (commit)
via 6048ac2981d584e7801d80b8cd7bb11bf6032db9 (commit)
via bbb3f6e9b5abdbe321ad0658c442d5bc6c3a4477 (commit)
via 38f4a77feafdd9c40e1cb670c5e0cd971f130706 (commit)
via fd2595b4cf18de08a3124be0080a2c28bdb130ba (commit)
via b809c5190c9704af8ec4d0157afa6df03ad5a42a (commit)
via 4ceb2abb859dc21a8aa2d55bfe5c594dcfad (commit)
via 5550e3903d41927a078084e22539b697c19773b0 (commit)
via ae45ea1debc38c0c01da3f8cc1dddcc0d1ff30e2 (commit)
via c22842440dc1732a77e0bce71fff421b1bca0151 (commit)
via e4f2815158bd74245e6c4d7f10d59254e095846c (commit)
via d498bdf6e8d77db221bea79b3c0d4a2dd415be46 (commit)
via 43a26e856aa39cd70d1428b554532ea6c3f2018c (commit)
via cf89392a74e84fdd9bfbeb6e9c0bbf2ce298f115 (commit)
via 6a5447b15a1b534659e62e929688b6a9d742e2be (commit)
via 02dc99ef564ca7c2da322d2942cf28aeb7bcae2f (commit)
via 253c3ae70674daa4ad619c2dd66ad8b0c02af908 (commit)
from b0c63c062fe90e4a4ec61ff5b5849e758834b8d7 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 53cb5c7336d898c75915b9ab368069b087ca61f5
Author: Michael Adam [EMAIL PROTECTED]
Date: Wed Aug 20 22:31:53 2008 +0200
gitignore: add examples/libsmbclient/tree
Michael
(cherry picked from commit e5c4cbbf5a4b3e5db1732043a74cd1f4a5eec136)
commit df01ba06121430ec7f151fa9ffc518425d9d7be6
Author: Michael Adam [EMAIL PROTECTED]
Date: Wed Aug 20 22:31:07 2008 +0200
gitignore: add lib/netapi/tests/Makefile
Michael
(cherry picked from commit fdf29c1cdf6b9bd1c6fb7a9f070084e0df5470bb)
commit fd83cc1b47e776263ea3f3cb12a17195f4f6847e
Author: Michael Adam [EMAIL PROTECTED]
Date: Wed Aug 20 22:34:26 2008 +0200
gitignore: add libsmbsharemodes.syms - this is now generated
Michael
(cherry picked from commit 11458f9a9ac17c68aa0496d2ade4b93d02e7ebcc)
commit 58628cb4bcf3417c8d242b556bb353ba0ebe6295
Author: Michael Adam [EMAIL PROTECTED]
Date: Wed Aug 20 15:09:27 2008 +0200
build: auto-generate symbols for libsmbsharemodes.
Michael
(cherry picked from commit f1d84e76bb6935e80b01d13414980f8de1f71824)
commit a0b90e42fe24e42b785111428836078b194728de
Author: Michael Adam [EMAIL PROTECTED]
Date: Wed Aug 20 22:33:17 2008 +0200
gitignore: add libsmbclient.syms - this is now generated
Michael
(cherry picked from commit 02d4b820fccfef1387f47db4bb5ade3dfd0d25bb)
commit f5c484caa57c6aff276118d7c901dda33d32cf3b
Author: Michael Adam [EMAIL PROTECTED]
Date: Wed Aug 20 15:06:02 2008 +0200
build: autogenerate symbols for libsmbclient.so
Michael
(cherry picked from commit d6fb6348a3672e915556dcb36c1a4999d4abae18)
commit d6e32fdef7a321081de6cffa6e25efe0245c40ee
Author: Michael Adam [EMAIL PROTECTED]
Date: Wed Aug 20 14:56:18 2008 +0200
build: fix bug #5590 by not linking in the static libs but the objects.
Michael
(cherry picked from commit 6ad2090391a92ebe822b2d7b80e180c251dc8e7a)
commit 8e19123bf0732974ce2df25cca4216b1bd17ca24
Author: Michael Adam [EMAIL PROTECTED]
Date: Wed Aug 20 14:55:24 2008 +0200
build: fall down to the same place when using an internal lib statically.
Michael
(cherry picked from commit 702c0bc04668117e3521d687b9b5a87fd7e0f1b1)
commit c46f0450e570074bf2530785cacb799e91f81435
Author: Michael Adam [EMAIL PROTECTED]
Date: Wed Aug 20 14:47:26 2008 +0200
build: remove duplicated and hardcoded definition of LIBSMBSHAREMODES
Michael
(cherry picked from commit c3c3dadcab81f0a1ae8834e85e7e80a3da6601fb)
commit 6048ac2981d584e7801d80b8cd7bb11bf6032db9
Author: Michael Adam [EMAIL PROTECTED]
Date: Wed Aug 20 13:22:13 2008 +0200
build: rename LIBNETAPI_OBJ1 to LIBNETAPI_OBJ0 for consistency.
Michael
(cherry picked from commit ead9b9d7167d999d73cf4111f3b321236aac2a15)
commit bbb3f6e9b5abdbe321ad0658c442d5bc6c3a4477
Author: Michael Adam [EMAIL PROTECTED]
Date: Fri Aug 15 15:55:17 2008 +0200
configure: use libdir=${prefix}/lib and modules=${libdir}/samba as default
with-fhs.
This is what one actually wants:
Shared/static libs in /usr/lib, shared modules and so on in /usr/lib/samba.
Michael
(cherry picked from commit
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2945-g24459c7
The branch, v3-2-test has been updated via 24459c7eda080a4fed2d4f2a576c97f878f905f9 (commit) via f3ad03d0f909ff862411511d9f63e77047034c01 (commit) via 8dd57f31b2ba621654f989e1ed58bd2dd80b7849 (commit) from d0a4b9f69984ca5da0007af91013f1bc78dcbf2b (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 24459c7eda080a4fed2d4f2a576c97f878f905f9 Author: Michael Adam [EMAIL PROTECTED] Date: Wed Aug 20 14:56:18 2008 +0200 build: fix bug #5590 by not linking in the static libs but the objects. Michael (cherry picked from commit 6ad2090391a92ebe822b2d7b80e180c251dc8e7a) commit f3ad03d0f909ff862411511d9f63e77047034c01 Author: Michael Adam [EMAIL PROTECTED] Date: Wed Aug 20 14:55:24 2008 +0200 build: fall down to the same place when using an internal lib statically. Michael (cherry picked from commit 702c0bc04668117e3521d687b9b5a87fd7e0f1b1) commit 8dd57f31b2ba621654f989e1ed58bd2dd80b7849 Author: Michael Adam [EMAIL PROTECTED] Date: Wed Aug 20 13:22:13 2008 +0200 build: rename LIBNETAPI_OBJ1 to LIBNETAPI_OBJ0 for consistency. Michael (cherry picked from commit ead9b9d7167d999d73cf4111f3b321236aac2a15) --- Summary of changes: source/Makefile.in |8 source/m4/aclocal.m4 |4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/source/Makefile.in b/source/Makefile.in index 11f7085..2a8bec0 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -1798,7 +1798,7 @@ shlibs test_shlibs: @LIBADDNS_SHARED@ # #--- -LIBNETAPI_OBJ1 = lib/netapi/netapi.o \ +LIBNETAPI_OBJ0 = lib/netapi/netapi.o \ lib/netapi/cm.o \ librpc/gen_ndr/ndr_libnetapi.o \ lib/netapi/libnetapi.o \ @@ -1807,7 +1807,7 @@ LIBNETAPI_OBJ1 = lib/netapi/netapi.o \ lib/netapi/getdc.o \ lib/netapi/user.o -LIBNETAPI_OBJ = $(LIBNETAPI_OBJ1) $(LIBNET_OBJ) \ +LIBNETAPI_OBJ = $(LIBNETAPI_OBJ0) $(LIBNET_OBJ) \ $(LIBSMBCONF_OBJ) \ $(REG_SMBCONF_OBJ) \ $(PARAM_WITHOUT_REG_OBJ) $(LIB_NONSMBD_OBJ) \ @@ -1838,9 +1838,9 @@ $(LIBNETAPI_SHARED_TARGET): $(LIBNETAPI_SHARED_TARGET_SONAME) @rm -f $@ @ln -s -f `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` $@ -$(LIBNETAPI_STATIC_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ1) +$(LIBNETAPI_STATIC_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ0) @echo Linking non-shared library $@ - @-$(AR) -rc $@ $(LIBNETAPI_OBJ1) + @-$(AR) -rc $@ $(LIBNETAPI_OBJ0) libnetapi: $(LIBNETAPI) diff --git a/source/m4/aclocal.m4 b/source/m4/aclocal.m4 index 53ad46c..9a4213d 100644 --- a/source/m4/aclocal.m4 +++ b/source/m4/aclocal.m4 @@ -139,7 +139,7 @@ if eval test x$build_lib = xyes ; then LIBUC[_SHARED]=$LIBUC[_SHARED_TARGET] AC_MSG_RESULT(yes) if test x$USESHARED != xtrue -o x$[LINK_]LIBUC = xSTATIC ; then - LIBUC[_STATIC]=$LIBUC[_STATIC_TARGET] + enable_static=yes else LIBUC[_LIBS]=LIBLIBS fi @@ -152,7 +152,7 @@ else AC_MSG_RESULT(shared library not selected, but will supply static library) fi if test $enable_static = yes; then - LIBUC[_STATIC]=$LIBUC[_STATIC_TARGET] + LIBUC[_STATIC]=[\$\(]LIBUC[_OBJ0\)] fi m4_popdef([LIBNAME]) -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-3783-g8027197
The branch, v3-devel has been updated
via 8027197635b988b3dcf9d3d00126a024e768fa62 (commit)
from e5c4cbbf5a4b3e5db1732043a74cd1f4a5eec136 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-devel
- Log -
commit 8027197635b988b3dcf9d3d00126a024e768fa62
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Wed Aug 20 16:24:22 2008 -0700
Here is a re-working of the winbindd
reconnect code to cope with rebooting a DC. This
replaces the code I asked Volker to revert.
The logic is pretty simple. It adds a new parameter,
winbind reconnect delay, set to 30 seconds by
default, which determines how long to wait between
connection attempts.
To avoid overwhelming the box with DC-probe
forked children, the code now keeps track of
the DC probe child per winbindd_domain struct
and only starts a new one if the existing one
has died.
I also added a little logic to make sure the
dc probe child always sends a message whatever
the reason for exit so we will always reschedule
another connect attempt.
Also added documentation.
Jeremy.
---
Summary of changes:
.../smbdotconf/winbind/winbindreconnectdelay.xml | 15
source/include/proto.h |1 +
source/param/loadparm.c| 12 ++
source/winbindd/winbindd.h |1 +
source/winbindd/winbindd_cm.c | 39
source/winbindd/winbindd_util.c|2 +-
6 files changed, 61 insertions(+), 9 deletions(-)
create mode 100644 docs-xml/smbdotconf/winbind/winbindreconnectdelay.xml
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/winbind/winbindreconnectdelay.xml
b/docs-xml/smbdotconf/winbind/winbindreconnectdelay.xml
new file mode 100644
index 000..2da263e
--- /dev/null
+++ b/docs-xml/smbdotconf/winbind/winbindreconnectdelay.xml
@@ -0,0 +1,15 @@
+samba:parameter name=winbind reconnect delay
+ context=G
+type=integer
+ advanced=1 developer=1
+ xmlns:samba=http://www.samba.org/samba/DTD/samba-doc;
+description
+ paraThis parameter specifies the number of
+ seconds the citerefentryrefentrytitlewinbindd/refentrytitle
+ manvolnum8/manvolnum/citerefentry daemon will wait between
+ attempts to contact a Domain controller for a domain that is
+ determined to be down or not contactable./para
+/description
+
+value type=default30/value
+/samba:parameter
diff --git a/source/include/proto.h b/source/include/proto.h
index 3d0d419..d3a8dbb 100644
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -6049,6 +6049,7 @@ int lp_directory_name_cache_size(int );
int lp_smb_encrypt(int );
char lp_magicchar(const struct share_params *p );
int lp_winbind_cache_time(void);
+int lp_winbind_reconnect_delay(void);
const char **lp_winbind_nss_info(void);
int lp_algorithmic_rid_base(void);
int lp_name_cache_timeout(void);
diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index bc111df..6817eca 100644
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -240,6 +240,7 @@ struct global {
int map_to_guest;
int oplock_break_wait_time;
int winbind_cache_time;
+ int winbind_reconnect_delay;
int winbind_max_idle_children;
char **szWinbindNssInfo;
int iLockSpinTime;
@@ -4363,6 +4364,15 @@ static struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED,
},
{
+ .label = winbind reconnect delay,
+ .type = P_INTEGER,
+ .p_class= P_GLOBAL,
+ .ptr= Globals.winbind_reconnect_delay,
+ .special= NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
.label = winbind enum users,
.type = P_BOOL,
.p_class= P_GLOBAL,
@@ -4829,6 +4839,7 @@ static void init_globals(bool first_time_only)
Globals.clustering = False;
Globals.winbind_cache_time = 300; /* 5 minutes */
+ Globals.winbind_reconnect_delay = 30; /* 30 seconds */
Globals.bWinbindEnumUsers = False;
Globals.bWinbindEnumGroups = False;
Globals.bWinbindUseDefaultDomain = False;
@@ -5341,6 +5352,7 @@ FN_LOCAL_INTEGER(lp_directory_name_cache_size,
iDirectoryNameCacheSize)
FN_LOCAL_INTEGER(lp_smb_encrypt, ismb_encrypt)
FN_LOCAL_CHAR(lp_magicchar, magic_char)
FN_GLOBAL_INTEGER(lp_winbind_cache_time, Globals.winbind_cache_time)
+FN_GLOBAL_INTEGER(lp_winbind_reconnect_delay, Globals.winbind_reconnect_delay)
FN_GLOBAL_LIST(lp_winbind_nss_info,
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3772-g1d87a36
The branch, v3-3-test has been updated
via 1d87a36cb08f1aca093164d7ddb9ba1f077ebf61 (commit)
from 53cb5c7336d898c75915b9ab368069b087ca61f5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 1d87a36cb08f1aca093164d7ddb9ba1f077ebf61
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Wed Aug 20 16:23:13 2008 -0700
Here is a re-working of the winbindd
reconnect code to cope with rebooting a DC. This
replaces the code I asked Volker to revert.
The logic is pretty simple. It adds a new parameter,
winbind reconnect delay, set to 30 seconds by
default, which determines how long to wait between
connection attempts.
To avoid overwhelming the box with DC-probe
forked children, the code now keeps track of
the DC probe child per winbindd_domain struct
and only starts a new one if the existing one
has died.
I also added a little logic to make sure the
dc probe child always sends a message whatever
the reason for exit so we will always reschedule
another connect attempt.
Also added documentation.
Jeremy.
---
Summary of changes:
.../smbdotconf/winbind/winbindreconnectdelay.xml | 15
source/include/proto.h |1 +
source/param/loadparm.c| 12 ++
source/winbindd/winbindd.h |1 +
source/winbindd/winbindd_cm.c | 39
source/winbindd/winbindd_util.c|2 +-
6 files changed, 61 insertions(+), 9 deletions(-)
create mode 100644 docs-xml/smbdotconf/winbind/winbindreconnectdelay.xml
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/winbind/winbindreconnectdelay.xml
b/docs-xml/smbdotconf/winbind/winbindreconnectdelay.xml
new file mode 100644
index 000..2da263e
--- /dev/null
+++ b/docs-xml/smbdotconf/winbind/winbindreconnectdelay.xml
@@ -0,0 +1,15 @@
+samba:parameter name=winbind reconnect delay
+ context=G
+type=integer
+ advanced=1 developer=1
+ xmlns:samba=http://www.samba.org/samba/DTD/samba-doc;
+description
+ paraThis parameter specifies the number of
+ seconds the citerefentryrefentrytitlewinbindd/refentrytitle
+ manvolnum8/manvolnum/citerefentry daemon will wait between
+ attempts to contact a Domain controller for a domain that is
+ determined to be down or not contactable./para
+/description
+
+value type=default30/value
+/samba:parameter
diff --git a/source/include/proto.h b/source/include/proto.h
index 0e089b0..9554c92 100644
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -6067,6 +6067,7 @@ int lp_directory_name_cache_size(int );
int lp_smb_encrypt(int );
char lp_magicchar(const struct share_params *p );
int lp_winbind_cache_time(void);
+int lp_winbind_reconnect_delay(void);
const char **lp_winbind_nss_info(void);
int lp_algorithmic_rid_base(void);
int lp_name_cache_timeout(void);
diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index bc111df..6817eca 100644
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -240,6 +240,7 @@ struct global {
int map_to_guest;
int oplock_break_wait_time;
int winbind_cache_time;
+ int winbind_reconnect_delay;
int winbind_max_idle_children;
char **szWinbindNssInfo;
int iLockSpinTime;
@@ -4363,6 +4364,15 @@ static struct parm_struct parm_table[] = {
.flags = FLAG_ADVANCED,
},
{
+ .label = winbind reconnect delay,
+ .type = P_INTEGER,
+ .p_class= P_GLOBAL,
+ .ptr= Globals.winbind_reconnect_delay,
+ .special= NULL,
+ .enum_list = NULL,
+ .flags = FLAG_ADVANCED,
+ },
+ {
.label = winbind enum users,
.type = P_BOOL,
.p_class= P_GLOBAL,
@@ -4829,6 +4839,7 @@ static void init_globals(bool first_time_only)
Globals.clustering = False;
Globals.winbind_cache_time = 300; /* 5 minutes */
+ Globals.winbind_reconnect_delay = 30; /* 30 seconds */
Globals.bWinbindEnumUsers = False;
Globals.bWinbindEnumGroups = False;
Globals.bWinbindUseDefaultDomain = False;
@@ -5341,6 +5352,7 @@ FN_LOCAL_INTEGER(lp_directory_name_cache_size,
iDirectoryNameCacheSize)
FN_LOCAL_INTEGER(lp_smb_encrypt, ismb_encrypt)
FN_LOCAL_CHAR(lp_magicchar, magic_char)
FN_GLOBAL_INTEGER(lp_winbind_cache_time, Globals.winbind_cache_time)
+FN_GLOBAL_INTEGER(lp_winbind_reconnect_delay, Globals.winbind_reconnect_delay)
FN_GLOBAL_LIST(lp_winbind_nss_info,
Build status as of Thu Aug 21 00:00:02 2008
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2008-08-20 00:00:12.0 + +++ /home/build/master/cache/broken_results.txt 2008-08-21 00:00:53.0 + @@ -1,4 +1,4 @@ -Build status as of Wed Aug 20 00:00:02 2008 +Build status as of Thu Aug 21 00:00:02 2008 Build counts: Tree Total Broken Panic @@ -6,18 +6,18 @@ ccache 30 9 0 ctdb 0 0 0 distcc 1 0 0 -ldb 31 30 0 -libreplace 31 11 0 +ldb 30 29 0 +libreplace 30 11 0 lorikeet-heimdal 25 20 0 pidl 17 9 0 ppp 9 0 0 rsync31 12 0 samba-docs 0 0 0 samba-gtk6 6 0 -samba_3_X_devel 26 21 0 -samba_3_X_test 27 24 0 +samba_3_X_devel 25 16 0 +samba_3_X_test 27 16 0 samba_4_0_test 29 24 0 -smb-build30 4 0 -talloc 30 5 0 -tdb 31 12 0 +smb-build29 4 0 +talloc 29 5 0 +tdb 30 12 0
