summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Reichl <preichl@redhat.com>2015-07-23 04:40:03 -0400
committerJakub Hrozek <jhrozek@redhat.com>2015-08-14 23:54:32 +0200
commit7c3cc1ee2914bc7b38a992c1af254fc76af5a1ad (patch)
tree086c3d57cd310feee8903abf4e6cf0e95043ef22
parent8145ab51b05aa86b2f1a21b49383f55e50b0a2e3 (diff)
downloadsssd-7c3cc1ee2914bc7b38a992c1af254fc76af5a1ad.tar.gz
sssd-7c3cc1ee2914bc7b38a992c1af254fc76af5a1ad.tar.xz
sssd-7c3cc1ee2914bc7b38a992c1af254fc76af5a1ad.zip
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 <jhrozek@redhat.com>
-rw-r--r--src/man/sssd-ad.5.xml6
-rw-r--r--src/man/sssd-ipa.5.xml5
-rw-r--r--src/providers/ldap/sdap_dyndns.c2
3 files changed, 11 insertions, 2 deletions
diff --git a/src/man/sssd-ad.5.xml b/src/man/sssd-ad.5.xml
index 7ccd29794..127e96582 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.
</para>
<para>
+ Please note that this option will be only used in
+ fallback attempt when previous attempt using
+ autodetected settings failed.
+ </para>
+ <para>
Default: None (let nsupdate choose the server)
</para>
</listitem>
</varlistentry>
-
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="include/override_homedir.xml" />
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="include/homedir_substring.xml" />
diff --git a/src/man/sssd-ipa.5.xml b/src/man/sssd-ipa.5.xml
index 871c41607..be390d58d 100644
--- a/src/man/sssd-ipa.5.xml
+++ b/src/man/sssd-ipa.5.xml
@@ -276,6 +276,11 @@
server.
</para>
<para>
+ Please note that this option will be only used in
+ fallback attempt when previous attempt using
+ autodetected settings failed.
+ </para>
+ <para>
Default: None (let nsupdate choose the server)
</para>
</listitem>
diff --git a/src/providers/ldap/sdap_dyndns.c b/src/providers/ldap/sdap_dyndns.c
index 01f4f1722..0f0e63ee2 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) {