allow to filter enabled/disabled user

diff --git a/Makefile b/Makefile
index 44bb5bcd336e7c071105cd74fbbd2faba703a303..9b4c4d0c7185e579dddb4d8254e665efb4a05763 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=2.0
 
 VERSION=1.0
 PACKAGE=libpve-access-control
 
 VERSION=1.0
 PACKAGE=libpve-access-control

-PKGREL=5
+PKGREL=6

 
 DESTDIR=
 PREFIX=/usr
 
 DESTDIR=
 PREFIX=/usr

diff --git a/PVE/API2/User.pm b/PVE/API2/User.pm
index 0637f765fda580392562bdfd35a175aa098e2a1e..6272cadbb1d366816ab86cec30e3ff6411cb1714 100644 (file)
--- a/PVE/API2/User.pm
+++ b/PVE/API2/User.pm
@@ -38,7 +38,13 @@ __PACKAGE__->register_method ({
     description => "User index.",
     parameters => {
        additionalProperties => 0,
     description => "User index.",
     parameters => {
        additionalProperties => 0,

-       properties => {},
+       properties => {
+           enabled => {
+               type => 'boolean',
+               description => "Optional filter for enable property.",
+               optional => 1,
+           }
+       },

     },
     returns => {
        type => 'array',
     },
     returns => {
        type => 'array',


@@ -59,8 +65,14 @@ __PACKAGE__->register_method ({
  
        foreach my $user (keys %{$usercfg->{users}}) {
            next if $user eq 'root';
  
        foreach my $user (keys %{$usercfg->{users}}) {
            next if $user eq 'root';

-
+           

            my $entry = &$extract_user_data($usercfg->{users}->{$user});
            my $entry = &$extract_user_data($usercfg->{users}->{$user});

+
+           if (defined($param->{enabled})) {
+               next if $entry->{enable} && !$param->{enabled};
+               next if !$entry->{enable} && $param->{enabled};
+           }
+

            $entry->{userid} = $user;
            push @$res, $entry;
        }
            $entry->{userid} = $user;
            push @$res, $entry;
        }

diff --git a/changelog.Debian b/changelog.Debian
index d928c01642afc9a7233cd8495a908a23a774776c..bc7426c90aa2b0e3130b1f205af6858a91b732ba 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+libpve-access-control (1.0-6) unstable; urgency=low
+
+  * API change: allow to filter enabled/disabled users.
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 11 Jan 2012 12:30:37 +0100
+

 libpve-access-control (1.0-5) unstable; urgency=low
 
   * add a way to return file changes (diffs): set_result_changes()
 libpve-access-control (1.0-5) unstable; urgency=low
 
   * add a way to return file changes (diffs): set_result_changes()