X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=b7ca63395812148bdc81efa823de760b4eddfb10;hb=685de8c801ade6d02e7c5033bf474036ffa57dbb;hp=f7c929eaafff39b5968724d3a763f0f92be718f4;hpb=6d44670b928bb0a25fc13236df9c9903926a857e;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-generate b/ud-generate
index f7c929e..b7ca633 100755
--- a/ud-generate
+++ b/ud-generate
@@ -799,20 +799,22 @@ while(1):
      Allowed = None
    CurrentHost = Split[0];
 
+   DoLink(GlobalDir,OutDir,"ssh-rsa-shadow");
+   DoLink(GlobalDir,OutDir,"debianhosts");
+   DoLink(GlobalDir,OutDir,"ssh_known_hosts");
+
    sys.stdout.flush();
    GenPasswd(l,OutDir+"passwd",Split[1]);
    sys.stdout.flush();
    GenGroup(l,OutDir+"group");
    if ExtraList.has_key("[UNTRUSTED]"):
 	continue;
-   GenShadow(l,OutDir+"shadow");
+   if not ExtraList.has_key("[NOPASSWD]"):
+     GenShadow(l,OutDir+"shadow");
 	
    # Link in global things   
-   DoLink(GlobalDir,OutDir,"ssh-rsa-shadow");
    DoLink(GlobalDir,OutDir,"markers");
    DoLink(GlobalDir,OutDir,"mail-forward.cdb");
-   DoLink(GlobalDir,OutDir,"debianhosts");
-   DoLink(GlobalDir,OutDir,"ssh_known_hosts");
    DoLink(GlobalDir,OutDir,"mail-disable");
    DoLink(GlobalDir,OutDir,"mail-greylist");
    DoLink(GlobalDir,OutDir,"mail-callout");