summaryrefslogtreecommitdiff
path: root/source4/kdc/kpasswdd.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2009-09-17 15:24:20 -0700
committerAndrew Tridgell <tridge@samba.org>2009-09-17 15:24:20 -0700
commit39971fff27f71b514308d10d7a2d8c3fb58c2420 (patch)
tree101f2adac9ef41af17579d22f6ddd56ada62ce5d /source4/kdc/kpasswdd.c
parent23676b6e9e8aad0ac2aa78d04e65f637b4551527 (diff)
parente71d9728f52e969e07927c5b38fa062c6ef6d1eb (diff)
downloadsamba-39971fff27f71b514308d10d7a2d8c3fb58c2420.tar.gz
samba-39971fff27f71b514308d10d7a2d8c3fb58c2420.tar.bz2
samba-39971fff27f71b514308d10d7a2d8c3fb58c2420.zip
Merge branch 'master' of /home/tridge/samba/git/combined
Diffstat (limited to 'source4/kdc/kpasswdd.c')
-rw-r--r--source4/kdc/kpasswdd.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/source4/kdc/kpasswdd.c b/source4/kdc/kpasswdd.c
index 3a39348578..9664d1b016 100644
--- a/source4/kdc/kpasswdd.c
+++ b/source4/kdc/kpasswdd.c
@@ -528,11 +528,19 @@ bool kpasswdd_process(struct kdc_server *kdc,
/* The kerberos PRIV packets include these addresses. MIT
* clients check that they are present */
+#if 0
+ /* Skip this part for now, it breaks with a NetAPP filer and
+ * in any case where the client address is behind NAT. If
+ * older MIT clients need this, we might have to insert more
+ * complex code */
+
nt_status = gensec_set_peer_addr(gensec_security, peer_addr);
if (!NT_STATUS_IS_OK(nt_status)) {
talloc_free(tmp_ctx);
return false;
}
+#endif
+
nt_status = gensec_set_my_addr(gensec_security, my_addr);
if (!NT_STATUS_IS_OK(nt_status)) {
talloc_free(tmp_ctx);