| 1 | /usr/local/src/Twisted/twisted/internet: cvs diff app.py |
|---|
| 2 | Index: app.py |
|---|
| 3 | =================================================================== |
|---|
| 4 | RCS file: /cvs/Twisted/twisted/internet/app.py,v |
|---|
| 5 | retrieving revision 1.97 |
|---|
| 6 | diff -r1.97 app.py |
|---|
| 7 | |
|---|
| 8 | 695,699c695,701 |
|---|
| 9 | < if hasattr(os, 'getgid'): |
|---|
| 10 | < if not os.getgid(): |
|---|
| 11 | < os.setegid(self.gid) |
|---|
| 12 | < os.seteuid(self.uid) |
|---|
| 13 | < log.msg('set euid/egid %s/%s' % (self.uid, self.gid)) |
|---|
| 14 | --- |
|---|
| 15 | > try: |
|---|
| 16 | > os.setegid(self.gid) |
|---|
| 17 | > os.seteuid(self.uid) |
|---|
| 18 | > except (AttributeError, OSError): |
|---|
| 19 | > pass |
|---|
| 20 | > else: |
|---|
| 21 | > log.msg('set euid/egid %s/%s' % (self.uid, self.gid)) |
|---|
| 22 | |
|---|
| 23 | 704,708c706,712 |
|---|
| 24 | < if hasattr(os, 'getgid'): |
|---|
| 25 | < if not os.getgid(): |
|---|
| 26 | < os.setgid(self.gid) |
|---|
| 27 | < os.setuid(self.uid) |
|---|
| 28 | < log.msg('set uid/gid %s/%s' % (self.uid, self.gid)) |
|---|
| 29 | --- |
|---|
| 30 | > try: |
|---|
| 31 | > os.setgid(self.gid) |
|---|
| 32 | > os.setuid(self.uid) |
|---|
| 33 | > except (AttributeError, OSError): |
|---|
| 34 | > pass |
|---|
| 35 | > else: |
|---|
| 36 | > log.msg('set uid/gid %s/%s' % (self.uid, self.gid)) |
|---|
