← Back to branch summary

~ubuntu-branches/ubuntu/utopic/389-ds-base/utopic-proposed

« back to all changes in this revision

Viewing changes to lib/libaccess/acltools.cpp

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen
  • Date: 2014-02-03 11:08:50 UTC
  • mfrom: (0.2.1)
  • Revision ID: package-import@ubuntu.com-20140203110850-tjzx85elnke9fiu3
Tags: 1.3.2.9-1
http://bugs.debian.org/704077
http://bugs.debian.org/704421
http://bugs.debian.org/718325
http://bugs.debian.org/721222
http://bugs.debian.org/730115
* New upstream release.
  - fixes CVE-2013-0336 (Closes: #704077)
  - fixes CVE-2013-1897 (Closes: #704421)
  - fixes CVE-2013-2219 (Closes: #718325)
  - fixes CVE-2013-4283 (Closes: #721222)
  - fixes CVE-2013-4485 (Closes: #730115)
* Drop fix-CVE-2013-0312.diff, upstream.
* rules: Add new scripts to rename.
* fix-sasl-path.diff: Use a triplet path to find libsasl2. (LP:
  #1088822)
* admin_scripts.diff: Add patch from upstream #47511 to fix bashisms.
* control: Add ldap-utils to -base depends.
* rules, rename-online-scripts.diff: Some scripts with .pl suffix are
  meant for an online server, so instead of overwriting the offline
  scripts use -online suffix.
* rules: Enable parallel build, but limit the jobs to 1 for
  dh_auto_install.
* control: Bump policy to 3.9.5, no changes.
* rules: Add get-orig-source target.
* lintian-overrides: Drop obsolete entries, add comments for the rest.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/libaccess/acltools.cpp
229
229
NSAPI_PUBLIC int
230
230
ACL_ExprAddArg( NSErr_t *errp, 
231
231
    ACLExprHandle_t *expr, 
232
 
    char *arg )
 
232
    const char *arg )
233
233
{
234
234
 
235
235
    if ( expr == NULL ) 
406
406
 * displays ASCII equivalent of CmpOp_t
407
407
 */
408
408
 
409
 
static char *
 
409
static const char *
410
410
acl_comp_string( CmpOp_t cmp )
411
411
{
412
412
    switch (cmp) {
445
445
 
446
446
NSAPI_PUBLIC int 
447
447
ACL_ExprTerm( NSErr_t *errp, ACLExprHandle_t *acl_expr,
448
 
        char *attr_name, 
 
448
        const char *attr_name,
449
449
        CmpOp_t cmp, 
450
450
        char *attr_pattern )
451
451
{
1381
1381
ACLListHandle_t         *handle = NULL;
1382
1382
int                     eid = 0;
1383
1383
int                     rv = 0;
1384
 
char                    *errmsg;
 
1384
const char                      *errmsg;
1385
1385
 
1386
1386
    ACL_InitAttr2Index();
1387
1387
 
1555
1555
    int                 list_size;
1556
1556
    char                **tmp_list;
1557
1557
    char                **local_list;
1558
 
    char                *name;
 
1558
    const char          *name;
1559
1559
    
1560
1560
 
1561
1561
    if ( acl_list == NULL )
1740
1740
int
1741
1741
ACL_InitAttr2Index(void)
1742
1742
{
1743
 
    int i;
 
1743
    intptr_t i;
1744
1744
 
1745
1745
    if (ACLAttr2IndexPList) return 0;
1746
1746