← Back to branch summary

~ubuntu-branches/ubuntu/trusty/aide/trusty

« back to all changes in this revision

Viewing changes to src/commandconf.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2010-10-12 16:10:31 UTC
  • mfrom: (1.1.7 upstream) (5.1.8 sid)
  • Revision ID: james.westby@ubuntu.com-20101012161031-42m31lgd5d6yngt0
Tags: 0.15.1-1ubuntu1
* Merge with Debian unstable; remaining Ubuntu changes:
  - debian/aide.conf.d/70_aide_dev: escape another special character in
    filenames. (LP #456710)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/commandconf.c
1
1
/* aide, Advanced Intrusion Detection Environment
2
2
 *
3
 
 * Copyright (C) 1999,2000,2001,2002 Rami Lehti, Pablo Virolainen
 
3
 * Copyright (C) 1999-2006,2010 Rami Lehti, Pablo Virolainen, Richard
 
4
 * van den Berg, Hannes von Haugwitz
4
5
 * $Header$
5
6
 *
6
7
 * This program is free software; you can redistribute it and/or
428
429
  if (check_dboo(db_attr)==RETOK) {
429
430
    conf->db_out_order[conf->db_out_size++]=db_attr;
430
431
  }
431
 
  if((attr&DB_PERM) && (check_dboo(db_perm)!=RETFAIL)){
 
432
  if(check_dboo(db_perm)==RETOK){
432
433
    conf->db_out_order[conf->db_out_size++]=db_perm;
433
434
  }
 
435
  if(check_dboo(db_inode)==RETOK){
 
436
    conf->db_out_order[conf->db_out_size++]=db_inode;
 
437
  }
434
438
  if((attr&DB_BCOUNT) && (check_dboo(db_bcount)!=RETFAIL)){
435
439
    conf->db_out_order[conf->db_out_size++]=db_bcount;
436
440
  }
455
459
  if((attr&DB_CTIME) && (check_dboo(db_ctime)!=RETFAIL)){
456
460
    conf->db_out_order[conf->db_out_size++]=db_ctime;
457
461
  }
458
 
  if((attr&DB_INODE||attr&DB_CHECKINODE) && (check_dboo(db_inode)!=RETFAIL)){
459
 
    conf->db_out_order[conf->db_out_size++]=db_inode;
460
 
  }
461
462
  if((attr&DB_LNKCOUNT) && (check_dboo(db_lnkcount)!=RETFAIL)){
462
463
    conf->db_out_order[conf->db_out_size++]=db_lnkcount;
463
464
  }
511
512
  if((attr&DB_SELINUX) && (check_dboo(db_selinux)!=RETFAIL)){
512
513
    conf->db_out_order[conf->db_out_size++]=db_selinux;
513
514
  }
 
515
  if((attr&DB_E2FSATTRS) && (check_dboo(db_e2fsattrs)!=RETFAIL)){
 
516
    conf->db_out_order[conf->db_out_size++]=db_e2fsattrs;
 
517
  }
514
518
  if((attr&DB_CHECKMASK) && (check_dboo(db_checkmask)!=RETFAIL)){
515
519
    conf->db_out_order[conf->db_out_size++]=db_checkmask;
516
520
  }