OSSP CVS Repository

ossp - Difference in ossp-pkg/petidomo/petidomo-kickout versions 1.1 and 1.2
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [History

ossp-pkg/petidomo/petidomo-kickout 1.1 -> 1.2

--- petidomo-kickout     2001/01/18 15:31:30     1.1
+++ petidomo-kickout     2001/01/21 12:00:35     1.2
@@ -20,10 +20,6 @@
     }
 }
 
-#   locate the Petidomo basedir
-my $basedir = `petidomo --version 2>&1`;
-$basedir =~ s|^.+\((\S+)\).*$|$1|s;
-
 #   read config 
 my $list = {};
 open(FP, "<$config") || die "No ~/.petidomo file found";
@@ -32,17 +28,16 @@
     if (m|^\s*(\S+)\s+(\S+)|) {
         my ($l, $pw) = ($1, $2);
         $l =~ s|@[^@]+$||;
-        if (-f "$basedir/$l.list") {
-            $list->{$l} = {};
-            $list->{$l}->{PASSWORD} = $pw;
-            $list->{$l}->{MEMBERS} = [];
-            open(LST, "<$basedir/$l.list");
-            while (<LST>) {
-                s|\n$||s;
-                push(@{$list->{$l}->{MEMBERS}}, $_);
-            }
-            close(LST);
+        $list->{$l} = {};
+        $list->{$l}->{PASSWORD} = $pw;
+        $list->{$l}->{MEMBERS} = [];
+        next if ($l eq 'petidomo');
+        open(DUMP, "./petidomo --masterconf=../test/petidomo.conf --mode=dump $l |") || die "fuck";
+        while (<DUMP>) {
+            s|\n$||s;
+            push(@{$list->{$l}->{MEMBERS}}, $_);
         }
+        close(DUMP);
     }
 }
 close(FP);
@@ -70,6 +65,5 @@
         }
     }
 }
-sleep(1);
 exit(0);
 

CVSTrac 2.0.1