* adm.h : Constant changes for the new kadmin code.

	* kdb.h : Added attribute bit KRB5_KDB_NEW_PRINC. This will
		allow kadmin administrators with add acls to modify a
		principal until this bit is cleared.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7013 dc483132-0cff-0310-8789-dd5450dbe970

3 files changed, 19 insertions, 12 deletions

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index b3cb1cda7..b23dc2756 100644
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,11 @@
+
+Fri Nov 03 04:37:56 1995   Chris Provenzano (proven@mit.edu)
+
+        * adm.h : Constant changes for the new kadmin code.
+	* kdb.h : Added attribute bit KRB5_KDB_NEW_PRINC. This will 
+		allow kadmin administrators with add acls to modify a
+		principal until this bit is cleared. 
+
 Fri Oct  6 21:58:05 1995  Theodore Y. Ts'o  <tytso@dcl>
 
 	* Makefile.in: Remove ##DOS!include of config/windows.in.
diff --git a/src/include/krb5/adm.h b/src/include/krb5/adm.h
index 3fcf0626f..e8e50c170 100644
--- a/src/include/krb5/adm.h
+++ b/src/include/krb5/adm.h
@@ -51,12 +51,8 @@
 #define	KRB5_ADM_DEL_PRINC_CMD	"DELETE-PRINCIPAL"
 #define	KRB5_ADM_REN_PRINC_CMD	"RENAME-PRINCIPAL"
 #define	KRB5_ADM_MOD_PRINC_CMD	"MODIFY-PRINCIPAL"
-#define	KRB5_ADM_CHG_OPW_CMD	"OTHER-CHANGEPW"
-#define	KRB5_ADM_CHG_ORPW_CMD	"OTHER-RANDOM-CHANGEPW"
 #define	KRB5_ADM_INQ_PRINC_CMD	"INQUIRE-PRINCIPAL"
 #define	KRB5_ADM_EXT_KEY_CMD	"EXTRACT-KEY"
-#define	KRB5_ADM_ADD_KEY_CMD	"ADD-KEY"
-#define	KRB5_ADM_DEL_KEY_CMD	"DELETE-KEY"
 
 /*
  * Reply status values.
@@ -75,15 +71,17 @@
 #define	KRB5_ADM_BAD_OPTION		67
 #define	KRB5_ADM_VALUE_REQUIRED		68
 #define	KRB5_ADM_SYSTEM_ERROR		69
-#define	KRB5_ADM_KEY_ALREADY_EXISTS	70
-#define	KRB5_ADM_KEY_DOES_NOT_EXIST	71
+#define	KRB5_ADM_KEY_DOES_NOT_EXIST	70
+#define	KRB5_ADM_KEY_ALREADY_EXISTS	71
 
 /*
  * Principal flag keywords.
  */
 /* Settable only */
 #define	KRB5_ADM_KW_PASSWORD		"PASSWORD"
+#define	KRB5_ADM_KW_APASSWORD		"APASSWORD"
 #define	KRB5_ADM_KW_RANDOMKEY		"RANDOMKEY"
+#define	KRB5_ADM_KW_ARANDOMKEY		"ARANDOMKEY"
 /* Settable and retrievable */
 #define	KRB5_ADM_KW_MAXLIFE		"MAXLIFE"
 #define	KRB5_ADM_KW_MAXRENEWLIFE	"MAXRENEWLIFE"
@@ -113,8 +111,8 @@
 #define	KRB5_ADM_M_FAILCOUNT		0x00000400
 #define	KRB5_ADM_M_AUXDATA		0x00000800
 #define	KRB5_ADM_M_KEYDATA		0x00001000
-#define	KRB5_ADM_M_EXTRADATA		0x00002000
-#define	KRB5_ADM_M_UNUSED_14		0x00004000
+#define	KRB5_ADM_M_APASSWORD		0x00002000
+#define	KRB5_ADM_M_ARANDOMKEY		0x00004000
 #define	KRB5_ADM_M_UNUSED_15		0x00008000
 #define	KRB5_ADM_M_UNUSED_16		0x00010000
 #define KRB5_ADM_M_UNUSED_17		0x00020000
@@ -135,14 +133,15 @@
 
 #define	KRB5_ADM_M_SET_VALID		(KRB5_ADM_M_SET		+ \
 					 KRB5_ADM_M_PASSWORD	+ \
+					 KRB5_ADM_M_APASSWORD	+ \
 					 KRB5_ADM_M_MAXLIFE	+ \
 					 KRB5_ADM_M_MAXRENEWLIFE+ \
 					 KRB5_ADM_M_EXPIRATION	+ \
 					 KRB5_ADM_M_PWEXPIRATION+ \
 					 KRB5_ADM_M_RANDOMKEY	+ \
+					 KRB5_ADM_M_ARANDOMKEY	+ \
 					 KRB5_ADM_M_FLAGS	+ \
-					 KRB5_ADM_M_AUXDATA	+ \
-					 KRB5_ADM_M_EXTRADATA)
+					 KRB5_ADM_M_AUXDATA)
 #define	KRB5_ADM_M_GET_VALID		(KRB5_ADM_M_GET		+ \
 					 KRB5_ADM_M_MAXLIFE	+ \
 					 KRB5_ADM_M_MAXRENEWLIFE+ \
@@ -154,8 +153,7 @@
 					 KRB5_ADM_M_LASTFAILED	+ \
 					 KRB5_ADM_M_FAILCOUNT	+ \
 					 KRB5_ADM_M_AUXDATA	+ \
-					 KRB5_ADM_M_KEYDATA	+ \
-					 KRB5_ADM_M_EXTRADATA)
+					 KRB5_ADM_M_KEYDATA)
 
 /*
  * Keytab reply components.
diff --git a/src/include/krb5/kdb.h b/src/include/krb5/kdb.h
index 605ad2d62..5c4a95ffa 100644
--- a/src/include/krb5/kdb.h
+++ b/src/include/krb5/kdb.h
@@ -49,6 +49,7 @@
 #define KRB5_KDB_DISALLOW_SVR		0x00001000
 #define KRB5_KDB_PWCHANGE_SERVICE	0x00002000
 #define KRB5_KDB_SUPPORT_DESMD5         0x00004000
+#define	KRB5_KDB_NEW_PRINC		0x00008000
 
 #if !defined(_MACINTOSH) && !defined(_MSDOS)