s3:auth Rename wksta_name -> workstation_name in auth_usersupplied_info

10 files changed, 34 insertions, 34 deletions

diff --git a/source3/auth/auth.c b/source3/auth/auth.c
index b4995ce19b..4fabbdddef 100644
--- a/source3/auth/auth.c
+++ b/source3/auth/auth.c
@@ -214,10 +214,10 @@ static NTSTATUS check_ntlm_password(const struct auth_context *auth_context,
 		return NT_STATUS_LOGON_FAILURE;
 
 	DEBUG(3, ("check_ntlm_password:  Checking password for unmapped user [%s]\\[%s]@[%s] with the new password interface\n", 
-		  user_info->client_domain, user_info->smb_name, user_info->wksta_name));
+		  user_info->client_domain, user_info->smb_name, user_info->workstation_name));
 
 	DEBUG(3, ("check_ntlm_password:  mapped user is: [%s]\\[%s]@[%s]\n", 
-		  user_info->domain, user_info->internal_username, user_info->wksta_name));
+		  user_info->domain, user_info->internal_username, user_info->workstation_name));
 
 	if (auth_context->challenge.length != 8) {
 		DEBUG(0, ("check_ntlm_password:  Invalid challenge stored for this auth context - cannot continue\n"));
diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c
index a42f3a1169..9d63e59dd6 100644
--- a/source3/auth/auth_domain.c
+++ b/source3/auth/auth_domain.c
@@ -310,7 +310,7 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx,
 						      dc_name,                    /* server name */
 						      user_info->smb_name,        /* user name logging on. */
 						      user_info->client_domain,   /* domain name */
-						      user_info->wksta_name,      /* workstation name */
+						      user_info->workstation_name,/* workstation name */
 						      chal,                       /* 8 byte challenge. */
 						      user_info->lm_resp,         /* lanman 24 byte response */
 						      user_info->nt_resp,         /* nt 24 byte response */
diff --git a/source3/auth/auth_netlogond.c b/source3/auth/auth_netlogond.c
index 1442e2f6ee..28ef93398c 100644
--- a/source3/auth/auth_netlogond.c
+++ b/source3/auth/auth_netlogond.c
@@ -80,16 +80,16 @@ static NTSTATUS netlogond_validate(TALLOC_CTX *mem_ctx,
 
 	status = rpccli_netlogon_sam_network_logon_ex(
 		p, p,
-		user_info->logon_parameters,/* flags such as 'allow
-					     * workstation logon' */
-		global_myname(),            /* server name */
-		user_info->smb_name,        /* user name logging on. */
-		user_info->client_domain,   /* domain name */
-		user_info->wksta_name,      /* workstation name */
+		user_info->logon_parameters,           /* flags such as 'allow
+					                * workstation logon' */
+		global_myname(),                       /* server name */
+		user_info->smb_name,                   /* user name logging on. */
+		user_info->client_domain,              /* domain name */
+		user_info->workstation_name,           /* workstation name */
 		(uchar *)auth_context->challenge.data, /* 8 byte challenge. */
-		user_info->lm_resp,         /* lanman 24 byte response */
-		user_info->nt_resp,         /* nt 24 byte response */
-		&info3);                    /* info3 out */
+		user_info->lm_resp,                    /* lanman 24 byte response */
+		user_info->nt_resp,                    /* nt 24 byte response */
+		&info3);                               /* info3 out */
 
 	DEBUG(10, ("rpccli_netlogon_sam_network_logon_ex returned %s\n",
 		   nt_errstr(status)));
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 3a63a3bee3..a64fd33db2 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -111,7 +111,7 @@ static int _smb_create_user(const char *domain, const char *unix_username, const
 NTSTATUS make_user_info_map(struct auth_usersupplied_info **user_info,
 			    const char *smb_name,
 			    const char *client_domain,
-			    const char *wksta_name,
+			    const char *workstation_name,
 			    DATA_BLOB *lm_pwd,
 			    DATA_BLOB *nt_pwd,
 			    DATA_BLOB *lm_interactive_pwd,
@@ -127,7 +127,7 @@ NTSTATUS make_user_info_map(struct auth_usersupplied_info **user_info,
 	was_mapped = map_username(internal_username);
 
 	DEBUG(5, ("Mapping user [%s]\\[%s] from workstation [%s]\n",
-		 client_domain, smb_name, wksta_name));
+		 client_domain, smb_name, workstation_name));
 
 	domain = client_domain;
 
@@ -148,7 +148,7 @@ NTSTATUS make_user_info_map(struct auth_usersupplied_info **user_info,
 			domain = get_global_sam_name();
 		DEBUG(5, ("Mapped domain from [%s] to [%s] for user [%s] from "
 			  "workstation [%s]\n",
-			  client_domain, domain, smb_name, wksta_name));
+			  client_domain, domain, smb_name, workstation_name));
 	}
 
 	/* We know that the given domain is trusted (and we are allowing them),
@@ -156,7 +156,7 @@ NTSTATUS make_user_info_map(struct auth_usersupplied_info **user_info,
 	 * primary domain name */
 
 	result = make_user_info(user_info, smb_name, internal_username,
-			      client_domain, domain, wksta_name,
+			      client_domain, domain, workstation_name,
 			      lm_pwd, nt_pwd,
 			      lm_interactive_pwd, nt_interactive_pwd,
 			      plaintext, encrypted);
@@ -174,7 +174,7 @@ NTSTATUS make_user_info_map(struct auth_usersupplied_info **user_info,
 bool make_user_info_netlogon_network(struct auth_usersupplied_info **user_info,
 				     const char *smb_name, 
 				     const char *client_domain, 
-				     const char *wksta_name, 
+				     const char *workstation_name,
 				     uint32 logon_parameters,
 				     const uchar *lm_network_pwd,
 				     int lm_pwd_len,
@@ -188,7 +188,7 @@ bool make_user_info_netlogon_network(struct auth_usersupplied_info **user_info,
 
 	status = make_user_info_map(user_info,
 				    smb_name, client_domain, 
-				    wksta_name, 
+				    workstation_name,
 				    lm_pwd_len ? &lm_blob : NULL, 
 				    nt_pwd_len ? &nt_blob : NULL,
 				    NULL, NULL, NULL,
@@ -212,7 +212,7 @@ bool make_user_info_netlogon_network(struct auth_usersupplied_info **user_info,
 bool make_user_info_netlogon_interactive(struct auth_usersupplied_info **user_info,
 					 const char *smb_name, 
 					 const char *client_domain, 
-					 const char *wksta_name, 
+					 const char *workstation_name,
 					 uint32 logon_parameters,
 					 const uchar chal[8], 
 					 const uchar lm_interactive_pwd[16], 
@@ -296,7 +296,7 @@ bool make_user_info_netlogon_interactive(struct auth_usersupplied_info **user_in
 
 		nt_status = make_user_info_map(
 			user_info, 
-			smb_name, client_domain, wksta_name, 
+			smb_name, client_domain, workstation_name,
 			lm_interactive_pwd ? &local_lm_blob : NULL,
 			nt_interactive_pwd ? &local_nt_blob : NULL,
 			lm_interactive_pwd ? &lm_interactive_blob : NULL,
diff --git a/source3/auth/auth_wbc.c b/source3/auth/auth_wbc.c
index 11cc7eafb3..7d46c8578c 100644
--- a/source3/auth/auth_wbc.c
+++ b/source3/auth/auth_wbc.c
@@ -65,7 +65,7 @@ static NTSTATUS check_wbc_security(const struct auth_context *auth_context,
 
 	params.account_name	= user_info->smb_name;
 	params.domain_name	= user_info->domain;
-	params.workstation_name	= user_info->wksta_name;
+	params.workstation_name	= user_info->workstation_name;
 
 	params.flags		= 0;
 	params.parameter_control= user_info->logon_parameters;
diff --git a/source3/auth/auth_winbind.c b/source3/auth/auth_winbind.c
index 68509e4342..d534e59cfc 100644
--- a/source3/auth/auth_winbind.c
+++ b/source3/auth/auth_winbind.c
@@ -61,7 +61,7 @@ static NTSTATUS check_winbind_security(const struct auth_context *auth_context,
 
 	params.account_name	= user_info->smb_name;
 	params.domain_name	= user_info->domain;
-	params.workstation_name	= user_info->wksta_name;
+	params.workstation_name	= user_info->workstation_name;
 
 	params.flags		= 0;
 	params.parameter_control= user_info->logon_parameters;
diff --git a/source3/auth/check_samsec.c b/source3/auth/check_samsec.c
index ef29df4d56..41a995e155 100644
--- a/source3/auth/check_samsec.c
+++ b/source3/auth/check_samsec.c
@@ -234,15 +234,15 @@ static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx,
 		bool invalid_ws = True;
 		char *tok = NULL;
 		const char *s = workstation_list;
-		char *machine_name = talloc_asprintf(mem_ctx, "%s$", user_info->wksta_name);
+		char *machine_name = talloc_asprintf(mem_ctx, "%s$", user_info->workstation_name);
 
 		if (machine_name == NULL)
 			return NT_STATUS_NO_MEMORY;
 
 		while (next_token_talloc(mem_ctx, &s, &tok, ",")) {
 			DEBUG(10,("sam_account_ok: checking for workstation match %s and %s\n",
-				  tok, user_info->wksta_name));
-			if(strequal(tok, user_info->wksta_name)) {
+				  tok, user_info->workstation_name));
+			if(strequal(tok, user_info->workstation_name)) {
 				invalid_ws = False;
 				break;
 			}
diff --git a/source3/auth/user_info.c b/source3/auth/user_info.c
index eb84a369f5..de2022b8d5 100644
--- a/source3/auth/user_info.c
+++ b/source3/auth/user_info.c
@@ -31,7 +31,7 @@ NTSTATUS make_user_info(struct auth_usersupplied_info **user_info,
 			const char *internal_username,
 			const char *client_domain,
 			const char *domain,
-			const char *wksta_name,
+			const char *workstation_name,
 			const DATA_BLOB *lm_pwd,
 			const DATA_BLOB *nt_pwd,
 			const DATA_BLOB *lm_interactive_pwd,
@@ -76,8 +76,8 @@ NTSTATUS make_user_info(struct auth_usersupplied_info **user_info,
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	(*user_info)->wksta_name = SMB_STRDUP(wksta_name);
-	if ((*user_info)->wksta_name == NULL) {
+	(*user_info)->workstation_name = SMB_STRDUP(workstation_name);
+	if ((*user_info)->workstation_name == NULL) {
 		free_user_info(user_info);
 		return NT_STATUS_NO_MEMORY;
 	}
@@ -121,7 +121,7 @@ void free_user_info(struct auth_usersupplied_info **user_info)
 		SAFE_FREE((*user_info)->internal_username);
 		SAFE_FREE((*user_info)->client_domain);
 		SAFE_FREE((*user_info)->domain);
-		SAFE_FREE((*user_info)->wksta_name);
+		SAFE_FREE((*user_info)->workstation_name);
 		data_blob_free(&(*user_info)->lm_resp);
 		data_blob_free(&(*user_info)->nt_resp);
 		data_blob_clear_free(&(*user_info)->lm_interactive_pwd);
diff --git a/source3/include/auth.h b/source3/include/auth.h
index 69a91d29aa..52e5141379 100644
--- a/source3/include/auth.h
+++ b/source3/include/auth.h
@@ -33,7 +33,7 @@ struct auth_usersupplied_info {
 	char *domain;                 /* domain name after mapping */
 	char *internal_username;      /* username after mapping */
 	char *smb_name;               /* username before mapping */
-	char *wksta_name;             /* workstation name (netbios calling
+	const char *workstation_name; /* workstation name (netbios calling
 				       * name) unicode string */
 
 	uint32 logon_parameters;
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 240c95f3a0..ee68dd1ae7 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -106,7 +106,7 @@ NTSTATUS auth_unix_init(void);
 NTSTATUS make_user_info_map(struct auth_usersupplied_info **user_info,
 			    const char *smb_name, 
 			    const char *client_domain, 
-			    const char *wksta_name, 
+			    const char *workstation_name,
  			    DATA_BLOB *lm_pwd, DATA_BLOB *nt_pwd,
  			    DATA_BLOB *lm_interactive_pwd, DATA_BLOB *nt_interactive_pwd,
 			    DATA_BLOB *plaintext, 
@@ -114,7 +114,7 @@ NTSTATUS make_user_info_map(struct auth_usersupplied_info **user_info,
 bool make_user_info_netlogon_network(struct auth_usersupplied_info **user_info,
 				     const char *smb_name, 
 				     const char *client_domain, 
-				     const char *wksta_name, 
+				     const char *workstation_name,
 				     uint32 logon_parameters,
 				     const uchar *lm_network_pwd,
 				     int lm_pwd_len,
@@ -123,7 +123,7 @@ bool make_user_info_netlogon_network(struct auth_usersupplied_info **user_info,
 bool make_user_info_netlogon_interactive(struct auth_usersupplied_info **user_info,
 					 const char *smb_name, 
 					 const char *client_domain, 
-					 const char *wksta_name, 
+					 const char *workstation_name,
 					 uint32 logon_parameters,
 					 const uchar chal[8], 
 					 const uchar lm_interactive_pwd[16], 
@@ -190,7 +190,7 @@ NTSTATUS make_user_info(struct auth_usersupplied_info **user_info,
 			const char *internal_username,
 			const char *client_domain,
 			const char *domain,
-			const char *wksta_name,
+			const char *workstation_name,
 			const DATA_BLOB *lm_pwd,
 			const DATA_BLOB *nt_pwd,
 			const DATA_BLOB *lm_interactive_pwd,