projects
/
mirror
/
userdir-ldap.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
91ce4ae
)
Support for no/all keyrings
author
jgg
<>
Tue, 2 May 2000 01:57:40 +0000
(
01:57
+0000)
committer
jgg
<>
Tue, 2 May 2000 01:57:40 +0000
(
01:57
+0000)
doc/ud-useradd.8.yo
patch
|
blob
|
history
ud-useradd
patch
|
blob
|
history
diff --git
a/doc/ud-useradd.8.yo
b/doc/ud-useradd.8.yo
index
a7d5649
..
ae7155a
100644
(file)
--- a/
doc/ud-useradd.8.yo
+++ b/
doc/ud-useradd.8.yo
@@
-93,6
+93,9
@@
name.
dit(bf(-m))
Force resending of the greeting emails.
dit(bf(-m))
Force resending of the greeting emails.
+
+dit(bf(-a))
+Use all available key rings.
enddit()
manpagefiles()
enddit()
manpagefiles()
diff --git
a/ud-useradd
b/ud-useradd
index
cadb798
..
37ab675
100755
(executable)
--- a/
ud-useradd
+++ b/
ud-useradd
@@
-7,7
+7,7
@@
from userdir_gpg import *;
# This tries to search for a free UID. There are two possible ways to do
# this, one is to fetch all the entires and pick the highest, the other
# This tries to search for a free UID. There are two possible ways to do
# this, one is to fetch all the entires and pick the highest, the other
-# is to randomly guess uids until one is free. This uses the form
a
r.
+# is to randomly guess uids until one is free. This uses the form
e
r.
# Regrettably ldap doesn't have an integer attribute comparision function
# so we can only cut the search down slightly
def GetFreeID(l):
# Regrettably ldap doesn't have an integer attribute comparision function
# so we can only cut the search down slightly
def GetFreeID(l):
@@
-26,13
+26,17
@@
AdminUser = pwd.getpwuid(os.getuid())[0];
# Process options
ForceMail = 0;
# Process options
ForceMail = 0;
-(options, arguments) = getopt.getopt(sys.argv[1:], "u:m")
+OldGPGKeyRings = GPGKeyRings;
+GPGKeyRings = [];
+(options, arguments) = getopt.getopt(sys.argv[1:], "u:ma")
for (switch, val) in options:
if (switch == '-u'):
AdminUser = val;
elif (switch == '-m'):
ForceMail = 1;
for (switch, val) in options:
if (switch == '-u'):
AdminUser = val;
elif (switch == '-m'):
ForceMail = 1;
-
+ elif (switch == '-a'):
+ GPGKeyRings = OldGPGKeyRings;
+
print "Accessing LDAP directory as '" + AdminUser + "'";
Password = getpass(AdminUser + "'s password: ");
print "Accessing LDAP directory as '" + AdminUser + "'";
Password = getpass(AdminUser + "'s password: ");