CVS commit: src/crypto/external/bsd/heimdal/dist/kadmin

2014-05-12 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Mon May 12 15:34:23 UTC 2014

Modified Files:
src/crypto/external/bsd/heimdal/dist/kadmin: rpc.c

Log Message:
CID 1011266: Unchecked returns


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/crypto/external/bsd/heimdal/dist/kadmin/rpc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/heimdal/dist/kadmin/rpc.c
diff -u src/crypto/external/bsd/heimdal/dist/kadmin/rpc.c:1.1.1.2 src/crypto/external/bsd/heimdal/dist/kadmin/rpc.c:1.2
--- src/crypto/external/bsd/heimdal/dist/kadmin/rpc.c:1.1.1.2	Thu Apr 24 08:45:27 2014
+++ src/crypto/external/bsd/heimdal/dist/kadmin/rpc.c	Mon May 12 11:34:23 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpc.c,v 1.1.1.2 2014/04/24 12:45:27 pettai Exp $	*/
+/*	$NetBSD: rpc.c,v 1.2 2014/05/12 15:34:23 christos Exp $	*/
 
 /*
  * Copyright (c) 2008 Kungliga Tekniska Högskolan
@@ -465,7 +465,7 @@ ret_principal_ent(krb5_context contextp,
 ent->max_life = flag;
 CHECK(krb5_ret_uint32(sp, &flag));
 if (flag == 0)
-	ret_principal_xdr(contextp, sp, &ent->mod_name);
+	CHECK(ret_principal_xdr(contextp, sp, &ent->mod_name));
 CHECK(krb5_ret_uint32(sp, &flag));
 ent->mod_date = flag;
 CHECK(krb5_ret_uint32(sp, &flag));

CVS commit: src/crypto/external/bsd/heimdal/dist/kadmin

2011-04-28 Thread Thomas Klausner 
Module Name:src
Committed By:   wiz
Date:   Thu Apr 28 14:15:53 UTC 2011

Modified Files:
src/crypto/external/bsd/heimdal/dist/kadmin: kadmind.8

Log Message:
Punctuation fix.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/kadmin/kadmind.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/heimdal/dist/kadmin/kadmind.8
diff -u src/crypto/external/bsd/heimdal/dist/kadmin/kadmind.8:1.2 src/crypto/external/bsd/heimdal/dist/kadmin/kadmind.8:1.3
--- src/crypto/external/bsd/heimdal/dist/kadmin/kadmind.8:1.2	Thu Apr 14 19:19:19 2011
+++ src/crypto/external/bsd/heimdal/dist/kadmin/kadmind.8	Thu Apr 28 14:15:53 2011
@@ -1,4 +1,4 @@
-.\"	$NetBSD: kadmind.8,v 1.2 2011/04/14 19:19:19 elric Exp $
+.\"	$NetBSD: kadmind.8,v 1.3 2011/04/28 14:15:53 wiz Exp $
 .\"
 .\" Copyright (c) 2002 - 2004 Kungliga Tekniska Högskolan
 .\" (Royal Institute of Technology, Stockholm, Sweden). 
@@ -78,8 +78,7 @@
 .Xr kpasswdd 8
 daemon is responsible for the Kerberos 5 password changing protocol
 (used by
-.Xr kpasswd 1 )
-.
+.Xr kpasswd 1 ) .
 .Pp
 This daemon should only be run on the master server, and not on any
 slaves.

CVS commit: src/crypto/external/bsd/heimdal/dist/kadmin

2011-04-21 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Apr 21 17:58:56 UTC 2011

Modified Files:
src/crypto/external/bsd/heimdal/dist/kadmin: get.c

Log Message:
Fix signed/unsigned warnings. Discover bug where < 0 case cannot happen,
and change it to >= 0 as intended.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/kadmin/get.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/heimdal/dist/kadmin/get.c
diff -u src/crypto/external/bsd/heimdal/dist/kadmin/get.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/kadmin/get.c:1.2
--- src/crypto/external/bsd/heimdal/dist/kadmin/get.c:1.1.1.1	Wed Apr 13 14:14:35 2011
+++ src/crypto/external/bsd/heimdal/dist/kadmin/get.c	Thu Apr 21 13:58:56 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: get.c,v 1.1.1.1 2011/04/13 18:14:35 elric Exp $	*/
+/*	$NetBSD: get.c,v 1.2 2011/04/21 17:58:56 christos Exp $	*/
 
 /*
  * Copyright (c) 1997-2006 Kungliga Tekniska Högskolan
@@ -66,7 +66,7 @@
 { "password", KADM5_TL_DATA, KRB5_TL_PASSWORD, KADM5_KEY_DATA, "Password", "Password", 0 },
 { "pkinit-acl", KADM5_TL_DATA, KRB5_TL_PKINIT_ACL, 0, "PK-INIT ACL", "PK-INIT ACL", 0 },
 { "aliases", KADM5_TL_DATA, KRB5_TL_ALIASES, 0, "Aliases", "Aliases", 0 },
-{ NULL }
+{ .fieldname = NULL }
 };
 
 struct field_info {
@@ -112,9 +112,9 @@
 static int
 cmp_salt (const krb5_salt *salt, const krb5_key_data *k)
 {
-if (salt->salttype != k->key_data_type[1])
+if (salt->salttype != (size_t)k->key_data_type[1])
 	return 1;
-if (salt->saltvalue.length != k->key_data_length[1])
+if (salt->saltvalue.length != (size_t)k->key_data_length[1])
 	return 1;
 return memcmp (salt->saltvalue.data, k->key_data_contents[1],
 		   salt->saltvalue.length);
@@ -247,7 +247,7 @@
 	krb5_tl_data *tl;
 
 	for (tl = princ->tl_data; tl != NULL; tl = tl->tl_data_next)
-	if (tl->tl_data_type == subfield)
+	if ((unsigned)tl->tl_data_type == subfield)
 		break;
 	if (tl == NULL) {
 	strlcpy(buf, "", buf_len);
@@ -263,7 +263,8 @@
 	case KRB5_TL_PKINIT_ACL: {
 	HDB_Ext_PKINIT_acl acl;
 	size_t size;
-	int i, ret;
+	int ret;
+	size_t i;
 
 	ret = decode_HDB_Ext_PKINIT_acl(tl->tl_data_contents,
 	tl->tl_data_length,
@@ -295,7 +296,8 @@
 	case KRB5_TL_ALIASES: {
 	HDB_Ext_Aliases alias;
 	size_t size;
-	int i, ret;
+	int ret;
+	size_t i;
 
 	ret = decode_HDB_Ext_Aliases(tl->tl_data_contents,
 	 tl->tl_data_length,
@@ -311,7 +313,7 @@
 		ret = krb5_unparse_name(context, &alias.aliases.val[i], &p);
 		if (ret)
 		break;
-		if (i < 0)
+		if (i > 0)
 		strlcat(buf, " ", buf_len);
 		strlcat(buf, p, buf_len);
 		free(p);

CVS commit: src/crypto/external/bsd/heimdal/dist/kadmin

2011-04-21 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Thu Apr 21 17:56:24 UTC 2011

Modified Files:
src/crypto/external/bsd/heimdal/dist/kadmin: util.c

Log Message:
Don't compare a pointer < 0; this is obviously a missed * here.
While here, remove shadow variable warnings.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/kadmin/util.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/heimdal/dist/kadmin/util.c
diff -u src/crypto/external/bsd/heimdal/dist/kadmin/util.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/kadmin/util.c:1.2
--- src/crypto/external/bsd/heimdal/dist/kadmin/util.c:1.1.1.1	Wed Apr 13 14:14:35 2011
+++ src/crypto/external/bsd/heimdal/dist/kadmin/util.c	Thu Apr 21 13:56:24 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: util.c,v 1.1.1.1 2011/04/13 18:14:35 elric Exp $	*/
+/*	$NetBSD: util.c,v 1.2 2011/04/21 17:56:24 christos Exp $	*/
 
 /*
  * Copyright (c) 1997 - 2006 Kungliga Tekniska Högskolan
@@ -67,7 +67,7 @@
 { "disallow-tgt-based",	KRB5_KDB_DISALLOW_TGT_BASED },
 { "disallow-forwardable",	KRB5_KDB_DISALLOW_FORWARDABLE },
 { "disallow-postdated",	KRB5_KDB_DISALLOW_POSTDATED },
-{ NULL }
+{ NULL, 0 }
 };
 
 /*
@@ -190,7 +190,7 @@
 if (str[0] == '+') {
 	str++;
 	*t = parse_time(str, "month");
-	if (t < 0)
+	if (*t < 0)
 	return -1;
 	*t += time(NULL);
 	return 0;
@@ -432,7 +432,7 @@
  */
 
 int
-set_entry(krb5_context context,
+set_entry(krb5_context contextp,
 	  kadm5_principal_ent_t ent,
 	  int *mask,
 	  const char *max_ticket_life,
@@ -444,14 +444,14 @@
 if (max_ticket_life != NULL) {
 	if (parse_deltat (max_ticket_life, &ent->max_life,
 			  mask, KADM5_MAX_LIFE)) {
-	krb5_warnx (context, "unable to parse `%s'", max_ticket_life);
+	krb5_warnx (contextp, "unable to parse `%s'", max_ticket_life);
 	return 1;
 	}
 }
 if (max_renewable_life != NULL) {
 	if (parse_deltat (max_renewable_life, &ent->max_renewable_life,
 			  mask, KADM5_MAX_RLIFE)) {
-	krb5_warnx (context, "unable to parse `%s'", max_renewable_life);
+	krb5_warnx (contextp, "unable to parse `%s'", max_renewable_life);
 	return 1;
 	}
 }
@@ -459,21 +459,21 @@
 if (expiration) {
 	if (parse_timet (expiration, &ent->princ_expire_time,
 			mask, KADM5_PRINC_EXPIRE_TIME)) {
-	krb5_warnx (context, "unable to parse `%s'", expiration);
+	krb5_warnx (contextp, "unable to parse `%s'", expiration);
 	return 1;
 	}
 }
 if (pw_expiration) {
 	if (parse_timet (pw_expiration, &ent->pw_expiration,
 			 mask, KADM5_PW_EXPIRATION)) {
-	krb5_warnx (context, "unable to parse `%s'", pw_expiration);
+	krb5_warnx (contextp, "unable to parse `%s'", pw_expiration);
 	return 1;
 	}
 }
 if (attributes != NULL) {
 	if (parse_attributes (attributes, &ent->attributes,
 			  mask, KADM5_ATTRIBUTES)) {
-	krb5_warnx (context, "unable to parse `%s'", attributes);
+	krb5_warnx (contextp, "unable to parse `%s'", attributes);
 	return 1;
 	}
 }