X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=source3%2Flibnet%2Flibnet_samsync.c;h=df7e875ab64d6161609fc244cde6679fb5d8fee0;hb=2b784738d7ce444fb63e2cac91ad2e220cc6e551;hp=5711b231c721ce42db3cd58c9998468a8b047364;hpb=6aaf220f9e20815a32d166c1c5953e41152e1c99;p=ira%2Fwip.git

diff --git a/source3/libnet/libnet_samsync.c b/source3/libnet/libnet_samsync.c
index 5711b231c72..df7e875ab64 100644
--- a/source3/libnet/libnet_samsync.c
+++ b/source3/libnet/libnet_samsync.c
@@ -23,154 +23,9 @@
 
 #include "includes.h"
 #include "libnet/libnet.h"
-
-/**
- * Decrypt and extract the user's passwords.
- *
- * The writes decrypted (no longer 'RID encrypted' or arcfour encrypted)
- * passwords back into the structure
- */
-
-static NTSTATUS fix_user(TALLOC_CTX *mem_ctx,
-			 DATA_BLOB *session_key,
-			 enum netr_SamDatabaseID database_id,
-			 struct netr_DELTA_ENUM *delta)
-{
-
-	uint32_t rid = delta->delta_id_union.rid;
-	struct netr_DELTA_USER *user = delta->delta_union.user;
-	struct samr_Password lm_hash;
-	struct samr_Password nt_hash;
-	unsigned char zero_buf[16];
-
-	memset(zero_buf, '\0', sizeof(zero_buf));
-
-	/* Note that win2000 may send us all zeros
-	 * for the hashes if it doesn't
-	 * think this channel is secure enough. */
-	if (user->lm_password_present) {
-		if (memcmp(user->lmpassword.hash, zero_buf, 16) != 0) {
-			sam_pwd_hash(rid, user->lmpassword.hash, lm_hash.hash, 0);
-		} else {
-			memset(lm_hash.hash, '\0', sizeof(lm_hash.hash));
-		}
-		user->lmpassword = lm_hash;
-	}
-
-	if (user->nt_password_present) {
-		if (memcmp(user->ntpassword.hash, zero_buf, 16) != 0) {
-			sam_pwd_hash(rid, user->ntpassword.hash, nt_hash.hash, 0);
-		} else {
-			memset(nt_hash.hash, '\0', sizeof(nt_hash.hash));
-		}
-		user->ntpassword = nt_hash;
-	}
-
-	if (user->user_private_info.SensitiveData) {
-		DATA_BLOB data;
-		struct netr_USER_KEYS keys;
-		enum ndr_err_code ndr_err;
-		data.data = user->user_private_info.SensitiveData;
-		data.length = user->user_private_info.DataLength;
-		SamOEMhashBlob(data.data, data.length, session_key);
-		user->user_private_info.SensitiveData = data.data;
-		user->user_private_info.DataLength = data.length;
-
-		ndr_err = ndr_pull_struct_blob(&data, mem_ctx, NULL, &keys,
-			(ndr_pull_flags_fn_t)ndr_pull_netr_USER_KEYS);
-		if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-			dump_data(10, data.data, data.length);
-			return ndr_map_error2ntstatus(ndr_err);
-		}
-
-		/* Note that win2000 may send us all zeros
-		 * for the hashes if it doesn't
-		 * think this channel is secure enough. */
-		if (keys.keys.keys2.lmpassword.length == 16) {
-			if (memcmp(keys.keys.keys2.lmpassword.pwd.hash,
-					zero_buf, 16) != 0) {
-				sam_pwd_hash(rid,
-					keys.keys.keys2.lmpassword.pwd.hash,
-					lm_hash.hash, 0);
-			} else {
-				memset(lm_hash.hash, '\0', sizeof(lm_hash.hash));
-			}
-			user->lmpassword = lm_hash;
-			user->lm_password_present = true;
-		}
-		if (keys.keys.keys2.ntpassword.length == 16) {
-			if (memcmp(keys.keys.keys2.ntpassword.pwd.hash,
-						zero_buf, 16) != 0) {
-				sam_pwd_hash(rid,
-					keys.keys.keys2.ntpassword.pwd.hash,
-					nt_hash.hash, 0);
-			} else {
-				memset(nt_hash.hash, '\0', sizeof(nt_hash.hash));
-			}
-			user->ntpassword = nt_hash;
-			user->nt_password_present = true;
-		}
-		/* TODO: rid decrypt history fields */
-	}
-	return NT_STATUS_OK;
-}
-
-/**
- * Decrypt and extract the secrets
- *
- * The writes decrypted secrets back into the structure
- */
-static NTSTATUS fix_secret(TALLOC_CTX *mem_ctx,
-			   DATA_BLOB *session_key,
-			   enum netr_SamDatabaseID database_id,
-			   struct netr_DELTA_ENUM *delta)
-{
-	struct netr_DELTA_SECRET *secret = delta->delta_union.secret;
-
-	SamOEMhashBlob(secret->current_cipher.cipher_data,
-		       secret->current_cipher.maxlen,
-		       session_key);
-
-	SamOEMhashBlob(secret->old_cipher.cipher_data,
-		       secret->old_cipher.maxlen,
-		       session_key);
-
-	return NT_STATUS_OK;
-}
-
-/**
- * Fix up the delta, dealing with encryption issues so that the final
- * callback need only do the printing or application logic
- */
-
-static NTSTATUS samsync_fix_delta(TALLOC_CTX *mem_ctx,
-				  DATA_BLOB *session_key,
-				  enum netr_SamDatabaseID database_id,
-				  struct netr_DELTA_ENUM *delta)
-{
-	NTSTATUS status = NT_STATUS_OK;
-
-	switch (delta->delta_type) {
-		case NETR_DELTA_USER:
-
-			status = fix_user(mem_ctx,
-					  session_key,
-					  database_id,
-					  delta);
-			break;
-		case NETR_DELTA_SECRET:
-
-			status = fix_secret(mem_ctx,
-					    session_key,
-					    database_id,
-					    delta);
-			break;
-		default:
-			break;
-	}
-
-	return status;
-}
+#include "../lib/crypto/crypto.h"
+#include "../libcli/samsync/samsync.h"
+#include "../libcli/auth/libcli_auth.h"
 
 /**
  * Fix up the delta, dealing with encryption issues so that the final
@@ -178,7 +33,7 @@ static NTSTATUS samsync_fix_delta(TALLOC_CTX *mem_ctx,
  */
 
 static NTSTATUS samsync_fix_delta_array(TALLOC_CTX *mem_ctx,
-					DATA_BLOB *session_key,
+					struct netlogon_creds_CredentialState *creds,
 					enum netr_SamDatabaseID database_id,
 					struct netr_DELTA_ENUM_ARRAY *r)
 {
@@ -188,7 +43,7 @@ static NTSTATUS samsync_fix_delta_array(TALLOC_CTX *mem_ctx,
 	for (i = 0; i < r->num_deltas; i++) {
 
 		status = samsync_fix_delta(mem_ctx,
-					   session_key,
+					   creds,
 					   database_id,
 					   &r->delta_enum[i]);
 		if (!NT_STATUS_IS_OK(status)) {
@@ -282,8 +137,8 @@ static const char *samsync_debug_str(TALLOC_CTX *mem_ctx,
  * libnet_samsync
  */
 
-void libnet_init_netr_ChangeLogEntry(struct samsync_object *o,
-				     struct netr_ChangeLogEntry *e)
+static void libnet_init_netr_ChangeLogEntry(struct samsync_object *o,
+					    struct netr_ChangeLogEntry *e)
 {
 	ZERO_STRUCTP(e);
 
@@ -331,50 +186,27 @@ void libnet_init_netr_ChangeLogEntry(struct samsync_object *o,
  * libnet_samsync_delta
  */
 
-static NTSTATUS libnet_samsync_delta(enum netr_SamDatabaseID database_id,
+static NTSTATUS libnet_samsync_delta(TALLOC_CTX *mem_ctx,
+				     enum netr_SamDatabaseID database_id,
+				     uint64_t *sequence_num,
 				     struct samsync_context *ctx,
 				     struct netr_ChangeLogEntry *e)
 {
 	NTSTATUS result;
 	NTSTATUS callback_status;
-	TALLOC_CTX *mem_ctx;
 	const char *logon_server = ctx->cli->desthost;
 	const char *computername = global_myname();
 	struct netr_Authenticator credential;
 	struct netr_Authenticator return_authenticator;
 	uint16_t restart_state = 0;
 	uint32_t sync_context = 0;
-	const char *debug_str;
-	DATA_BLOB session_key;
-	uint64_t sequence_num = 0;
 
 	ZERO_STRUCT(return_authenticator);
 
-	if (!ctx->ops) {
-		return NT_STATUS_INVALID_PARAMETER;
-	}
-
-	if (!(mem_ctx = talloc_init("libnet_samsync"))) {
-		return NT_STATUS_NO_MEMORY;
-	}
-
-	if (ctx->ops->startup) {
-		result = ctx->ops->startup(mem_ctx, ctx,
-					   database_id, &sequence_num);
-		if (!NT_STATUS_IS_OK(result)) {
-			goto out;
-		}
-	}
-
-	debug_str = samsync_debug_str(mem_ctx, ctx->mode, database_id);
-	if (debug_str) {
-		d_fprintf(stderr, "%s\n", debug_str);
-	}
-
 	do {
 		struct netr_DELTA_ENUM_ARRAY *delta_enum_array = NULL;
 
-		netlogon_creds_client_step(ctx->cli->dc, &credential);
+		netlogon_creds_client_authenticator(ctx->cli->dc, &credential);
 
 		if (ctx->single_object_replication &&
 		    !ctx->force_full_replication) {
@@ -386,14 +218,15 @@ static NTSTATUS libnet_samsync_delta(enum netr_SamDatabaseID database_id,
 							  *e,
 							  0,
 							  &delta_enum_array);
-		} else if (!ctx->force_full_replication && (sequence_num > 0)) {
+		} else if (!ctx->force_full_replication &&
+		           sequence_num && (*sequence_num > 0)) {
 			result = rpccli_netr_DatabaseDeltas(ctx->cli, mem_ctx,
 							    logon_server,
 							    computername,
 							    &credential,
 							    &return_authenticator,
 							    database_id,
-							    &sequence_num,
+							    sequence_num,
 							    &delta_enum_array,
 							    0xffff);
 		} else {
@@ -424,17 +257,15 @@ static NTSTATUS libnet_samsync_delta(enum netr_SamDatabaseID database_id,
 			break;
 		}
 
-		session_key = data_blob_const(ctx->cli->dc->sess_key, 16);
-
 		samsync_fix_delta_array(mem_ctx,
-					&session_key,
+					ctx->cli->dc,
 					database_id,
 					delta_enum_array);
 
 		/* Process results */
 		callback_status = ctx->ops->process_objects(mem_ctx, database_id,
 							    delta_enum_array,
-							    &sequence_num,
+							    sequence_num,
 							    ctx);
 		if (!NT_STATUS_IS_OK(callback_status)) {
 			result = callback_status;
@@ -443,39 +274,10 @@ static NTSTATUS libnet_samsync_delta(enum netr_SamDatabaseID database_id,
 
 		TALLOC_FREE(delta_enum_array);
 
-		/* Increment sync_context */
-		sync_context += 1;
-
 	} while (NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES));
 
  out:
 
-	if (NT_STATUS_IS_OK(result) && ctx->ops->finish) {
-		callback_status = ctx->ops->finish(mem_ctx, ctx,
-						   database_id, sequence_num);
-		if (!NT_STATUS_IS_OK(callback_status)) {
-			result = callback_status;
-		}
-	}
-
-	if (NT_STATUS_IS_ERR(result) && !ctx->error_message) {
-
-		ctx->error_message = talloc_asprintf(ctx,
-			"Failed to fetch %s database: %s",
-			samsync_database_str(database_id),
-			nt_errstr(result));
-
-		if (NT_STATUS_EQUAL(result, NT_STATUS_NOT_SUPPORTED)) {
-
-			ctx->error_message =
-				talloc_asprintf_append(ctx->error_message,
-					"\nPerhaps %s is a Windows native mode domain?",
-					ctx->domain_name);
-		}
-	}
-
-	talloc_destroy(mem_ctx);
-
 	return result;
 }
 
@@ -487,10 +289,37 @@ NTSTATUS libnet_samsync(enum netr_SamDatabaseID database_id,
 			struct samsync_context *ctx)
 {
 	NTSTATUS status = NT_STATUS_OK;
+	NTSTATUS callback_status;
+	TALLOC_CTX *mem_ctx;
+	const char *debug_str;
+	uint64_t sequence_num = 0;
 	int i = 0;
 
+	if (!(mem_ctx = talloc_new(ctx))) {
+		return NT_STATUS_NO_MEMORY;
+	}
+
+	if (!ctx->ops) {
+		return NT_STATUS_INVALID_PARAMETER;
+	}
+
+	if (ctx->ops->startup) {
+		status = ctx->ops->startup(mem_ctx, ctx,
+					   database_id, &sequence_num);
+		if (!NT_STATUS_IS_OK(status)) {
+			goto done;
+		}
+	}
+
+	debug_str = samsync_debug_str(mem_ctx, ctx->mode, database_id);
+	if (debug_str) {
+		d_fprintf(stderr, "%s\n", debug_str);
+	}
+
 	if (!ctx->single_object_replication) {
-		return libnet_samsync_delta(database_id, ctx, NULL);
+		status = libnet_samsync_delta(mem_ctx, database_id,
+					      &sequence_num, ctx, NULL);
+		goto done;
 	}
 
 	for (i=0; i<ctx->num_objects; i++) {
@@ -503,12 +332,41 @@ NTSTATUS libnet_samsync(enum netr_SamDatabaseID database_id,
 
 		libnet_init_netr_ChangeLogEntry(&ctx->objects[i], &e);
 
-		status = libnet_samsync_delta(database_id, ctx, &e);
+		status = libnet_samsync_delta(mem_ctx, database_id,
+					      &sequence_num, ctx, &e);
 		if (!NT_STATUS_IS_OK(status)) {
-			return status;
+			goto done;
+		}
+	}
+
+ done:
+
+	if (NT_STATUS_IS_OK(status) && ctx->ops->finish) {
+		callback_status = ctx->ops->finish(mem_ctx, ctx,
+						   database_id, sequence_num);
+		if (!NT_STATUS_IS_OK(callback_status)) {
+			status = callback_status;
+		}
+	}
+
+	if (NT_STATUS_IS_ERR(status) && !ctx->error_message) {
+
+		ctx->error_message = talloc_asprintf(ctx,
+			"Failed to fetch %s database: %s",
+			samsync_database_str(database_id),
+			nt_errstr(status));
+
+		if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {
+
+			ctx->error_message =
+				talloc_asprintf_append(ctx->error_message,
+					"\nPerhaps %s is a Windows native mode domain?",
+					ctx->domain_name);
 		}
 	}
 
+	talloc_destroy(mem_ctx);
+
 	return status;
 }