Merge V1_0_FREEZE_3 into the mainline. (Note this merge does *not*

include the doc subtree!!)

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

5 files changed, 37 insertions, 20 deletions

diff --git a/src/slave/ChangeLog b/src/slave/ChangeLog
index 60673e1dc..acaeb8a3d 100644
--- a/src/slave/ChangeLog
+++ b/src/slave/ChangeLog
@@ -1,3 +1,20 @@
+Thu Dec  5 21:15:27 1996  Tom Yu  <tlyu@mit.edu>
+
+	* kslave_update: Update script for new filename conventions. [PR
+	280]
+
+	* kprop.M: Update outdated references to kdb5_edit and /krb5 [PR
+	279]
+
+	* kpropd.M: Update outdated references to kdb5_edit and /krb5 [PR
+	279]
+
+Fri Nov 22 15:52:07 1996  unknown  <bjaspan@mit.edu>
+
+	* kprop.c (open_connection): use sizeof instead of h_length to
+ 	determine number of bytes of addr to copy from DNS response
+ 	[krb5-misc/211]
+
 Thu Nov  7 15:18:01 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* kprop.c (main): 
diff --git a/src/slave/kprop.M b/src/slave/kprop.M
index 7a25db6df..a0b5ac840 100644
--- a/src/slave/kprop.M
+++ b/src/slave/kprop.M
@@ -35,8 +35,8 @@ Kerberos server to a slave Kerberos server, which is specfied by
 .IR slave_host .  
 This is done by transmitting the dumped database file to the slave
 server over an encrypted, secure channel.  The dump file must be created
-by kdb5_edit, and is normally KPROP_DEFAULT_FILE
-(/krb5/slave_datatrans).
+by kdb5_util, and is normally KPROP_DEFAULT_FILE
+(/usr/local/var/krb5kdc/slave_datatrans).
 .SH OPTIONS
 .TP
 \fB\-r\fP \fIrealm\fP
@@ -48,7 +48,7 @@ is used.
 \fB\-f\fP \fIfile\fP
 specifies the filename where the dumped principal database file is to be
 found; by default the dumped database file is KPROP_DEFAULT_FILE
-(normally /krb5/slave_datatrans).
+(normally /usr/local/var/krb5kdc/slave_datatrans).
 .TP
 \fB\-P\fP \fIport\fP
 specifies the port to use to contact the
@@ -61,4 +61,4 @@ prints debugging information.
 \fB\-s\fP \fIkeytab\fP
 specifies the location of the keytab file.
 .SH SEE ALSO
-kpropd(8), kdb5_edit(8), krb5kdc(8)
+kpropd(8), kdb5_util(8), krb5kdc(8)
diff --git a/src/slave/kprop.c b/src/slave/kprop.c
index 3c4848135..0ddcc2fb1 100644
--- a/src/slave/kprop.c
+++ b/src/slave/kprop.c
@@ -324,7 +324,7 @@ open_connection(host, fd, Errmsg)
 		return(0);
 	}
 	sin.sin_family = hp->h_addrtype;
-	memcpy((char *)&sin.sin_addr, hp->h_addr, hp->h_length);
+	memcpy((char *)&sin.sin_addr, hp->h_addr, sizeof(sin.sin_addr));
 	if(!port) {
 		sp = getservbyname(KPROP_SERVICE, "tcp");
 		if (sp == 0) {
diff --git a/src/slave/kpropd.M b/src/slave/kpropd.M
index 3228ed953..e037a1121 100644
--- a/src/slave/kpropd.M
+++ b/src/slave/kpropd.M
@@ -35,7 +35,7 @@ kpropd \- Kerberos V5 slave KDC update server
 .I principal_database
 ] [
 .B \-p
-.I kdb5_edit_prog
+.I kdb5_util_prog
 ] [
 .B \-d
 ] [
@@ -52,7 +52,7 @@ is the server which accepts connections from the
 program.  
 .I kpropd 
 accepts the dumped KDC database and places it in a file, and then runs 
-.IR kdb5_edit (8)
+.IR kdb5_util (8)
 to load the dumped database into the active database which is used by 
 .IR krb5kdc (8).
 Thus, the master Kerberos server can use 
@@ -66,7 +66,7 @@ Normally, kpropd is invoked out of
 This is done by adding a line to the inetd.conf file which looks like
 this:
 
-kprop	stream	tcp	nowait	root	/krb5/bin/kpropd	kpropd
+kprop	stream	tcp	nowait	root	/usr/local/sbin/kpropd	kpropd
 
 However, kpropd can also run as a standalone deamon, if the
 .B \-S
@@ -84,13 +84,13 @@ is used.
 \fB\-f\fP \fIfile\fP
 specifies the filename where the dumped principal database file is to be
 stored; by default the dumped database file is KPROPD_DEFAULT_FILE
-(normally /krb5/from_master).
+(normally /usr/local/var/krb5kdc/from_master).
 .TP
 .B \-p
 allows the user to specify the pathname to the
-.IR kdb5_edit (8)
-program; by default the pathname used is KPROPD_DEFAULT_KDB5_EDIT
-(normally /krb5/bin/kdb5_edit).
+.IR kdb5_util (8)
+program; by default the pathname used is KPROPD_DEFAULT_KDB5_UTIL
+(normally /usr/local/sbin/kdb5_util).
 .TP
 .B \-S
 turn on standalone mode.  Normally, kpropd is invoked out of
@@ -124,4 +124,4 @@ Access file for
 Each entry is a line containing the principal of a host from which the
 local machine will allow Kerberos database propagation via kprop.
 .SH SEE ALSO
-kprop(8), kdb5_edit(8), krb5kdc(8), inetd(8)
+kprop(8), kdb5_util(8), krb5kdc(8), inetd(8)
diff --git a/src/slave/kslave_update b/src/slave/kslave_update
index d6207de60..a4da274ff 100644
--- a/src/slave/kslave_update
+++ b/src/slave/kslave_update
@@ -1,16 +1,16 @@
 #!/bin/sh
 #
-# Propagate if database (principal.pag) has been modified since last dump
+# Propagate if database (principal.db) has been modified since last dump
 # (dumpfile.dump_ok) or if database has been dumped since last successful
 # propagation (dumpfile.<slave machine>.last_prop)
 
-KDB_DIR=/krb5
+KDB_DIR=/usr/local/var/krb5kdc
 
-KDB_FILE=$KDB_DIR/principal.page
+KDB_FILE=$KDB_DIR/principal.db
 DUMPFILE=$KDB_DIR/slave_datatrans
-KDB5_EDIT=/krb5/sbin/kdb5_edit
-KPROP=/krb5/sbin/kprop
- 
+KDB5_UTIL=/usr/local/sbin/kdb5_util
+KPROP=/usr/local/sbin/kprop
+
 SLAVE=$1
 if [ -z "${SLAVE}" ]
 then 
@@ -23,7 +23,7 @@ if [ "`ls -t $DUMPFILE.dump_ok $KDB_FILE | sed -n 1p`"  = "$KDB_FILE" -o \
 then
 
 	date
-	$KDB5_EDIT -R "ddb $DUMPFILE" >/dev/null
+	$KDB5_EDIT dump $DUMPFILE > /dev/null
 
 	$KPROP -d -f $DUMPFILE ${SLAVE}
 	rm $DUMPFILE