Changeset 471

Timestamp:

12/20/07 15:49:38 (8 months ago)

Author:

smoku

Message:

Using more standard attributes for LDAP

Location:

trunk/etc

Files:

• c2s.xml.dist.in (modified) (3 diffs)
• sm.xml.dist.in (modified) (1 diff)

trunk/etc/c2s.xml.dist.in

@@ -431 +431 @@
       <type>ad</type>
       -->
+
       <!-- LDAP attribute that holds the user ID (default: uid) -->
+      <uidattr>uid</uidattr>
+      <objectclass>posixAccount</objectclass>
+      <pwattr>userPassword</pwattr>
+      <!-- if you use included jabberd.schema use this:
       <uidattr>jid</uidattr>
+      <objectclass>jabberUser</objectclass>
+      <pwattr>jabberPassword</pwattr>
+      -->
+
       <!-- Attribute that holds jabber account status. Must be TRUE for AD,
            and 1 for other LDAP server.
@@ -440 +449 @@
       -->
       <fulluid/>
-      <pwattr>jabberPassword</pwattr>
       <!-- If pwscheme is not defined, then passwords are stored in clear
            text and digest authentication may be done.
@@ -447 +455 @@
            For now, sha, ssha and plain may be specified -->
       <!-- <pwscheme>ssha</pwscheme> -->
-      <objectclass>jabberUser</objectclass>
 
       <!-- base DN of the tree. You should specify a DN for each

trunk/etc/sm.xml.dist.in

@@ -207 +207 @@
 
       <!-- LDAP attribute that holds the user ID (default: uid) -->
+      <uidattr>uid</uidattr>
+      <objectclass>posixAccount</objectclass>
+      <pwattr>userPassword</pwattr>
+      <!-- if you use included jabberd.schema use this:
       <uidattr>jid</uidattr>
-
       <objectclass>jabberUser</objectclass>
+      <pwattr>jabberPassword</pwattr>
+      -->
 
       <!-- see authreg.ldapfull int c2s.xml for description. -->