summaryrefslogtreecommitdiff
path: root/usr/src/cmd/gss
diff options
context:
space:
mode:
authorMark Phalan <Mark.Phalan@Sun.COM>2008-10-24 01:34:59 -0700
committerMark Phalan <Mark.Phalan@Sun.COM>2008-10-24 01:34:59 -0700
commit159d09a20817016f09b3ea28d1bdada4a336bb91 (patch)
tree11f215cc1150dca61c7bf211297c0bfc38536067 /usr/src/cmd/gss
parent628e3cbed6489fa1db545d8524a06cd6535af456 (diff)
downloadillumos-gate-159d09a20817016f09b3ea28d1bdada4a336bb91.tar.gz
PSARC/2008/631 Kerberos PKINIT
PSARC/2008/358 removal of kadm5.keytab 6698059 Resync with mit 1.6.3 (pkinit) 6749302 pam_krb5 auth fails with key table entry not found
Diffstat (limited to 'usr/src/cmd/gss')
-rw-r--r--usr/src/cmd/gss/etc/kdc.conf9
1 files changed, 3 insertions, 6 deletions
diff --git a/usr/src/cmd/gss/etc/kdc.conf b/usr/src/cmd/gss/etc/kdc.conf
index 3248586f11..b5afae1d36 100644
--- a/usr/src/cmd/gss/etc/kdc.conf
+++ b/usr/src/cmd/gss/etc/kdc.conf
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 1998-2002 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
[kdcdefaults]
kdc_ports = 88,750
@@ -32,7 +30,6 @@
___default_realm___ = {
profile = /etc/krb5/krb5.conf
database_name = /var/krb5/principal
- admin_keytab = /etc/krb5/kadm5.keytab
acl_file = /etc/krb5/kadm5.acl
kadmind_port = 749
max_life = 8h 0m 0s