diff options
Diffstat (limited to 'crypto/kerberosIV/slave')
| -rw-r--r-- | crypto/kerberosIV/slave/kprop.c | 6 | ||||
| -rw-r--r-- | crypto/kerberosIV/slave/kpropd.c | 11 | ||||
| -rw-r--r-- | crypto/kerberosIV/slave/slav_locl.h | 9 |
3 files changed, 8 insertions, 18 deletions
diff --git a/crypto/kerberosIV/slave/kprop.c b/crypto/kerberosIV/slave/kprop.c index 877787d..2cb1aee 100644 --- a/crypto/kerberosIV/slave/kprop.c +++ b/crypto/kerberosIV/slave/kprop.c @@ -19,7 +19,7 @@ provided "as is" without express or implied warranty. #include "slav_locl.h" -RCSID("$Id: kprop.c,v 1.36 1999/03/11 20:57:07 bg Exp $"); +RCSID("$Id: kprop.c,v 1.37 1999/09/16 20:41:59 assar Exp $"); #include "kprop.h" @@ -208,7 +208,7 @@ prop_to_slaves(struct slave_host *sl, p_my_host_name = krb_get_phost (my_host_name); /* copy it to make sure gethostbyname static doesn't * screw us. */ - strcpy_truncate (kprop_service_instance, + strlcpy (kprop_service_instance, p_my_host_name, INST_SZ); kerror = krb_get_svc_in_tkt (KPROP_SERVICE_NAME, @@ -434,7 +434,7 @@ main(int argc, char **argv) else if (strcmp (argv[i], "-realm") == 0) { i++; if (i < argc) - strcpy_truncate(my_realm, argv[i], REALM_SZ); + strlcpy(my_realm, argv[i], REALM_SZ); else usage(); } else if (strcmp (argv[i], "-force") == 0) diff --git a/crypto/kerberosIV/slave/kpropd.c b/crypto/kerberosIV/slave/kpropd.c index cf30d7b..db74509 100644 --- a/crypto/kerberosIV/slave/kpropd.c +++ b/crypto/kerberosIV/slave/kpropd.c @@ -14,12 +14,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the Kungliga Tekniska - * Högskolan and its contributors. - * - * 4. Neither the name of the Institute nor the names of its contributors + * 3. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -40,7 +35,7 @@ #include "kprop.h" -RCSID("$Id: kpropd.c,v 2.30 1999/03/11 20:29:14 bg Exp $"); +RCSID("$Id: kpropd.c,v 2.32 1999/12/02 16:58:56 joda Exp $"); #ifndef SBINDIR #define SBINDIR "/usr/athena/sbin" @@ -292,7 +287,7 @@ main(int argc, char **argv) kdb_util = optarg; break; case 'r': - strcpy_truncate(realm, optarg, REALM_SZ); + strlcpy(realm, optarg, REALM_SZ); break; case 's': srvtab = optarg; diff --git a/crypto/kerberosIV/slave/slav_locl.h b/crypto/kerberosIV/slave/slav_locl.h index 50c19e6..2772ed9 100644 --- a/crypto/kerberosIV/slave/slav_locl.h +++ b/crypto/kerberosIV/slave/slav_locl.h @@ -14,12 +14,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the Kungliga Tekniska - * Högskolan and its contributors. - * - * 4. Neither the name of the Institute nor the names of its contributors + * 3. Neither the name of the Institute nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -36,7 +31,7 @@ * SUCH DAMAGE. */ -/* $Id: slav_locl.h,v 1.13 1998/06/13 00:07:00 assar Exp $ */ +/* $Id: slav_locl.h,v 1.14 1999/12/02 16:58:56 joda Exp $ */ #ifndef __slav_locl_h #define __slav_locl_h |
