fix spelling

diff --git a/doc/man/man5/slapo-glue.5 b/doc/man/man5/slapo-glue.5
index 9e8524518c2b6c140f10d27e7f27e4b538adf4d9..a8083366391e4970a4fa5ff147720024b818930a 100644 (file)
--- a/doc/man/man5/slapo-glue.5
+++ b/doc/man/man5/slapo-glue.5
@@ -30,13 +30,13 @@ directive and before any subsequent
 .B database
 directive.
 .TP
-.B glue-sub <suffix-DN> [async] [advertize]
+.B glue-sub <suffix-DN> [async] [advertise]
 Specify the suffix of a database to attach as a subordinate to the root
 database. The specified database must have already been configured. If the
 optional \fBasync\fP keyword is supplied, searches against this database may
 be spawned in a separate thread to run concurrently with other operations
-(currently not implemented).  If the optional \fBadvertize\fI flag 
-is supplied, the naming context is advertized in the rootDSE.
+(currently not implemented).  If the optional \fBadvertise\fI flag 
+is supplied, the naming context is advertised in the rootDSE.
 .SH FILES
 .TP
 ETCDIR/slapd.conf

diff --git a/servers/slapd/overlays/glue.c b/servers/slapd/overlays/glue.c
index 2413ae28c5542c74ecbbf1ada21c96179eb06145..a09176e5c71f45dc92fc10cdd8f688b698b0a602 100644 (file)
--- a/servers/slapd/overlays/glue.c
+++ b/servers/slapd/overlays/glue.c
@@ -768,22 +768,22 @@ glue_db_config(
        SLAP_DBFLAGS( be ) |= SLAP_DBFLAG_GLUE_INSTANCE;
 
        if ( strcasecmp( argv[0], "glue-sub" ) == 0 ) {
-               int i, async = 0, advertize = 0;
+               int i, async = 0, advertise = 0;
                BackendDB *b2;
                struct berval bv, dn;
                gluenode *gn;
 
                if ( argc < 2 ) {
                        fprintf( stderr, "%s: line %d: too few arguments in "
-                               "\"glue-sub <suffixDN> [async] [advertize]\"\n", fname, lineno );
+                               "\"glue-sub <suffixDN> [async] [advertise]\"\n", fname, lineno );
                        return -1;
                }
                for ( i = 2; i < argc; i++ ) {
                        if ( strcasecmp( argv[i], "async" ) == 0 ) {
                                async = 1;
 
-                       } else if ( strcasecmp( argv[i], "advertize" ) == 0 ) {
-                               advertize = 1;
+                       } else if ( strcasecmp( argv[i], "advertise" ) == 0 ) {
+                               advertise = 1;
 
                        } else {
                                fprintf( stderr, "%s: line %d: unrecognized option "
@@ -802,8 +802,8 @@ glue_db_config(
                        return -1;
                }
                SLAP_DBFLAGS(b2) |= SLAP_DBFLAG_GLUE_SUBORDINATE;
-               if ( advertize ) {
-                       SLAP_DBFLAGS(b2) |= SLAP_DBFLAG_GLUE_ADVERTIZE;
+               if ( advertise ) {
+                       SLAP_DBFLAGS(b2) |= SLAP_DBFLAG_GLUE_ADVERTISE;
                }
                gi = (glueinfo *)ch_realloc( gi, sizeof(glueinfo) +
                        gi->gi_nodes * sizeof(gluenode));

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index ce68caa1910be21af66416b39396914069ce92ad..8d18760abea0ecb53ed64d4c39a7a1f52e280f05 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -128,7 +128,7 @@ root_dse_info(
                        }
                        continue;
                }
-               if ( SLAP_GLUE_SUBORDINATE( &backends[i] ) && !SLAP_GLUE_ADVERTIZE( &backends[i] ) ) {
+               if ( SLAP_GLUE_SUBORDINATE( &backends[i] ) && !SLAP_GLUE_ADVERTISE( &backends[i] ) ) {
                        continue;
                }
                for ( j = 0; backends[i].be_suffix[j].bv_val != NULL; j++ ) {

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 1193b875d1302cb53701909bd22926d2f5e78334..ee65e32dc81c33908795d0c604ef750b98123bfc 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1597,7 +1597,7 @@ struct slap_backend_db {
 #define        SLAP_DBFLAG_GLUE_INSTANCE       0x0010U /* a glue backend */
 #define        SLAP_DBFLAG_GLUE_SUBORDINATE    0x0020U /* child of a glue hierarchy */
 #define        SLAP_DBFLAG_GLUE_LINKED         0x0040U /* child is connected to parent */
-#define SLAP_DBFLAG_GLUE_ADVERTIZE     0x0080U /* advertize in rootDSE */
+#define SLAP_DBFLAG_GLUE_ADVERTISE     0x0080U /* advertise in rootDSE */
 #define SLAP_DBFLAG_OVERLAY            0x0100U /* this db struct is an overlay */
 #define        SLAP_DBFLAG_GLOBAL_OVERLAY      0x0200U /* this db struct is a global overlay */
 #define SLAP_DBFLAG_SHADOW             0x8000U /* a shadow */
@@ -1616,8 +1616,8 @@ struct slap_backend_db {
        (SLAP_DBFLAGS(be) & SLAP_DBFLAG_GLUE_SUBORDINATE)
 #define        SLAP_GLUE_LINKED(be)            \
        (SLAP_DBFLAGS(be) & SLAP_DBFLAG_GLUE_LINKED)
-#define        SLAP_GLUE_ADVERTIZE(be) \
-       (SLAP_DBFLAGS(be) & SLAP_DBFLAG_GLUE_ADVERTIZE)
+#define        SLAP_GLUE_ADVERTISE(be) \
+       (SLAP_DBFLAGS(be) & SLAP_DBFLAG_GLUE_ADVERTISE)
 #define SLAP_SHADOW(be)                                (SLAP_DBFLAGS(be) & SLAP_DBFLAG_SHADOW)
 #define SLAP_SYNC_SHADOW(be)                   (SLAP_DBFLAGS(be) & SLAP_DBFLAG_SYNC_SHADOW)
 #define SLAP_SLURP_SHADOW(be)                  (SLAP_DBFLAGS(be) & SLAP_DBFLAG_SLURP_SHADOW)