Cleanup

[openldap] / servers / slapd / slapadd.c

diff --git a/servers/slapd/slapadd.c b/servers/slapd/slapadd.c
index 38d5b89253aeb06ff0071f892881b11ac5f6080f..8dcd79cc173707b31aa45ca8ca875ef456c1bc62 100644 (file)
--- a/servers/slapd/slapadd.c
+++ b/servers/slapd/slapadd.c
@@ -40,8 +40,8 @@
 
 #include "slapcommon.h"
 
-static char csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ];
-static char maxcsnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE * ( SLAP_SYNC_SID_MAX + 1 ) ];
+static char csnbuf[ LDAP_PVT_CSNSTR_BUFSIZE ];
+static char maxcsnbuf[ LDAP_PVT_CSNSTR_BUFSIZE * ( SLAP_SYNC_SID_MAX + 1 ) ];
 
 int
 slapadd( int argc, char **argv )
@@ -64,7 +64,7 @@ slapadd( int argc, char **argv )
 
        int match;
        int checkvals;
-       int lineno, nextline;
+       int lineno, nextline, ldifrc;
        int lmax;
        int rc = EXIT_SUCCESS;
        int manage = 0; 
@@ -76,7 +76,7 @@ slapadd( int argc, char **argv )
        /* default "000" */
        csnsid = 0;
 
-       if ( isatty (1) ) enable_meter = 1;
+       if ( isatty (2) ) enable_meter = 1;
        slap_tool_init( progname, SLAPADD, argc, argv );
 
        memset( &opbuf, 0, sizeof(opbuf) );
@@ -120,7 +120,7 @@ slapadd( int argc, char **argv )
        if ( update_ctxcsn ) {
                maxcsn[ 0 ].bv_val = maxcsnbuf;
                for ( sid = 1; sid <= SLAP_SYNC_SID_MAX; sid++ ) {
-                       maxcsn[ sid ].bv_val = maxcsn[ sid - 1 ].bv_val + LDAP_LUTIL_CSNSTR_BUFSIZE;
+                       maxcsn[ sid ].bv_val = maxcsn[ sid - 1 ].bv_val + LDAP_PVT_CSNSTR_BUFSIZE;
                        maxcsn[ sid ].bv_len = 0;
                }
        }
@@ -142,7 +142,7 @@ slapadd( int argc, char **argv )
        }
 
        /* nextline is the line number of the end of the current entry */
-       for( lineno=1; ldif_read_record( ldiffp, &nextline, &buf, &lmax );
+       for( lineno=1; ( ldifrc = ldif_read_record( ldiffp, &nextline, &buf, &lmax )) > 0;
                lineno=nextline+1 )
        {
                BackendDB *bd;
@@ -280,13 +280,20 @@ slapadd( int argc, char **argv )
                        struct berval nname;
                        char timebuf[ LDAP_LUTIL_GENTIME_BUFSIZE ];
 
+                       enum {
+                               GOT_NONE = 0x0,
+                               GOT_CSN = 0x1,
+                               GOT_UUID = 0x2,
+                               GOT_ALL = (GOT_CSN|GOT_UUID)
+                       } got = GOT_ALL;
+
                        vals[1].bv_len = 0;
                        vals[1].bv_val = NULL;
 
                        nvals[1].bv_len = 0;
                        nvals[1].bv_val = NULL;
 
-                       csn.bv_len = lutil_csnstr( csnbuf, sizeof( csnbuf ), csnsid, 0 );
+                       csn.bv_len = ldap_pvt_csnstr( csnbuf, sizeof( csnbuf ), csnsid, 0 );
                        csn.bv_val = csnbuf;
 
                        timestamp.bv_val = timebuf;
@@ -305,6 +312,7 @@ slapadd( int argc, char **argv )
                        if( attr_find( e->e_attrs, slap_schema.si_ad_entryUUID )
                                == NULL )
                        {
+                               got &= ~GOT_UUID;
                                vals[0].bv_len = lutil_uuidstr( uuidbuf, sizeof( uuidbuf ) );
                                vals[0].bv_val = uuidbuf;
                                attr_merge_normalize_one( e, slap_schema.si_ad_entryUUID, vals, NULL );
@@ -328,6 +336,7 @@ slapadd( int argc, char **argv )
                        if( attr_find( e->e_attrs, slap_schema.si_ad_entryCSN )
                                == NULL )
                        {
+                               got &= ~GOT_CSN;
                                vals[0] = csn;
                                attr_merge( e, slap_schema.si_ad_entryCSN, vals, NULL );
                        }
@@ -347,6 +356,19 @@ slapadd( int argc, char **argv )
                                attr_merge( e, slap_schema.si_ad_modifyTimestamp, vals, NULL );
                        }
 
+                       if ( SLAP_SINGLE_SHADOW(be) && got != GOT_ALL ) {
+                               char buf[SLAP_TEXT_BUFLEN];
+
+                               snprintf( buf, sizeof(buf),
+                                       "%s%s%s",
+                                       ( !(got & GOT_UUID) ? slap_schema.si_ad_entryUUID->ad_cname.bv_val : "" ),
+                                       ( !(got & GOT_CSN) ? "," : "" ),
+                                       ( !(got & GOT_CSN) ? slap_schema.si_ad_entryCSN->ad_cname.bv_val : "" ) );
+
+                               Debug( LDAP_DEBUG_ANY, "%s: warning, missing attrs %s from entry dn=\"%s\"\n",
+                                       progname, buf, e->e_name.bv_val );
+                       }
+
                        if ( update_ctxcsn ) {
                                int rc_sid;
 
@@ -356,8 +378,8 @@ slapadd( int argc, char **argv )
                                rc_sid = slap_parse_csn_sid( &attr->a_nvals[ 0 ] );
                                if ( rc_sid < 0 ) {
                                        Debug( LDAP_DEBUG_ANY, "%s: could not "
-                                               "extract SID from entryCSN=%s\n",
-                                               progname, attr->a_nvals[ 0 ].bv_val, 0 );
+                                               "extract SID from entryCSN=%s, entry dn=\"%s\"\n",
+                                               progname, attr->a_nvals[ 0 ].bv_val, e->e_name.bv_val );
 
                                } else {
                                        assert( rc_sid <= SLAP_SYNC_SID_MAX );
@@ -403,6 +425,9 @@ slapadd( int argc, char **argv )
                entry_free( e );
        }
 
+       if ( ldifrc < 0 )
+               rc = EXIT_FAILURE;
+
        bvtext.bv_len = textlen;
        bvtext.bv_val = textbuf;
        bvtext.bv_val[0] = '\0';
@@ -413,10 +438,32 @@ slapadd( int argc, char **argv )
        }
 
        if ( rc == EXIT_SUCCESS && update_ctxcsn && !dryrun && sid != SLAP_SYNC_SID_MAX + 1 ) {
-               ctxcsn_id = be->be_dn2id_get( be, be->be_nsuffix );
+               struct berval ctxdn;
+               if ( SLAP_SYNC_SUBENTRY( be )) {
+                       build_new_dn( &ctxdn, &be->be_nsuffix[0],
+                               (struct berval *)&slap_ldapsync_cn_bv, NULL );
+               } else {
+                       ctxdn = be->be_nsuffix[0];
+               }
+               ctxcsn_id = be->be_dn2id_get( be, &ctxdn );
                if ( ctxcsn_id == NOID ) {
-                       fprintf( stderr, "%s: context entry is missing\n", progname );
-                       rc = EXIT_FAILURE;
+                       if ( SLAP_SYNC_SUBENTRY( be )) {
+                               ctxcsn_e = slap_create_context_csn_entry( be, NULL );
+                               for ( sid = 0; sid <= SLAP_SYNC_SID_MAX; sid++ ) {
+                                       if ( maxcsn[ sid ].bv_len ) {
+                                               attr_merge_one( ctxcsn_e, slap_schema.si_ad_contextCSN,
+                                                       &maxcsn[ sid ], NULL );
+                                       }
+                               }
+                               ctxcsn_id = be->be_entry_put( be, ctxcsn_e, &bvtext );
+                               if ( ctxcsn_id == NOID ) {
+                                       fprintf( stderr, "%s: couldn't create context entry\n", progname );
+                                       rc = EXIT_FAILURE;
+                               }
+                       } else {
+                               fprintf( stderr, "%s: context entry is missing\n", progname );
+                               rc = EXIT_FAILURE;
+                       }
                } else {
                        ctxcsn_e = be->be_entry_get( be, ctxcsn_id );
                        if ( ctxcsn_e != NULL ) {
@@ -506,7 +553,7 @@ slapadd( int argc, char **argv )
 
        if ( !dryrun ) {
                if ( enable_meter ) {
-                       fprintf( stdout, "Closing DB..." );
+                       fprintf( stderr, "Closing DB..." );
                }
                if( be->be_entry_close( be ) ) {
                        rc = EXIT_FAILURE;
@@ -516,7 +563,7 @@ slapadd( int argc, char **argv )
                        be->be_sync( be );
                }
                if ( enable_meter ) {
-                       fprintf( stdout, "\n" );
+                       fprintf( stderr, "\n" );
                }
        }