Changeset c0a8738 for fedkit/rc.fedaccounts

Timestamp:

Feb 14, 2010 2:25:46 PM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

b7f6ccc

Parents:

d87778f

Message:

Moving toward the federation scripts that don't rely on tmcd forwarding.

File:

• fedkit/rc.fedaccounts (modified) (2 diffs)

fedkit/rc.fedaccounts

@@ -39 +39 @@
 
 my $old_accts = "/usr/local/federation/etc/old_accts";
-my $accts = "/usr/local/federation/etc/accts";
+my $accts = "/usr/local/federation/etc/userconf";
 
 fatal("Need both $old_accts and $accts") unless -e $old_accts && -e $accts;
@@ -81 +81 @@
         os_groupadd($group, $gid);
     };
-    /^ADDUSER\s+LOGIN=([-\w]+)\s+PSWD=([^:]+)\s+UID=(\d+)\s+GID=(\d+)\s+
-        ROOT=(\d)\s+NAME="([^"]+)"\s+HOMEDIR=(\S+)\s+GLIST="([^"]*)"\s+
-        SERIAL=(\d+)\s+EMAIL="([^"]*)"\s+SHELL=(\S+)/x && do {
-            my ($login, $pswd, $uid, $gid, $root, $name, $hdir, $glist, 
-                $serial, $email, $shell) = 
-            ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11);
+    /^ADDUSER\s+/ && do { 
+        my $login;
+        my $pswd;
+        my $uid;
+        my $gid;
+        my $root;
+        my $name;
+        my $hdir;
+        my $glist;
+        my $serial;
+        my $email;
+        my $shell;
 
-            print "Adding $login $uid $gid\n";
-            os_useradd($login, $uid, $gid, $pswd, "$glist", $hdir, $name, 
-                $root, $shell);
-            os_mkdir($hdir, "0755") unless -e $hdir;
-            next;
+        /LOGIN=([\S]+)/ && do { $login = $1; }; 
+        /PSWD=(\S+)/ && do { $pswd=$1; } ;
+        /UID=(\d+)/ && do { $uid = $1; };
+        /GID=(\d+)/ && do { $gid = $1; };
+        /ROOT=(\d)/ && do { $root = $1; }; 
+        /NAME="([^"]*)"/ && do { $name = $1; };
+        /HOMEDIR=(\S+)/ && do { $hdir = $1; };
+        /GLIST="([^"]*)"/ && do { $glist = $1; }; 
+        /SERIAL=(\d+)/ && do { $serial = $1; };
+        /EMAIL="([^"]*)"/ && do { $email=$1; };
+        /SHELL=(\S+)/ && do { $shell = $1; };
+
+        print "Adding $login $uid $gid\n";
+        os_useradd($login, $uid, $gid, $pswd, "$glist", $hdir, $name, 
+            $root, $shell);
+        os_mkdir($hdir, "0755") unless -e $hdir;
+        next;
     };
 }