diff options
| author | Dan McDonald <danmcd@joyent.com> | 2020-09-22 10:39:49 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2020-09-22 10:39:49 -0400 |
| commit | 267e12a7d9bf6e5fcefb9cc00f46bfff0dc5226e (patch) | |
| tree | 19a3941920d0039c35d53a5cbee189b5ca51995a /usr/src/cmd/idmap | |
| parent | 517abc5c668925e6092495bf332233c3599980d2 (diff) | |
| parent | e9faba760cdf80d7dfa110fe0830917ab94668c2 (diff) | |
| download | illumos-joyent-vpc.tar.gz | |
Merge branch 'master' into vpcvpc
Diffstat (limited to 'usr/src/cmd/idmap')
| -rw-r--r-- | usr/src/cmd/idmap/idmapd/krb5_lookup.c | 10 | ||||
| -rw-r--r-- | usr/src/cmd/idmap/idmapd/mapfile-intf | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/usr/src/cmd/idmap/idmapd/krb5_lookup.c b/usr/src/cmd/idmap/idmapd/krb5_lookup.c index a45fc5d8f3..bdd0d56759 100644 --- a/usr/src/cmd/idmap/idmapd/krb5_lookup.c +++ b/usr/src/cmd/idmap/idmapd/krb5_lookup.c @@ -10,7 +10,7 @@ */ /* - * Copyright 2014 Nexenta Systems, Inc. All rights reserved. + * Copyright 2020 Nexenta by DDN, Inc. All rights reserved. */ #include <stdio.h> @@ -27,6 +27,8 @@ #include <synch.h> #include <thread.h> +#include <ads/dsgetdc.h> + #include "idmapd.h" #include "libadutils.h" #include "locate_plugin.h" @@ -102,6 +104,12 @@ _krb5_override_service_locator( goto out; } + if ((ds->flags & DS_KDC_FLAG) == 0) { + idmapdlog(LOG_WARNING, "Domain Controller is not a KDC: " + "Kerberos auth may be slow"); + goto out; + } + switch (family) { case AF_UNSPEC: break; /* OK */ diff --git a/usr/src/cmd/idmap/idmapd/mapfile-intf b/usr/src/cmd/idmap/idmapd/mapfile-intf index 1ab5c033d7..d2f8c7cb04 100644 --- a/usr/src/cmd/idmap/idmapd/mapfile-intf +++ b/usr/src/cmd/idmap/idmapd/mapfile-intf @@ -21,6 +21,7 @@ # # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2019 Nexenta by DDN, Inc. All rights reserved. # # @@ -43,4 +44,5 @@ $mapfile_version 2 SYMBOL_SCOPE { global: app_krb5_user_uid; + _krb5_override_service_locator; }; |