r6736: Revert metze's -r 6734, as metze and I made the same changes at the

same time, but with different names.  This just helps me avoid
conflicts when I merge up my other changes.

Andrew Bartlett
(This used to be commit 27e6a853a5160cb1ad595bea25e891eeae439662)

3 files changed, 51 insertions, 51 deletions

diff --git a/source4/auth/ntlmssp/ntlmssp.h b/source4/auth/ntlmssp/ntlmssp.h
index aa69fe277d..270beb151f 100644
--- a/source4/auth/ntlmssp/ntlmssp.h
+++ b/source4/auth/ntlmssp/ntlmssp.h
@@ -178,7 +178,7 @@ struct gensec_ntlmssp_state
 			/* internal variables used by NTLM2 */
 			uint8_t session_nonce[16];
 		} ntlm2;
-	} v;
+	};
 
 	struct auth_context *auth_context;
 	struct auth_serversupplied_info *server_info;
diff --git a/source4/auth/ntlmssp/ntlmssp_server.c b/source4/auth/ntlmssp/ntlmssp_server.c
index c3a2d4179a..c54d30abdc 100644
--- a/source4/auth/ntlmssp/ntlmssp_server.c
+++ b/source4/auth/ntlmssp/ntlmssp_server.c
@@ -350,11 +350,11 @@ static NTSTATUS ntlmssp_server_preauth(struct gensec_ntlmssp_state *gensec_ntlms
 			
 			gensec_ntlmssp_state->doing_ntlm2 = True;
 
-			memcpy(gensec_ntlmssp_state->v.ntlm2.session_nonce, gensec_ntlmssp_state->internal_chal.data, 8);
-			memcpy(&gensec_ntlmssp_state->v.ntlm2.session_nonce[8], gensec_ntlmssp_state->lm_resp.data, 8);
+			memcpy(gensec_ntlmssp_state->ntlm2.session_nonce, gensec_ntlmssp_state->internal_chal.data, 8);
+			memcpy(&gensec_ntlmssp_state->ntlm2.session_nonce[8], gensec_ntlmssp_state->lm_resp.data, 8);
 			
 			MD5Init(&md5_session_nonce_ctx);
-			MD5Update(&md5_session_nonce_ctx, gensec_ntlmssp_state->v.ntlm2.session_nonce, 16);
+			MD5Update(&md5_session_nonce_ctx, gensec_ntlmssp_state->ntlm2.session_nonce, 16);
 			MD5Final(session_nonce_hash, &md5_session_nonce_ctx);
 			
 			gensec_ntlmssp_state->chal = data_blob_talloc(gensec_ntlmssp_state, 
@@ -404,8 +404,8 @@ static NTSTATUS ntlmssp_server_postauth(struct gensec_ntlmssp_state *gensec_ntlm
 	if (gensec_ntlmssp_state->doing_ntlm2) {
 		if (user_session_key && user_session_key->data && user_session_key->length == 16) {
 			session_key = data_blob_talloc(gensec_ntlmssp_state, NULL, 16);
-			hmac_md5(user_session_key->data, gensec_ntlmssp_state->v.ntlm2.session_nonce, 
-				 sizeof(gensec_ntlmssp_state->v.ntlm2.session_nonce), session_key.data);
+			hmac_md5(user_session_key->data, gensec_ntlmssp_state->ntlm2.session_nonce, 
+				 sizeof(gensec_ntlmssp_state->ntlm2.session_nonce), session_key.data);
 			DEBUG(10,("ntlmssp_server_auth: Created NTLM2 session key.\n"));
 			dump_data_pw("NTLM2 session key:\n", session_key.data, session_key.length);
 			
diff --git a/source4/auth/ntlmssp/ntlmssp_sign.c b/source4/auth/ntlmssp/ntlmssp_sign.c
index bcb0b8afa1..2a8073ded6 100644
--- a/source4/auth/ntlmssp/ntlmssp_sign.c
+++ b/source4/auth/ntlmssp/ntlmssp_sign.c
@@ -78,16 +78,16 @@ static NTSTATUS ntlmssp_make_packet_signature(struct gensec_ntlmssp_state *gense
 			
 		switch (direction) {
 		case NTLMSSP_SEND:
-			SIVAL(seq_num, 0, gensec_ntlmssp_state->v.ntlm2.send_seq_num);
-			gensec_ntlmssp_state->v.ntlm2.send_seq_num++;
-			hmac_md5_init_limK_to_64(gensec_ntlmssp_state->v.ntlm2.send_sign_key.data, 
-						 gensec_ntlmssp_state->v.ntlm2.send_sign_key.length, &ctx);
+			SIVAL(seq_num, 0, gensec_ntlmssp_state->ntlm2.send_seq_num);
+			gensec_ntlmssp_state->ntlm2.send_seq_num++;
+			hmac_md5_init_limK_to_64(gensec_ntlmssp_state->ntlm2.send_sign_key.data, 
+						 gensec_ntlmssp_state->ntlm2.send_sign_key.length, &ctx);
 			break;
 		case NTLMSSP_RECEIVE:
-			SIVAL(seq_num, 0, gensec_ntlmssp_state->v.ntlm2.recv_seq_num);
-			gensec_ntlmssp_state->v.ntlm2.recv_seq_num++;
-			hmac_md5_init_limK_to_64(gensec_ntlmssp_state->v.ntlm2.recv_sign_key.data, 
-						 gensec_ntlmssp_state->v.ntlm2.recv_sign_key.length, &ctx);
+			SIVAL(seq_num, 0, gensec_ntlmssp_state->ntlm2.recv_seq_num);
+			gensec_ntlmssp_state->ntlm2.recv_seq_num++;
+			hmac_md5_init_limK_to_64(gensec_ntlmssp_state->ntlm2.recv_sign_key.data, 
+						 gensec_ntlmssp_state->ntlm2.recv_sign_key.length, &ctx);
 			break;
 		}
 		hmac_md5_update(seq_num, sizeof(seq_num), &ctx);
@@ -97,10 +97,10 @@ static NTSTATUS ntlmssp_make_packet_signature(struct gensec_ntlmssp_state *gense
 		if (encrypt_sig && gensec_ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCH) {
 			switch (direction) {
 			case NTLMSSP_SEND:
-				arcfour_crypt_sbox(gensec_ntlmssp_state->v.ntlm2.send_seal_arcfour_state, digest, 8);
+				arcfour_crypt_sbox(gensec_ntlmssp_state->ntlm2.send_seal_arcfour_state, digest, 8);
 				break;
 			case NTLMSSP_RECEIVE:
-				arcfour_crypt_sbox(gensec_ntlmssp_state->v.ntlm2.recv_seal_arcfour_state, digest, 8);
+				arcfour_crypt_sbox(gensec_ntlmssp_state->ntlm2.recv_seal_arcfour_state, digest, 8);
 				break;
 			}
 		}
@@ -112,12 +112,12 @@ static NTSTATUS ntlmssp_make_packet_signature(struct gensec_ntlmssp_state *gense
 	} else {
 		uint32_t crc;
 		crc = crc32_calc_buffer(data, length);
-		if (!msrpc_gen(sig_mem_ctx, sig, "dddd", NTLMSSP_SIGN_VERSION, 0, crc, gensec_ntlmssp_state->v.ntlm.seq_num)) {
+		if (!msrpc_gen(sig_mem_ctx, sig, "dddd", NTLMSSP_SIGN_VERSION, 0, crc, gensec_ntlmssp_state->ntlm.seq_num)) {
 			return NT_STATUS_NO_MEMORY;
 		}
-		gensec_ntlmssp_state->v.ntlm.seq_num++;
+		gensec_ntlmssp_state->ntlm.seq_num++;
 
-		arcfour_crypt_sbox(gensec_ntlmssp_state->v.ntlm.arcfour_state, sig->data+4, sig->length-4);
+		arcfour_crypt_sbox(gensec_ntlmssp_state->ntlm.arcfour_state, sig->data+4, sig->length-4);
 	}
 	dump_data_pw("calculated ntlmssp signature\n", sig->data, sig->length);
 	return NT_STATUS_OK;
@@ -249,14 +249,14 @@ NTSTATUS gensec_ntlmssp_seal_packet(struct gensec_security *gensec_security,
 							  data, length, 
 							  whole_pdu, pdu_length, 
 							  NTLMSSP_SEND, sig, False);
-		arcfour_crypt_sbox(gensec_ntlmssp_state->v.ntlm2.send_seal_arcfour_state, data, length);
+		arcfour_crypt_sbox(gensec_ntlmssp_state->ntlm2.send_seal_arcfour_state, data, length);
 		if (gensec_ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_KEY_EXCH) {
-			arcfour_crypt_sbox(gensec_ntlmssp_state->v.ntlm2.send_seal_arcfour_state, sig->data+4, 8);
+			arcfour_crypt_sbox(gensec_ntlmssp_state->ntlm2.send_seal_arcfour_state, sig->data+4, 8);
 		}
 	} else {
 		uint32_t crc;
 		crc = crc32_calc_buffer(data, length);
-		if (!msrpc_gen(sig_mem_ctx, sig, "dddd", NTLMSSP_SIGN_VERSION, 0, crc, gensec_ntlmssp_state->v.ntlm.seq_num)) {
+		if (!msrpc_gen(sig_mem_ctx, sig, "dddd", NTLMSSP_SIGN_VERSION, 0, crc, gensec_ntlmssp_state->ntlm.seq_num)) {
 			return NT_STATUS_NO_MEMORY;
 		}
 
@@ -266,10 +266,10 @@ NTSTATUS gensec_ntlmssp_seal_packet(struct gensec_security *gensec_security,
 		   constant, but is is rather updated with each
 		   iteration */
 
-		arcfour_crypt_sbox(gensec_ntlmssp_state->v.ntlm.arcfour_state, data, length);
-		arcfour_crypt_sbox(gensec_ntlmssp_state->v.ntlm.arcfour_state, sig->data+4, sig->length-4);
+		arcfour_crypt_sbox(gensec_ntlmssp_state->ntlm.arcfour_state, data, length);
+		arcfour_crypt_sbox(gensec_ntlmssp_state->ntlm.arcfour_state, sig->data+4, sig->length-4);
 		/* increment counter on send */
-		gensec_ntlmssp_state->v.ntlm.seq_num++;
+		gensec_ntlmssp_state->ntlm.seq_num++;
 		nt_status = NT_STATUS_OK;
 	}
 	dump_data_pw("ntlmssp signature\n", sig->data, sig->length);
@@ -303,7 +303,7 @@ NTSTATUS gensec_ntlmssp_unseal_packet(struct gensec_security *gensec_security,
 
 	dump_data_pw("ntlmssp sealed data\n", data, length);
 	if (gensec_ntlmssp_state->neg_flags & NTLMSSP_NEGOTIATE_NTLM2) {
-		arcfour_crypt_sbox(gensec_ntlmssp_state->v.ntlm2.recv_seal_arcfour_state, data, length);
+		arcfour_crypt_sbox(gensec_ntlmssp_state->ntlm2.recv_seal_arcfour_state, data, length);
 
 		nt_status = ntlmssp_make_packet_signature(gensec_ntlmssp_state, sig_mem_ctx, 
 							  data, length, 
@@ -329,7 +329,7 @@ NTSTATUS gensec_ntlmssp_unseal_packet(struct gensec_security *gensec_security,
 		dump_data_pw("ntlmssp clear data\n", data, length);
 		return NT_STATUS_OK;
 	} else {
-		arcfour_crypt_sbox(gensec_ntlmssp_state->v.ntlm.arcfour_state, data, length);
+		arcfour_crypt_sbox(gensec_ntlmssp_state->ntlm.arcfour_state, data, length);
 		dump_data_pw("ntlmssp clear data\n", data, length);
 		return gensec_ntlmssp_check_packet(gensec_security, sig_mem_ctx, data, length, whole_pdu, pdu_length, sig);
 	}
@@ -379,10 +379,10 @@ NTSTATUS ntlmssp_sign_init(struct gensec_ntlmssp_state *gensec_ntlmssp_state)
 			return NT_STATUS_INTERNAL_ERROR;
 		}
 		
-		gensec_ntlmssp_state->v.ntlm2.send_seal_arcfour_state = talloc(gensec_ntlmssp_state, struct arcfour_state);
-		NT_STATUS_HAVE_NO_MEMORY(gensec_ntlmssp_state->v.ntlm2.send_seal_arcfour_state);
-		gensec_ntlmssp_state->v.ntlm2.recv_seal_arcfour_state = talloc(gensec_ntlmssp_state, struct arcfour_state);
-		NT_STATUS_HAVE_NO_MEMORY(gensec_ntlmssp_state->v.ntlm2.send_seal_arcfour_state);
+		gensec_ntlmssp_state->ntlm2.send_seal_arcfour_state = talloc(gensec_ntlmssp_state, struct arcfour_state);
+		NT_STATUS_HAVE_NO_MEMORY(gensec_ntlmssp_state->ntlm2.send_seal_arcfour_state);
+		gensec_ntlmssp_state->ntlm2.recv_seal_arcfour_state = talloc(gensec_ntlmssp_state, struct arcfour_state);
+		NT_STATUS_HAVE_NO_MEMORY(gensec_ntlmssp_state->ntlm2.send_seal_arcfour_state);
 
 		/**
 		   Weaken NTLMSSP keys to cope with down-level clients, servers and export restrictions.
@@ -404,11 +404,11 @@ NTSTATUS ntlmssp_sign_init(struct gensec_ntlmssp_state *gensec_ntlmssp_state)
 
 		/* SEND */
 		calc_ntlmv2_key(gensec_ntlmssp_state, 
-				&gensec_ntlmssp_state->v.ntlm2.send_sign_key, 
+				&gensec_ntlmssp_state->ntlm2.send_sign_key, 
 				gensec_ntlmssp_state->session_key, send_sign_const);
 		dump_data_pw("NTLMSSP send sign key:\n",
-			     gensec_ntlmssp_state->v.ntlm2.send_sign_key.data, 
-			     gensec_ntlmssp_state->v.ntlm2.send_sign_key.length);
+			     gensec_ntlmssp_state->ntlm2.send_sign_key.data, 
+			     gensec_ntlmssp_state->ntlm2.send_sign_key.length);
 		
 		calc_ntlmv2_key(gensec_ntlmssp_state, 
 				&send_seal_key, 
@@ -417,20 +417,20 @@ NTSTATUS ntlmssp_sign_init(struct gensec_ntlmssp_state *gensec_ntlmssp_state)
 			     send_seal_key.data, 
 			     send_seal_key.length);
 
-		arcfour_init(gensec_ntlmssp_state->v.ntlm2.send_seal_arcfour_state, 
+		arcfour_init(gensec_ntlmssp_state->ntlm2.send_seal_arcfour_state, 
 			     &send_seal_key);
 
 		dump_data_pw("NTLMSSP send sesl hash:\n", 
-			     gensec_ntlmssp_state->v.ntlm2.send_seal_arcfour_state->sbox, 
-			     sizeof(gensec_ntlmssp_state->v.ntlm2.send_seal_arcfour_state->sbox));
+			     gensec_ntlmssp_state->ntlm2.send_seal_arcfour_state->sbox, 
+			     sizeof(gensec_ntlmssp_state->ntlm2.send_seal_arcfour_state->sbox));
 
 		/* RECV */
 		calc_ntlmv2_key(gensec_ntlmssp_state, 
-				&gensec_ntlmssp_state->v.ntlm2.recv_sign_key, 
+				&gensec_ntlmssp_state->ntlm2.recv_sign_key, 
 				gensec_ntlmssp_state->session_key, recv_sign_const);
 		dump_data_pw("NTLMSSP recv sign key:\n",
-			     gensec_ntlmssp_state->v.ntlm2.recv_sign_key.data, 
-			     gensec_ntlmssp_state->v.ntlm2.recv_sign_key.length);
+			     gensec_ntlmssp_state->ntlm2.recv_sign_key.data, 
+			     gensec_ntlmssp_state->ntlm2.recv_sign_key.length);
 
 		calc_ntlmv2_key(gensec_ntlmssp_state, 
 				&recv_seal_key, 
@@ -438,28 +438,28 @@ NTSTATUS ntlmssp_sign_init(struct gensec_ntlmssp_state *gensec_ntlmssp_state)
 		dump_data_pw("NTLMSSP recv seal key:\n",
 			     recv_seal_key.data, 
 			     recv_seal_key.length);
-		arcfour_init(gensec_ntlmssp_state->v.ntlm2.recv_seal_arcfour_state, 
+		arcfour_init(gensec_ntlmssp_state->ntlm2.recv_seal_arcfour_state, 
 			     &recv_seal_key);
 
 		dump_data_pw("NTLMSSP receive seal hash:\n", 
-			     gensec_ntlmssp_state->v.ntlm2.recv_seal_arcfour_state->sbox, 
-			     sizeof(gensec_ntlmssp_state->v.ntlm2.recv_seal_arcfour_state->sbox));
+			     gensec_ntlmssp_state->ntlm2.recv_seal_arcfour_state->sbox, 
+			     sizeof(gensec_ntlmssp_state->ntlm2.recv_seal_arcfour_state->sbox));
 
-		gensec_ntlmssp_state->v.ntlm2.send_seq_num = 0;
-		gensec_ntlmssp_state->v.ntlm2.recv_seq_num = 0;
+		gensec_ntlmssp_state->ntlm2.send_seq_num = 0;
+		gensec_ntlmssp_state->ntlm2.recv_seq_num = 0;
 
 	} else {
 		DEBUG(5, ("NTLMSSP Sign/Seal - using NTLM1\n"));
 
-		gensec_ntlmssp_state->v.ntlm.arcfour_state = talloc(gensec_ntlmssp_state, struct arcfour_state);
-		NT_STATUS_HAVE_NO_MEMORY(gensec_ntlmssp_state->v.ntlm.arcfour_state);
+		gensec_ntlmssp_state->ntlm.arcfour_state = talloc(gensec_ntlmssp_state, struct arcfour_state);
+		NT_STATUS_HAVE_NO_MEMORY(gensec_ntlmssp_state->ntlm.arcfour_state);
 
-		arcfour_init(gensec_ntlmssp_state->v.ntlm.arcfour_state, 
+		arcfour_init(gensec_ntlmssp_state->ntlm.arcfour_state, 
 			     &gensec_ntlmssp_state->session_key);
-		dump_data_pw("NTLMSSP hash:\n", gensec_ntlmssp_state->v.ntlm.arcfour_state->sbox,
-			     sizeof(gensec_ntlmssp_state->v.ntlm.arcfour_state->sbox));
+		dump_data_pw("NTLMSSP hash:\n", gensec_ntlmssp_state->ntlm.arcfour_state->sbox,
+			     sizeof(gensec_ntlmssp_state->ntlm.arcfour_state->sbox));
 
-		gensec_ntlmssp_state->v.ntlm.seq_num = 0;
+		gensec_ntlmssp_state->ntlm.seq_num = 0;
 	}
 
 	return NT_STATUS_OK;