this commit includes all the changes on the OV_9510_INTEGRATION and

OV_MERGE branches.  This includes, but is not limited to, the new openvision
admin system, and major changes to gssapi to add functionality, and bring
the implementation in line with rfc1964.  before committing, the
code was built and tested for netbsd and solaris.

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

6 files changed, 115 insertions, 106 deletions

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index cba08f35e6..8fa97791e6 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -89,6 +89,11 @@ Tue Apr 30 14:51:55 1996    <tytso@rsts-11.mit.edu>
 		Macintosh definitions of PROVIDE_* since that is done in
 		mac/libaries/KerberosHeaders.h.
 
+Wed Apr 17 20:56:51 1996  Marc Horowitz  <marc@mit.edu>
+
+	* k5-int.h, port-sockets.h: moved socket stuff into a separate
+	file so that gssapi doesn't have to include k5-int.h
+
 Thu Apr 11 23:50:24 1996  Theodore Y. Ts'o  <tytso@dcl>
 
 	* krb5.hin (krb5_x, krb5_xc): Fix wrapper macros so they don't
diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index e3d2057e2e..bcc6c5ac00 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -365,85 +365,7 @@ typedef unsigned char	u_char;
 #include "krb5.h"
 
 #ifdef NEED_SOCKETS
-/*
- * Begin "k5-sockets.h"
- */
-#if defined (_MSDOS) || defined(_WIN32)
-
-#include <winsock.h>
-
-/* Some of our own infrastructure where the WinSock stuff was too hairy
-   to dump into a clean Unix program...  */
-
-#define SOCKET_INITIALIZE()     win_socket_initialize()
-#define SOCKET_CLEANUP()        WSACleanup()
-#define SOCKET_ERRNO            (WSAGetLastError())
-#define SOCKET_SET_ERRNO(x)     (WSASetLastError (x))
-#define SOCKET_NFDS(f)          (0)     /* select()'s first arg is ignored */
-#define SOCKET_READ(fd, b, l)   (recv(fd, b, l, 0))
-#define SOCKET_WRITE(fd, b, l)  (send(fd, b, l, 0))
-#define SOCKET_EINTR            WSAEINTR
-
-int win_socket_initialize();
-
-#else /* not _MSDOS */
-
-/* If this source file requires it, define struct sockaddr_in
-   (and possibly other things related to network I/O).  */
-
-#ifdef HAVE_MACSOCK_H		/* Sockets stuff differs on Mac */
-#include "macsock.h"		/* Macintosh sockets emulation library */
-
-/* Some of our own infrastructure where the WinSock stuff was too hairy
-   to dump into a clean Unix program...  */
-
-#define	SOCKET_INITIALIZE()	(WSAStartup(0x0101, (WSADATA *)0))
-#define	SOCKET_CLEANUP()	(WSACleanup())
-#define	SOCKET_ERRNO		(WSAGetLastError())
-#define	SOCKET_SET_ERRNO(x)	(WSASetLastError(x))
-#define	SOCKET_NFDS(f)		(0)	/* select()'s first arg is ignored */
-#define SOCKET_READ(fd, b, l)	(recv(fd, b, l, 0))
-#define SOCKET_WRITE(fd, b, l)	(send(fd, b, l, 0))
-#define SOCKET_EINTR		WSAEINTR
-
-#else  /* ! HAVE_MACSOCK_H */	/* Sockets stuff for Unix machines */
-
-#include <netinet/in.h>		/* For struct sockaddr_in and in_addr */
-#include <arpa/inet.h>		/* For inet_ntoa */
-#include <netdb.h>		/* For struct hostent, gethostbyname, etc */
-#include <sys/param.h>		/* For MAXHOSTNAMELEN */
-#include <sys/socket.h>		/* For SOCK_*, AF_*, etc */
-#include <sys/time.h>		/* For struct timeval */
-#include <net/if.h>		/* For struct ifconf, for localaddr.c */
-
-/*
- * Compatability with WinSock calls on MS-Windows...
- */
-#define	SOCKET		unsigned int
-#define	INVALID_SOCKET	((SOCKET)~0)
-#define	closesocket	close
-#define	ioctlsocket	ioctl
-#define	SOCKET_ERROR	(-1)
-
-/* Some of our own infrastructure where the WinSock stuff was too hairy
-   to dump into a clean Unix program...  */
-
-#define	SOCKET_INITIALIZE()	(0)	/* No error (or anything else) */
-#define	SOCKET_CLEANUP()	/* nothing */
-#define	SOCKET_ERRNO		errno
-#define	SOCKET_SET_ERRNO(x)	(errno = (x))
-#define SOCKET_NFDS(f)		((f)+1)	/* select() arg for a single fd */
-#define SOCKET_READ		read
-#define SOCKET_WRITE		write
-#define SOCKET_EINTR		EINTR
-
-#endif /* HAVE_MACSOCK_H */
-
-#endif /* _MSDOS */
-
-/*
- * End "k5-sockets.h"
- */
+#include "port-sockets.h"
 #endif
 
 /* krb5/krb5.h includes many other .h files in the krb5 subdirectory.
diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index adc0fabd5a..123349af26 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 0202823502..b4ec50852c 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 7a8f5bb252..db7157f14f 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  *,
diff --git a/src/include/port-sockets.h b/src/include/port-sockets.h
new file mode 100644
index 0000000000..2c2fba906d
--- /dev/null
+++ b/src/include/port-sockets.h
@@ -0,0 +1,72 @@
+#ifdef _MSDOS
+
+#include <winsock.h>
+
+/* Some of our own infrastructure where the WinSock stuff was too hairy
+   to dump into a clean Unix program...  */
+
+#define SOCKET_INITIALIZE()     win_socket_initialize()
+#define SOCKET_CLEANUP()        WSACleanup()
+#define SOCKET_ERRNO            (WSAGetLastError())
+#define SOCKET_SET_ERRNO(x)     (WSASetLastError (x))
+#define SOCKET_NFDS(f)          (0)     /* select()'s first arg is ignored */
+#define SOCKET_READ(fd, b, l)   (recv(fd, b, l, 0))
+#define SOCKET_WRITE(fd, b, l)  (send(fd, b, l, 0))
+#define SOCKET_EINTR            WSAEINTR
+
+int win_socket_initialize();
+
+#else /* not _MSDOS */
+
+/* If this source file requires it, define struct sockaddr_in
+   (and possibly other things related to network I/O).  */
+
+#ifdef HAVE_MACSOCK_H		/* Sockets stuff differs on Mac */
+#include "macsock.h"		/* Macintosh sockets emulation library */
+
+/* Some of our own infrastructure where the WinSock stuff was too hairy
+   to dump into a clean Unix program...  */
+
+#define	SOCKET_INITIALIZE()	(WSAStartup(0x0101, (WSADATA *)0))
+#define	SOCKET_CLEANUP()	(WSACleanup())
+#define	SOCKET_ERRNO		(WSAGetLastError())
+#define	SOCKET_SET_ERRNO(x)	(WSASetLastError(x))
+#define	SOCKET_NFDS(f)		(0)	/* select()'s first arg is ignored */
+#define SOCKET_READ(fd, b, l)	(recv(fd, b, l, 0))
+#define SOCKET_WRITE(fd, b, l)	(send(fd, b, l, 0))
+#define SOCKET_EINTR		WSAEINTR
+
+#else  /* ! HAVE_MACSOCK_H */	/* Sockets stuff for Unix machines */
+
+#include <netinet/in.h>		/* For struct sockaddr_in and in_addr */
+#include <arpa/inet.h>		/* For inet_ntoa */
+#include <netdb.h>		/* For struct hostent, gethostbyname, etc */
+#include <sys/param.h>		/* For MAXHOSTNAMELEN */
+#include <sys/socket.h>		/* For SOCK_*, AF_*, etc */
+#include <sys/time.h>		/* For struct timeval */
+#include <net/if.h>		/* For struct ifconf, for localaddr.c */
+
+/*
+ * Compatability with WinSock calls on MS-Windows...
+ */
+#define	SOCKET		unsigned int
+#define	INVALID_SOCKET	((SOCKET)~0)
+#define	closesocket	close
+#define	ioctlsocket	ioctl
+#define	SOCKET_ERROR	(-1)
+
+/* Some of our own infrastructure where the WinSock stuff was too hairy
+   to dump into a clean Unix program...  */
+
+#define	SOCKET_INITIALIZE()	(0)	/* No error (or anything else) */
+#define	SOCKET_CLEANUP()	/* nothing */
+#define	SOCKET_ERRNO		errno
+#define	SOCKET_SET_ERRNO(x)	(errno = (x))
+#define SOCKET_NFDS(f)		((f)+1)	/* select() arg for a single fd */
+#define SOCKET_READ		read
+#define SOCKET_WRITE		write
+#define SOCKET_EINTR		EINTR
+
+#endif /* HAVE_MACSOCK_H */
+
+#endif /* _MSDOS */