From 12d5c6bba210de4a03363567be1c19a37f8e806b Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Sun, 30 Nov 2003 01:09:12 +0000 Subject: [PATCH] Move global to ldapsync --- servers/slapd/globals.c | 19 ++----------------- servers/slapd/ldapsync.c | 7 +++++++ 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/servers/slapd/globals.c b/servers/slapd/globals.c index eb1d4beb42..ac0f0d7c55 100644 --- a/servers/slapd/globals.c +++ b/servers/slapd/globals.c @@ -13,16 +13,6 @@ * top-level directory of the distribution or, alternatively, at * . */ -/* Portions Copyright (c) 1995 Regents of the University of Michigan. - * All rights reserved. - * - * Redistribution and use in source and binary forms are permitted - * provided that this notice is preserved and that due credit is given - * to the University of Michigan at Ann Arbor. The name of the University - * may not be used to endorse or promote products derived from this - * software without specific prior written permission. This software - * is provided ``as is'' without express or implied warranty. - */ #include "portable.h" @@ -32,9 +22,9 @@ /* - * global variables, in general, should be declared in the file + * Global variables, in general, should be declared in the file * primarily responsible for its management. Configurable globals - * belong in config.c. variables declared here have no other + * belong in config.c. Variables declared here have no other * sensible home. */ @@ -45,8 +35,3 @@ const struct berval slap_unknown_bv = BER_BVC("unknown"); const struct berval slap_true_bv = BER_BVC("TRUE"); const struct berval slap_false_bv = BER_BVC("FALSE"); -#if 0 -struct sync_cookie *slap_sync_cookie = NULL; -#endif -struct slap_sync_cookie_s slap_sync_cookie = - LDAP_STAILQ_HEAD_INITIALIZER( slap_sync_cookie ); diff --git a/servers/slapd/ldapsync.c b/servers/slapd/ldapsync.c index 699fe8f66f..7241f1318e 100644 --- a/servers/slapd/ldapsync.c +++ b/servers/slapd/ldapsync.c @@ -28,6 +28,13 @@ #include "../../libraries/liblber/lber-int.h" /* get ber_strndup() */ #include "lutil_ldap.h" +#if 0 +struct sync_cookie *slap_sync_cookie = NULL; +#else +struct slap_sync_cookie_s slap_sync_cookie = + LDAP_STAILQ_HEAD_INITIALIZER( slap_sync_cookie ); +#endif + int slap_build_sync_state_ctrl( Operation *op, -- 2.39.5