projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change Build-Depends-Indep to Build-Depends.
[mirror/userdir-ldap.git]
/
ud-host
diff --git
a/ud-host
b/ud-host
index
442de6d
..
4ba0571
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,
whrandom,
readline, copy;
+import string, 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 *;
@@
-116,16
+116,15
@@
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):
@@
-243,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=*")