projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add sshdistAuthKeysHost
[mirror/userdir-ldap.git]
/
ud-host
diff --git
a/ud-host
b/ud-host
index
ebcaa05
..
f6d6c56
100755
(executable)
--- a/
ud-host
+++ b/
ud-host
@@
-32,7
+32,7
@@
# -l list all hosts and their status
# -f list all SSH fingerprints
# -l list all hosts and their status
# -f list all SSH fingerprints
-import
string,
time, os, pwd, sys, getopt, ldap, crypt, readline, copy;
+import time, os, pwd, sys, getopt, ldap, crypt, readline, copy;
from tempfile import mktemp
from os import O_CREAT, O_EXCL, O_WRONLY
from userdir_ldap import *;
from tempfile import mktemp
from os import O_CREAT, O_EXCL, O_WRONLY
from userdir_ldap import *;
@@
-53,7
+53,13
@@
AttrInfo = {"description": ["Machine Descr.", 1],
"physicalHost": ["Physical Host", 13],
"sshRSAHostKey": ["SSH Host Keys", 14],
"bandwidth": ["Bandwidth", 15],
"physicalHost": ["Physical Host", 13],
"sshRSAHostKey": ["SSH Host Keys", 14],
"bandwidth": ["Bandwidth", 15],
- "purpose": ["Purposes", 16],};
+ "purpose": ["Purposes", 16],
+ "allowedGroups": ["Groups", 17],
+ "exportOptions": ["Export-Opts", 18],
+ "ipHostNumber": ["IP Address", 19],
+ "mXRecord": ["MXRecord", 20],
+ "sshdistAuthKeysHost": ["extra authkeys ip", 21],
+ }
AttrPrompt = {"description": ["Purpose of the machine"],
"hostname": ["The hostnames for the box (ipv4/ipv6)"],
AttrPrompt = {"description": ["Purpose of the machine"],
"hostname": ["The hostnames for the box (ipv4/ipv6)"],
@@
-68,9
+74,15
@@
AttrPrompt = {"description": ["Purpose of the machine"],
"memory": ["Installed RAM"],
"disk": ["Disk Space, RAID levels, etc"],
"physicalHost": ["The box hosting this virtual server"],
"memory": ["Installed RAM"],
"disk": ["Disk Space, RAID levels, etc"],
"physicalHost": ["The box hosting this virtual server"],
- "sshRSAHostKey": ["A copy of /etc/ssh/ssh_*host_key.pub"],
+
"sshRSAHostKey": ["A copy of /etc/ssh/ssh_*host_key.pub"],
"bandwidth": ["Available outbound"],
"bandwidth": ["Available outbound"],
- "purpose": ["The purposes of this host"],};
+ "purpose": ["The purposes of this host"],
+ "allowedGroups": ["allowed Groups on this host"],
+ "exportOptions": ["additional export options"],
+ "ipHostNumber": ["IP Addresses(es) of the machine"],
+ "mXRecord": ["Mail Exchanger for this machine"],
+ "sshdistAuthKeysHost": ["additional hosts for sshdist's authkeys file"],
+ };
# Create a map of IDs to desc,value,attr
OrderedIndex = {};
# Create a map of IDs to desc,value,attr
OrderedIndex = {};
@@
-132,7
+144,7
@@
def Overview(Attrs):
# Change a single attribute
def ChangeAttr(Attrs,Attr):
# Change a single attribute
def ChangeAttr(Attrs,Attr):
- if (Attr in ["sponsor", "sshRSAHostKey", "purpose"]):
+ if (Attr in ["sponsor", "sshRSAHostKey", "purpose"
, "allowedGroups", "exportOptions", "ipHostNumber", "mXRecord", "sshdistAuthKeysHost"
]):
return MultiChangeAttr(Attrs,Attr);
print "Old value: '%s'" % (GetAttr(Attrs,Attr,""));
return MultiChangeAttr(Attrs,Attr);
print "Old value: '%s'" % (GetAttr(Attrs,Attr,""));
@@
-170,7
+182,7
@@
def MultiChangeAttr(Attrs,Attr):
Attrs[1][Attr].sort();
print "Old values: ",Attrs[1][Attr];
Attrs[1][Attr].sort();
print "Old values: ",Attrs[1][Attr];
- Mode =
string.upper(raw_input("[D]elete or [A]dd? "));
+ Mode =
raw_input("[D]elete or [A]dd? ").upper()
if (Mode != 'D' and Mode != 'A'):
return;
if (Mode != 'D' and Mode != 'A'):
return;
@@
-241,9
+253,9
@@
for (switch, val) in options:
FingerPrints = 1
if (BindUser != ""):
FingerPrints = 1
if (BindUser != ""):
- l = passwdAccessLDAP(
LDAPServer,
BaseDn, BindUser)
+ l = passwdAccessLDAP(BaseDn, BindUser)
else:
else:
- l =
ldap.open(LDAPServer);
+ l =
connectLDAP()
l.simple_bind_s("","")
if ListMode == 1:
l.simple_bind_s("","")
if ListMode == 1: