Changeset 398

Timestamp:

08/27/09 15:22:43 (15 years ago)

Author:

nanardon

Message:

• add -r option allowing to remove groups/users instead adding

Location:

LATMOS-Accounts/bin

Files:

• la-group (modified) (4 diffs)
• la-guser (modified) (4 diffs)

LATMOS-Accounts/bin/la-group

@@ -15 +15 @@
 =head1 SYNOPSIS
 
-    la-create [options] group user1 [user2 [...]]
+    la-create [options] [-s|-r] group user1 [user2 [...]]
 
 =cut
@@ -23 +23 @@
     'b|base=s'   => \my $base,
     's'          => \my $set,
+    'r'          => \my $remove,
     'help'       => sub { pod2usage(0) },
 ) or pod2usage();
+
+$set && $remove and do {
+    warn "-s and -r cannot be used together\n";
+    pod2usage();
+    exit 1;
+};
 
 my $otype = 'group';
@@ -40 +47 @@
 Query this specific base instead default.
 
+=item -r
+
+Remove users list instead adding (cannot be used with -s)
+
 =item -s
 
-Set member list to user list instead of adding
+Set member list to user list instead of adding (cannot be used with -r)
 
 =back
@@ -68 +79 @@
     my @current_users = $obj->get_attributes('member');
     my %uniq_users;
-    foreach (($set ? () : @current_users), @users) {
-        $uniq_users{$_} = 1;
+    if ($set) {
+        foreach (@users) {
+            $uniq_users{$_} = 1;
+        }
+    } else {
+        foreach (@current_users) {
+            $uniq_users{$_} = 1;
+        }
+        if ($remove) {
+            foreach (@users) {
+                delete $uniq_users{$_};
+            }
+        }
     }
     my @new_users = keys %uniq_users;

LATMOS-Accounts/bin/la-guser

@@ -15 +15 @@
 =head1 SYNOPSIS
 
-    la-create [options] user group1 [group2 [...]]
+    la-create [options] [-s|-r] user group1 [group2 [...]]
 
 =cut
@@ -23 +23 @@
     'b|base=s'   => \my $base,
     's'          => \my $set,
+    'r'          => \my $remove,
     'help'       => sub { pod2usage(0) },
 ) or pod2usage();
+
+$set && $remove and do {                                              
+    warn "-s and -r cannot be used together\n";                       
+    pod2usage();                                                      
+    exit 1;                                                           
+};  
 
 my $otype = 'user';
@@ -40 +47 @@
 Query this specific base instead default.
 
+=item -r
+
+Remove user from groups instead adding (cannot be used with -s)
+
 =item -s
 
-Set member list to user list instead of adding
+Set member list to user list instead of adding (cannot be used with -r)
 
 =back
@@ -68 +79 @@
     my @current_groups = $obj->get_attributes('memberOf');
     my %uniq_groups;
-    foreach (($set ? () : @current_groups), @groups) {
-        $uniq_groups{$_} = 1;
+    if ($set) {
+        foreach (@groups) {
+            $uniq_groups{$_} = 1;
+        }
+    } else {
+        foreach (@current_groups) {
+            $uniq_groups{$_} = 1;
+        }
+        if ($remove) {
+            foreach (@groups) {
+                delete $uniq_groups{$_};
+            }
+        }
     }
     my @new_groups = keys %uniq_groups;