diff options
Diffstat (limited to 'usr/src/cmd/idmap/idmapd/idmapd.c')
| -rw-r--r-- | usr/src/cmd/idmap/idmapd/idmapd.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/usr/src/cmd/idmap/idmapd/idmapd.c b/usr/src/cmd/idmap/idmapd/idmapd.c index 720b209240..5ea3292acd 100644 --- a/usr/src/cmd/idmap/idmapd/idmapd.c +++ b/usr/src/cmd/idmap/idmapd/idmapd.c @@ -19,8 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. */ @@ -293,6 +292,7 @@ main(int argc, char **argv) (void) textdomain(TEXT_DOMAIN); idmap_set_logger(idmapdlog); + adutils_set_logger(idmapdlog); idmap_log_syslog(B_TRUE); idmap_log_stderr(_idmapdstate.daemon_mode ? -1 : LOG_DEBUG); @@ -488,13 +488,6 @@ degrade_svc(int poke_discovery, const char *reason) { const char *fmri; - /* - * If the config update thread is in a state where auto-discovery could - * be re-tried, then this will make it try it -- a sort of auto-refresh. - */ - if (poke_discovery) - idmap_cfg_poke_updates(); - membar_consumer(); if (degraded) return; @@ -509,6 +502,13 @@ degrade_svc(int poke_discovery, const char *reason) if ((fmri = get_fmri()) != NULL) (void) smf_degrade_instance(fmri, 0); + + /* + * If the config update thread is in a state where auto-discovery could + * be re-tried, then this will make it try it -- a sort of auto-refresh. + */ + if (poke_discovery) + idmap_cfg_poke_updates(); } void |