Attachment 'setuidfix.diff'

Download

   1 diff -r 7e18782d09b2 MoinMoin/theme/__init__.py
   2 --- a/MoinMoin/theme/__init__.py	Fri Mar 19 20:23:50 2010 +0100
   3 +++ b/MoinMoin/theme/__init__.py	Sat Mar 20 22:09:13 2010 +0100
   4 @@ -322,8 +322,12 @@
   5                  userlinks.append(d['page'].link_to(request, text=_('Settings'),
   6                                                 querystr={'action': 'userprefs'}, id='userprefs', rel='nofollow'))
   7  
   8 -        if request.user.valid:
   9 -            if request.user.auth_method in request.cfg.auth_can_logout:
  10 +        if (request.user.valid
  11 +            or
  12 +            request.user.auth_method == 'setuid'):
  13 +            if (request.user.auth_method in request.cfg.auth_can_logout
  14 +                or
  15 +                request.user.auth_method == 'setuid'):
  16                  userlinks.append(d['page'].link_to(request, text=_('Logout'),
  17                                                     querystr={'action': 'logout', 'logout': 'logout'}, id='logout', rel='nofollow'))
  18          else:
  19 diff -r 7e18782d09b2 MoinMoin/userprefs/suid.py
  20 --- a/MoinMoin/userprefs/suid.py	Fri Mar 19 20:23:50 2010 +0100
  21 +++ b/MoinMoin/userprefs/suid.py	Sat Mar 20 22:09:13 2010 +0100
  22 @@ -26,8 +26,7 @@
  23          self.name = 'suid'
  24  
  25      def allowed(self):
  26 -        return (self.request.user.auth_method in self.request.cfg.auth_can_logout and
  27 -               UserPrefBase.allowed(self) and self.request.user.isSuperUser())
  28 +        return UserPrefBase.allowed(self) and self.request.user.isSuperUser()
  29  
  30      def handle_form(self):
  31          _ = self._

Attached Files

To refer to attachments on a page, use attachment:filename, as shown below in the list of files. Do NOT use the URL of the [get] link, since this is subject to change and can break easily.
  • [get | view] (2010-03-20 21:12:58, 1.5 KB) [[attachment:setuidfix.diff]]
 All files | Selected Files: delete move to page copy to page

You are not allowed to attach a file to this page.