diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-21 18:04:47 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-21 18:04:47 +0200 |
| commit | 20796bcf57a7f5e1921dc12e0568221f985fe4f2 (patch) | |
| tree | 8f0540a602a9ea0031d656bc31c0b8bc1e91eb70 /source3/libads/kerberos.c | |
| parent | 323be4a6907e4915bb76aa103bf5b868f0b459b1 (diff) | |
| parent | 1a416ff13ca7786f2e8d24c66addf00883e9cb12 (diff) | |
| download | samba-20796bcf57a7f5e1921dc12e0568221f985fe4f2.tar.gz samba-20796bcf57a7f5e1921dc12e0568221f985fe4f2.tar.bz2 samba-20796bcf57a7f5e1921dc12e0568221f985fe4f2.zip | |
Merge branch 'v3-3-test' of ssh://git.samba.org/data/git/samba into docbook
Conflicts:
source/Makefile.in
(This used to be commit 01987778a123f853fccdcb7fe9566143e2d7c490)
Diffstat (limited to 'source3/libads/kerberos.c')
| -rw-r--r-- | source3/libads/kerberos.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c index 66f203b12d..2adf6a4700 100644 --- a/source3/libads/kerberos.c +++ b/source3/libads/kerberos.c @@ -731,6 +731,9 @@ static char *print_kdc_line(char *mem_ctx, /************************************************************************ Create a string list of available kdc's, possibly searching by sitename. Does DNS queries. + + If "sitename" is given, the DC's in that site are listed first. + ************************************************************************/ static char *get_kdc_ip_string(char *mem_ctx, @@ -749,7 +752,10 @@ static char *get_kdc_ip_string(char *mem_ctx, return NULL; } - /* Get the KDC's only in this site. */ + /* + * First get the KDC's only in this site, the rest will be + * appended later + */ if (sitename) { |