Changeset 1071

Timestamp:

07/07/03 14:19:52 (21 years ago)

Author:

jalet

Message:

Now repykota and warnpykota --groups check the groups the user is a member of
in the print quota database, not in the system passwd/group files

Location:

pykota/trunk/bin

Files:

• repykota (modified) (2 diffs)
• warnpykota (modified) (2 diffs)

pykota/trunk/bin/repykota

@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.41  2003/07/07 12:19:52  jalet
+# Now repykota and warnpykota --groups check the groups the user is a member of
+# in the print quota database, not in the system passwd/group files
+#
 # Revision 1.40  2003/06/30 12:46:15  jalet
 # Extracted reporting code.
@@ -238 +242 @@
             # not the root user
             # reports only the current user
+            username = pwd.getpwuid(uid)[0]
             if options["groups"] :
-                ugnames = [ grp.getgrgid(pwd.getpwuid(uid)[3])[0] ]
+                user = self.storage.getUser(username)
+                if user.Exists :
+                    ugnames = [ g.Name for g in self.storage.getUserGroups(user) ]
+                else :    
+                    ugnames = [ ]
             else :
-                ugnames = [ pwd.getpwuid(uid)[0] ]
+                ugnames = [ username ]
         
         printers = self.storage.getMatchingPrinters(options["printer"])

pykota/trunk/bin/warnpykota

@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.21  2003/07/07 12:19:52  jalet
+# Now repykota and warnpykota --groups check the groups the user is a member of
+# in the print quota database, not in the system passwd/group files
+#
 # Revision 1.20  2003/06/25 14:10:01  jalet
 # Hey, it may work (edpykota --reset excepted) !
@@ -173 +177 @@
             # protects other users from mail bombing if they are
             # over quota.
+            username = pwd.getpwuid(uid)[0]
             if options["groups"] :
-                ugnames = [ grp.getgrgid(pwd.getpwuid(uid)[3])[0] ]
+                user = self.storage.getUser(username)
+                if user.Exists :
+                    ugnames = [ g.Name for g in self.storage.getUserGroups(user) ]
+                else :    
+                    ugnames = [ ]
             else :
-                ugnames = [ pwd.getpwuid(uid)[0] ]
+                ugnames = [ username ]
         
         printers = self.storage.getMatchingPrinters(options["printer"])