← Back to branch summary

~ubuntu-branches/debian/sid/vsftpd/sid

« back to all changes in this revision

Viewing changes to access.c

  • Committer: Package Import Robot
  • Author(s): Daniel Baumann
  • Date: 2011-09-05 15:55:00 UTC
  • mfrom: (1.4.12 upstream) (18.1.7 experimental)
  • Revision ID: package-import@ubuntu.com-20110905155500-7muqa8swhz2zfj03
Tags: 2.3.4-1
http://bugs.debian.org/634725
http://bugs.debian.org/630075
http://bugs.debian.org/629373
* Merging upstream version 2.3.4:
* Updating maintainer and uploaders fields.
* Removing vcs fields.
* Removing references to my old email address.
* Makging packaging distribution neutral.
* Updating years in copyright file.
* Updating to standards version 3.9.2.
* Compacting copyright file.
* Updating debconf-po files.
* Dropping alpha.patch, not supported anymore.
* Renumbering patches.
* Rediffing s390.patch.
* Simplifying architecture listing for libcap2-dev build-depends,
  thanks to Robert Millan <rmh@debian.org> (Closes: #634725).
* Adding Catalan debconf translations from Innocent De Marchi
  <tangram.peces@gmail.com> (Closes: #630075).
* Adding patch from Ben Hutchings <ben@decadent.org.uk> to fix a
  remote DoS on Linux 2.6.32 (Closes: #629373).

Show diffs side-by-side

added added

removed removed

Lines of Context:
access.c
16
16
vsf_access_check_file(const struct mystr* p_filename_str)
17
17
{
18
18
  static struct mystr s_access_str;
 
19
  unsigned int iters = 0;
19
20
 
20
21
  if (!tunable_deny_file)
21
22
  {
25
26
  {
26
27
    str_alloc_text(&s_access_str, tunable_deny_file);
27
28
  }
28
 
  if (vsf_filename_passes_filter(p_filename_str, &s_access_str))
 
29
  if (vsf_filename_passes_filter(p_filename_str, &s_access_str, &iters))
29
30
  {
30
31
    return 0;
31
32
  }
45
46
vsf_access_check_file_visible(const struct mystr* p_filename_str)
46
47
{
47
48
  static struct mystr s_access_str;
 
49
  unsigned int iters = 0;
48
50
 
49
51
  if (!tunable_hide_file)
50
52
  {
54
56
  {
55
57
    str_alloc_text(&s_access_str, tunable_hide_file);
56
58
  }
57
 
  if (vsf_filename_passes_filter(p_filename_str, &s_access_str))
 
59
  if (vsf_filename_passes_filter(p_filename_str, &s_access_str, &iters))
58
60
  {
59
61
    return 0;
60
62
  }