From: Theodore Tso <tytso@mit.edu>
Date: Wed, 27 Sep 1995 00:09:13 +0000 (+0000)
Subject: kdb.h, kdb_dbm.h: Add #if !defined(_MSDOS) && !defined(_MACINTOSH) to
X-Git-Tag: krb5-1.0-beta6~1001
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a22b20b45b26ad6b30d84db809c9645a66f8173b;p=krb5.git

kdb.h, kdb_dbm.h: Add #if !defined(_MSDOS) && !defined(_MACINTOSH) to
	prevent these #includes from being used by Mac and PC
	machines.

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

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index b99dbfb39..c7753c321 100644
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,9 @@
+Tue Sep 26 15:36:20 1995    <tytso@rsts-11.mit.edu>
+
+	* kdb.h, kdb_dbm.h: Add #if !defined(_MSDOS) &&
+		!defined(_MACINTOSH) to prevent these #includes from being
+		used by Mac and PC machines.
+
 Mon Sep 25 16:39:36 1995  Theodore Y. Ts'o  <tytso@dcl>
 
 	* Makefile.in: Removed "foo:: foo-$(WHAT)" lines from the
diff --git a/src/include/krb5/kdb.h b/src/include/krb5/kdb.h
index 032c40c67..605ad2d62 100644
--- a/src/include/krb5/kdb.h
+++ b/src/include/krb5/kdb.h
@@ -28,6 +28,30 @@
 #ifndef KRB5_KDB5__
 #define KRB5_KDB5__
 
+/* Salt types */
+#define KRB5_KDB_SALTTYPE_NORMAL	0
+#define KRB5_KDB_SALTTYPE_V4		1
+#define KRB5_KDB_SALTTYPE_NOREALM	2
+#define KRB5_KDB_SALTTYPE_ONLYREALM	3
+#define KRB5_KDB_SALTTYPE_SPECIAL	4
+
+/* Attributes */
+#define	KRB5_KDB_DISALLOW_POSTDATED	0x00000001
+#define	KRB5_KDB_DISALLOW_FORWARDABLE	0x00000002
+#define	KRB5_KDB_DISALLOW_TGT_BASED	0x00000004
+#define	KRB5_KDB_DISALLOW_RENEWABLE	0x00000008
+#define	KRB5_KDB_DISALLOW_PROXIABLE	0x00000010
+#define	KRB5_KDB_DISALLOW_DUP_SKEY	0x00000020
+#define	KRB5_KDB_DISALLOW_ALL_TIX	0x00000040
+#define	KRB5_KDB_REQUIRES_PRE_AUTH	0x00000080
+#define KRB5_KDB_REQUIRES_HW_AUTH	0x00000100
+#define	KRB5_KDB_REQUIRES_PWCHANGE	0x00000200
+#define KRB5_KDB_DISALLOW_SVR		0x00001000
+#define KRB5_KDB_PWCHANGE_SERVICE	0x00002000
+#define KRB5_KDB_SUPPORT_DESMD5         0x00004000
+
+#if !defined(_MACINTOSH) && !defined(_MSDOS)
+
 /*
  * Note --- these structures cannot be modified without changing the
  * database version number in libkdb.a, but should be expandable by
@@ -61,13 +85,6 @@ typedef struct _krb5_keysalt {
     krb5_data		  data;			/* Length, data */
 } krb5_keysalt;
 
-/* Salt types */
-#define KRB5_KDB_SALTTYPE_NORMAL	0
-#define KRB5_KDB_SALTTYPE_V4		1
-#define KRB5_KDB_SALTTYPE_NOREALM	2
-#define KRB5_KDB_SALTTYPE_ONLYREALM	3
-#define KRB5_KDB_SALTTYPE_SPECIAL	4
-
 typedef struct _krb5_db_entry_new {
     krb5_magic 		  magic;		/* NOT saved */
     krb5_int16		  len;			
@@ -106,21 +123,6 @@ typedef struct tl_data_2 {
 
 #define KRB5_TL_MOD_PRINC		0x0002
     
-/* Attributes */
-#define	KRB5_KDB_DISALLOW_POSTDATED	0x00000001
-#define	KRB5_KDB_DISALLOW_FORWARDABLE	0x00000002
-#define	KRB5_KDB_DISALLOW_TGT_BASED	0x00000004
-#define	KRB5_KDB_DISALLOW_RENEWABLE	0x00000008
-#define	KRB5_KDB_DISALLOW_PROXIABLE	0x00000010
-#define	KRB5_KDB_DISALLOW_DUP_SKEY	0x00000020
-#define	KRB5_KDB_DISALLOW_ALL_TIX	0x00000040
-#define	KRB5_KDB_REQUIRES_PRE_AUTH	0x00000080
-#define KRB5_KDB_REQUIRES_HW_AUTH	0x00000100
-#define	KRB5_KDB_REQUIRES_PWCHANGE	0x00000200
-#define KRB5_KDB_DISALLOW_SVR		0x00001000
-#define KRB5_KDB_PWCHANGE_SERVICE	0x00002000
-#define KRB5_KDB_SUPPORT_DESMD5         0x00004000
-
 /*
  * Determines the number of failed KDC requests before DISALLOW_ALL_TIX is set
  * on the principal.
@@ -411,4 +413,5 @@ typedef struct _kdb5_dispatch_table {
 krb5_error_code kdb5_db_set_dbops KRB5_PROTOTYPE((krb5_context,
 						  kdb5_dispatch_table *));
 #endif	/* KDB5_DISPATCH */
+#endif /* !defined(_MACINTOSH) && !defined(_MSDOS) */
 #endif /* KRB5_KDB5__ */
diff --git a/src/include/krb5/kdb_dbm.h b/src/include/krb5/kdb_dbm.h
index 958853e89..ea023a484 100644
--- a/src/include/krb5/kdb_dbm.h
+++ b/src/include/krb5/kdb_dbm.h
@@ -28,6 +28,8 @@
 #ifndef KRB5_KDB5_DBM__
 #define KRB5_KDB5_DBM__
 
+#if !defined(_MACINTOSH) && !defined(_MSDOS)
+	
 /* exclusive or shared lock flags */
 #define	KRB5_DBM_SHARED		0
 #define	KRB5_DBM_EXCLUSIVE	1
@@ -109,4 +111,5 @@ krb5_error_code krb5_dbm_db_open_database
 krb5_error_code krb5_dbm_db_close_database 
 	KRB5_PROTOTYPE((krb5_context));
 
+#endif /* !defined(_MACINTOSH) && !defined(_MSDOS) */
 #endif /* KRB5_KDB5_DBM__ */