arts-branch.diff

   1 Index: arts/soundserver/artswrapper.c
   2 ===================================================================
   3 --- arts/soundserver/artswrapper.c      (.../tags/arts/1.5.3)   (revision 549703)
   4 +++ arts/soundserver/artswrapper.c      (.../branches/arts/1.5) (revision 549703)
   5 @@ -95,6 +95,10 @@
   6  #else
   7                 setreuid(-1, getuid());
   8  #endif
   9 +               if (geteuid() != getuid()) {
  10 +                       perror("setuid()");
  11 +                       return 2;
  12 +               }
  13         }
  14
  15         if(argc == 0)
  16 Index: arts/soundserver/crashhandler.cc
  17 ===================================================================
  18 --- arts/soundserver/crashhandler.cc    (.../tags/arts/1.5.3)   (revision 549703)
  19 +++ arts/soundserver/crashhandler.cc    (.../branches/arts/1.5) (revision 549703)
  20 @@ -196,7 +196,12 @@
  21            argv[i++] = NULL;
  22
  23            setgid(getgid());
  24 -          setuid(getuid());
  25 +          if (getuid() != geteuid())
  26 +            setuid(getuid());
  27 +          if (getuid() != geteuid()) {
  28 +           perror("setuid()");
  29 +            exit(255);
  30 +          }
  31
  32            execvp(crashApp, argv);
  33
  34 Index: arts/flow/gsl/gslmagic.c
  35 ===================================================================
  36 --- arts/flow/gsl/gslmagic.c    (.../tags/arts/1.5.3)   (revision 549703)
  37 +++ arts/flow/gsl/gslmagic.c    (.../branches/arts/1.5) (revision 549703)
  38 @@ -616,7 +616,7 @@
  39      return FALSE;
  40
  41    do
  42 -    ret = fstat (bfile->fd, &buf) < 0;
  43 +    ret = fstat (bfile->fd, &buf);
  44    while (ret < 0 && errno == EINTR);
  45    if (ret < 0)
  46      {
  47
  48 Property changes on: arts
  49 ___________________________________________________________________
  50 Name: svn:externals
  51    + libltdl https://svn.kde.org/home/kde/branches/KDE/3.5/kdelibs/libltdl
  52 admin https://svn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin
  53
  54