Skip to content
Snippets Groups Projects
Commit eabd7e69 authored by Eric Vidal's avatar Eric Vidal :speech_balloon:
Browse files

add nallow field at resolve file

parent fe41e9e4
No related branches found
No related tags found
No related merge requests found
......@@ -38,6 +38,7 @@ int tree_resolve_master_copy(resolve_tree_master_t *dst, resolve_tree_master_t *
dst->enabled = mres->enabled ;
dst->current = mres->current ;
dst->current = mres->contents ;
dst->nallow = mres->nallow ;
dst->nenabled = mres->nenabled ;
dst->nenabled = mres->ncontents ;
......
......@@ -45,6 +45,7 @@ int tree_resolve_master_create(char const *base, uid_t owner)
mres.name = resolve_add_string(wres, SS_MASTER + 1) ;
mres.allow = resolve_add_string(wres, pw->pw_name) ;
mres.nallow++ ;
log_trace("write Master resolve file of trees") ;
if (!resolve_write_g(wres, base, SS_MASTER + 1))
......
......@@ -49,6 +49,11 @@ int tree_resolve_master_get_field_tosa(stralloc *sa, resolve_tree_master_t *mres
str = mres->sa.s + mres->contents ;
break ;
case E_RESOLVE_TREE_MASTER_NALLOW:
fmt[uint32_fmt(fmt,mres->nallow)] = 0 ;
str = fmt ;
break ;
case E_RESOLVE_TREE_MASTER_NENABLED:
fmt[uint32_fmt(fmt,mres->nenabled)] = 0 ;
str = fmt ;
......
......@@ -29,6 +29,7 @@ resolve_field_table_t resolve_tree_master_field_table[] = {
[E_RESOLVE_TREE_MASTER_ENABLED] = { .field = "enabled" },
[E_RESOLVE_TREE_MASTER_CURRENT] = { .field = "current" },
[E_RESOLVE_TREE_MASTER_CONTENTS] = { .field = "contents" },
[E_RESOLVE_TREE_MASTER_NALLOW] = { .field = "nallow" },
[E_RESOLVE_TREE_MASTER_NENABLED] = { .field = "nenabled" },
[E_RESOLVE_TREE_MASTER_NCONTENTS] = { .field = "ncontents" },
[E_RESOLVE_TREE_MASTER_ENDOFKEY] = { .field = 0 }
......@@ -65,6 +66,13 @@ int tree_resolve_master_modify_field(resolve_tree_master_t *mres, uint8_t field,
mres->contents = resolve_add_string(wres,data) ;
break ;
case E_RESOLVE_TREE_MASTER_NALLOW:
if (!data)
data = "0" ;
if (!uint0_scan(data, &ifield)) goto err ;
mres->nallow = ifield ;
break ;
case E_RESOLVE_TREE_MASTER_NENABLED:
if (!data)
data = "0" ;
......
......@@ -55,6 +55,10 @@ int tree_resolve_master_read_cdb(cdb *c, resolve_tree_master_t *mres)
resolve_find_cdb(&tmp,c,"contents") ;
mres->contents = tmp.len ? resolve_add_string(wres,tmp.s) : 0 ;
/* nallow */
x = resolve_find_cdb(&tmp,c,"nallow") ;
mres->nallow = x ;
/* nenabled */
x = resolve_find_cdb(&tmp,c,"nenabled") ;
mres->nenabled = x ;
......
......@@ -40,6 +40,9 @@ int tree_resolve_master_write_cdb(cdbmaker *c, resolve_tree_master_t *mres)
/* contents */
!resolve_add_cdb(c,"contents",str, mres->contents, 1) ||
/* nallow */
!resolve_add_cdb_uint(c,"nallow", mres->nallow) ||
/* nenabled */
!resolve_add_cdb_uint(c,"nenabled",mres->nenabled) ||
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment