← Back to branch summary

~james-page/ubuntu/maverick/openldap/fix-666028

« back to all changes in this revision

Viewing changes to servers/slapd/schema_init.c

  • Committer: Bazaar Package Importer
  • Author(s): Mathias Gug
  • Date: 2010-02-18 00:58:13 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20100218005813-8230cn0y207m8wzy
Tags: 2.4.21-0ubuntu1
* New upstream release.
* debian/rules, debian/schema/extra/: 
  Fix get-orig-source rule to supports extra schemas shipped as part of the
  debian/schema/ directory.

Show diffs side-by-side

added added

removed removed

Lines of Context:
servers/slapd/schema_init.c
1
1
/* schema_init.c - init builtin schema */
2
 
/* $OpenLDAP: pkg/ldap/servers/slapd/schema_init.c,v 1.386.2.36 2009/08/13 00:35:54 quanah Exp $ */
 
2
/* $OpenLDAP: pkg/ldap/servers/slapd/schema_init.c,v 1.386.2.37 2009/11/17 17:18:11 quanah Exp $ */
3
3
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
4
4
 *
5
5
 * Copyright 1998-2009 The OpenLDAP Foundation.
2265
2265
 
2266
2266
        p = normalized->bv_val;
2267
2267
        for ( l = 0; !BER_BVISNULL( &nlines[l] ); l++ ) {
2268
 
                p = lutil_strncopy( p, nlines[l].bv_val, nlines[l].bv_len );
2269
 
 
 
2268
                p = lutil_strbvcopy( p, &nlines[l] );
2270
2269
                *p++ = '$';
2271
2270
        }
2272
2271
        *--p = '\0';
3329
3328
 
3330
3329
        p = out->bv_val;
3331
3330
        p = lutil_strcopy( p, "{ serialNumber " /*}*/ );
3332
 
        p = lutil_strncopy( p, sn.bv_val, sn.bv_len );
 
3331
        p = lutil_strbvcopy( p, &sn );
3333
3332
        p = lutil_strcopy( p, ", issuer rdnSequence:\"" );
3334
 
        p = lutil_strncopy( p, ni.bv_val, ni.bv_len );
 
3333
        p = lutil_strbvcopy( p, &ni );
3335
3334
        p = lutil_strcopy( p, /*{*/ "\" }" );
3336
3335
 
3337
3336
        assert( p == &out->bv_val[out->bv_len] );
3491
3490
        p = out->bv_val;
3492
3491
 
3493
3492
        p = lutil_strcopy( p, "{ serialNumber " /*}*/ );
3494
 
        p = lutil_strncopy( p, sn3.bv_val, sn3.bv_len );
 
3493
        p = lutil_strbvcopy( p, &sn3 );
3495
3494
        p = lutil_strcopy( p, ", issuer rdnSequence:\"" );
3496
 
        p = lutil_strncopy( p, ni.bv_val, ni.bv_len );
 
3495
        p = lutil_strbvcopy( p, &ni );
3497
3496
        p = lutil_strcopy( p, /*{*/ "\" }" );
3498
3497
 
3499
3498
        assert( p == &out->bv_val[out->bv_len] );
3588
3587
        p = normalized->bv_val;
3589
3588
 
3590
3589
        p = lutil_strcopy( p, "{ serialNumber " /*}*/ );
3591
 
        p = lutil_strncopy( p, sn2.bv_val, sn2.bv_len );
 
3590
        p = lutil_strbvcopy( p, &sn2 );
3592
3591
        p = lutil_strcopy( p, ", issuer rdnSequence:\"" );
3593
 
        p = lutil_strncopy( p, issuer_dn.bv_val, issuer_dn.bv_len );
 
3592
        p = lutil_strbvcopy( p, &issuer_dn );
3594
3593
        p = lutil_strcopy( p, /*{*/ "\" }" );
3595
3594
 
3596
3595
        rc = LDAP_SUCCESS;
3920
3919
 
3921
3920
        p = out->bv_val;
3922
3921
        p = lutil_strcopy( p, "{ issuer rdnSequence:\"" /*}*/ );
3923
 
        p = lutil_strncopy( p, ni.bv_val, ni.bv_len );
 
3922
        p = lutil_strbvcopy( p, &ni );
3924
3923
        p = lutil_strcopy( p, "\", thisUpdate \"" );
3925
 
        p = lutil_strncopy( p, tu.bv_val, tu.bv_len );
 
3924
        p = lutil_strbvcopy( p, &tu );
3926
3925
        p = lutil_strcopy( p, /*{*/ "\" }" );
3927
3926
 
3928
3927
        assert( p == &out->bv_val[out->bv_len] );
3986
3985
        p = out->bv_val;
3987
3986
 
3988
3987
        p = lutil_strcopy( p, "{ issuer rdnSequence:\"" /*}*/ );
3989
 
        p = lutil_strncopy( p, ni.bv_val, ni.bv_len );
 
3988
        p = lutil_strbvcopy( p, &ni );
3990
3989
        p = lutil_strcopy( p, "\", thisUpdate \"" );
3991
 
        p = lutil_strncopy( p, tu2.bv_val, tu2.bv_len );
 
3990
        p = lutil_strbvcopy( p, &tu2 );
3992
3991
        p = lutil_strcopy( p, /*{*/ "\" }" );
3993
3992
 
3994
3993
        assert( p == &out->bv_val[out->bv_len] );
4081
4080
        p = normalized->bv_val;
4082
4081
 
4083
4082
        p = lutil_strcopy( p, "{ issuer rdnSequence:\"" );
4084
 
        p = lutil_strncopy( p, issuer_dn.bv_val, issuer_dn.bv_len );
 
4083
        p = lutil_strbvcopy( p, &issuer_dn );
4085
4084
        p = lutil_strcopy( p, "\", thisUpdate \"" );
4086
 
        p = lutil_strncopy( p, thisUpdate.bv_val, thisUpdate.bv_len );
 
4085
        p = lutil_strbvcopy( p, &thisUpdate );
4087
4086
        p = lutil_strcopy( p, /*{*/ "\" }" );
4088
4087
 
4089
4088
        rc = LDAP_SUCCESS;
4516
4515
 
4517
4516
        p = out->bv_val;
4518
4517
        p = lutil_strcopy( p, "{ serialNumber " );
4519
 
        p = lutil_strncopy( p, sn.bv_val, sn.bv_len );
 
4518
        p = lutil_strbvcopy( p, &sn );
4520
4519
        p = lutil_strcopy( p, ", issuer { baseCertificateID { issuer { directoryName:rdnSequence:\"" );
4521
 
        p = lutil_strncopy( p, ni.bv_val, ni.bv_len );
 
4520
        p = lutil_strbvcopy( p, &ni );
4522
4521
        p = lutil_strcopy( p, "\" }, serial " );
4523
 
        p = lutil_strncopy( p, i_sn.bv_val, i_sn.bv_len );
 
4522
        p = lutil_strbvcopy( p, &i_sn );
4524
4523
        p = lutil_strcopy( p, " } } }" );
4525
4524
 
4526
4525
        assert( p == &out->bv_val[out->bv_len] );
4630
4629
        p = out->bv_val;
4631
4630
 
4632
4631
        p = lutil_strcopy( p, "{ serialNumber " );
4633
 
        p = lutil_strncopy( p, sn3.bv_val, sn3.bv_len );
 
4632
        p = lutil_strbvcopy( p, &sn3 );
4634
4633
        p = lutil_strcopy( p, ", issuer { baseCertificateID { issuer { directoryName:rdnSequence:\"" );
4635
 
        p = lutil_strncopy( p, ni.bv_val, ni.bv_len );
 
4634
        p = lutil_strbvcopy( p, &ni );
4636
4635
        p = lutil_strcopy( p, "\" }, serial " );
4637
 
        p = lutil_strncopy( p, i_sn3.bv_val, i_sn3.bv_len );
 
4636
        p = lutil_strbvcopy( p, &i_sn3 );
4638
4637
        p = lutil_strcopy( p, " } } }" );
4639
4638
 
4640
4639
        assert( p == &out->bv_val[out->bv_len] );
4763
4762
        p = normalized->bv_val;
4764
4763
 
4765
4764
        p = lutil_strcopy( p, "{ serialNumber " );
4766
 
        p = lutil_strncopy( p, sn2.bv_val, sn2.bv_len );
 
4765
        p = lutil_strbvcopy( p, &sn2 );
4767
4766
        p = lutil_strcopy( p, ", issuer { baseCertificateID { issuer { directoryName:rdnSequence:\"" );
4768
 
        p = lutil_strncopy( p, issuer_dn.bv_val, issuer_dn.bv_len );
 
4767
        p = lutil_strbvcopy( p, &issuer_dn );
4769
4768
        p = lutil_strcopy( p, "\" }, serial " );
4770
 
        p = lutil_strncopy( p, i_sn2.bv_val, i_sn2.bv_len );
 
4769
        p = lutil_strbvcopy( p, &i_sn2 );
4771
4770
        p = lutil_strcopy( p, " } } }" );
4772
4771
 
4773
4772
        Debug( LDAP_DEBUG_TRACE, "attributeCertificateExactNormalize: %s\n",
5108
5107
        ptr = lutil_strncopy( ptr, &gt.bv_val[ STRLENOF( "YYYYmmddHH:MM:" ) ],
5109
5108
                STRLENOF( "SS" ) );
5110
5109
        ptr = lutil_strcopy( ptr, ".000000Z#00" );
5111
 
        ptr = lutil_strncopy( ptr, cnt.bv_val, cnt.bv_len );
 
5110
        ptr = lutil_strbvcopy( ptr, &cnt );
5112
5111
        *ptr++ = '#';
5113
5112
        *ptr++ = '0';
5114
5113
        *ptr++ = '0';
5201
5200
        ptr = bv.bv_val;
5202
5201
        ptr = lutil_strncopy( ptr, gt.bv_val, gt.bv_len - 1 );
5203
5202
        ptr = lutil_strcopy( ptr, ".000000Z#" );
5204
 
        ptr = lutil_strncopy( ptr, cnt.bv_val, cnt.bv_len );
 
5203
        ptr = lutil_strbvcopy( ptr, &cnt );
5205
5204
        *ptr++ = '#';
5206
5205
        *ptr++ = '0';
5207
5206
        for ( i = 0; i < sid.bv_len; i++ ) {