Skip to content

Commit aca0001

Browse files
authored
Merge pull request #191915 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 8a145b5 + 84be9f7 commit aca0001

File tree

5 files changed

+39
-1
lines changed

5 files changed

+39
-1
lines changed

articles/active-directory/authentication/howto-authentication-passwordless-security-key-on-premises.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ Run the following steps in each domain and forest in your organization that cont
9898
1. Open a PowerShell prompt using the Run as administrator option.
9999
1. Run the following PowerShell commands to create a new Azure AD Kerberos Server object both in your on-premises Active Directory domain and in your Azure Active Directory tenant.
100100

101+
### Example 1 prompt for all credentials
101102
> [!NOTE]
102103
> Replace `contoso.corp.com` in the following example with your on-premises Active Directory domain name.
103104
@@ -117,6 +118,7 @@ Run the following steps in each domain and forest in your organization that cont
117118
Set-AzureADKerberosServer -Domain $domain -CloudCredential $cloudCred -DomainCredential $domainCred
118119
```
119120

121+
### Example 2 prompt for cloud credential
120122
> [!NOTE]
121123
> If you're working on a domain-joined machine with an account that has domain administrator privileges, you can skip the "-DomainCredential" parameter. If the "-DomainCredential" parameter isn't provided, the current Windows login credential is used to access your on-premises Active Directory Domain Controller.
122124
@@ -134,6 +136,7 @@ Run the following steps in each domain and forest in your organization that cont
134136
Set-AzureADKerberosServer -Domain $domain -CloudCredential $cloudCred
135137
```
136138

139+
### Example 3 prompt for all credentials using modern authentication
137140
> [!NOTE]
138141
> If your organization protects password-based sign-in and enforces modern authentication methods such as multifactor authentication, FIDO2, or smart card technology, you must use the `-UserPrincipalName` parameter with the User Principal Name (UPN) of a global administrator.
139142
> - Replace `contoso.corp.com` in the following example with your on-premises Active Directory domain name.
@@ -156,6 +159,26 @@ Run the following steps in each domain and forest in your organization that cont
156159
Set-AzureADKerberosServer -Domain $domain -UserPrincipalName $userPrincipalName -DomainCredential $domainCred
157160
```
158161

162+
### Example 4 prompt for cloud credentials using modern authentication
163+
> [!NOTE]
164+
> If you are working on a domain-joined machine with an account that has domain administrator privileges and your organization protects password-based sign-in and enforces modern authentication methods such as multifactor authentication, FIDO2, or smart card technology, you must use the `-UserPrincipalName` parameter with the User Principal Name (UPN) of a global administrator. And you can skip the "-DomainCredential" parameter.
165+
> - Replace `contoso.corp.com` in the following example with your on-premises Active Directory domain name.
166+
> - Replace `[email protected]` in the following example with the UPN of a global administrator.
167+
168+
```powershell
169+
# Specify the on-premises Active Directory domain. A new Azure AD
170+
# Kerberos Server object will be created in this Active Directory domain.
171+
$domain = "contoso.corp.com"
172+
173+
# Enter a UPN of an Azure Active Directory global administrator
174+
$userPrincipalName = "[email protected]"
175+
176+
# Create the new Azure AD Kerberos Server object in Active Directory
177+
# and then publish it to Azure Active Directory.
178+
# Open an interactive sign-in prompt with given username to access the Azure AD.
179+
Set-AzureADKerberosServer -Domain $domain -UserPrincipalName $userPrincipalName
180+
```
181+
159182
### View and verify the Azure AD Kerberos Server
160183

161184
You can view and verify the newly created Azure AD Kerberos Server by using the following command:
@@ -263,6 +286,12 @@ Make sure that enough DCs are patched to respond in time to service your resourc
263286
> [!NOTE]
264287
> The `/keylist` switch in the `nltest` command is available in client Windows 10 v2004 and later.
265288
289+
### What if I have a CloudTGT but it never gets exchange for a OnPremTGT when I am using Windows Hello for Business Cloud Trust?
290+
291+
Make sure that the user you are signed in as, is a member of the groups of users that can use FIDO2 as an authentication method, or enable it for all users.
292+
293+
> [!NOTE]
294+
> Even if you are not explicitly using a security key to sign-in to your device, the underlying technology is dependent on the FIDO2 infrastructure requirements.
266295
267296
### Do FIDO2 security keys work in a Windows login with RODC present in the hybrid environment?
268297

articles/active-directory/develop/v2-saml-bearer-assertion.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,3 +95,5 @@ For more information about app registration and authentication flow, see:
9595

9696
- [Register an application with the Microsoft identity platform](quickstart-register-app.md)
9797
- [Authentication flows and application scenarios](authentication-flows-app-scenarios.md)
98+
99+
<!-- _This article was originally contributed by [Umesh Barapatre](https://github.com/umeshbarapatre)._ -->

articles/event-grid/manage-event-delivery.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ To set a dead letter location, you need a storage account for holding events tha
2323
> [!NOTE]
2424
> - Create a storage account and a blob container in the storage before running commands in this article.
2525
> - The Event Grid service creates blobs in this container. The names of blobs will have the name of the Event Grid subscription with all the letters in upper case. For example, if the name of the subscription is My-Blob-Subscription, names of the dead letter blobs will have MY-BLOB-SUBSCRIPTION (myblobcontainer/MY-BLOB-SUBSCRIPTION/2019/8/8/5/111111111-1111-1111-1111-111111111111.json). This behavior is to protect against differences in case handling between Azure services.
26+
> - The dead letter blobs created will contain one or more events in an array. An important behavior to consider when processing dead letters.
2627
2728

2829
### Azure CLI

articles/storage/common/storage-account-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ The following table describes the types of storage accounts recommended by Micro
3939

4040
Legacy storage accounts are also supported. For more information, see [Legacy storage account types](#legacy-storage-account-types).
4141

42-
You can’t change a storage account to a different type after it's' created. To move your data to a storage account of a different type, you must create a new account and copy the data to the new account.
42+
You can’t change a storage account to a different type after it's created. To move your data to a storage account of a different type, you must create a new account and copy the data to the new account.
4343

4444
## Storage account endpoints
4545

articles/virtual-machines/linux/freebsd-intro-on-azure.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,14 @@ Microsoft Corporation is making images of FreeBSD available on Azure with the [A
2323

2424
- FreeBSD 10.4 on the Azure Marketplace
2525
- FreeBSD 11.2 on the Azure Marketplace
26+
- FreeBSD 11.3 on the Azure Marketplace
2627
- FreeBSD 12.0 on the Azure Marketplace
2728

29+
The following FreeBSD versions also include the [Azure VM Guest Agent](https://github.com/Azure/WALinuxAgent/), however, they are offered as images by the FreeBSD Foundation:
30+
- FreeBSD 11.4 on the Azure Marketplace
31+
- FreeBSD 12.2 on the Azure Marketplace
32+
- FreeBSD 13.0 on the Azure Marketplace
33+
2834
The agent is responsible for communication between the FreeBSD VM and the Azure fabric for operations such as provisioning the VM on first use (user name, password or SSH key, host name, etc.) and enabling functionality for selective VM extensions.
2935

3036
As for future versions of FreeBSD, the strategy is to stay current and make the latest releases available shortly after they are published by the FreeBSD release engineering team.

0 commit comments

Comments
 (0)