← Back to branch summary

~dannf/ubuntu/saucy/screen/lp1213278-from-debian

« back to all changes in this revision

Viewing changes to debian/patches/25allow_symlink_sockdir.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2007-10-23 17:36:30 UTC
  • mto: This revision was merged to the branch mainline in revision 4.
  • Revision ID: james.westby@ubuntu.com-20071023173630-6q4agogsxuzujhwd
Tags: 4.0.3-7ubuntu1
* Merge with Debian; remaining Ubuntu changes:
  - 07_norootpassword.dpatch: When locking a root-owned screen, check that
    root has a password set. If not, ask for an unlocking key. (LP#6760)
  - debian/preinst: Remove obsolete init script 'screen' on
    upgrades. The script is called 'screen-cleanup' in Debian and thus
    should be called the same in Ubuntu to avoid a permanent and pointless
    delta. This needs to be kept until after the next LTS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/25allow_symlink_sockdir.dpatch
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## 25allow_symlink_sockdir.dpatch by  <hesso@pool.math.tu-berlin.de>
 
3
##
 
4
## DP: I don't know why screen should not allow a symlinked SockDir;
 
5
## DP: so now it does. (Note: this is one of TWO calls to lstat()
 
6
## DP: the whole program has - and this one isn't even wrapped in
 
7
## DP: #ifdef HAVE_LSTAT as it should.)
 
8
 
 
9
@DPATCH@
 
10
diff -Nau screen-4.0.3.orig/screen.c screen-4.0.3/screen.c
 
11
--- screen-4.0.3.orig/screen.c
 
12
+++ screen-4.0.3/screen.c
 
13
@@ -971,7 +971,7 @@
 
14
       else
 
15
        {
 
16
          SockDir = SOCKDIR;
 
17
-         if (lstat(SockDir, &st))
 
18
+         if (stat(SockDir, &st))
 
19
            {
 
20
              n = (eff_uid == 0 && (real_uid || eff_gid == real_gid)) ? 0755 :
 
21
                  (eff_gid != real_gid) ? 0775 :