[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 84ad848 s3-xattr_tdb: Remove dead code: talloc_stackframe() cannot
fail
via 00d493b s3-dbwrap: Remove dead code: talloc_stackframe() cannot fail
via 4471778 s3-passdb: Remove unused sampass-pass_must_change_time
from cf39ef3 s4-kcc: avoid a false alarm with rodc
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 84ad848c86f6c36cb7ceab25609710acbc57893b
Author: Andrew Bartlett abart...@samba.org
Date: Thu Apr 19 16:31:52 2012 +1000
s3-xattr_tdb: Remove dead code: talloc_stackframe() cannot fail
Autobuild-User: Andrew Bartlett abart...@samba.org
Autobuild-Date: Thu Apr 19 14:15:42 CEST 2012 on sn-devel-104
commit 00d493b00ced40f3a5dd39d9f1386ff5694872a3
Author: Andrew Bartlett abart...@samba.org
Date: Thu Apr 19 16:31:40 2012 +1000
s3-dbwrap: Remove dead code: talloc_stackframe() cannot fail
commit 4471778d7846e0c5d5989e522ee214a3b4ded153
Author: Andrew Bartlett abart...@samba.org
Date: Thu Apr 19 10:39:56 2012 +1000
s3-passdb: Remove unused sampass-pass_must_change_time
There is no need to call pdb_set_pass_must_change_time() because
nothing ever consults that value. It is always calculated from the
domain policy.
Also, this means we no longer store the value in LDAP. The value
would only ever be set when migrating from tdbsam or smbpasswd, not on
password changes, so would become incorrect over time.
Andrew Bartlett
---
Summary of changes:
source3/include/passdb.h|3 ---
source3/lib/dbwrap/dbwrap.c | 11 +--
source3/lib/xattr_tdb.c | 12
source3/modules/vfs_xattr_tdb.c |8
source3/passdb/passdb.c |5 -
source3/passdb/pdb_get_set.c|6 --
source3/passdb/pdb_ldap.c | 20
source3/passdb/pdb_samba4.c |1 -
source3/passdb/py_passdb.c |7 +++
source3/torture/pdbtest.c |6 --
10 files changed, 4 insertions(+), 75 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/passdb.h b/source3/include/passdb.h
index 2a3844d..905a5d1 100644
--- a/source3/include/passdb.h
+++ b/source3/include/passdb.h
@@ -183,7 +183,6 @@ enum pdb_elements {
PDB_KICKOFFTIME,
PDB_BAD_PASSWORD_TIME,
PDB_CANCHANGETIME,
- PDB_MUSTCHANGETIME,
PDB_PLAINTEXT_PW,
PDB_USERNAME,
PDB_FULLNAME,
@@ -267,7 +266,6 @@ struct samu {
time_t bad_password_time; /* last bad password entered */
time_t pass_last_set_time;/* password last set time */
time_t pass_can_change_time; /* password can change time */
- time_t pass_must_change_time; /* password must change time */
const char *username; /* UNIX username string */
const char *domain; /* Windows Domain name */
@@ -752,7 +750,6 @@ bool pdb_set_logoff_time(struct samu *sampass, time_t
mytime, enum pdb_value_sta
bool pdb_set_kickoff_time(struct samu *sampass, time_t mytime, enum
pdb_value_state flag);
bool pdb_set_bad_password_time(struct samu *sampass, time_t mytime, enum
pdb_value_state flag);
bool pdb_set_pass_can_change_time(struct samu *sampass, time_t mytime, enum
pdb_value_state flag);
-bool pdb_set_pass_must_change_time(struct samu *sampass, time_t mytime, enum
pdb_value_state flag);
bool pdb_set_pass_last_set_time(struct samu *sampass, time_t mytime, enum
pdb_value_state flag);
bool pdb_set_hours_len(struct samu *sampass, uint32_t len, enum
pdb_value_state flag);
bool pdb_set_logon_divs(struct samu *sampass, uint16_t hours, enum
pdb_value_state flag);
diff --git a/source3/lib/dbwrap/dbwrap.c b/source3/lib/dbwrap/dbwrap.c
index 80bd09b..c78ee74 100644
--- a/source3/lib/dbwrap/dbwrap.c
+++ b/source3/lib/dbwrap/dbwrap.c
@@ -149,9 +149,6 @@ static struct db_record *dbwrap_fetch_locked_internal(
struct db_record *rec;
struct dbwrap_lock_order_state *lock_order;
TALLOC_CTX *frame = talloc_stackframe();
- if (!frame) {
- return NULL;
- }
lock_order = dbwrap_check_lock_order(db, frame);
if (lock_order == NULL) {
@@ -242,9 +239,6 @@ NTSTATUS dbwrap_store(struct db_context *db, TDB_DATA key,
struct db_record *rec;
NTSTATUS status;
TALLOC_CTX *frame = talloc_stackframe();
- if (!frame) {
- return NT_STATUS_NO_MEMORY;
- }
rec = dbwrap_fetch_locked(db, frame, key);
if (rec == NULL) {
@@ -262,11 +256,8 @@ NTSTATUS dbwrap_delete(struct db_context *db, TDB_DATA key)
struct db_record *rec;
NTSTATUS status;
TALLOC_CTX *frame = talloc_stackframe();
- if (!frame) {
- return NT_STATUS_NO_MEMORY;
- }
- rec =
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via b31f773 s3/ldap: remove outdated netscape ds 5 schema file from 84ad848 s3-xattr_tdb: Remove dead code: talloc_stackframe() cannot fail http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit b31f773ae1640313dc1ba86b334e9bbb9cb31bd6 Author: Björn Jacke b...@sernet.de Date: Thu Apr 19 13:26:20 2012 +0200 s3/ldap: remove outdated netscape ds 5 schema file remove outdated netscape ds 5 schema file and put a README there pointing to the FDS schema file instead. This fixes bug #8869 Autobuild-User: Björn Jacke b...@sernet.de Autobuild-Date: Thu Apr 19 15:54:56 CEST 2012 on sn-devel-104 --- Summary of changes: examples/LDAP/samba-schema-netscapeds5.x| 79 --- examples/LDAP/samba-schema-netscapeds5.x.README |2 + 2 files changed, 2 insertions(+), 79 deletions(-) delete mode 100644 examples/LDAP/samba-schema-netscapeds5.x create mode 100644 examples/LDAP/samba-schema-netscapeds5.x.README Changeset truncated at 500 lines: diff --git a/examples/LDAP/samba-schema-netscapeds5.x b/examples/LDAP/samba-schema-netscapeds5.x deleted file mode 100644 index 8175eb2..000 --- a/examples/LDAP/samba-schema-netscapeds5.x +++ /dev/null @@ -1,79 +0,0 @@ -## -## Darren Chew darren.chew at vicscouts dot asn dot au -## Andre Fiebach andre dot fiebach at stud dot uni-rostock dot de -## Thomas Mueller 12.04.2003, thomas.muel...@christ-wasser.de -## Richard Renard rren...@idealx.com 2005-01-28 -## - added support for MungedDial, BadPasswordCount, BadPasswordTime, PasswordHistory, LogonHours -## TAKEDA Yasuma yas...@osstech.co.jp 2008-11-06 -## - added sambaTrustedDomainPassword objectClasses -## - in Sun One 5.2 copy it as 99samba-schema-netscapeds5.ldif -## -## Samba 3.2 schema file for Netscape DS 5.x -## -## INSTALL-DIRECTORY/slapd-your_name/config/schema/samba-schema-netscapeds5.ldif - -# Sun One DS do not load the schema without this lines -# André Fiebach af...@uni-rostock.de -dn: cn=schema -objectClass: top -objectClass: ldapSubentry -objectClass: subschema -cn: schema -aci: (target=ldap:///cn=schema;)(targetattr !=aci)(version 3.0;acl anonymo - us, no acis; allow (read, search, compare) userdn = ldap:///anyone;;) -aci: (targetattr = *)(version 3.0; acl Configuration Administrator; allow - (all) userdn = ldap:///uid=admin,ou=Administrators, ou=TopologyManagement, - o=NetscapeRoot;) -aci: (targetattr = *)(version 3.0; acl Local Directory Administrators Group - ; allow (all) groupdn = ldap:///cn=Directory Administrators, dc=samba,dc=org;) -aci: (targetattr = *)(version 3.0; acl SIE Group; allow (all)groupdn = ld - ap:///cn=slapd-sambaldap, cn=iPlanet Directory Server, cn=Server Group, cn=iPlanetDirectory.samba.org, ou=samba.org, o=NetscapeRoot;) - -objectClasses: ( 1.3.6.1.4.1.7165.2.2.6 NAME 'sambaSamAccount' SUP top AUXILIARY DESC 'Samba 3.0 Auxilary SAM Account' MUST ( uid $ sambaSID ) MAY ( cn $ sambaLMPassword $ sambaNTPassword $ sambaPwdLastSet $ sambaLogonTime $ sambaLogoffTime $ sambaKickoffTime $ sambaPwdCanChange $ sambaPwdMustChange $ sambaAcctFlags $ displayName $ sambaHomePath $ sambaHomeDrive $ sambaLogonScript $ sambaProfilePath $ description $ sambaUserWorkstations $ sambaPrimaryGroupSID $ sambaDomainName $ sambaMungedDial $ sambaBadPasswordCount $ sambaBadPasswordTime $ sambaPasswordHistory $ sambaLogonHours) X-ORIGIN 'user defined' ) -objectClasses: ( 1.3.6.1.4.1.7165.2.2.4 NAME 'sambaGroupMapping' SUP top AUXILIARY DESC 'Samba Group Mapping' MUST ( gidNumber $ sambaSID $ sambaGroupType ) MAY ( displayName $ description ) X-ORIGIN 'user defined' ) -objectClasses: ( 1.3.6.1.4.1.7165.2.2.5 NAME 'sambaDomain' SUP top STRUCTURAL DESC 'Samba Domain Information' MUST ( sambaDomainName $ sambaSID ) MAY ( sambaNextRid $ sambaNextGroupRid $ sambaNextUserRid $ sambaAlgorithmicRidBase ) X-ORIGIN 'user defined' ) -objectClasses: ( 1.3.6.1.4.1.7165.2.2.7 NAME 'sambaUnixIdPool' SUP top AUXILIARY DESC 'Pool for allocating UNIX uids/gids' MUST ( uidNumber $ gidNumber ) X-ORIGIN 'user defined' ) -objectClasses: ( 1.3.6.1.4.1.7165.2.2.8 NAME 'sambaIdmapEntry' SUP top AUXILIARY DESC 'Mapping from a SID to an ID' MUST ( sambaSID ) MAY ( uidNumber $ gidNumber ) X-ORIGIN 'user defined' ) -objectClasses: ( 1.3.6.1.4.1.7165.2.2.9 NAME 'sambaSidEntry' SUP top STRUCTURAL DESC 'Structural Class for a SID' MUST ( sambaSID ) X-ORIGIN 'user defined' ) -objectClasses: ( 1.3.6.1.4.1.7165.2.2.15 NAME 'sambaTrustedDomainPassword' SUP top STRUCTURAL DESC 'Samba Trusted Domain Password' MUST ( sambaDomainName $ sambaSID $ sambaClearTextPassword $ sambaPwdLastSet ) MAY ( sambaPreviousClearTextPassword
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via e21029a waf: Fix mispelling
via 70d44a9 Fix Error messages
from b31f773 s3/ldap: remove outdated netscape ds 5 schema file
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e21029a270a6e3b8bcc5ff33b74977cb0cd6cd17
Author: Simo Sorce i...@samba.org
Date: Mon Apr 9 08:33:37 2012 -0400
waf: Fix mispelling
Autobuild-User: Simo Sorce i...@samba.org
Autobuild-Date: Thu Apr 19 17:36:41 CEST 2012 on sn-devel-104
commit 70d44a9a177621b173c8a24c7cb503f5632a8ff7
Author: Simo Sorce i...@samba.org
Date: Thu Apr 19 09:35:08 2012 -0400
Fix Error messages
---
Summary of changes:
buildtools/wafsamba/samba_deps.py | 12 ++--
buildtools/wafsamba/samba_python.py|6 +++---
buildtools/wafsamba/wafsamba.py|2 +-
source4/auth/kerberos/srv_keytab.c |6 ++
source4/scripting/python/wscript_build |2 +-
5 files changed, 13 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_deps.py
b/buildtools/wafsamba/samba_deps.py
index 51b7da9..f073e41 100644
--- a/buildtools/wafsamba/samba_deps.py
+++ b/buildtools/wafsamba/samba_deps.py
@@ -214,7 +214,7 @@ def add_init_functions(self):
if m is not None:
modules.append(m)
-sentinal = getattr(self, 'init_function_sentinal', 'NULL')
+sentinel = getattr(self, 'init_function_sentinel', 'NULL')
targets= LOCAL_CACHE(bld, 'TARGET_TYPE')
cflags = getattr(self, 'samba_cflags', [])[:]
@@ -222,8 +222,8 @@ def add_init_functions(self):
if modules == []:
sname = sname.replace('-','_')
sname = sname.replace('/','_')
-cflags.append('-DSTATIC_%s_MODULES=%s' % (sname, sentinal))
-if sentinal == 'NULL':
+cflags.append('-DSTATIC_%s_MODULES=%s' % (sname, sentinel))
+if sentinel == 'NULL':
cflags.append('-DSTATIC_%s_MODULES_PROTO' % sname)
self.ccflags = cflags
return
@@ -236,11 +236,11 @@ def add_init_functions(self):
if targets[d['TARGET']] != 'DISABLED':
init_fn_list.append(d['INIT_FUNCTION'])
if init_fn_list == []:
-cflags.append('-DSTATIC_%s_MODULES=%s' % (m, sentinal))
-if sentinal == 'NULL':
+cflags.append('-DSTATIC_%s_MODULES=%s' % (m, sentinel))
+if sentinel == 'NULL':
cflags.append('-DSTATIC_%s_MODULES_PROTO' % m)
else:
-cflags.append('-DSTATIC_%s_MODULES=%s' % (m,
','.join(init_fn_list) + ',' + sentinal))
+cflags.append('-DSTATIC_%s_MODULES=%s' % (m,
','.join(init_fn_list) + ',' + sentinel))
proto=''
for f in init_fn_list:
proto = proto + '_MODULE_PROTO(%s)' % f
diff --git a/buildtools/wafsamba/samba_python.py
b/buildtools/wafsamba/samba_python.py
index 503fa75..6bc32f0 100644
--- a/buildtools/wafsamba/samba_python.py
+++ b/buildtools/wafsamba/samba_python.py
@@ -21,7 +21,7 @@ def SAMBA_PYTHON(bld, name,
realname=None,
cflags='',
includes='',
- init_function_sentinal=None,
+ init_function_sentinel=None,
local_include=True,
vars=None,
enabled=True):
@@ -29,8 +29,8 @@ def SAMBA_PYTHON(bld, name,
# when we support static python modules we'll need to gather
# the list from all the SAMBA_PYTHON() targets
-if init_function_sentinal is not None:
-cflags += '-DSTATIC_LIBPYTHON_MODULES=%s' % init_function_sentinal
+if init_function_sentinel is not None:
+cflags += '-DSTATIC_LIBPYTHON_MODULES=%s' % init_function_sentinel
source = bld.EXPAND_VARIABLES(source, vars=vars)
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index fd72cf3..317bca1 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -477,7 +477,7 @@ def SAMBA_SUBSYSTEM(bld, modname, source,
cflags='',
cflags_end=None,
group='main',
-init_function_sentinal=None,
+init_function_sentinel=None,
autoproto=None,
autoproto_extra_source='',
depends_on='',
diff --git a/source4/auth/kerberos/srv_keytab.c
b/source4/auth/kerberos/srv_keytab.c
index ca2d385..b7a2079 100644
--- a/source4/auth/kerberos/srv_keytab.c
+++ b/source4/auth/kerberos/srv_keytab.c
@@ -54,8 +54,7 @@ static krb5_error_code principals_from_list(TALLOC_CTX
*parent_ctx,
}
if (!realm) {
- *error_string = Cannot have a kerberos secret in
- secrets.ldb without a realm;
+
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via e58f03c s3: Fix the build on FreeBSD
via 0b1f3ae s3: Fix Coverity ID 2682: NULL_RETURNS
via 15c6045 librpc: Make finding newest pidl file more portable
via 7011d7e s3: Fix Coverity ID 2743: CHECKED_RETURN
via f1c90e1 s3: Fix Coverity ID 2744: CHECKED_RETURN
via 85c1e89 s3: Fix Coverity ID 2745 and 2746: FORWARD_NULL
via 8173331 s3: Fix Coverity ID 2747: FORWARD_NULL
via dc3b796 s3: Attempt to fix Coverity ID 2748: INTEGER_OVERFLOW
via ee8d556 s3: Fix Coverity ID 2749: REVERSE_INULL
from e21029a waf: Fix mispelling
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e58f03c91a6a01a690e4bb0909f6467036add2eb
Author: Volker Lendecke v...@samba.org
Date: Thu Apr 19 13:32:14 2012 +0200
s3: Fix the build on FreeBSD
Autobuild-User: Volker Lendecke v...@samba.org
Autobuild-Date: Thu Apr 19 19:13:45 CEST 2012 on sn-devel-104
commit 0b1f3aea27280de0436f465346264c2623ba2d3e
Author: Volker Lendecke v...@samba.org
Date: Thu Apr 19 11:36:11 2012 +0200
s3: Fix Coverity ID 2682: NULL_RETURNS
commit 15c60456994b57b94da21c5be57d9b798242b42c
Author: Volker Lendecke v...@samba.org
Date: Thu Apr 19 09:03:18 2012 +0200
librpc: Make finding newest pidl file more portable
FreeBSD find does not support the -printf argument.
David, please check if this still work for you!
commit 7011d7ef188de916b8428acc40efd5264b268d8d
Author: Volker Lendecke v...@samba.org
Date: Thu Apr 19 11:15:46 2012 +0200
s3: Fix Coverity ID 2743: CHECKED_RETURN
commit f1c90e12f500201975ca63f175a48575bc9a7505
Author: Volker Lendecke v...@samba.org
Date: Thu Apr 19 10:47:07 2012 +0200
s3: Fix Coverity ID 2744: CHECKED_RETURN
commit 85c1e895a5b4d520481de419aff04c2519198894
Author: Volker Lendecke v...@samba.org
Date: Thu Apr 19 10:27:07 2012 +0200
s3: Fix Coverity ID 2745 and 2746: FORWARD_NULL
We can assume that the rbt dbs are around
commit 8173331150482b78e85c005fcea2c7d80f430f65
Author: Volker Lendecke v...@samba.org
Date: Thu Apr 19 10:20:27 2012 +0200
s3: Fix Coverity ID 2747: FORWARD_NULL
For the notify cleanup process we have a notify context without a
messaging entry. We will never call notify_add/remove for this, but
the code should protect against this.
commit dc3b79626022e07980be40627b9f2255d58b6e70
Author: Volker Lendecke v...@samba.org
Date: Thu Apr 19 10:04:04 2012 +0200
s3: Attempt to fix Coverity ID 2748: INTEGER_OVERFLOW
Not sure this will actually please Coverity, but it fixes a severe bug
commit ee8d55622fa6435ac17befc269daa28f5cfa21dc
Author: Volker Lendecke v...@samba.org
Date: Thu Apr 19 09:51:11 2012 +0200
s3: Fix Coverity ID 2749: REVERSE_INULL
---
Summary of changes:
librpc/build_idl.sh | 10 +-
source3/lib/background.c |9 ++---
source3/lib/dbwrap/dbwrap_cache.c | 26 +++---
source3/lib/dbwrap/dbwrap_tdb.c |7 ++-
source3/lib/msg_channel.c |2 +-
source3/lib/xattr_tdb.c |2 +-
source3/modules/vfs_scannedonly.c |4
source3/smbd/notify_internal.c|6 --
8 files changed, 38 insertions(+), 28 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/build_idl.sh b/librpc/build_idl.sh
index e028bc6..35acd1f 100755
--- a/librpc/build_idl.sh
+++ b/librpc/build_idl.sh
@@ -28,15 +28,7 @@ fi
## Find newer files rather than rebuild all of them. Also handle the case
## where the pidl compiler itself is newer.
##
-PIDL_NEWEST=`find $PIDL_DIR -type f -printf %p\0%T@\n \
- | perl -e '$ts_newest = 0;
- while (STDIN) {
- ($f, $ts) = split(/\0/);
- next if ($ts = $ts_newest);
- $ts_newest = $ts;
- $f_newest = $f;
- }
- print $f_newest'` || exit 1
+PIDL_NEWEST=$(ls -rt $(find $PIDL_DIR -type f) | tail -n -1)
list=
for f in ${IDL_FILES}; do
diff --git a/source3/lib/background.c b/source3/lib/background.c
index aa2a77d..6a91783 100644
--- a/source3/lib/background.c
+++ b/source3/lib/background.c
@@ -121,9 +121,12 @@ static void background_job_trigger(
struct background_job_state *state = talloc_get_type_abort(
private_data, struct background_job_state);
- if (state-wakeup_req != NULL) {
- tevent_req_set_endtime(state-wakeup_req, state-ev,
- timeval_zero());
+ if (state-wakeup_req == NULL) {
+ return;
+ }
+ if (!tevent_req_set_endtime(state-wakeup_req, state-ev,
+ timeval_zero())) {
+ DEBUG(10,
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 4ded55e s4-python: Ensure we handle the no-eadb case for system xattrs in get/setntacl via f1f00e5 Added number of FSMO roles owned by the server we are trying to demote. via 0615cf5 s4-provision: Always give the warning if we are using eadb. It really should be for testing only from e58f03c s3: Fix the build on FreeBSD http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 4ded55ebcd4ae3e0425d7e89e30b24d72682c0de Author: Andrew Bartlett abart...@samba.org Date: Thu Apr 19 22:45:48 2012 +1000 s4-python: Ensure we handle the no-eadb case for system xattrs in get/setntacl Autobuild-User: Andrew Bartlett abart...@samba.org Autobuild-Date: Thu Apr 19 20:51:16 CEST 2012 on sn-devel-104 commit f1f00e5ba0b52bafac8532fba19112ebbed06738 Author: Daniele Dario d.dari...@gmail.com Date: Thu Apr 19 12:13:41 2012 +0200 Added number of FSMO roles owned by the server we are trying to demote. commit 0615cf5f85ba2a4946a583c060af78fbe3e8cb4c Author: Andrew Bartlett abart...@samba.org Date: Thu Apr 19 22:31:29 2012 +1000 s4-provision: Always give the warning if we are using eadb. It really should be for testing only --- Summary of changes: source4/scripting/python/samba/netcmd/domain.py |2 +- source4/scripting/python/samba/ntacls.py|1 + source4/setup/provision |9 ++--- 3 files changed, 8 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py index 2d8bfe3..2ce0535 100644 --- a/source4/scripting/python/samba/netcmd/domain.py +++ b/source4/scripting/python/samba/netcmd/domain.py @@ -249,7 +249,7 @@ class cmd_domain_demote(Command): controls=[search_options:1:2]) if len(res) != 0: -raise CommandError(Current DC is still the owner of %d role(s), use the role command to transfer roles to another DC) +raise CommandError(Current DC is still the owner of %d role(s), use the role command to transfer roles to another DC % len(res)) print Using %s as partner server for the demotion % server (drsuapiBind, drsuapi_handle, supportedExtensions) = drsuapi_connect(server, lp, creds) diff --git a/source4/scripting/python/samba/ntacls.py b/source4/scripting/python/samba/ntacls.py index 51d6de5..e3d24fa 100644 --- a/source4/scripting/python/samba/ntacls.py +++ b/source4/scripting/python/samba/ntacls.py @@ -37,6 +37,7 @@ def checkset_backend(lp, backend, eadbfile): posix_eadb = lp.get(posix:eadb) if posix_eadb is not None: return (samba.posix_eadb, lp.get(posix:eadb)) +return (None, None) elif backend == native: return (None, None) elif backend == eadb: diff --git a/source4/setup/provision b/source4/setup/provision index f254fa7..a0e58ec 100755 --- a/source4/setup/provision +++ b/source4/setup/provision @@ -221,6 +221,7 @@ if opts.targetdir is not None: os.mkdir(opts.targetdir) eadb = True + if opts.use_xattrs == yes: eadb = False elif opts.use_xattrs == auto and not lp.get(posix:eadb): @@ -231,14 +232,16 @@ elif opts.use_xattrs == auto and not lp.get(posix:eadb): try: try: samba.ntacls.setntacl(lp, file.name, -O:S-1-5-32G:S-1-5-32, S-1-5-32, native) + O:S-1-5-32G:S-1-5-32, S-1-5-32, native) eadb = False except Exception: -logger.info(You are not root or your system do not support xattr, using tdb backend for attributes. -If you intend to use this provision in production, rerun the script as root on a system supporting xattrs.) +logger.info(You are not root or your system do not support xattr, using tdb backend for attributes. ) finally: file.close() +if eadb: +logger.info(not using extended attributes to store ACLs and other metadata. If you intend to use this provision in production, rerun the script as root on a system supporting xattrs.) + session = system_session() try: result = provision(logger, -- Samba Shared Repository
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2012-04-19-2056/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2012-04-19-2056/samba3.stderr http://git.samba.org/autobuild.flakey/2012-04-19-2056/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2012-04-19-2056/samba4.stderr http://git.samba.org/autobuild.flakey/2012-04-19-2056/samba4.stdout The top commit at the time of the failure was: commit e58f03c91a6a01a690e4bb0909f6467036add2eb Author: Volker Lendecke v...@samba.org Date: Thu Apr 19 13:32:14 2012 +0200 s3: Fix the build on FreeBSD Autobuild-User: Volker Lendecke v...@samba.org Autobuild-Date: Thu Apr 19 19:13:45 CEST 2012 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 393936a s3: Fix Coverity ID 2682 -- NULL_RETURNS
via 3f18316 s3: Fix Coverity ID 2727 to 2740 -- UNINIT
via e573f11 s3: Fix Coverity ID 2686 -- RESOURCE_LEAK
from 4ded55e s4-python: Ensure we handle the no-eadb case for system
xattrs in get/setntacl
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 393936aee6f20d85ba2b3e6c59af7c6b8c554a28
Author: Volker Lendecke v...@samba.org
Date: Thu Apr 19 16:09:41 2012 +0200
s3: Fix Coverity ID 2682 -- NULL_RETURNS
Autobuild-User: Volker Lendecke v...@samba.org
Autobuild-Date: Thu Apr 19 22:28:34 CEST 2012 on sn-devel-104
commit 3f18316358c15fc13ca676b497c7f510b1d5bd85
Author: Volker Lendecke v...@samba.org
Date: Thu Apr 19 15:38:25 2012 +0200
s3: Fix Coverity ID 2727 to 2740 -- UNINIT
commit e573f114681533425eded76f1322a9327308c40e
Author: Volker Lendecke v...@samba.org
Date: Thu Apr 19 15:30:06 2012 +0200
s3: Fix Coverity ID 2686 -- RESOURCE_LEAK
---
Summary of changes:
source3/locking/posix.c | 13 ++---
source3/nmbd/nmbd_processlogon.c |1 +
source3/utils/net_rpc_printer.c | 19 ---
source3/winbindd/winbindd_pam.c |4 ++--
4 files changed, 25 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/locking/posix.c b/source3/locking/posix.c
index 463aa21..557099b 100644
--- a/source3/locking/posix.c
+++ b/source3/locking/posix.c
@@ -457,11 +457,18 @@ void reduce_windows_lock_ref_count(files_struct *fsp,
unsigned int dcount)
posix_pending_close_db, talloc_tos(),
locking_ref_count_key_fsp(fsp, tmp));
+ if (rec == NULL) {
+ DEBUG(0, (reduce_windows_lock_ref_count: rec not found\n));
+ return;
+ }
+
value = dbwrap_record_get_value(rec);
- SMB_ASSERT((rec != NULL)
- (value.dptr != NULL)
- (value.dsize == sizeof(lock_ref_count)));
+ if ((value.dptr == NULL) || (value.dsize != sizeof(lock_ref_count))) {
+ DEBUG(0, (reduce_windows_lock_ref_count: wrong value\n));
+ TALLOC_FREE(rec);
+ return;
+ }
memcpy(lock_ref_count, value.dptr, sizeof(lock_ref_count));
diff --git a/source3/nmbd/nmbd_processlogon.c b/source3/nmbd/nmbd_processlogon.c
index 76864e6..ca77ebf 100644
--- a/source3/nmbd/nmbd_processlogon.c
+++ b/source3/nmbd/nmbd_processlogon.c
@@ -505,6 +505,7 @@ logons are not enabled.\n, inet_ntoa(p-ip) ));
status = push_nbt_netlogon_response(blob_out, talloc_tos(),
response);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0,(process_logon_packet: failed to push
packet\n));
+ SAFE_FREE(source_addr);
return;
}
diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c
index eec5a6c..ef84d9e 100644
--- a/source3/utils/net_rpc_printer.c
+++ b/source3/utils/net_rpc_printer.c
@@ -1309,7 +1309,7 @@ static NTSTATUS rpc_printer_publish_internals_args(struct
rpc_pipe_client *pipe_
struct spoolss_SetPrinterInfoCtr info_ctr;
struct spoolss_DevmodeContainer devmode_ctr;
struct sec_desc_buf secdesc_ctr;
- struct policy_handle hnd;
+ struct policy_handle hnd = { 0, };
WERROR result;
const char *action_str;
@@ -1465,7 +1465,7 @@ NTSTATUS rpc_printer_publish_list_internals(struct
net_context *c,
const char *printername, *sharename;
union spoolss_PrinterInfo *info_enum;
union spoolss_PrinterInfo info;
- struct policy_handle hnd;
+ struct policy_handle hnd = { 0, };
int state;
WERROR werr;
@@ -1564,7 +1564,8 @@ NTSTATUS rpc_printer_migrate_security_internals(struct
net_context *c,
const char *printername, *sharename;
struct rpc_pipe_client *pipe_hnd_dst = NULL;
struct dcerpc_binding_handle *b_dst = NULL;
- struct policy_handle hnd_src, hnd_dst;
+ struct policy_handle hnd_src = { 0, };
+ struct policy_handle hnd_dst = { 0, };
union spoolss_PrinterInfo *info_enum;
struct cli_state *cli_dst = NULL;
union spoolss_PrinterInfo info_src, info_dst;
@@ -1714,7 +1715,8 @@ NTSTATUS rpc_printer_migrate_forms_internals(struct
net_context *c,
const char *printername, *sharename;
struct rpc_pipe_client *pipe_hnd_dst = NULL;
struct dcerpc_binding_handle *b_dst = NULL;
- struct policy_handle hnd_src, hnd_dst;
+ struct policy_handle hnd_src = { 0, };
+ struct policy_handle hnd_dst = { 0, };
union spoolss_PrinterInfo *info_enum;
union spoolss_PrinterInfo info_dst;
uint32_t num_forms;
@@ -1889,7 +1891,8 @@
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 00d5f32 Fix bug #8877 - Syslog broken owing to mistyping of
debug_settings.syslog.
from 393936a s3: Fix Coverity ID 2682 -- NULL_RETURNS
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 00d5f32025bf13285ab3f8ffae914107c9eca275
Author: Joseph Tam jtam.h...@gmail.com
Date: Thu Apr 19 11:46:16 2012 -0700
Fix bug #8877 - Syslog broken owing to mistyping of debug_settings.syslog.
Setting syslog only = yes did not divert log messages to syslog. The
test in
lib/util/debug.c:Debug1():747
if( syslog_level state.settings.syslog )
produces wrong results since .syslog is typed bool rather than int.
The attached patch fixes this by typing this field correctly as int.
Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Fri Apr 20 00:06:12 CEST 2012 on sn-devel-104
---
Summary of changes:
lib/util/debug.h |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/debug.h b/lib/util/debug.h
index b3647a3..2566418 100644
--- a/lib/util/debug.h
+++ b/lib/util/debug.h
@@ -201,7 +201,7 @@ enum debug_logtype {DEBUG_DEFAULT_STDERR = 0,
DEBUG_DEFAULT_STDOUT = 1, DEBUG_FI
struct debug_settings {
size_t max_log_size;
- bool syslog;
+ int syslog;
bool syslog_only;
bool timestamp_logs;
bool debug_prefix_timestamp;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 4b29cf5 Move kdc_get_policy helper in the lsa server where it
belongs.
via 37e98ff Use loadparm helper to find lifetime defaults
via 86910e1 loadparm: Add helper function to fetch default lifetime
policies
via 74510b0 loadparm: Add convenience function to return long integers
via e0f425a loadparm: Fix broken lp_ulong utility function
via 97f5b28 Move README file in the right place.
from 00d5f32 Fix bug #8877 - Syslog broken owing to mistyping of
debug_settings.syslog.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4b29cf5f66c5e75f759a5c2a79ba26629f907778
Author: Simo Sorce i...@samba.org
Date: Thu Apr 19 17:54:57 2012 -0400
Move kdc_get_policy helper in the lsa server where it belongs.
This was used in only 2 places, db-glue.c and the lsa server.
In db-glue.c it is awkward though, as it forces to use an unconvenient lsa
structure and conversions from time_t to nt_time only to have nt_times
converted back to time_t for actual use. This is silly.
Also the kdc-policy file was a single funciton library, that's just
ridiculous.
The loadparm helper is all we need to keep the values consistent, and if we
ever end up doing something with group policies we will care about it when
it's
the time. the code would have to change quite a lot anyway.
Autobuild-User: Simo Sorce i...@samba.org
Autobuild-Date: Fri Apr 20 01:53:37 CEST 2012 on sn-devel-104
commit 37e98ff252edc5e76d2c74a8459247ffcb5fd101
Author: Simo Sorce i...@samba.org
Date: Thu Apr 19 11:17:25 2012 -0400
Use loadparm helper to find lifetime defaults
Implictly fixes buggy use of int for time_t
commit 86910e15feaa490cf70f592c6e9af44f3db7e6f0
Author: Simo Sorce i...@samba.org
Date: Thu Apr 19 11:16:03 2012 -0400
loadparm: Add helper function to fetch default lifetime policies
This use long to fetch time_t quantities, because there are architectures
were
time_t is a signed long but long != int, So long is the proper way to deal
with
it.
commit 74510b059e6852d1491a4cb6eaa9cc7c2ed61fbf
Author: Simo Sorce i...@samba.org
Date: Thu Apr 19 11:00:45 2012 -0400
loadparm: Add convenience function to return long integers
commit e0f425ab2d49779d0abbc0756326f548ff1ee19b
Author: Simo Sorce i...@samba.org
Date: Thu Apr 19 10:58:39 2012 -0400
loadparm: Fix broken lp_ulong utility function
commit 97f5b287fbe36e8e0026c3a76f90a7662111e9aa
Author: Simo Sorce i...@samba.org
Date: Thu Apr 19 10:34:54 2012 -0400
Move README file in the right place.
Someone forgot to move the README when they moved the code ...
---
Summary of changes:
{source4 = lib}/param/README |0
lib/param/loadparm.c| 29 +++-
lib/param/param.h |5 +++
lib/param/util.c| 19 ++
source4/kdc/db-glue.c | 17 +++-
source4/kdc/kdc-policy.h| 25 --
source4/kdc/policy.c| 48 ---
source4/kdc/samba_kdc.h |8 +-
source4/kdc/wscript_build | 10 +--
source4/rpc_server/lsa/dcesrv_lsa.c | 26 ++-
source4/rpc_server/wscript_build|2 +-
11 files changed, 95 insertions(+), 94 deletions(-)
rename {source4 = lib}/param/README (100%)
delete mode 100644 source4/kdc/kdc-policy.h
delete mode 100644 source4/kdc/policy.c
mode change 100644 = 100755 source4/kdc/wscript_build
Changeset truncated at 500 lines:
diff --git a/source4/param/README b/lib/param/README
similarity index 100%
rename from source4/param/README
rename to lib/param/README
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 46bae44..d68d585 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -1699,11 +1699,11 @@ static int lp_int(const char *s)
/**
* convenience routine to return unsigned long parameters.
*/
-static int lp_ulong(const char *s)
+static unsigned long lp_ulong(const char *s)
{
if (!s) {
- DEBUG(0,(lp_int(%s): is called with NULL!\n,s));
+ DEBUG(0,(lp_ulong(%s): is called with NULL!\n,s));
return -1;
}
@@ -1713,6 +1713,20 @@ static int lp_ulong(const char *s)
/**
* convenience routine to return unsigned long parameters.
*/
+static long lp_long(const char *s)
+{
+
+ if (!s) {
+ DEBUG(0,(lp_long(%s): is called with NULL!\n,s));
+ return -1;
+ }
+
+ return strtol(s, NULL, 0);
+}
+
+/**
+ * convenience routine to return unsigned long parameters.
+ */
static double lp_double(const char *s)
{
@@ -1840,6 +1854,17 @@ unsigned long lpcfg_parm_ulong(struct
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 26007a8 wafsamba: allow certain public libraries to be forced to be
private
via 18e8d49 libwbclient: bump version to 0.9, and add this version to
.pc file
from 4b29cf5 Move kdc_get_policy helper in the lsa server where it
belongs.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 26007a89174760a830ba96cc1ee43ca8a958e986
Author: Andrew Bartlett abart...@samba.org
Date: Thu Apr 19 15:34:48 2012 +1000
wafsamba: allow certain public libraries to be forced to be private
This will help installations where the Samba4 libraries must be used but
the main system is not using the system libs that would normally
be installed. This in particular impacts on libwbclient, which is a
core dep, but is different to that used by the rest of a Samba 3.x based
system.
Use eg: ./configure --private-libraries=wbclient
Andrew Bartlett
Autobuild-User: Andrew Bartlett abart...@samba.org
Autobuild-Date: Fri Apr 20 03:27:22 CEST 2012 on sn-devel-104
commit 18e8d49d7e1adecb09fce63d266197da0d3b0f9e
Author: Andrew Bartlett abart...@samba.org
Date: Thu Apr 19 14:59:43 2012 +1000
libwbclient: bump version to 0.9, and add this version to .pc file
---
Summary of changes:
buildtools/wafsamba/samba_bundled.py |4
buildtools/wafsamba/wafsamba.py |3 +++
buildtools/wafsamba/wscript |5 +
nsswitch/libwbclient/wbclient.h |3 ++-
nsswitch/libwbclient/wscript |7 +--
5 files changed, 19 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_bundled.py
b/buildtools/wafsamba/samba_bundled.py
index c5b4022..1a5d565 100644
--- a/buildtools/wafsamba/samba_bundled.py
+++ b/buildtools/wafsamba/samba_bundled.py
@@ -81,6 +81,10 @@ def LIB_MUST_BE_BUNDLED(conf, libname):
return ('ALL' in conf.env.BUNDLED_LIBS or
libname in conf.env.BUNDLED_LIBS)
+@conf
+def LIB_MUST_BE_PRIVATE(conf, libname):
+return ('ALL' in conf.env.PRIVATE_LIBS or
+libname in conf.env.PRIVATE_LIBS)
@conf
def CHECK_PREREQUISITES(conf, prereqs):
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 317bca1..534bace 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -132,6 +132,9 @@ def SAMBA_LIBRARY(bld, libname, source,
enabled=True):
'''define a Samba library'''
+if LIB_MUST_BE_PRIVATE(bld, libname):
+private_library=True
+
if not enabled:
SET_TARGET_TYPE(bld, libname, 'DISABLED')
return
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index ff18777..4db3412 100755
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -27,6 +27,10 @@ def set_options(opt):
help=(comma separated list of bundled libraries. May
include !LIBNAME to disable bundling a library. Can be 'NONE' or 'ALL' [auto]),
action=store, dest='BUNDLED_LIBS', default='')
+gr.add_option('--private-libraries',
+ help=(comma separated list of normally public libraries to
build instead as private libraries. May include !LIBNAME to disable making a
library private. Can be 'NONE' or 'ALL' [auto]),
+ action=store, dest='PRIVATE_LIBS', default='')
+
extension_default = Options.options['PRIVATE_EXTENSION_DEFAULT']
gr.add_option('--private-library-extension',
help=(name extension for private libraries [%s] %
extension_default),
@@ -233,6 +237,7 @@ def configure(conf):
conf.env.MODULESDIR = Options.options.MODULESDIR
conf.env.PRIVATELIBDIR = Options.options.PRIVATELIBDIR
conf.env.BUNDLED_LIBS = Options.options.BUNDLED_LIBS.split(',')
+conf.env.PRIVATE_LIBS = Options.options.PRIVATE_LIBS.split(',')
conf.env.BUILTIN_LIBRARIES = Options.options.BUILTIN_LIBRARIES.split(',')
conf.env.DISABLE_SHARED = Options.options.disable_shared
conf.env.NONSHARED_BINARIES = Options.options.NONSHARED_BINARIES.split(',')
diff --git a/nsswitch/libwbclient/wbclient.h b/nsswitch/libwbclient/wbclient.h
index 809e00a..1dd387a 100644
--- a/nsswitch/libwbclient/wbclient.h
+++ b/nsswitch/libwbclient/wbclient.h
@@ -68,9 +68,10 @@ const char *wbcErrorString(wbcErr error);
* 0.6: Made struct wbcInterfaceDetails char* members non-const
* 0.7: Added wbcSidToStringBuf()
* 0.8: Added wbcSidsToUnixIds() and wbcLookupSids()
+ * 0.9: Added support for WBC_ID_TYPE_BOTH
**/
#define WBCLIENT_MAJOR_VERSION 0
-#define WBCLIENT_MINOR_VERSION 8
+#define WBCLIENT_MINOR_VERSION 9
#define WBCLIENT_VENDOR_VERSION Samba libwbclient
struct wbcLibraryDetails {
uint16_t major_version;
diff --git
[SCM] Samba Shared Repository - annotated tag ldb-1.1.6 created
The annotated tag, ldb-1.1.6 has been created
at b5ff0957737173243a91d373fcbd12f0ccc20198 (tag)
tagging 27bcf7a0b6ab3a4c74129e3952c1bf14b8017b86 (commit)
replaces samba-4.0.0alpha19
tagged by Stefan Metzmacher
on Thu Apr 19 08:57:18 2012 +0200
- Log -
ldb: tag release ldb-1.1.6
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
iQEcBAABAgAGBQJPj7dOAAoJEEeTkWETCEAlmdIH/iygqlxFJ4SUOeTvVUjwCzBH
EPben15RoC6Xq9IQ0swzGZt2GsZi2XJbV9mKGWiNCtXb2nLipFZ7A9Jb7tVf4kQ2
H9fAEGE0BIiBzz5yrjWpbc3dksQ5ZU+X5YDBR5tg78wIQ7n4RH1HShk+cEoZ8lJP
a1fHbQ3pNIlplpA08kqxCY25qZh7wwzv+ht5gFhJ/g2jDvaDgI3mRDIUFbMlZsQa
kwIPtanuMF66XOn6fHK72epBxHNPw+2/RU5ei162/W8R3yTZdZ8S6PCMcXvpGH3/
R0qoBE44UVLlOKWgcjdtHISTzo8XQl+R+gDAAtnvjnIsEbVcRHwDYKvmsvX0N3E=
=V9Te
-END PGP SIGNATURE-
Adrian Bunk (1):
rely on sys/inotify.h for inotify
Alexander Bokovoy (5):
WAF: Add support for stopping processing before end of wscript{_*}
s4-libnet: split export_keytab in a separate python module to avoid
pulling in HDB dependency
wafsamba: add support for separate rules in stages
s4-auth: Make sure ldb context is initialized even if not passed by
Python code
waf: samba-specific methods should have capitalized names, change
process_separate_rule to follow
Amitay Isaacs (3):
dlz_bind9: changes to make dlz_bind9 work with BIND 9.9.0
dlz_bind9: Build shared libraries for both BIND versions 9.8 and 9.9
s4-provision: Update configuration lines for dlz_bind9
Andreas Schneider (5):
s4-smb2: Fix a talloc crash bug.
s3-waf: Fix client/smbclient dependencies.
s3-waf: Add possibility to build with system libsmbclient.
waf: Add possibility to build with system libwbclient.
waf: Use Logs.info() instead of print.
Andrew Bartlett (26):
on our way with Samba 4.0alpha20
lib/tdb_compat: Do not define BUILD_TDB2 if we are not building tdb2
build: use include paths for pkg-config found libraries
build: Fix spelling of tevent
param: Merge common param elements by adding .flags
param: harmonsise logfile parameter
make _lp_readraw() and _lp_writeraw() static
param: Change from _lp to lp__ as the prefix for internal parameter
wrappers
s3-param: make FN_GLOBAL macros consistent, add lp_ using the macro
param: Merge common param elements by adding .flags
lib/param: swap preferred name for 'lock dir' to match s3
param: harmonise wins parameters
param: leave realm as a normal string, handle upper/lower case in
handle_realm
build: Remove more of the s3 special cases in waf: only pidfile.c needs
-DCONFIGFILE
s3-dbwrap: Add talloc_stackframe() calls
s3-dbwrap: push lp_ctx up another layer in the stack
lib/util: Move map_nt_error_from_tdb to the top level
s3-build: Add missing samba3-util dep to tdb-wrap3
dbwrap: Add dbwrap_tdb to private dbwrap library
s3-build: move file_id.c into samba3-util and create a private header
s3-lib: Add file_id_string()
s3-xattr_tdb: make xattr_tdb a private library, for use outside
vfs_xattr_tdb
s3-xattr_tdb: Be nice to xattr_tdb_getxattr callers, return the full blob
s3-xattr_tdb: Use talloc_stackframe() more to allow calling from common
code
s4-python: Add python wrapper for xattr_tdb format xattr storage
s3fs: Use xattr_tdb format for xattr storage
Andrew Tridgell (1):
ldb: added ldb_msg_element_equal_ordered()
Christian Ambach (6):
s3:param convert kernel oplocks to share parameter
docs: update kernel oplocks documentation
s3:smbd add seperate function to initialize kernel oplocks
s3:smbd only initialize kernel oplocks if they are enabled for a share
s3:smbd only care about missing level2 support if kernel oplocks are
enabled
s3: switch off kernel oplocks by default
Christof Schmitt (1):
docs:man:vfs_gpfs: Remove itemized list to fix indentation
David Disseldorp (1):
build: rebuild idl if the pidl compiler is changed
Günther Deschner (5):
s3-waf: remove requirement of having --enable-developer for running
system krb5 checks.
waf: when building with system krb5, we do not need to build local
heimdal.
waf: when USING_SYSTEM_KRB5 environment variable is set, dont configure
local
wafsamba: point out that local heimdal paths are not included when
s4-ldb: use KRB5_KEY macros to access key elements.
Jelmer Vernooij (4):
s3/selftest: Fix reference to knownfail file.
provision: Simplify handling of default for --dns-backend option.
provision: Simplify handling of default for --function-level.
provision: Simplify handling of default for --server-role.
Jeremy Allison (9):
Simplify the logic around doing an immediate event reschedule.
Try and fix autoconf on the build farm. Always include
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 9ce9389 s3: Fix a ISO C90 forbids mixed declarations and code
from 7ca706d dbcheck: Add a check that every FSMO role has a valid owner
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 9ce9389b292dfee7d6c82681a78ef93eeef9b443
Author: Volker Lendecke v...@samba.org
Date: Thu Apr 19 08:24:27 2012 +0200
s3: Fix a ISO C90 forbids mixed declarations and code
Autobuild-User: Volker Lendecke v...@samba.org
Autobuild-Date: Thu Apr 19 10:32:27 CEST 2012 on sn-devel-104
---
Summary of changes:
source3/utils/ntlm_auth.c | 10 +++---
1 files changed, 7 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index ab629d2..84457f6 100644
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -1068,14 +1068,18 @@ static NTSTATUS
ntlm_auth_start_ntlmssp_server(TALLOC_CTX *mem_ctx,
struct gensec_security *gensec_security;
NTSTATUS nt_status;
- TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
- NT_STATUS_HAVE_NO_MEMORY(tmp_ctx);
+ TALLOC_CTX *tmp_ctx;
struct gensec_settings *gensec_settings;
size_t idx = 0;
struct cli_credentials *server_credentials;
- struct auth4_context *auth4_context =
make_auth4_context_ntlm_auth(tmp_ctx, opt_password);
+ struct auth4_context *auth4_context;
+
+ tmp_ctx = talloc_new(mem_ctx);
+ NT_STATUS_HAVE_NO_MEMORY(tmp_ctx);
+
+ auth4_context = make_auth4_context_ntlm_auth(tmp_ctx, opt_password);
if (auth4_context == NULL) {
TALLOC_FREE(tmp_ctx);
return NT_STATUS_NO_MEMORY;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via cf39ef3 s4-kcc: avoid a false alarm with rodc
via 89cb1a4 samba_spnupdate: don't try to register DNS related SPN if
we are not mastering the NC
from 9ce9389 s3: Fix a ISO C90 forbids mixed declarations and code
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit cf39ef363782dae8d9b73bb249f2321c924c1dc8
Author: Matthieu Patou m...@matws.net
Date: Thu Apr 19 01:51:24 2012 -0700
s4-kcc: avoid a false alarm with rodc
Autobuild-User: Matthieu Patou m...@samba.org
Autobuild-Date: Thu Apr 19 12:32:58 CEST 2012 on sn-devel-104
commit 89cb1a46760b2f95abdf832f0db713f1c979caf8
Author: Matthieu Patou m...@matws.net
Date: Thu Apr 19 01:44:14 2012 -0700
samba_spnupdate: don't try to register DNS related SPN if we are not
mastering the NC
For RW DC the impact is pretty small but for RODC the whole SPN set is
rejected by the target DC as RODC hasn't the right to register DNS SPN
if it is not mastering this NC.
---
Summary of changes:
source4/dsdb/kcc/kcc_periodic.c |7 +++
source4/scripting/bin/samba_spnupdate | 25 -
2 files changed, 31 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/kcc/kcc_periodic.c b/source4/dsdb/kcc/kcc_periodic.c
index f4374d2..e379230 100644
--- a/source4/dsdb/kcc/kcc_periodic.c
+++ b/source4/dsdb/kcc/kcc_periodic.c
@@ -436,6 +436,13 @@ static int kccsrv_gc_update(struct kccsrv_service *s,
struct ldb_result *res)
talloc_free(tmp_ctx);
return LDB_SUCCESS;
}
+
+ if (s-am_rodc) {
+ DEBUG(5, (%d partial replica should be added but we are RODC
so we skip\n, msg-num_elements));
+ talloc_free(tmp_ctx);
+ return LDB_SUCCESS;
+ }
+
msg-elements[0].flags = LDB_FLAG_MOD_ADD;
ret = dsdb_modify(s-samdb, msg, 0);
diff --git a/source4/scripting/bin/samba_spnupdate
b/source4/scripting/bin/samba_spnupdate
index 52a51d8..69406a8 100755
--- a/source4/scripting/bin/samba_spnupdate
+++ b/source4/scripting/bin/samba_spnupdate
@@ -3,6 +3,7 @@
# update our servicePrincipalName names from spn_update_list
#
# Copyright (C) Andrew Tridgell 2010
+# Copyright (C) Matthieu Patou m...@matws.net 2012
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -18,7 +19,7 @@
# along with this program. If not, see http://www.gnu.org/licenses/.
-import os, sys
+import os, sys, re
# ensure we get messages out immediately, so they get in the samba logs,
# and don't get swallowed by a timeout
@@ -120,11 +121,31 @@ file = open(spn_update_list, r)
spn_list = []
+has_forest_dns = False
+has_domain_dns = False
+# check if we are DNS server
+res = samdb.search(base=samdb.get_config_basedn(),
+ expression='(objectguid=%s)' % sub_vars['NTDSGUID'],
+ attrs=[msDS-hasMasterNCs])
+
+basedn = str(samdb.get_default_basedn())
+if len(res) == 1:
+for e in res[0][msDS-hasMasterNCs]:
+if str(e) == DC=DomainDnsZones,%s % basedn:
+has_domain_dns = True
+if str(e) == DC=ForestDnsZones,%s % basedn:
+has_forest_dns = True
+
+
# build the spn list
for line in file:
line = line.strip()
if line == '' or line[0] == #:
continue
+if re.match(r.*/DomainDnsZones\..*, line) and not has_domain_dns:
+continue
+if re.match(r.*/ForestDnsZones\..*, line) and not has_forest_dns:
+continue
line = samba.substitute_var(line, sub_vars)
spn_list.append(line)
@@ -221,6 +242,8 @@ def call_rodc_update(d):
return
req1.spn_names = spn_names
(level, res) = drs.DsWriteAccountSpn(drs_handle, 1, req1)
+if (res.status != (0, 'WERR_OK')):
+print WriteAccountSpn has failed with error %s % str(res.status)
if samdb.am_rodc():
call_rodc_update(add_list)
--
Samba Shared Repository
