Use IPV6_V6ONLY on IPv6 sockets if available. This way we only get IPv6

[openldap] / servers / slapd / tools / slapadd.c

diff --git a/servers/slapd/tools/slapadd.c b/servers/slapd/tools/slapadd.c
index b6b05bdae7818fe84e300369a81ed0ab32ea896e..d14114c50c0e18a60a6b5164a9b4505a28032342 100644 (file)
--- a/servers/slapd/tools/slapadd.c
+++ b/servers/slapd/tools/slapadd.c
@@ -53,7 +53,10 @@ main( int argc, char **argv )
 
        while( ldif_read_record( ldiffp, &lineno, &buf, &lmax ) ) {
                Entry *e = str2entry( buf );
-               struct berval bvtext = { textlen, textbuf };
+               struct berval bvtext;
+
+               bvtext.bv_len = textlen;
+               bvtext.bv_val = textbuf;
 
                if( e == NULL ) {
                        fprintf( stderr, "%s: could not parse entry (line=%d)\n",
@@ -80,12 +83,12 @@ main( int argc, char **argv )
                        fprintf( stderr, "%s: line %d: "
                                "database (%s) not configured to hold \"%s\"\n",
                                progname, lineno,
-                               be ? be->be_suffix[0]->bv_val : "<none>",
+                               be ? be->be_suffix[0].bv_val : "<none>",
                                e->e_dn );
                        fprintf( stderr, "%s: line %d: "
                                "database (%s) not configured to hold \"%s\"\n",
                                progname, lineno,
-                               be ? be->be_nsuffix[0]->bv_val : "<none>",
+                               be ? be->be_nsuffix[0].bv_val : "<none>",
                                e->e_ndn );
                        rc = EXIT_FAILURE;
                        entry_free( e );
@@ -112,7 +115,8 @@ main( int argc, char **argv )
                        if( sc == NULL ) {
                                struct berval vals[2];
 
-                               int ret = structural_class( oc->a_vals, vals,
+                               /* int ret = */ 
+                                       structural_class( oc->a_vals, vals,
                                        NULL, &text, textbuf, textlen );
 
                                if( vals[0].bv_len == 0 ) {