Changeset c0a8738 for fedkit/smbmount.Linux.pl

Timestamp:

Feb 14, 2010 2:25:46 PM (14 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/smbmount.Linux.pl (modified) (2 diffs)

fedkit/smbmount.Linux.pl

@@ -43 +43 @@
 }
 
-open(TM, "$TMCC accounts windows |") or die("Failed to execute TMCC");
+# open(TM, "$TMCC accounts windows |") or die("Failed to execute TMCC");
+open(TM, "/usr/local/federation/etc/userconf")or die("Failed to open userconf");
 open(FSTAB,">>$FSTAB") or die("Cannot Open File $FSTAB");
 
@@ -49 +50 @@
 
 while(<TM>) {
-        if (/ADDUSER LOGIN=(\S+) PSWD=(\S+) UID=(\d+) GID=(\d+).*HOMEDIR=(\S+) / ) {
-                ($user, $pswd, $uid, $gid, $homedir) = ($1, $2, $3, $4, $5);
+    /ADDUSER/ && do {
+        /LOGIN=(\S+)/ && do { $user = $1; };
+        /WPSWD=(\S+)/ && do { $pswd = $1; };
+        /UID=(\S+)/ && do { $uid = $1; };
+        /GID=(\S+)/ && do { $gid = $1; };
+        /HOMEDIR=(\S+)/ && do { $homedir = $1; };
 
+        open(PWDFILE, ">/tmp/$user.cifs_creds") || 
+            warn "Can't create credentials for $user:$!\n";
+        print PWDFILE "username=$user\npassword=$pswd\n";
+        close(PWDFILE);
+        chmod(0600, "/tmp/$user.cifs_creds") == 1 || 
+            warn "Credential file /tmp/$user.cifs_creds may have " .
+                "bad permissions:$!\n";
 
-                open(PWDFILE, ">/tmp/$user.cifs_creds") || 
-                    warn "Can't create credentials for $user:$!\n";
-                print PWDFILE "username=$user\npassword=$pswd\n";
-                close(PWDFILE);
-                chmod(0600, "/tmp/$user.cifs_creds") == 1 || 
-                    warn "Credential file /tmp/$user.cifs_creds may have " .
-                        "bad permissions:$!\n";
+        print FSTAB "//$SHARE/$user\t";
+        print FSTAB "$homedir\tcifs\t";
+        print FSTAB "auto,rw,credentials=/tmp/$user.cifs_creds,ip=$ADDR\t0\t0\n";
 
-                print FSTAB "//$SHARE/$user\t";
-                print FSTAB "$homedir\tcifs\t";
-                print FSTAB "auto,rw,credentials=/tmp/$user.cifs_creds,ip=$ADDR\t0\t0\n";
+        #
+        # If we are PUSER, the user assigned to mount the project
+        # directory, then we add in the mount for that.  The share is
+        # called proj-$PNAME where PNAME is the name of the project at
+        # the mothership.  We need a second map for this since we will
+        # be mounting under /proj.  We should really not use share in
+        # federation.
+        #
 
-                #
-                # If we are PUSER, the user assigned to mount the project
-                # directory, then we add in the mount for that.  The share is
-                # called proj-$PNAME where PNAME is the name of the project at
-                # the mothership.  We need a second map for this since we will
-                # be mounting under /proj.  We should really not use share in
-                # federation.
-                #
+        if($user =~ m/$PUSER/i) {
+            print FSTAB "//$SHARE/proj-$PNAME\t";
+            print FSTAB "$PROJROOT/$PNAME\tcifs\t";
+            print FSTAB "rw,credentials=/tmp/$user.cifs_creds,ip=$ADDR\t0\t0\n";
 
-                if($user =~ m/$PUSER/i) {
-                        print FSTAB "//$SHARE/proj-$PNAME\t";
-                        print FSTAB "$PROJROOT/$PNAME\tcifs\t";
-                        print FSTAB "rw,credentials=/tmp/$user.cifs_creds,ip=$ADDR\t0\t0\n";
-
-                }
-        }
+        }
+    }
 }