projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Query the LDAP server if no locally defined group with that name was found
[mirror/userdir-ldap.git]
/
ud-generate
diff --git
a/ud-generate
b/ud-generate
index
bc85714
..
b7ca633
100755
(executable)
--- a/
ud-generate
+++ b/
ud-generate
@@
-4,7
+4,7
@@
# Copyright (c) 2000-2001 Jason Gunthorpe <jgg@debian.org>
# Copyright (c) 2003-2004 James Troup <troup@debian.org>
# Copyright (c) 2000-2001 Jason Gunthorpe <jgg@debian.org>
# Copyright (c) 2003-2004 James Troup <troup@debian.org>
-# Copyright (c) 2004-2005 Joey Schulze <joey@infodrom.org>
+# Copyright (c) 2004-2005
,7
Joey Schulze <joey@infodrom.org>
# Copyright (c) 2001-2007 Ryan Murray <rmurray@debian.org>
#
# This program is free software; you can redistribute it and/or modify
# Copyright (c) 2001-2007 Ryan Murray <rmurray@debian.org>
#
# This program is free software; you can redistribute it and/or modify
@@
-364,7
+364,8
@@
def GenPrivate(l,File):
continue;
# If the account is locked, do not write it
continue;
# If the account is locked, do not write it
- if (string.find(GetAttr(x,"userPassword"),"*LK*") != -1):
+ if (string.find(GetAttr(x,"userPassword"),"*LK*") != -1) \
+ or (string.find(GetAttr(x,"userPassword"),"*PK*") != -1):
continue;
# If the account has no PGP key, do not write it
continue;
# If the account has no PGP key, do not write it
@@
-798,20
+799,22
@@
while(1):
Allowed = None
CurrentHost = Split[0];
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;
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
# Link in global things
- DoLink(GlobalDir,OutDir,"ssh-rsa-shadow");
DoLink(GlobalDir,OutDir,"markers");
DoLink(GlobalDir,OutDir,"mail-forward.cdb");
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");
DoLink(GlobalDir,OutDir,"mail-disable");
DoLink(GlobalDir,OutDir,"mail-greylist");
DoLink(GlobalDir,OutDir,"mail-callout");