Rework ac/socket.h for HAVE_WINSOCK:

[openldap] / servers / slapd / aclparse.c

diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index f6e5d29ed369ddb1862e681098f64a3c51792d84..b7b0d9507ab8b5684e577cb2e860fbf4995a504f 100644 (file)
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -87,7 +87,7 @@ parse_acl(
 )
 {
        int             i;
-       char            *e, *left, *right;
+       char            *left, *right;
        struct acl      *a;
        struct access   *b;
 
@@ -160,7 +160,7 @@ parse_acl(
 
                                        alist = str2charray( right, "," );
                                        charray_merge( &a->acl_attrs, alist );
-                                       free( alist );
+                                       charray_free( alist );
                                } else {
                                        fprintf( stderr,
                                                "%s: line %d: expecting <what> got \"%s\"\n",
@@ -181,8 +181,7 @@ parse_acl(
                         * by clause consists of <who> and <access>
                         */
 
-                       b = (struct access *) ch_calloc( 1,
-                           sizeof(struct access) );
+                       b = (struct access *) ch_calloc( 1, sizeof(struct access) );
 
                        if ( ++i == argc ) {
                                fprintf( stderr,
@@ -243,7 +242,7 @@ parse_acl(
 
                                /* normalize the domain */
                                for ( s = b->a_domainpat; *s; s++ ) {
-                                       *s = TOLOWER( *s );
+                                       *s = TOLOWER( (unsigned char) *s );
                                }
                        } else if ( strcasecmp( left, "addr" ) == 0 ) {
                                regtest(fname, lineno, right);
@@ -412,7 +411,8 @@ acl_append( struct acl **l, struct acl *a )
 static void
 print_access( struct access *b )
 {
-       printf( "\tby" );
+       fprintf( stderr, "\tby" );
+
        if ( b->a_dnpat != NULL ) {
                fprintf( stderr, " dn=%s", b->a_dnpat );
        } else if ( b->a_addrpat != NULL ) {