[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Tue Jan 22 05:04:03 MST 2013
The branch, master has been updated
via 9aca528 Tests: Fix the display of test vars in screen --testenv
via b1e2313 libcli-acl: add documentation
via 65396ad drsuapi: Add documentation
via d7bbd18 drepl-notify: change misleading message
from 0a4a4ba devel-script: add options for RODC and partial replica for replicate flags
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 9aca52877a3f6f59887098ebb8e664922c8c7aad
Author: Matthieu Patou <mat at matws.net>
Date: Thu Jan 3 14:33:45 2013 -0800
Tests: Fix the display of test vars in screen --testenv
The form bash -c echo "important stuff blabla bla" && LD_LIBARY_PATH bash
is not working in screen when it's working in xterm and the in_screen
script already wrap all the command within a bash shell so there is no
need to re-force bash as the echo will execute in a bash shell
Signed-off-by: Matthieu Patou <mat at matws.net>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Tue Jan 22 13:03:52 CET 2013 on sn-devel-104
commit b1e231384a9245a191ef5e004544d7cafe17e036
Author: Matthieu Patou <mat at matws.net>
Date: Sun Oct 14 01:01:08 2012 -0700
libcli-acl: add documentation
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 65396adaad18821568f727a223c38c36a2b16291
Author: Matthieu Patou <mat at matws.net>
Date: Sun Oct 14 01:04:51 2012 -0700
drsuapi: Add documentation
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit d7bbd182b33441a0a4e91c00a31de29b2b09f59a
Author: Matthieu Patou <mat at matws.net>
Date: Mon Oct 15 22:15:17 2012 -0700
drepl-notify: change misleading message
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
-----------------------------------------------------------------------
Summary of changes:
libcli/security/access_check.c | 20 +++++++++++++++++++-
selftest/selftest.pl | 15 ++++++++-------
source4/dsdb/repl/drepl_notify.c | 2 +-
source4/rpc_server/drsuapi/updaterefs.c | 21 ++++++++++++++++++---
4 files changed, 46 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/security/access_check.c b/libcli/security/access_check.c
index f0a7b66..936ffca 100644
--- a/libcli/security/access_check.c
+++ b/libcli/security/access_check.c
@@ -374,7 +374,25 @@ static const struct GUID *get_ace_object_type(struct security_ace *ace)
return NULL;
}
-/* modified access check for the purposes of DS security
+/**
+ * @brief Perform directoryservice (DS) related access checks for a given user
+ *
+ * Perform DS access checks for the user represented by its security_token, on
+ * the provided security descriptor. If an tree associating GUID and access
+ * required is provided then object access (OA) are checked as well. *
+ * @param[in] sd The security descritor against which the required
+ * access are requested
+ *
+ * @param[in] token The security_token associated with the user to
+ * test
+ *
+ * @param[in] access_desired A bitfield of rights that must be granted for the
+ * given user in the specified SD.
+ *
+ * If one
+ * of the entry in the tree grants all the requested rights for the given GUID
+ * FIXME
+ * tree can be null if not null it's the
* Lots of code duplication, it will ve united in just one
* function eventually */
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 4ac5aeb..639c8a2 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -849,13 +849,7 @@ if ($opt_testenv) {
my $envvarstr = exported_envvars_str($testenv_vars);
- my @term = ();
- if ($ENV{TERMINAL}) {
- @term = ($ENV{TERMINAL});
- } else {
- @term = ("xterm", "-e");
- }
- my @term_args = ("bash", "-c", "echo -e \"
+ my @term_args = ("echo -e \"
Welcome to the Samba4 Test environment '$testenv_name'
This matches the client environment used in make test
@@ -867,6 +861,13 @@ SMB_CONF_PATH=\$SMB_CONF_PATH
$envvarstr
\" && LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH} bash");
+ my @term = ();
+ if ($ENV{TERMINAL}) {
+ @term = ($ENV{TERMINAL});
+ } else {
+ @term = ("xterm", "-e");
+ unshift(@term_args, ("bash", "-c"));
+ }
system(@term, @term_args);
diff --git a/source4/dsdb/repl/drepl_notify.c b/source4/dsdb/repl/drepl_notify.c
index cd248d5..905fe5f 100644
--- a/source4/dsdb/repl/drepl_notify.c
+++ b/source4/dsdb/repl/drepl_notify.c
@@ -195,7 +195,7 @@ static void dreplsrv_notify_op_callback(struct tevent_req *subreq)
ldb_dn_get_linearized(op->source_dsa->partition->dn),
nt_errstr(status), win_errstr(werr)));
} else {
- DEBUG(2,("dreplsrv_notify: DsReplicaSync OK for %s\n",
+ DEBUG(2,("dreplsrv_notify: DsReplicaSync successfuly sent to %s\n",
op->source_dsa->repsFrom1->other_info->dns_name));
op->source_dsa->notify_uSN = op->uSN;
}
diff --git a/source4/rpc_server/drsuapi/updaterefs.c b/source4/rpc_server/drsuapi/updaterefs.c
index 3cea1c4..b7a0b44 100644
--- a/source4/rpc_server/drsuapi/updaterefs.c
+++ b/source4/rpc_server/drsuapi/updaterefs.c
@@ -120,9 +120,24 @@ static WERROR uref_del_dest(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
return WERR_OK;
}
-/*
- drsuapi_DsReplicaUpdateRefs - a non RPC version callable from getncchanges
-*/
+/**
+ * @brief Update the references for the given NC and the destination DSA object
+ *
+ * This function is callable from non RPC functions (ie. getncchanges), it
+ * will validate the request to update reference and then will add/del a repsTo
+ * to the specified server referenced by its DSA GUID in the request.
+ *
+ * @param[in] b_state A bind_state object
+ *
+ * @param[in] mem_ctx A talloc context for memory allocation
+ *
+ * @param[in] req A drsuapi_DsReplicaUpdateRefsRequest1
+ * object which NC, which server and which
+ * action (add/delete) should be performed
+ *
+ * @return WERR_OK is success, different error
+ * otherwise.
+ */
WERROR drsuapi_UpdateRefs(struct drsuapi_bind_state *b_state, TALLOC_CTX *mem_ctx,
struct drsuapi_DsReplicaUpdateRefsRequest1 *req)
{
--
Samba Shared Repository
More information about the samba-cvs
mailing list