Import mail500 change from rel eng 1.1.

diff --git a/clients/mail500/main.c b/clients/mail500/main.c
index b147908db6216c922d8374d1e1039c860d6fc57f..3c4bb7529b6e784ac8e5c124a3a37fc88182349f 100644 (file)
--- a/clients/mail500/main.c
+++ b/clients/mail500/main.c
@@ -105,20 +105,20 @@ typedef struct baseinfo {
                                /* (up to three of them) */
 } Base;
 
-Base   base[] = 
-       { "ou=People, o=University of Michigan, c=US",
+Base   base[] = {
+       {"ou=People, dc=OpenLDAP, dc=org",
                0, USER,
-               "uid=%s", "cn=%s", NULL,
-         "ou=System Groups, ou=Groups, o=University of Michigan, c=US",
+               {"uid=%s", "cn=%s", NULL}},
+       {"ou=System Groups, ou=Groups, dc=OpenLDAP, dc=org",
                1, 0xff,
-               "(&(cn=%s)(associatedDomain=%h))", NULL, NULL,
-         "ou=User Groups, ou=Groups, o=University of Michigan, c=US",
+               {"(&(cn=%s)(associatedDomain=%h))", NULL, NULL}},
+       {"ou=User Groups, ou=Groups, dc=OpenLDAP, dc=org",
                1, 0xff,
-               "(&(cn=%s)(associatedDomain=%h))", NULL, NULL,
-         NULL
-       };
+               {"(&(cn=%s)(associatedDomain=%h))", NULL, NULL}},
+       NULL
+};
 
-char   *sendmailargs[] = { MAIL500_SENDMAIL, "-oMrX.500", "-odi", "-oi", "-f", NULL, NULL };
+char   *sendmailargs[] = { MAIL500_SENDMAIL, "-oMrLDAP", "-odi", "-oi", "-f", NULL, NULL };
 
 static char    *attrs[] = { "objectClass", "title", "postaladdress",
                        "telephoneNumber", "mail", "description", "owner",