summaryrefslogtreecommitdiffstats
path: root/src/include/krb5
diff options
context:
space:
mode:
Diffstat (limited to 'src/include/krb5')
-rw-r--r--src/include/krb5/ChangeLog7
-rw-r--r--src/include/krb5/adm.h1
-rw-r--r--src/include/krb5/kdb.h56
3 files changed, 37 insertions, 27 deletions
diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index adc0fabd5..123349af2 100644
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,4 @@
+<<<<<<< ChangeLog
Wed Jun 12 00:40:29 1996 Theodore Ts'o <tytso@rsts-11.mit.edu>
* adm_proto.h: Change usage of INTERFACE to use KRB5_CALLCONV and
@@ -24,6 +25,12 @@ Sun May 19 14:32:19 1996 Sam Hartman <hartmans@tertius.mit.edu>
* configure.in: Check for uid_t.
+Sun May 12 00:46:05 1996 Marc Horowitz <marc@mit.edu>
+
+ * kdb.h: convert to use new krb5_dbe_* tl_data functions.
+
+ * adm.h (struct __krb5_realm_params): add realm_acl_file
+
Tue Apr 30 17:15:57 1996 Ken Raeburn <raeburn@cygnus.com>
* configure.in: Invoke AC_C_CROSS before AC_TRY_RUN to pretty up
diff --git a/src/include/krb5/adm.h b/src/include/krb5/adm.h
index 020282350..b4ec50852 100644
--- a/src/include/krb5/adm.h
+++ b/src/include/krb5/adm.h
@@ -197,6 +197,7 @@ typedef struct __krb5_realm_params {
char * realm_mkey_name;
char * realm_stash_file;
char * realm_kdc_ports;
+ char * realm_acl_file;
krb5_int32 realm_kadmind_port;
krb5_enctype realm_enctype;
krb5_deltat realm_max_life;
diff --git a/src/include/krb5/kdb.h b/src/include/krb5/kdb.h
index 7a8f5bb25..db7157f14 100644
--- a/src/include/krb5/kdb.h
+++ b/src/include/krb5/kdb.h
@@ -111,18 +111,9 @@ typedef struct _krb5_db_entry_new {
#define KRB5_KDB_MAGIC_NUMBER 0xdbdbdbdb
#define KRB5_KDB_V1_BASE_LENGTH 38
-typedef struct tl_data_1 {
- krb5_timestamp last_pwd_change; /* Last time passwd changed */
-} krb5_tl_last_change;
-
#define KRB5_TL_LAST_PWD_CHANGE 0x0001
-
-typedef struct tl_data_2 {
- krb5_timestamp mod_date;
- krb5_principal mod_princ;
-} krb5_tl_mod_princ;
-
#define KRB5_TL_MOD_PRINC 0x0002
+#define KRB5_TL_KADM_DATA 0x0003
/*
* Determines the number of failed KDC requests before DISALLOW_ALL_TIX is set
@@ -263,22 +254,32 @@ krb5_error_code krb5_dbekd_decrypt_key_data
krb5_error_code krb5_dbe_create_key_data
KRB5_PROTOTYPE((krb5_context,
krb5_db_entry *));
-krb5_error_code krb5_dbe_encode_mod_princ_data
+krb5_error_code krb5_dbe_update_tl_data
KRB5_PROTOTYPE((krb5_context,
- krb5_tl_mod_princ *,
- krb5_db_entry *));
-krb5_error_code krb5_dbe_decode_mod_princ_data
+ krb5_db_entry *,
+ krb5_tl_data *));
+krb5_error_code krb5_dbe_lookup_tl_data
KRB5_PROTOTYPE((krb5_context,
- krb5_db_entry *,
- krb5_tl_mod_princ **));
-krb5_error_code krb5_dbe_encode_last_pwd_change
+ krb5_db_entry *,
+ krb5_tl_data *));
+krb5_error_code krb5_dbe_update_last_pwd_change
KRB5_PROTOTYPE((krb5_context,
- krb5_tl_last_change *,
- krb5_db_entry *));
-krb5_error_code krb5_dbe_decode_last_pwd_change
+ krb5_db_entry *,
+ krb5_timestamp));
+krb5_error_code krb5_dbe_lookup_last_pwd_change
+ KRB5_PROTOTYPE((krb5_context,
+ krb5_db_entry *,
+ krb5_timestamp *));
+krb5_error_code krb5_dbe_update_mod_princ_data
KRB5_PROTOTYPE((krb5_context,
- krb5_db_entry *,
- krb5_tl_last_change *));
+ krb5_db_entry *,
+ krb5_timestamp,
+ krb5_principal));
+krb5_error_code krb5_dbe_lookup_mod_princ_data
+ KRB5_PROTOTYPE((krb5_context,
+ krb5_db_entry *,
+ krb5_timestamp *,
+ krb5_principal *));
int krb5_encode_princ_dbmkey
KRB5_PROTOTYPE((krb5_context,
datum *,
@@ -322,11 +323,12 @@ struct __krb5_key_salt_tuple;
krb5_error_code krb5_dbe_cpw
KRB5_PROTOTYPE((krb5_context,
- krb5_encrypt_block *,
- struct __krb5_key_salt_tuple *,
- int,
- char *,
- krb5_db_entry *));
+ krb5_encrypt_block *,
+ struct __krb5_key_salt_tuple *,
+ int,
+ char *,
+ int,
+ krb5_db_entry *));
krb5_error_code krb5_dbe_apw
KRB5_PROTOTYPE((krb5_context,
krb5_encrypt_block *,