Skip to content

Commit 6d2c2ca

Browse files
authored
Merge pull request #174826 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents f093f50 + c15e3c0 commit 6d2c2ca

File tree

5 files changed

+28
-14
lines changed

5 files changed

+28
-14
lines changed

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

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,6 @@ $domain = "contoso.corp.com"
8585
# Enter an Azure Active Directory global administrator username and password.
8686
$cloudCred = Get-Credential
8787
88-
If you have MFA enabled for Global administrator, Please remove "-Cloudcredential $cloudCred"
89-
you will see web-based popup and complete the U/P and MFA there
90-
9188
# Enter a domain administrator username and password.
9289
$domainCred = Get-Credential
9390
@@ -96,6 +93,29 @@ $domainCred = Get-Credential
9693
Set-AzureADKerberosServer -Domain $domain -CloudCredential $cloudCred -DomainCredential $domainCred
9794
```
9895

96+
> [!NOTE]
97+
> If your organization protects password-based sign-in and enforces modern authentication methods such as MFA, FIDO2, or Smart Card, you must use the "-UserPrincipalName" parameter with the User Principal Name of a Global administrator.
98+
> - Replace `contoso.corp.com` in the following example with your on-premises Active Directory domain name.
99+
> - Replace `[email protected]` in the following example with the User Principal Name of a Global administrator.
100+
101+
```powerShell
102+
Import-Module ".\AzureAdKerberos.psd1"
103+
104+
# Specify the on-premises Active Directory domain. A new Azure AD
105+
# Kerberos Server object will be created in this Active Directory domain.
106+
$domain = "contoso.corp.com"
107+
108+
# Enter a User Principal Name of Azure Active Directory global administrator
109+
$userPrincipalName = "[email protected]"
110+
111+
# Enter a domain administrator username and password.
112+
$domainCred = Get-Credential
113+
114+
# Create the new Azure AD Kerberos Server object in Active Directory
115+
# and then publish it to Azure Active Directory.
116+
Set-AzureADKerberosServer -Domain $domain -UserPrincipalName $userPrincipalName -DomainCredential $domainCred
117+
```
118+
99119
### Viewing and verifying the Azure AD Kerberos Server
100120

101121
You can view and verify the newly created Azure AD Kerberos Server using the following command:

articles/active-directory/saas-apps/factset-tutorial.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
7474
1. On the **Set up single sign-on with SAML** page, perform the following steps:
7575

7676
a. In the **Identifier** text box, type the URL:
77-
`https://login.factset.com`
77+
`https://auth.factset.com`
7878

7979
b. In the **Reply URL** text box, type the URL:
80-
`https://login.factset.com/services/saml2/`
80+
`https://auth.factset.com/sp/ACS.saml2`
8181

8282
1. On the **Set up single sign-on with SAML** page, in the **SAML Signing Certificate** section, find **Federation Metadata XML** and select **Download** to download the metadata file and save it on your computer.
8383

@@ -129,4 +129,4 @@ In this section, you test your Azure AD single sign-on configuration with follow
129129

130130
## Next steps
131131

132-
Once you configure FactSet you can enforce session control, which protects exfiltration and infiltration of your organization’s sensitive data in real time. Session control extends from Conditional Access. [Learn how to enforce session control with Microsoft Cloud App Security](/cloud-app-security/proxy-deployment-aad).
132+
Once you configure FactSet you can enforce session control, which protects exfiltration and infiltration of your organization’s sensitive data in real time. Session control extends from Conditional Access. [Learn how to enforce session control with Microsoft Cloud App Security](/cloud-app-security/proxy-deployment-aad).

articles/app-service/webjobs-sdk-get-started.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,6 @@ Starting with version 3 of the WebJobs SDK, to connect to Azure Storage services
196196
{
197197
var builder = new HostBuilder();
198198
builder.UseEnvironment(EnvironmentName.Development);
199-
builder.ConfigureWebJobs(b =>
200-
{
201-
b.AddAzureStorageCoreServices();
202-
});
203199
builder.ConfigureLogging((context, b) =>
204200
{
205201
b.AddConsole();
@@ -549,4 +545,4 @@ Output bindings simplify code that writes data. This example modifies the previo
549545
This tutorial showed you how to create, run, and deploy a WebJobs SDK 3.x project.
550546

551547
> [!div class="nextstepaction"]
552-
> [Learn more about the WebJobs SDK](webjobs-sdk-how-to.md)
548+
> [Learn more about the WebJobs SDK](webjobs-sdk-how-to.md)

articles/azure-functions/functions-how-to-azure-devops.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,6 @@ When you create a new release pipeline, search for the Azure Functions release t
241241

242242
![Search for the Azure Functions release template](media/functions-how-to-azure-devops/release-template.png)
243243

244-
Deploying to a deployment slot is not supported in the release template.
245-
246244
## Create a build pipeline by using the Azure CLI
247245

248246
To create a build pipeline in Azure, use the `az functionapp devops-pipeline create` [command](/cli/azure/functionapp/devops-pipeline#az_functionapp_devops_pipeline_create). The build pipeline is created to build and release any code changes that are made in your repo. The command generates a new YAML file that defines the build and release pipeline and then commits it to your repo. The prerequisites for this command depend on the location of your code.

articles/governance/policy/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ role includes most Azure Policy operations. **Owner** has full rights. Both **Co
118118
**Reader** have access to all _read_ Azure Policy operations. **Contributor** may trigger resource
119119
remediation, but can't _create_ definitions or assignments. **User Access Administrator** is
120120
necessary to grant the managed identity on **deployIfNotExists** or **modify** assignments necessary
121-
permissions.
121+
permissions. All policy objects will be readable to all roles over the scope.
122122

123123
If none of the Built-in roles have the permissions required, create a
124124
[custom role](../../role-based-access-control/custom-roles.md).

0 commit comments

Comments
 (0)