Back out previous change. Should have been applied only to devel.

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