3.8.0.PRE preparations and
* Obsoleted COMPAT_CLIV and COMPAT_XSL that were optional in 3.7
This commit is contained in:
parent
f2d2b0a8c0
commit
56e51f1a8d
22 changed files with 29 additions and 1333 deletions
|
|
@ -987,13 +987,7 @@ nacm_access(clicon_handle h,
|
|||
if (username == NULL)
|
||||
goto step10;
|
||||
/* User's group */
|
||||
if (xpath_vec(xacm,
|
||||
#ifdef COMPAT_XSL
|
||||
"groups/group[user-name=%s]",
|
||||
#else
|
||||
"groups/group[user-name='%s']",
|
||||
#endif
|
||||
&gvec, &glen, username) < 0)
|
||||
if (xpath_vec(xacm, "groups/group[user-name='%s']", &gvec, &glen, username) < 0)
|
||||
goto done;
|
||||
/* 5. If no groups are found, continue with step 10. */
|
||||
if (glen == 0)
|
||||
|
|
@ -1010,13 +1004,7 @@ nacm_access(clicon_handle h,
|
|||
for (j=0; j<glen; j++){
|
||||
char *gname;
|
||||
gname = xml_find_body(gvec[j], "name");
|
||||
if (xpath_first(xrlist,
|
||||
#ifdef COMPAT_XSL
|
||||
".[group=%s]",
|
||||
#else
|
||||
".[group='%s']",
|
||||
#endif
|
||||
gname)!=NULL)
|
||||
if (xpath_first(xrlist, ".[group='%s']", gname)!=NULL)
|
||||
break; /* found */
|
||||
}
|
||||
if (j==glen) /* not found */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue