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

2018-04-06 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Apr  6 19:57:03 UTC 2018

Modified Files:
src/crypto/external/bsd/heimdal/dist/kcm: glue.c

Log Message:
- use c99 initializers
- add kdc offset functions


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/kcm/glue.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/kcm/glue.c
diff -u src/crypto/external/bsd/heimdal/dist/kcm/glue.c:1.2 src/crypto/external/bsd/heimdal/dist/kcm/glue.c:1.3
--- src/crypto/external/bsd/heimdal/dist/kcm/glue.c:1.2	Sat Jan 28 16:31:44 2017
+++ src/crypto/external/bsd/heimdal/dist/kcm/glue.c	Fri Apr  6 15:57:03 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: glue.c,v 1.2 2017/01/28 21:31:44 christos Exp $	*/
+/*	$NetBSD: glue.c,v 1.3 2018/04/06 19:57:03 christos Exp $	*/
 
 /*
  * Copyright (c) 2005, PADL Software Pty Ltd.
@@ -34,7 +34,7 @@
 
 #include "kcm_locl.h"
 
-__RCSID("$NetBSD: glue.c,v 1.2 2017/01/28 21:31:44 christos Exp $");
+__RCSID("$NetBSD: glue.c,v 1.3 2018/04/06 19:57:03 christos Exp $");
 
 /*
  * Server-side loopback glue for credentials cache operations; this
@@ -248,33 +248,60 @@ kcmss_get_version(krb5_context context,
 return 0;
 }
 
+static krb5_error_code
+kcmss_get_kdc_sec_offset(krb5_context context,
+			 krb5_ccache id,
+			 krb5_deltat *t)
+{
+kcm_ccache c = KCMCACHE(id);
+
+KCM_ASSERT_VALID(c);
+
+*t = c->kdc_offset;
+
+return 0;
+}
+
+static krb5_error_code
+kcmss_set_kdc_sec_offset(krb5_context context,
+			 krb5_ccache id, krb5_deltat t)
+{
+kcm_ccache c = KCMCACHE(id);
+
+KCM_ASSERT_VALID(c);
+
+c->kdc_offset = t;
+
+return 0;
+}
+
 static const krb5_cc_ops krb5_kcmss_ops = {
-KRB5_CC_OPS_VERSION,
-"KCM",
-kcmss_get_name,
-kcmss_resolve,
-kcmss_gen_new,
-kcmss_initialize,
-kcmss_destroy,
-kcmss_close,
-kcmss_store_cred,
-kcmss_retrieve,
-kcmss_get_principal,
-kcmss_get_first,
-kcmss_get_next,
-kcmss_end_get,
-kcmss_remove_cred,
-kcmss_set_flags,
-kcmss_get_version,
-NULL,
-NULL,
-NULL,
-NULL,
-NULL,
-NULL,
-NULL,
-NULL,
-NULL,
+.version =		KRB5_CC_OPS_VERSION,
+.prefix =		"KCM",
+.get_name =		kcmss_get_name,
+.resolve =		kcmss_resolve,
+.gen_new =		kcmss_gen_new,
+.init =		kcmss_initialize,
+.destroy =		kcmss_destroy,
+.close =		kcmss_close,
+.store =		kcmss_store_cred,
+.retrieve =		kcmss_retrieve,
+.get_princ =	kcmss_get_principal,
+.get_first =	kcmss_get_first,
+.get_next =		kcmss_get_next,
+.end_get =		kcmss_end_get,
+.remove_cred =	kcmss_remove_cred,
+.set_flags =	kcmss_set_flags,
+.get_version =	kcmss_get_version,
+.get_cache_first =	NULL,
+.get_cache_next =	NULL,
+.end_cache_get =	NULL,
+.move =		NULL,
+.get_default_name =	NULL,
+.set_default =	NULL,
+.lastchange =	NULL,
+.set_kdc_offset =	kcmss_set_kdc_sec_offset,
+.get_kdc_offset =	kcmss_get_kdc_sec_offset,
 };
 
 krb5_error_code



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

2018-04-06 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Apr  6 19:56:43 UTC 2018

Modified Files:
src/crypto/external/bsd/heimdal/dist/kcm: cache.c

Log Message:
don't forget to initialize the kdc_offset (it was random before)


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/dist/kcm/cache.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/kcm/cache.c
diff -u src/crypto/external/bsd/heimdal/dist/kcm/cache.c:1.3 src/crypto/external/bsd/heimdal/dist/kcm/cache.c:1.4
--- src/crypto/external/bsd/heimdal/dist/kcm/cache.c:1.3	Sat Jan 28 16:31:44 2017
+++ src/crypto/external/bsd/heimdal/dist/kcm/cache.c	Fri Apr  6 15:56:43 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: cache.c,v 1.3 2017/01/28 21:31:44 christos Exp $	*/
+/*	$NetBSD: cache.c,v 1.4 2018/04/06 19:56:43 christos Exp $	*/
 
 /*
  * Copyright (c) 2005, PADL Software Pty Ltd.
@@ -324,6 +324,7 @@ kcm_ccache_alloc(krb5_context context,
 slot->key.keytab = NULL;
 slot->tkt_life = 0;
 slot->renew_life = 0;
+slot->kdc_offset = 0;
 
 if (new_slot)
 	ccache_head = slot;



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

2014-07-24 Thread Joerg Sonnenberger
Module Name:src
Committed By:   joerg
Date:   Thu Jul 24 22:54:10 UTC 2014

Modified Files:
src/crypto/external/bsd/heimdal/dist/kcm: cache.c

Log Message:
Fix size argument of memcmp.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/crypto/external/bsd/heimdal/dist/kcm/cache.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/kcm/cache.c
diff -u src/crypto/external/bsd/heimdal/dist/kcm/cache.c:1.1.1.2 src/crypto/external/bsd/heimdal/dist/kcm/cache.c:1.2
--- src/crypto/external/bsd/heimdal/dist/kcm/cache.c:1.1.1.2	Thu Apr 24 12:45:27 2014
+++ src/crypto/external/bsd/heimdal/dist/kcm/cache.c	Thu Jul 24 22:54:10 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: cache.c,v 1.1.1.2 2014/04/24 12:45:27 pettai Exp $	*/
+/*	$NetBSD: cache.c,v 1.2 2014/07/24 22:54:10 joerg Exp $	*/
 
 /*
  * Copyright (c) 2005, PADL Software Pty Ltd.
@@ -104,7 +104,7 @@ kcm_ccache_resolve_by_uuid(krb5_context 
 for (p = ccache_head; p != NULL; p = p->next) {
 	if ((p->flags & KCM_FLAGS_VALID) == 0)
 	continue;
-	if (memcmp(p->uuid, uuid, sizeof(uuid)) == 0) {
+	if (memcmp(p->uuid, uuid, sizeof(*uuid)) == 0) {
 	ret = 0;
 	break;
 	}