oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

parse/store flags field

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@24469 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2009-01-25 00:49:10 +00:00
parent 2e5770b7f4
commit defb2afef1
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/krb5/keytab_file.c
View File

@@ -453,6 +453,7 @@ fkt_next_entry_int(krb5_context context,
int ret; int ret;
int8_t tmp8; int8_t tmp8;
int32_t tmp32; int32_t tmp32;
uint32_t utmp32;
off_t pos, curpos; off_t pos, curpos;
pos = krb5_storage_seek(cursor->sp, 0, SEEK_CUR); pos = krb5_storage_seek(cursor->sp, 0, SEEK_CUR);
@@ -467,8 +468,8 @@ loop:
ret = krb5_kt_ret_principal (context, d, cursor->sp, &entry->principal); ret = krb5_kt_ret_principal (context, d, cursor->sp, &entry->principal);
if (ret) if (ret)
goto out; goto out;
ret = krb5_ret_int32(cursor->sp, &tmp32); ret = krb5_ret_uint32(cursor->sp, &utmp32);
entry->timestamp = tmp32; entry->timestamp = utmp32;
if (ret) if (ret)
goto out; goto out;
ret = krb5_ret_int8(cursor->sp, &tmp8); ret = krb5_ret_int8(cursor->sp, &tmp8);
@@ -484,11 +485,17 @@ loop:
curpos = krb5_storage_seek(cursor->sp, 0, SEEK_CUR); curpos = krb5_storage_seek(cursor->sp, 0, SEEK_CUR);
if(len + 4 + pos - curpos >= 4) { if(len + 4 + pos - curpos >= 4) {
ret = krb5_ret_int32(cursor->sp, &tmp32); ret = krb5_ret_int32(cursor->sp, &tmp32);
if (ret == 0 && tmp32 != 0) { if (ret == 0 && tmp32 != 0)
entry->vno = tmp32; entry->vno = tmp32;
} }
} /* there might be a flags field here */
if(len + 4 + pos - curpos >= 8) {
ret = krb5_ret_uint32(cursor->sp, &utmp32);
if (ret == 0)
entry->flags = tmp32;
} else
entry->flags = 0; entry->flags = 0;
entry->aliases = NULL; entry->aliases = NULL;
if(start) *start = pos; if(start) *start = pos;
@@ -664,6 +671,15 @@ fkt_add_entry(krb5_context context,
krb5_storage_free(emem); krb5_storage_free(emem);
goto out; goto out;
} }
ret = krb5_store_uint32 (emem, entry->flags);
if (ret) {
krb5_set_error_message(context, ret,
N_("Failed storing extended kvno "
"in keytab %s", ""),
d->filename);
krb5_storage_free(emem);
goto out;
}
} }
ret = krb5_storage_to_data(emem, &keytab); ret = krb5_storage_to_data(emem, &keytab);