/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to plugins.d/mandos-client.c

  • Committer: Teddy Hogeborn
  • Date: 2016-02-28 15:11:35 UTC
  • mto: This revision was merged to the branch mainline in revision 809.
  • Revision ID: teddy@recompile.se-20160228151135-2c001gcl4cgtbbwt
Tags: version-1.7.2-1
http://bugs.debian.org/811159
* Makefile (version): Changed to "1.7.2".
* NEWS (Version 1.7.2): New entry.
* debian/changelog (1.7.2-1): - '' -
* debian/control (Package: mandos/Depends): Remove duplicate
  "python-dbus".

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/mandos-client.c
1914
1914
      return;
1915
1915
    }
1916
1916
  }
 
1917
#ifdef __GLIBC__
 
1918
#if __GLIBC_PREREQ(2, 15)
1917
1919
  int numhooks = scandirat(hookdir_fd, ".", &direntries,
1918
1920
                           runnable_hook, alphasort);
 
1921
#else  /* not __GLIBC_PREREQ(2, 15) */
 
1922
  int numhooks = scandir(hookdir, &direntries, runnable_hook,
 
1923
                         alphasort);
 
1924
#endif  /* not __GLIBC_PREREQ(2, 15) */
 
1925
#else   /* not __GLIBC__ */
 
1926
  int numhooks = scandir(hookdir, &direntries, runnable_hook,
 
1927
                         alphasort);
 
1928
#endif  /* not __GLIBC__ */
1919
1929
  if(numhooks == -1){
1920
1930
    perror_plus("scandir");
1921
1931
    return;
3044
3054
    if(tempdir_fd == -1){
3045
3055
      perror_plus("open");
3046
3056
    } else {
 
3057
#ifdef __GLIBC__
 
3058
#if __GLIBC_PREREQ(2, 15)
3047
3059
      int numentries = scandirat(tempdir_fd, ".", &direntries,
3048
3060
                                 notdotentries, alphasort);
 
3061
#else  /* not __GLIBC_PREREQ(2, 15) */
 
3062
      int numentries = scandir(tempdir, &direntries, notdotentries,
 
3063
                               alphasort);
 
3064
#endif  /* not __GLIBC_PREREQ(2, 15) */
 
3065
#else   /* not __GLIBC__ */
 
3066
      int numentries = scandir(tempdir, &direntries, notdotentries,
 
3067
                               alphasort);
 
3068
#endif  /* not __GLIBC__ */
3049
3069
      if(numentries >= 0){
3050
3070
        for(int i = 0; i < numentries; i++){
3051
3071
          ret = unlinkat(tempdir_fd, direntries[i]->d_name, 0);