Deleted Added
full compact
log.c (102644) log.c (120945)
1/*
1/*
2 * Copyright (c) 1997 - 2002 Kungliga Tekniska H�gskolan
2 * Copyright (c) 1997 - 2003 Kungliga Tekniska H�gskolan
3 * (Royal Institute of Technology, Stockholm, Sweden).
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:
9 *
10 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 */
33
34#include "kadm5_locl.h"
35
3 * (Royal Institute of Technology, Stockholm, Sweden).
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:
9 *
10 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 */
33
34#include "kadm5_locl.h"
35
36RCSID("$Id: log.c,v 1.19 2002/05/24 15:19:21 joda Exp $");
36RCSID("$Id: log.c,v 1.20 2003/04/16 17:56:55 lha Exp $");
37
38/*
39 * A log record consists of:
40 *
41 * version number 4 bytes
42 * time in seconds 4 bytes
43 * operation (enum kadm_ops) 4 bytes
44 * length of record 4 bytes

--- 218 unchanged lines hidden (view full) ---

263 u_int32_t ver,
264 u_int32_t len,
265 krb5_storage *sp)
266{
267 krb5_error_code ret;
268 krb5_data data;
269 hdb_entry ent;
270
37
38/*
39 * A log record consists of:
40 *
41 * version number 4 bytes
42 * time in seconds 4 bytes
43 * operation (enum kadm_ops) 4 bytes
44 * length of record 4 bytes

--- 218 unchanged lines hidden (view full) ---

263 u_int32_t ver,
264 u_int32_t len,
265 krb5_storage *sp)
266{
267 krb5_error_code ret;
268 krb5_data data;
269 hdb_entry ent;
270
271 krb5_data_alloc (&data, len);
271 ret = krb5_data_alloc (&data, len);
272 if (ret)
273 return ret;
272 krb5_storage_read (sp, data.data, len);
273 ret = hdb_value2entry (context->context, &data, &ent);
274 krb5_data_free(&data);
275 if (ret)
276 return ret;
277 ret = context->db->store(context->context, context->db, 0, &ent);
278 hdb_free_entry (context->context, &ent);
279 return ret;

--- 136 unchanged lines hidden (view full) ---

416 krb5_data value;
417 off_t off;
418 size_t princ_len, data_len;
419
420 off = krb5_storage_seek(sp, 0, SEEK_CUR);
421 krb5_ret_principal (sp, &source);
422 princ_len = krb5_storage_seek(sp, 0, SEEK_CUR) - off;
423 data_len = len - princ_len;
274 krb5_storage_read (sp, data.data, len);
275 ret = hdb_value2entry (context->context, &data, &ent);
276 krb5_data_free(&data);
277 if (ret)
278 return ret;
279 ret = context->db->store(context->context, context->db, 0, &ent);
280 hdb_free_entry (context->context, &ent);
281 return ret;

--- 136 unchanged lines hidden (view full) ---

418 krb5_data value;
419 off_t off;
420 size_t princ_len, data_len;
421
422 off = krb5_storage_seek(sp, 0, SEEK_CUR);
423 krb5_ret_principal (sp, &source);
424 princ_len = krb5_storage_seek(sp, 0, SEEK_CUR) - off;
425 data_len = len - princ_len;
424 krb5_data_alloc (&value, data_len);
426 ret = krb5_data_alloc (&value, data_len);
427 if (ret) {
428 krb5_free_principal (context->context, source);
429 return ret;
430 }
425 krb5_storage_read (sp, value.data, data_len);
426 ret = hdb_value2entry (context->context, &value, &target_ent);
427 krb5_data_free(&value);
428 if (ret) {
429 krb5_free_principal (context->context, source);
430 return ret;
431 }
432 ret = context->db->store (context->context, context->db, 0, &target_ent);

--- 71 unchanged lines hidden (view full) ---

504{
505 krb5_error_code ret;
506 int32_t mask;
507 krb5_data value;
508 hdb_entry ent, log_ent;
509
510 krb5_ret_int32 (sp, &mask);
511 len -= 4;
431 krb5_storage_read (sp, value.data, data_len);
432 ret = hdb_value2entry (context->context, &value, &target_ent);
433 krb5_data_free(&value);
434 if (ret) {
435 krb5_free_principal (context->context, source);
436 return ret;
437 }
438 ret = context->db->store (context->context, context->db, 0, &target_ent);

--- 71 unchanged lines hidden (view full) ---

510{
511 krb5_error_code ret;
512 int32_t mask;
513 krb5_data value;
514 hdb_entry ent, log_ent;
515
516 krb5_ret_int32 (sp, &mask);
517 len -= 4;
512 krb5_data_alloc (&value, len);
518 ret = krb5_data_alloc (&value, len);
519 if (ret)
520 return ret;
513 krb5_storage_read (sp, value.data, len);
514 ret = hdb_value2entry (context->context, &value, &log_ent);
515 krb5_data_free(&value);
516 if (ret)
517 return ret;
518 ent.principal = log_ent.principal;
519 log_ent.principal = NULL;
520 ret = context->db->fetch(context->context, context->db,

--- 285 unchanged lines hidden ---
521 krb5_storage_read (sp, value.data, len);
522 ret = hdb_value2entry (context->context, &value, &log_ent);
523 krb5_data_free(&value);
524 if (ret)
525 return ret;
526 ent.principal = log_ent.principal;
527 log_ent.principal = NULL;
528 ret = context->db->fetch(context->context, context->db,

--- 285 unchanged lines hidden ---