← Back to branch summary

~ubuntu-branches/debian/sid/subversion/sid

« back to all changes in this revision

Viewing changes to subversion/libsvn_fs_base/id.c

  • Committer: Package Import Robot
  • Author(s): James McCoy
  • Date: 2015-08-07 21:32:47 UTC
  • mfrom: (0.2.15) (4.1.7 experimental)
  • Revision ID: package-import@ubuntu.com-20150807213247-ozyewtmgsr6tkewl
Tags: 1.9.0-1
http://bugs.debian.org/791844
* Upload to unstable
* New upstream release.
  + Security fixes
    - CVE-2015-3184: Mixed anonymous/authenticated path-based authz with
      httpd 2.4
    - CVE-2015-3187: svn_repos_trace_node_locations() reveals paths hidden
      by authz
* Add >= 2.7 requirement for python-all-dev Build-Depends, needed to run
  tests.
* Remove Build-Conflicts against ruby-test-unit.  (Closes: #791844)
* Remove patches/apache_module_dependency in favor of expressing the
  dependencies in authz_svn.load/dav_svn.load.
* Build-Depend on apache2-dev (>= 2.4.16) to ensure ap_some_authn_required()
  is available when building mod_authz_svn and Depend on apache2-bin (>=
  2.4.16) for runtime support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
subversion/libsvn_fs_base/id.c
108
108
}
109
109
 
110
110
 
111
 
int
 
111
svn_fs_node_relation_t
112
112
svn_fs_base__id_compare(const svn_fs_id_t *a,
113
113
                        const svn_fs_id_t *b)
114
114
{
115
115
  if (svn_fs_base__id_eq(a, b))
116
 
    return 0;
117
 
  return (svn_fs_base__id_check_related(a, b) ? 1 : -1);
 
116
    return svn_fs_node_unchanged;
 
117
  return (svn_fs_base__id_check_related(a, b) ? svn_fs_node_common_ancestor
 
118
                                              : svn_fs_node_unrelated);
118
119
}
119
120
 
120
121