Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 93365 invoked from network); 22 Mar 2005 08:42:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 22 Mar 2005 08:42:17 -0000 Received: (qmail 5995 invoked by uid 500); 22 Mar 2005 08:42:16 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 5945 invoked by uid 500); 22 Mar 2005 08:42:16 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 5930 invoked by uid 99); 22 Mar 2005 08:42:16 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Tue, 22 Mar 2005 00:42:15 -0800 Received: (qmail 93346 invoked by uid 65534); 22 Mar 2005 08:42:14 -0000 Message-ID: <20050322084214.93345.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Tue, 22 Mar 2005 08:42:14 -0000 Subject: svn commit: r158579 - directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/service/KdcConfiguration.java To: commits@directory.apache.org From: erodriguez@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: erodriguez Date: Tue Mar 22 00:41:59 2005 New Revision: 158579 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D158579 Log: Added smart defaults to config. Modified: directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/ser= vice/KdcConfiguration.java Modified: directory/shared/kerberos/trunk/common/src/java/org/apache/kerber= os/service/KdcConfiguration.java URL: http://svn.apache.org/viewcvs/directory/shared/kerberos/trunk/common/s= rc/java/org/apache/kerberos/service/KdcConfiguration.java?view=3Ddiff&r1=3D= 158578&r2=3D158579 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/ser= vice/KdcConfiguration.java (original) +++ directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/ser= vice/KdcConfiguration.java Tue Mar 22 00:41:59 2005 @@ -34,12 +34,15 @@ private static final String KDC_PRIMARY_REALM =3D "kdc.primary.realm"; /** the prop key const for kdc.principal */ private static final String KDC_PRINCIPAL =3D "kdc.principal"; - - + =20 private static final int DEFAULT_PORT =3D 88; private static final int CHANGEPW_PORT =3D 464; private static final int BUFFER_SIZE =3D 1024; private static final int MINUTE =3D 1000 * 60; + =20 + private static final String DEFAULT_REALM =3D "EXAMPLE.COM"; + private static final String DEFAULT_PRINCIPAL =3D "krbtgt/EXAMPLE.COM@= EXAMPLE.COM"; + private static final String DEFAULT_CHANGEPW_PRINCIPAL =3D "kadmin/cha= ngepw@EXAMPLE.COM"; =20 private final Properties properties =3D new Properties(); private EncryptionType[] _encryptionTypes; @@ -57,34 +60,31 @@ prepareEncryptionTypes(); } =20 - public String getPrimaryRealm() { String key =3D KDC_PRIMARY_REALM; - return ( String ) properties.get( key ); + if ( properties.containsKey( key ) ) + { + return ( String ) properties.get( key ); + } + return DEFAULT_REALM; } =20 - public KerberosPrincipal getKdcPrincipal() { String key =3D KDC_PRINCIPAL; - return new KerberosPrincipal( ( String ) properties.get( key ) ); - } - - - public String getKerberosKeysLocation() - { - String key =3D "kdc.keys.location"; - return ( String ) properties.get( key ); + if ( properties.containsKey( key ) ) + { + return new KerberosPrincipal( ( String ) properties.get( key )= ); + } + return new KerberosPrincipal( DEFAULT_PRINCIPAL ); } - - + =20 public EncryptionType[] getEncryptionTypes() { return _encryptionTypes; } =20 - public Hashtable getProperties() { // Request that the krb5key value be returned as binary @@ -93,7 +93,6 @@ return properties; } =20 - public long getClockSkew() { String key =3D "kdc.allowable.clockskew"; @@ -104,7 +103,6 @@ return MINUTE * 5; } =20 - public long getMaximumTicketLifetime() { String key =3D "tgs.maximum.ticket.lifetime"; @@ -115,7 +113,6 @@ return MINUTE * 1440; } =20 - public long getMaximumRenewableLifetime() { String key =3D "tgs.maximum.renewable.lifetime"; @@ -126,7 +123,6 @@ return MINUTE * 10080; } =20 - public int getDefaultPort() { String key =3D "kdc.default.port"; @@ -137,7 +133,6 @@ return DEFAULT_PORT; } =20 - public int getBufferSize() { String key =3D "kdc.buffer.size"; @@ -148,7 +143,6 @@ return BUFFER_SIZE; } =20 - public boolean isPaEncTimestampRequired() { String key =3D "kdc.pa.enc.timestamp.required"; @@ -159,7 +153,6 @@ return true; } =20 - public boolean isEmptyAddressesAllowed() { String key =3D "tgs.empty.addresses.allowed"; @@ -170,7 +163,6 @@ return true; } =20 - public boolean isForwardableAllowed() { String key =3D "tgs.forwardable.allowed"; @@ -181,7 +173,6 @@ return true; } =20 - public boolean isProxiableAllowed() { String key =3D "tgs.proxiable.allowed"; @@ -192,7 +183,6 @@ return true; } =20 - public boolean isPostdateAllowed() { String key =3D "tgs.postdate.allowed"; @@ -203,7 +193,6 @@ return true; } =20 - public boolean isRenewableAllowed() { String key =3D "tgs.renewable.allowed"; @@ -214,7 +203,6 @@ return true; } =20 - public int getChangepwPort() { String key =3D "changepw.default.port"; @@ -228,24 +216,27 @@ public KerberosPrincipal getChangepwPrincipal() { String key =3D "changepw.principal"; - return new KerberosPrincipal( ( String ) properties.get( key ) ); - } - - public KerberosPrincipal getLdapPrincipal() - { - String key =3D "ldap.principal"; if ( properties.containsKey( key ) ) { return new KerberosPrincipal( ( String ) properties.get( key )= ); } - return null; + return new KerberosPrincipal( DEFAULT_CHANGEPW_PRINCIPAL ); } - + =20 private void prepareEncryptionTypes() { + String[] encryptionTypes =3D null; + =20 String key =3D "kdc.encryption.types"; - String[] encryptionTypes =3D ( ( String ) properties.get( key ) ).= split( "\\s" ); - + if ( properties.containsKey( key ) ) + { + encryptionTypes =3D ( ( String ) properties.get( key ) ).split= ( "\\s" ); + } + else + { + encryptionTypes =3D new String[] { "des-cbc-md5" }; + } + =20 List encTypes =3D new ArrayList(); =20 for ( int i =3D 0; i < encryptionTypes.length; i++ )