Update copyright notices

[openldap] / clients / mail500 / main.c

diff --git a/clients/mail500/main.c b/clients/mail500/main.c
index f885feec4cfbe7fe39518be098c8a7bf8e166846..cbe5bb80372f1ce7343e6af71f9ef0deae4b17b7 100644 (file)
--- a/clients/mail500/main.c
+++ b/clients/mail500/main.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
@@ -8,14 +9,20 @@
  * may not be used to endorse or promote products derived from this
  * software without specific prior written permission. This software
  * is provided ``as is'' without express or implied warranty.
+ *
+ * Copyright 1998-2000 The OpenLDAP Foundation
+ * COPYING RESTRICTIONS APPLY.  See COPYRIGHT File in top level directory
+ * of this package for details.
  */
 
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
+#include <ac/param.h>
 #include <ac/signal.h>
 #include <ac/string.h>
 #include <ac/sysexits.h>
@@ -26,18 +33,13 @@
 
 #include <sys/stat.h>
 
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif
 
-#include "lber.h"
-#include "ldap.h"
+#include <ldap.h>
 
-#include "ldapconfig.h"
+#include "ldap_defaults.h"
 
 #ifndef MAIL500_BOUNCEFROM
 #define MAIL500_BOUNCEFROM "<>"
@@ -81,7 +83,7 @@ typedef struct errs {
 #define        E_NOOWNER               11
 #define E_GROUPUNKNOWN         12
        char            *e_addr;
-       union {
+       union e_union_u {
                char            *e_u_loop;
                LDAPMessage     *e_u_msg;
        } e_union;
@@ -106,16 +108,16 @@ typedef struct baseinfo {
 } Base;
 
 Base   base[] = {
-       {"ou=People, dc=OpenLDAP, dc=org",
+       {"ou=People, dc=example, dc=com",
                0, USER,
                {"uid=%s", "cn=%s", NULL}},
-       {"ou=System Groups, ou=Groups, dc=OpenLDAP, dc=org",
+       {"ou=System Groups, ou=Groups, dc=example, dc=com",
                1, 0xff,
                {"(&(cn=%s)(associatedDomain=%h))", NULL, NULL}},
-       {"ou=User Groups, ou=Groups, dc=OpenLDAP, dc=org",
+       {"ou=User Groups, ou=Groups, dc=example, dc=com",
                1, 0xff,
                {"(&(cn=%s)(associatedDomain=%h))", NULL, NULL}},
-       NULL
+       {NULL}
 };
 
 char   *sendmailargs[] = { MAIL500_SENDMAIL, "-oMrLDAP", "-odi", "-oi", "-f", NULL, NULL };
@@ -161,7 +163,7 @@ main ( int argc, char **argv )
        int             numto, ngroups, numerr, nargs;
        int             i, j;
 
-       if ( (myname = strrchr( argv[0], '/' )) == NULL )
+       if ( (myname = strrchr( argv[0], *LDAP_DIRSEP )) == NULL )
                myname = strdup( argv[0] );
        else
                myname = strdup( myname + 1 );
@@ -172,7 +174,7 @@ main ( int argc, char **argv )
 
 #ifdef LOG_MAIL
        openlog( myname, OPENLOG_OPTIONS, LOG_MAIL );
-#else
+#elif LOG_DEBUG
        openlog( myname, OPENLOG_OPTIONS );
 #endif
 
@@ -359,8 +361,8 @@ connect_to_x500( void )
 {
        int opt;
 
-       if ( (ld = ldap_open( ldaphost, 0 )) == NULL ) {
-               syslog( LOG_ALERT, "ldap_open failed" );
+       if ( (ld = ldap_init( ldaphost, 0 )) == NULL ) {
+               syslog( LOG_ALERT, "ldap_init failed" );
                return( -1 );
        }
 
@@ -514,9 +516,9 @@ do_address(
        /* no matches - bounce with user unknown */
        if ( match == 0 ) {
                if ( type == USER ) {
-                       add_error( err, nerr, E_USERUNKNOWN, name, NULLMSG );
+                       add_error( err, nerr, E_USERUNKNOWN, name, NULL );
                } else {
-                       add_error( err, nerr, E_GROUPUNKNOWN, name, NULLMSG );
+                       add_error( err, nerr, E_GROUPUNKNOWN, name, NULL );
                }
                return;
        }
@@ -836,7 +838,7 @@ do_group_members(
                if ( strcasecmp( joinable[0], "FALSE" ) == 0 ) {
                        if ( ! anymembers ) {
                                add_error( err, nerr, E_NOMEMBERS, dn,
-                                   NULLMSG );
+                                   NULL );
                        }
 
                        ldap_value_free( joinable );
@@ -903,7 +905,7 @@ do_group_members(
                                        ndn = ldap_get_dn( ld, ee );
 
                                        add_error( err, nerr,
-                                           E_JOINMEMBERNOEMAIL, ndn, NULLMSG );
+                                           E_JOINMEMBERNOEMAIL, ndn, NULL );
 
                                        free( ndn );
                                }
@@ -916,7 +918,7 @@ do_group_members(
        }
 
        if ( ! anymembers ) {
-               add_error( err, nerr, E_NOMEMBERS, dn, NULLMSG );
+               add_error( err, nerr, E_NOMEMBERS, dn, NULL );
        }
 }
 
@@ -935,7 +937,7 @@ add_member(
 {
        char            *ndn;
        char            **mail;
-       int             i, rc;
+       int             rc;
        LDAPMessage     *res, *e;
        struct timeval  timeout;
 
@@ -944,7 +946,7 @@ add_member(
        if ( (rc = ldap_search_st( ld, dn, LDAP_SCOPE_BASE, "(objectclass=*)",
            attrs, 0, &timeout, &res )) != LDAP_SUCCESS ) {
                if ( rc == LDAP_NO_SUCH_OBJECT ) {
-                       add_error( err, nerr, E_BADMEMBER, dn, NULLMSG );
+                       add_error( err, nerr, E_BADMEMBER, dn, NULL );
 
                        return;
                } else {
@@ -983,7 +985,7 @@ add_member(
        } else {
                if ( suppress == NULL || strcasecmp( suppress[0], "FALSE" )
                    == 0 ) {
-                       add_error( err, nerr, E_MEMBERNOEMAIL, ndn, NULLMSG );
+                       add_error( err, nerr, E_MEMBERNOEMAIL, ndn, NULL );
                }
        }
 
@@ -1008,7 +1010,7 @@ do_group_request(
 
                ldap_value_free( requeststo );
        } else {
-               add_error( err, nerr, E_NOREQUEST, dn, NULLMSG );
+               add_error( err, nerr, E_NOREQUEST, dn, NULL );
        }
 }
 
@@ -1030,7 +1032,7 @@ do_group_errors(
 
                ldap_value_free( errorsto );
        } else {
-               add_error( err, nerr, E_NOERRORS, dn, NULLMSG );
+               add_error( err, nerr, E_NOERRORS, dn, NULL );
        }
 }
 
@@ -1050,7 +1052,7 @@ do_group_owner(
                add_to( to, nto, owner );
                ldap_value_free( owner );
        } else {
-               add_error( err, nerr, E_NOOWNER, dn, NULLMSG );
+               add_error( err, nerr, E_NOOWNER, dn, NULL );
        }
 }
 
@@ -1621,7 +1623,7 @@ get_attributes_mail_dn(
 )
 {
        LDAPMessage     *ee, *res;
-       char            **vals, **dnlist, **mail, **grname, **graddr;
+       char            **vals, **dnlist, **mail, **grname;
         char            *dn;
        int             nto = 0, i, rc;
        struct timeval  timeout;