No restriction on list names.

[moira.git] / gen / ldap.gen

diff --git a/gen/ldap.gen b/gen/ldap.gen
index 4efa512a8828545a635f7c9b3ea53a2c1d36e75a..a1a81815d02ef7097712a96f091ef5b4327ab56f 100755 (executable)
--- a/gen/ldap.gen
+++ b/gen/ldap.gen
@@ -18,14 +18,18 @@ umask 022;
 $dbh = DBI->connect("dbi:Oracle:moira", "moira", "moira")
     || exit $MR_DBMS_ERR;
 
-$sth = $dbh->prepare("SELECT login, first, middle, last, clearid FROM users " .
-                    "WHERE status = 1 OR status = 9");
+$sth0 = $dbh->prepare("SELECT u.login, u.first, u.middle, u.last, " .
+                     "u.clearid, u.unix_uid, u.shell FROM users u " .
+                     "WHERE (u.status = 1 OR u.status = 9)") 
+    || exit $MR_DBMS_ERR;
+
 
-$sth->execute;
+$sth0->execute;
 
 open(OUT, ">$outdir/users") || exit $MR_OCONFIG;
 
-while(($login, $first, $middle, $last, $clearid) = $sth->fetchrow_array) {
+while(($login, $first, $middle, $last, $clearid, $unix_uid, 
+       $shell) = $sth0->fetchrow_array) {
     $row = "dn: uid=$login,ou=users,dc=mit,dc=edu\n";
     $row .= "objectclass: top\n";
     $row .= "objectclass: person\n";
@@ -36,6 +40,9 @@ while(($login, $first, $middle, $last, $clearid) = $sth->fetchrow_array) {
     $row .= "krb5PrincipalName: $login\@ATHENA.MIT.EDU\n";
     $row .= "userPassword: {KERBEROS}$login\@ATHENA.MIT.EDU\n";
     $row .= "employeeNumber: $clearid\n";
+    $row .= "loginShell: $shell\n";
+    $row .= "uidNumber: $unix_uid\n";
+    $row .= "gidNumber: 101\n";
 
     if($last) {
        $sn = "sn: $last\n";
@@ -62,6 +69,17 @@ while(($login, $first, $middle, $last, $clearid) = $sth->fetchrow_array) {
        $givenName .= "\n";
     }
 
+    $sth = $dbh->prepare("SELECT f.type, f.name FROM filesys f " .
+                        "WHERE f.label = '$login'") || exit $MR_DBMS_ERR;
+    
+    $sth->execute;
+    
+    if(($f_type, $f_name) = $sth->fetchrow_array) { 
+       if($f_type eq "AFS") {
+           $row .= "homeDirectory: $f_name\n";
+       }
+    }
+
     $row .= $sn;
     $row .= $cn;
     $row .= $givenName;
@@ -86,6 +104,7 @@ while (($name) = $sth0->fetchrow_array) {
                         "list l WHERE l.name = " . $dbh->quote($name) .
                         "AND l.list_id = i.list_id " .
                         "AND i.member_type = 'USER' " .
+                        "AND (u.status = 1 OR u.status = 9) " .
                         "AND i.member_id = u.users_id") || exit $MR_DBMS_ERR;
     $sth->execute;