From: Michael Adam <obnox@samba.org>
Date: Mon, 28 Jul 2008 12:42:30 +0000 (+0200)
Subject: dssync keytab: add store enctypes in the libnet_keytype_entry structs.
X-Git-Tag: samba-3.3.0pre1~327
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=447b8b1122a35d4bc0ec0f88fb46d18cddcf6eb9;p=thirdparty%2Fsamba.git

dssync keytab: add store enctypes in the libnet_keytype_entry structs.

Still unused by the libnet_keytab_add() function.
This will follow.
In preparation of supporting multiple encryption types in libnet_dssync_keytab.

Michael
---

diff --git a/source/libnet/libnet_dssync_keytab.c b/source/libnet/libnet_dssync_keytab.c
index 350aa033208..cc53c983afd 100644
--- a/source/libnet/libnet_dssync_keytab.c
+++ b/source/libnet/libnet_dssync_keytab.c
@@ -28,6 +28,7 @@ static NTSTATUS add_to_keytab_entries(TALLOC_CTX *mem_ctx,
 				      uint32_t kvno,
 				      const char *name,
 				      const char *prefix,
+				      const krb5_enctype enctype,
 				      DATA_BLOB blob)
 {
 	struct libnet_keytab_entry entry;
@@ -38,6 +39,7 @@ static NTSTATUS add_to_keytab_entries(TALLOC_CTX *mem_ctx,
 					  prefix ? prefix : "",
 					  prefix ? "/" : "",
 					  name, ctx->dns_domain_name);
+	entry.enctype = enctype;
 	entry.password = blob;
 	NT_STATUS_HAVE_NO_MEMORY(entry.name);
 	NT_STATUS_HAVE_NO_MEMORY(entry.principal);
@@ -126,7 +128,8 @@ static NTSTATUS keytab_finish(struct dssync_context *ctx, TALLOC_CTX *mem_ctx,
 		}
 
 		status = add_to_keytab_entries(mem_ctx, keytab_ctx, 0,
-					       ctx->nc_dn, "UTDV", blob);
+					       ctx->nc_dn, "UTDV",
+					       ENCTYPE_NULL, blob);
 		if (!NT_STATUS_IS_OK(status)) {
 			goto done;
 		}
@@ -250,6 +253,7 @@ static NTSTATUS parse_object(TALLOC_CTX *mem_ctx,
 	DEBUGADD(1,("\n"));
 
 	status = add_to_keytab_entries(mem_ctx, ctx, kvno, name, NULL,
+				       ENCTYPE_ARCFOUR_HMAC,
 				       data_blob_talloc(mem_ctx, nt_passwd, 16));
 
 	if (!NT_STATUS_IS_OK(status)) {
@@ -272,6 +276,7 @@ static NTSTATUS parse_object(TALLOC_CTX *mem_ctx,
 
 	for (; i<pwd_history_len; i++) {
 		status = add_to_keytab_entries(mem_ctx, ctx, kvno--, name, NULL,
+				ENCTYPE_ARCFOUR_HMAC,
 				data_blob_talloc(mem_ctx, &pwd_history[i*16], 16));
 		if (!NT_STATUS_IS_OK(status)) {
 			break;