diff options
| author | Jeremy Allison <jra@samba.org> | 2006-08-31 04:14:08 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:39:01 -0500 |
| commit | 2fcd113f5507f643fcf80d5a9770ce72aa121ba8 (patch) | |
| tree | 29bd85c741a4c43b3fdfdf8d5d6e8481bf044b67 /source3/libads/dns.c | |
| parent | cceb492250ce7e273cdc48c030048c0879a7265a (diff) | |
| download | samba-2fcd113f5507f643fcf80d5a9770ce72aa121ba8.tar.gz samba-2fcd113f5507f643fcf80d5a9770ce72aa121ba8.tar.bz2 samba-2fcd113f5507f643fcf80d5a9770ce72aa121ba8.zip | |
r17945: Store the server and client sitenames in the ADS
struct so we can see when they match - only create
the ugly krb5 hack when they do.
Jeremy.
(This used to be commit 9be4ecf24b6b5dacf4c2891bddb072fa7543753f)
Diffstat (limited to 'source3/libads/dns.c')
| -rw-r--r-- | source3/libads/dns.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source3/libads/dns.c b/source3/libads/dns.c index 4d935c1b6e..3f99a73a33 100644 --- a/source3/libads/dns.c +++ b/source3/libads/dns.c @@ -590,8 +590,9 @@ BOOL sitename_store(const char *sitename) if (!sitename || (sitename && !*sitename)) { DEBUG(5,("sitename_store: deleting empty sitename!\n")); return gencache_del(SITENAME_KEY); - } else if (sitename && strequal(sitename, "Default-First-Site-Name")) { - DEBUG(5,("sitename_store: delete default sitename Default-First-Site-Name\n")); + } else if (sitename && strequal(sitename, DEFAULT_SITE_NAME)) { + DEBUG(5,("sitename_store: delete default sitename %s\n", + DEFAULT_SITE_NAME)); return gencache_del(SITENAME_KEY); } @@ -633,11 +634,16 @@ char *sitename_fetch(void) Did the sitename change ? ****************************************************************************/ -BOOL sitename_changed(const char *sitename) +BOOL stored_sitename_changed(const char *sitename) { BOOL ret = False; char *new_sitename = sitename_fetch(); + /* Treat default site as no name. */ + if (strequal(sitename, DEFAULT_SITE_NAME)) { + sitename = NULL; + } + if (sitename && new_sitename && !strequal(sitename, new_sitename)) { ret = True; } else if ((sitename && !new_sitename) || |