From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 1 Aug 2012 09:00:02 +0000 (+0200)
Subject: s3:rpc_client: rename pipe_auth_data->user_session_key to transport_session_key
X-Git-Tag: ldb-1.1.9~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e1c6d42327faae5df6e384cf9573bf4dc925038;p=thirdparty%2Fsamba.git

s3:rpc_client: rename pipe_auth_data->user_session_key to transport_session_key

metze
---

diff --git a/source3/librpc/rpc/dcerpc.h b/source3/librpc/rpc/dcerpc.h
index a91b06e0e93..b3ae3b4e5c4 100644
--- a/source3/librpc/rpc/dcerpc.h
+++ b/source3/librpc/rpc/dcerpc.h
@@ -45,7 +45,7 @@ struct pipe_auth_data {
 	/* Only the client code uses these 3 for now */
 	char *domain;
 	char *user_name;
-	DATA_BLOB user_session_key;
+	DATA_BLOB transport_session_key;
 };
 
 /* The following definitions come from librpc/rpc/dcerpc_helpers.c  */
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index bd4981316df..edb3876b70e 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -2873,9 +2873,9 @@ NTSTATUS cli_rpc_pipe_open_noauth_transport(struct cli_state *cli,
 		}
 
 		status = smbXcli_session_application_key(session, auth,
-						&auth->user_session_key);
+						&auth->transport_session_key);
 		if (!NT_STATUS_IS_OK(status)) {
-			auth->user_session_key = data_blob_null;
+			auth->transport_session_key = data_blob_null;
 		}
 	}
 
@@ -3147,8 +3147,8 @@ NTSTATUS cli_get_session_key(TALLOC_CTX *mem_ctx,
 		break;
 	case DCERPC_AUTH_TYPE_NCALRPC_AS_SYSTEM:
 	case DCERPC_AUTH_TYPE_NONE:
-		sk = data_blob_const(a->user_session_key.data,
-				     a->user_session_key.length);
+		sk = data_blob_const(a->transport_session_key.data,
+				     a->transport_session_key.length);
 		make_dup = true;
 		break;
 	default: