[SCM] Samba Shared Repository - branch master updated -
2ac4b434302ad5e9c105a709fe02431f17a0fecc
Günther Deschner
gd at samba.org
Tue Nov 18 15:00:46 GMT 2008
The branch, master has been updated
via 2ac4b434302ad5e9c105a709fe02431f17a0fecc (commit)
via 1a48107cc4667f22b05fdfce952f9dcdcfaa0c7a (commit)
from 1c07c30d31b4b588b59b845bdb5f85a0ba19f762 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 2ac4b434302ad5e9c105a709fe02431f17a0fecc
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 4 16:25:40 2008 +0100
s3-net-vampire: add support for partial replication (individual deltas).
Guenther
commit 1a48107cc4667f22b05fdfce952f9dcdcfaa0c7a
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 4 15:49:27 2008 +0100
s3-libnet-samsync: add support for partial replication.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/libnet/libnet_samsync.c | 119 +++++++++++++++++++++++++++++++++++----
source3/libnet/libnet_samsync.h | 17 ++++++
source3/utils/net_rpc_samsync.c | 109 +++++++++++++++++++++++++++++++++++
3 files changed, 233 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libnet/libnet_samsync.c b/source3/libnet/libnet_samsync.c
index 00caf2b..2e7063e 100644
--- a/source3/libnet/libnet_samsync.c
+++ b/source3/libnet/libnet_samsync.c
@@ -282,8 +282,58 @@ static const char *samsync_debug_str(TALLOC_CTX *mem_ctx,
* libnet_samsync
*/
-NTSTATUS libnet_samsync(enum netr_SamDatabaseID database_id,
- struct samsync_context *ctx)
+void libnet_init_netr_ChangeLogEntry(struct samsync_object *o,
+ struct netr_ChangeLogEntry *e)
+{
+ ZERO_STRUCTP(e);
+
+ e->db_index = o->database_id;
+ e->delta_type = o->object_type;
+
+ switch (e->delta_type) {
+ case NETR_DELTA_DOMAIN:
+ case NETR_DELTA_DELETE_GROUP:
+ case NETR_DELTA_RENAME_GROUP:
+ case NETR_DELTA_DELETE_USER:
+ case NETR_DELTA_RENAME_USER:
+ case NETR_DELTA_DELETE_ALIAS:
+ case NETR_DELTA_RENAME_ALIAS:
+ case NETR_DELTA_DELETE_TRUST:
+ case NETR_DELTA_DELETE_ACCOUNT:
+ case NETR_DELTA_DELETE_SECRET:
+ case NETR_DELTA_DELETE_GROUP2:
+ case NETR_DELTA_DELETE_USER2:
+ case NETR_DELTA_MODIFY_COUNT:
+ break;
+ case NETR_DELTA_USER:
+ case NETR_DELTA_GROUP:
+ case NETR_DELTA_GROUP_MEMBER:
+ case NETR_DELTA_ALIAS:
+ case NETR_DELTA_ALIAS_MEMBER:
+ e->object_rid = o->object_identifier.rid;
+ break;
+ case NETR_DELTA_SECRET:
+ e->object.object_name = o->object_identifier.name;
+ e->flags = NETR_CHANGELOG_NAME_INCLUDED;
+ break;
+ case NETR_DELTA_TRUSTED_DOMAIN:
+ case NETR_DELTA_ACCOUNT:
+ case NETR_DELTA_POLICY:
+ e->object.object_sid = o->object_identifier.sid;
+ e->flags = NETR_CHANGELOG_SID_INCLUDED;
+ break;
+ default:
+ break;
+ }
+}
+
+/**
+ * libnet_samsync_delta
+ */
+
+static NTSTATUS libnet_samsync_delta(enum netr_SamDatabaseID database_id,
+ struct samsync_context *ctx,
+ struct netr_ChangeLogEntry *e)
{
NTSTATUS result;
TALLOC_CTX *mem_ctx;
@@ -313,16 +363,28 @@ NTSTATUS libnet_samsync(enum netr_SamDatabaseID database_id,
netlogon_creds_client_step(ctx->cli->dc, &credential);
- result = rpccli_netr_DatabaseSync2(ctx->cli, mem_ctx,
- logon_server,
- computername,
- &credential,
- &return_authenticator,
- database_id,
- restart_state,
- &sync_context,
- &delta_enum_array,
- 0xffff);
+ if (ctx->single_object_replication) {
+ result = rpccli_netr_DatabaseRedo(ctx->cli, mem_ctx,
+ logon_server,
+ computername,
+ &credential,
+ &return_authenticator,
+ *e,
+ 0,
+ &delta_enum_array);
+ } else {
+ result = rpccli_netr_DatabaseSync2(ctx->cli, mem_ctx,
+ logon_server,
+ computername,
+ &credential,
+ &return_authenticator,
+ database_id,
+ restart_state,
+ &sync_context,
+ &delta_enum_array,
+ 0xffff);
+ }
+
if (NT_STATUS_EQUAL(result, NT_STATUS_NOT_SUPPORTED)) {
return result;
}
@@ -384,6 +446,39 @@ NTSTATUS libnet_samsync(enum netr_SamDatabaseID database_id,
}
/**
+ * libnet_samsync
+ */
+
+NTSTATUS libnet_samsync(enum netr_SamDatabaseID database_id,
+ struct samsync_context *ctx)
+{
+ NTSTATUS status = NT_STATUS_OK;
+ int i = 0;
+
+ if (!ctx->single_object_replication) {
+ return libnet_samsync_delta(database_id, ctx, NULL);
+ }
+
+ for (i=0; i<ctx->num_objects; i++) {
+
+ struct netr_ChangeLogEntry e;
+
+ if (ctx->objects[i].database_id != database_id) {
+ continue;
+ }
+
+ libnet_init_netr_ChangeLogEntry(&ctx->objects[i], &e);
+
+ status = libnet_samsync_delta(database_id, ctx, &e);
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
+ }
+ }
+
+ return status;
+}
+
+/**
* pull_netr_AcctLockStr
*/
diff --git a/source3/libnet/libnet_samsync.h b/source3/libnet/libnet_samsync.h
index 1f10d2c..4a356e2 100644
--- a/source3/libnet/libnet_samsync.h
+++ b/source3/libnet/libnet_samsync.h
@@ -33,6 +33,16 @@ typedef NTSTATUS (*samsync_delta_fn_t)(TALLOC_CTX *,
bool,
struct samsync_context *);
+struct samsync_object {
+ uint16_t database_id;
+ uint16_t object_type;
+ union {
+ uint32_t rid;
+ const char *name;
+ struct dom_sid sid;
+ } object_identifier;
+};
+
struct samsync_context {
enum net_samsync_mode mode;
const struct dom_sid *domain_sid;
@@ -46,6 +56,13 @@ struct samsync_context {
char *result_message;
char *error_message;
+ bool single_object_replication;
+ bool force_full_replication;
+ bool clean_old_entries;
+
+ uint32_t num_objects;
+ struct samsync_object *objects;
+
struct rpc_pipe_client *cli;
samsync_delta_fn_t delta_fn;
void *private_data;
diff --git a/source3/utils/net_rpc_samsync.c b/source3/utils/net_rpc_samsync.c
index 73e6dd0..9fab949 100644
--- a/source3/utils/net_rpc_samsync.c
+++ b/source3/utils/net_rpc_samsync.c
@@ -26,6 +26,81 @@
#include "includes.h"
#include "utils/net.h"
+static void parse_samsync_partial_replication_objects(TALLOC_CTX *mem_ctx,
+ int argc,
+ const char **argv,
+ bool *do_single_object_replication,
+ struct samsync_object **objects,
+ uint32_t *num_objects)
+{
+ int i;
+
+ if (argc > 0) {
+ *do_single_object_replication = true;
+ }
+
+ for (i=0; i<argc; i++) {
+
+ struct samsync_object o;
+
+ ZERO_STRUCT(o);
+
+ if (!StrnCaseCmp(argv[i], "user_rid=", strlen("user_rid="))) {
+ o.object_identifier.rid = get_int_param(argv[i]);
+ o.object_type = NETR_DELTA_USER;
+ o.database_id = SAM_DATABASE_DOMAIN;
+ }
+ if (!StrnCaseCmp(argv[i], "group_rid=", strlen("group_rid="))) {
+ o.object_identifier.rid = get_int_param(argv[i]);
+ o.object_type = NETR_DELTA_GROUP;
+ o.database_id = SAM_DATABASE_DOMAIN;
+ }
+ if (!StrnCaseCmp(argv[i], "group_member_rid=", strlen("group_member_rid="))) {
+ o.object_identifier.rid = get_int_param(argv[i]);
+ o.object_type = NETR_DELTA_GROUP_MEMBER;
+ o.database_id = SAM_DATABASE_DOMAIN;
+ }
+ if (!StrnCaseCmp(argv[i], "alias_rid=", strlen("alias_rid="))) {
+ o.object_identifier.rid = get_int_param(argv[i]);
+ o.object_type = NETR_DELTA_ALIAS;
+ o.database_id = SAM_DATABASE_BUILTIN;
+ }
+ if (!StrnCaseCmp(argv[i], "alias_member_rid=", strlen("alias_member_rid="))) {
+ o.object_identifier.rid = get_int_param(argv[i]);
+ o.object_type = NETR_DELTA_ALIAS_MEMBER;
+ o.database_id = SAM_DATABASE_BUILTIN;
+ }
+ if (!StrnCaseCmp(argv[i], "account_sid=", strlen("account_sid="))) {
+ const char *sid_str = get_string_param(argv[i]);
+ string_to_sid(&o.object_identifier.sid, sid_str);
+ o.object_type = NETR_DELTA_ACCOUNT;
+ o.database_id = SAM_DATABASE_PRIVS;
+ }
+ if (!StrnCaseCmp(argv[i], "policy_sid=", strlen("policy_sid="))) {
+ const char *sid_str = get_string_param(argv[i]);
+ string_to_sid(&o.object_identifier.sid, sid_str);
+ o.object_type = NETR_DELTA_POLICY;
+ o.database_id = SAM_DATABASE_PRIVS;
+ }
+ if (!StrnCaseCmp(argv[i], "trustdom_sid=", strlen("trustdom_sid="))) {
+ const char *sid_str = get_string_param(argv[i]);
+ string_to_sid(&o.object_identifier.sid, sid_str);
+ o.object_type = NETR_DELTA_TRUSTED_DOMAIN;
+ o.database_id = SAM_DATABASE_PRIVS;
+ }
+ if (!StrnCaseCmp(argv[i], "secret_name=", strlen("secret_name="))) {
+ o.object_identifier.name = get_string_param(argv[i]);
+ o.object_type = NETR_DELTA_SECRET;
+ o.database_id = SAM_DATABASE_PRIVS;
+ }
+
+ if (o.object_type > 0) {
+ ADD_TO_ARRAY(mem_ctx, struct samsync_object, o,
+ objects, num_objects);
+ }
+ }
+}
+
/* dump sam database via samsync rpc calls */
NTSTATUS rpc_samdump_internals(struct net_context *c,
const DOM_SID *domain_sid,
@@ -51,6 +126,14 @@ NTSTATUS rpc_samdump_internals(struct net_context *c,
ctx->delta_fn = display_sam_entries;
ctx->domain_name = domain_name;
+ ctx->force_full_replication = c->opt_force_full_repl ? true : false;
+ ctx->clean_old_entries = c->opt_clean_old_entries ? true : false;
+
+ parse_samsync_partial_replication_objects(ctx, argc, argv,
+ &ctx->single_object_replication,
+ &ctx->objects,
+ &ctx->num_objects);
+
libnet_samsync(SAM_DATABASE_DOMAIN, ctx);
libnet_samsync(SAM_DATABASE_BUILTIN, ctx);
@@ -126,6 +209,14 @@ NTSTATUS rpc_vampire_internals(struct net_context *c,
ctx->delta_fn = fetch_sam_entries;
ctx->domain_name = domain_name;
+ ctx->force_full_replication = c->opt_force_full_repl ? true : false;
+ ctx->clean_old_entries = c->opt_clean_old_entries ? true : false;
+
+ parse_samsync_partial_replication_objects(ctx, argc, argv,
+ &ctx->single_object_replication,
+ &ctx->objects,
+ &ctx->num_objects);
+
/* fetch domain */
result = libnet_samsync(SAM_DATABASE_DOMAIN, ctx);
@@ -179,12 +270,21 @@ NTSTATUS rpc_vampire_ldif_internals(struct net_context *c,
if (argc >= 1) {
ctx->output_filename = argv[0];
}
+ if (argc >= 2) {
+ parse_samsync_partial_replication_objects(ctx, argc-1, argv+1,
+ &ctx->single_object_replication,
+ &ctx->objects,
+ &ctx->num_objects);
+ }
ctx->mode = NET_SAMSYNC_MODE_FETCH_LDIF;
ctx->cli = pipe_hnd;
ctx->delta_fn = fetch_sam_entries_ldif;
ctx->domain_name = domain_name;
+ ctx->force_full_replication = c->opt_force_full_repl ? true : false;
+ ctx->clean_old_entries = c->opt_clean_old_entries ? true : false;
+
/* fetch domain */
status = libnet_samsync(SAM_DATABASE_DOMAIN, ctx);
@@ -255,6 +355,12 @@ NTSTATUS rpc_vampire_keytab_internals(struct net_context *c,
} else {
ctx->output_filename = argv[0];
}
+ if (argc >= 2) {
+ parse_samsync_partial_replication_objects(ctx, argc-1, argv+1,
+ &ctx->single_object_replication,
+ &ctx->objects,
+ &ctx->num_objects);
+ }
ctx->mode = NET_SAMSYNC_MODE_FETCH_KEYTAB;
ctx->cli = pipe_hnd;
@@ -263,6 +369,9 @@ NTSTATUS rpc_vampire_keytab_internals(struct net_context *c,
ctx->username = c->opt_user_name;
ctx->password = c->opt_password;
+ ctx->force_full_replication = c->opt_force_full_repl ? true : false;
+ ctx->clean_old_entries = c->opt_clean_old_entries ? true : false;
+
/* fetch domain */
status = libnet_samsync(SAM_DATABASE_DOMAIN, ctx);
--
Samba Shared Repository
More information about the samba-cvs
mailing list