diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-12-23 22:12:23 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-12-23 22:12:23 +0100 |
| commit | 5c75b65ca15f7c71babd835a45b252fed6534acf (patch) | |
| tree | 6b8baa3f5d27c4eafd89fece7deedae30a6ff1fd /source4/libnet/libnet_join.c | |
| parent | 86cee0b28c50dd849fe919bbe3faa4deba5275bf (diff) | |
| parent | ff26cb4b1c1d0292231e1cfc0490f4be6040d3e3 (diff) | |
| download | samba-5c75b65ca15f7c71babd835a45b252fed6534acf.tar.gz samba-5c75b65ca15f7c71babd835a45b252fed6534acf.tar.xz samba-5c75b65ca15f7c71babd835a45b252fed6534acf.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source4/libnet/libnet_join.c')
| -rw-r--r-- | source4/libnet/libnet_join.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c index 70fcb4a894..0a4e357925 100644 --- a/source4/libnet/libnet_join.c +++ b/source4/libnet/libnet_join.c @@ -1223,6 +1223,8 @@ NTSTATUS libnet_Join(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, struct lib case SEC_CHAN_BDC: return libnet_Join_primary_domain(ctx, mem_ctx, r); case SEC_CHAN_DOMAIN: + case SEC_CHAN_DNS_DOMAIN: + case SEC_CHAN_NULL: break; } |