From 6d1ba78ff110ee424e54025c3d823fb5c504aefa Mon Sep 17 00:00:00 2001 From: Pavel Reichl Date: Thu, 23 Jul 2015 04:40:03 -0400 Subject: [PATCH 85/90] DYNDNS: Don't use server cmd in nsupdate by default nsupdate command `server` should not be used for the first attempt to udpate DNS. It should be used only in subsequent attempts after the first attempt failed. Resolves: https://fedorahosted.org/sssd/ticket/2495 Reviewed-by: Jakub Hrozek (cherry picked from commit 7c3cc1ee2914bc7b38a992c1af254fc76af5a1ad) --- src/man/sssd-ad.5.xml | 6 +++++- src/man/sssd-ipa.5.xml | 5 +++++ src/providers/ldap/sdap_dyndns.c | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/man/sssd-ad.5.xml b/src/man/sssd-ad.5.xml index 7ccd29794a89fa6b69b744a47da04f908efc7ef9..127e96582d71e8216db88d37a16d37d01748131d 100644 --- a/src/man/sssd-ad.5.xml +++ b/src/man/sssd-ad.5.xml @@ -826,12 +826,16 @@ ad_gpo_map_deny = +my_pam_service server. + Please note that this option will be only used in + fallback attempt when previous attempt using + autodetected settings failed. + + Default: None (let nsupdate choose the server) - diff --git a/src/man/sssd-ipa.5.xml b/src/man/sssd-ipa.5.xml index 871c41607b97bd24fe5feaa282258def0fd0cc8b..be390d58dd3ce5a6ca6d5212d2c7aa176d3a74c4 100644 --- a/src/man/sssd-ipa.5.xml +++ b/src/man/sssd-ipa.5.xml @@ -276,6 +276,11 @@ server. + Please note that this option will be only used in + fallback attempt when previous attempt using + autodetected settings failed. + + Default: None (let nsupdate choose the server) diff --git a/src/providers/ldap/sdap_dyndns.c b/src/providers/ldap/sdap_dyndns.c index 01f4f17226f1b7dd417699403b425c571b780c3a..0f0e63ee2259d017c3e94afca5f3148f4fc2ce04 100644 --- a/src/providers/ldap/sdap_dyndns.c +++ b/src/providers/ldap/sdap_dyndns.c @@ -112,10 +112,10 @@ sdap_dyndns_update_send(TALLOC_CTX *mem_ctx, state->auth_type = auth_type; state->pass_num = 0; + /* fallback servername is overriden by user option */ conf_servername = dp_opt_get_string(opts, DP_OPT_DYNDNS_SERVER); if (conf_servername != NULL) { state->servername = conf_servername; - state->use_server_with_nsupdate = true; } if (ifname) { -- 2.4.3