X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=db6770d3d4ac8e16453784f1803d72de67de1529;hb=refs%2Fheads%2Ffordsa;hp=3d63776f36585aa4dd3c54bb07e295a9bad457a2;hpb=23219d2d7df150e32242a8f2391852640f0d123d;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-generate b/ud-generate
index 3d63776..db6770d 100755
--- a/ud-generate
+++ b/ud-generate
@@ -215,6 +215,8 @@ def GenPasswd(accounts, File, HomePrefix, PwdMarker):
       userlist = {}
       i = 0
       for a in accounts:
+         if 'loginShell' not in a:
+             continue
          # Do not let people try to buffer overflow some busted passwd parser.
          if len(a['gecos']) > 100 or len(a['loginShell']) > 50: continue
 
@@ -1301,8 +1303,8 @@ def generate_host(host, global_dir, all_accounts, all_hosts, ssh_userkeys):
    DoLink(global_dir, OutDir, "mail-rhsbl")
    DoLink(global_dir, OutDir, "mail-whitelist")
    DoLink(global_dir, OutDir, "all-accounts.json")
-   DoLink(global_dir, Outdir, "default-mail-options.cdb")
-   DoLink(global_dir, Outdir, "default-mail-options.db")
+   DoLink(global_dir, OutDir, "default-mail-options.cdb")
+   DoLink(global_dir, OutDir, "default-mail-options.db")
    GenCDB(accounts, OutDir + "user-forward.cdb", 'emailForward')
    GenDBM(accounts, OutDir + "user-forward.db", 'emailForward')
    GenCDB(accounts, OutDir + "batv-tokens.cdb", 'bATVToken')