projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improved admin output
[mirror/userdir-ldap.git]
/
ud-host
diff --git
a/ud-host
b/ud-host
index
956c046
..
1183aa5
100755
(executable)
--- a/
ud-host
+++ b/
ud-host
@@
-116,20
+116,19
@@
def ShowAttrs(Attrs):
def Overview(Attrs):
"""Display a one-line overview for a given host"""
def Overview(Attrs):
"""Display a one-line overview for a given host"""
- if 'status' in Attrs[1].keys():
- status = Attrs[1]['status'][0]
- else:
- status = ''
+ for i in ['host','architecture','distribution','access','status']:
+ if i not in Attrs[1].keys():
+ Attrs[1][i] = ['']
print "%-12s %-10s %-38s %-25s %s" % (\
Attrs[1]['host'][0], \
Attrs[1]['architecture'][0], \
Attrs[1]['distribution'][0], \
Attrs[1]['access'][0], \
print "%-12s %-10s %-38s %-25s %s" % (\
Attrs[1]['host'][0], \
Attrs[1]['architecture'][0], \
Attrs[1]['distribution'][0], \
Attrs[1]['access'][0], \
-
status
)
+
Attrs[1]['status'][0]
)
# Change a single attribute
def ChangeAttr(Attrs,Attr):
# Change a single attribute
def ChangeAttr(Attrs,Attr):
- if (Attr == "sponsor" or Attr == "
hostname" or Attr == "
sshRSAHostKey"):
+ if (Attr == "sponsor" or Attr == "sshRSAHostKey"):
return MultiChangeAttr(Attrs,Attr);
print "Old value: '%s'" % (GetAttr(Attrs,Attr,""));
return MultiChangeAttr(Attrs,Attr);
print "Old value: '%s'" % (GetAttr(Attrs,Attr,""));
@@
-213,8
+212,14
@@
User = pwd.getpwuid(os.getuid())[0];
BindUser = User;
ListMode = 0
FingerPrints = 0
BindUser = User;
ListMode = 0
FingerPrints = 0
+Host = None
# Process options
# Process options
-(options, arguments) = getopt.getopt(sys.argv[1:], "nh:a:rlf")
+try:
+ (options, arguments) = getopt.getopt(sys.argv[1:], "nh:a:rlf")
+except getopt.GetoptError, data:
+ print data
+ sys.exit(1)
+
for (switch, val) in options:
if (switch == '-h'):
Host = val;
for (switch, val) in options:
if (switch == '-h'):
Host = val;
@@
-237,7
+242,7
@@
else:
l = ldap.open(LDAPServer);
l.simple_bind_s("","")
l = ldap.open(LDAPServer);
l.simple_bind_s("","")
-HBaseDn =
"ou=hosts,dc=debian,dc=org";
+HBaseDn =
HostBaseDn
if ListMode == 1:
Attrs = l.search_s(HBaseDn,ldap.SCOPE_ONELEVEL,"host=*")
if ListMode == 1:
Attrs = l.search_s(HBaseDn,ldap.SCOPE_ONELEVEL,"host=*")
@@
-254,7
+259,10
@@
if ListMode == 1:
Overview(hAttrs)
sys.exit(0)
elif FingerPrints == 1:
Overview(hAttrs)
sys.exit(0)
elif FingerPrints == 1:
- Attrs = l.search_s(HBaseDn,ldap.SCOPE_ONELEVEL,"host=*")
+ if Host is not None:
+ Attrs = l.search_s(HBaseDn,ldap.SCOPE_ONELEVEL,"host=" + Host)
+ else:
+ Attrs = l.search_s(HBaseDn,ldap.SCOPE_ONELEVEL,"host=*")
hosts = []
for hAttrs in Attrs:
hosts.append(hAttrs[1]['host'][0])
hosts = []
for hAttrs in Attrs:
hosts.append(hAttrs[1]['host'][0])