[Da-tools-commits] ./da-tools/userdir-ldap-common r355: ud-host: cleanup

[Peter Palfrader]

------------------------------------------------------------
revno: 355
committer: Peter Palfrader <peter at palfrader.org>
branch nick: test
timestamp: Tue 2007-12-25 20:30:50 +0100
message:
  ud-host: cleanup
  
  Replace local copy HBaseDn of the centrally configured HostBaseDn
modified:
  debian/changelog
  ud-host
    ------------------------------------------------------------
    revno: 349.4.3
    committer: Marc 'HE' Brockschmidt <he at debian.org>
    branch nick: userdir-ldap-common
    timestamp: Tue 2007-12-25 16:05:58 +0100
    message:
      Replace local copy HBaseDn of the centrally configured HostBaseDn by the
      latter everywhere we use it.
    modified:
      ud-host
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2007-12-25 19:25:33 +0000
+++ b/debian/changelog	2007-12-25 19:30:50 +0000
@@ -14,8 +14,10 @@
   * ud-useradd: support usergroups [HE].
   * ud-host/userdir-ldap.schema: Add 'purpose', 'physicalHost' to
     debianServer schema and teach ud-host about [HE].
+  * ud-host: cleanup: Replace local copy HBaseDn of the centrally
+    configured HostBaseDn [HE].
 
- -- Peter Palfrader <weasel at debian.org>  Tue, 25 Dec 2007 20:24:48 +0100
+ -- Peter Palfrader <weasel at debian.org>  Tue, 25 Dec 2007 20:30:17 +0100
 
 userdir-ldap (0.3.15) unstable; urgency=low
 

=== modified file 'ud-host'
--- a/ud-host	2007-12-25 14:37:29 +0000
+++ b/ud-host	2007-12-25 15:05:58 +0000
@@ -246,10 +246,8 @@
    l = ldap.open(LDAPServer);
    l.simple_bind_s("","")
 
-HBaseDn = HostBaseDn
-
 if ListMode == 1:
-   Attrs = l.search_s(HBaseDn,ldap.SCOPE_ONELEVEL,"host=*")
+   Attrs = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"host=*")
    hosts = []
    for hAttrs in Attrs:
       hosts.append(hAttrs[1]['host'][0])
@@ -264,9 +262,9 @@
    sys.exit(0)
 elif FingerPrints == 1:
    if Host is not None:
-      Attrs = l.search_s(HBaseDn,ldap.SCOPE_ONELEVEL,"host=" + Host)
+      Attrs = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"host=" + Host)
    else:
-      Attrs = l.search_s(HBaseDn,ldap.SCOPE_ONELEVEL,"host=*")
+      Attrs = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"host=*")
    hosts = []
    for hAttrs in Attrs:
       hosts.append(hAttrs[1]['host'][0])
@@ -289,10 +287,10 @@
    os.unlink(tmpfile)
    sys.exit(0)
 
-HostDn = "host=" + Host + "," + HBaseDn;
+HostDn = "host=" + Host + "," + HostBaseDn;
 
 # Query the server for all of the attributes
-Attrs = l.search_s(HBaseDn,ldap.SCOPE_ONELEVEL,"host=" + Host);
+Attrs = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"host=" + Host);
 if len(Attrs) == 0:
    print "Host",Host,"was not found.";
    sys.exit(0);
@@ -321,13 +319,13 @@
       NewHost = raw_input("Host? ");
       if NewHost == "":
          continue;
-      NAttrs = l.search_s(HBaseDn,ldap.SCOPE_ONELEVEL,"host=" + NewHost);
+      NAttrs = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"host=" + NewHost);
       if len(NAttrs) == 0:
          print "Host",NewHost,"was not found.";
          continue;
       Attrs = NAttrs;
       Host = NewHost;
-      HostDn = "host=" + Host + "," + HBaseDn;
+      HostDn = "host=" + Host + "," + HostBaseDn;
       OrderedIndex = copy.deepcopy(OrigOrderedIndex);
       continue;
 
@@ -336,26 +334,26 @@
       NewHost = raw_input("Host? ");
       if NewHost == "":
          continue;
-      NAttrs = l.search_s(HBaseDn,ldap.SCOPE_ONELEVEL,"host=" + NewHost);
+      NAttrs = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"host=" + NewHost);
       if len(NAttrs) != 0:
          print "Host",NewHost,"already exists.";
          continue;
       NewHostName = raw_input("Hostname? ");
       if NewHost == "":
          continue;
-      Dn = "host=" + NewHost + "," + HBaseDn;
+      Dn = "host=" + NewHost + "," + HostBaseDn;
       l.add_s(Dn,[("host", NewHost),
                   ("hostname", NewHostName),
                   ("objectClass", ("top", "debianServer"))]);
 
       # Switch
-      NAttrs = l.search_s(HBaseDn,ldap.SCOPE_ONELEVEL,"host=" + NewHost);
+      NAttrs = l.search_s(HostBaseDn,ldap.SCOPE_ONELEVEL,"host=" + NewHost);
       if len(NAttrs) == 0:
          print "Host",NewHost,"was not found.";
          continue;
       Attrs = NAttrs;
       Host = NewHost;
-      HostDn = "host=" + Host + "," + HBaseDn;
+      HostDn = "host=" + Host + "," + HostBaseDn;
       OrderedIndex = copy.deepcopy(OrigOrderedIndex);
       continue;