From: Kurt Zeilenga <kurt@openldap.org>
Date: Mon, 14 Dec 1998 20:57:09 +0000 (+0000)
Subject: Back out previous change.  Should have been applied only to devel.
X-Git-Tag: OPENLDAP_REL_ENG_1_1_0~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46d8a7dbe0f12794951e3d766301a7b89ffddfa6;p=thirdparty%2Fopenldap.git

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

diff --git a/clients/mail500/main.c b/clients/mail500/main.c
index 380fd208a3..d826499e0f 100644
--- 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",