Attachment #3455 for bug #23367

(-)debian/control (-1 / +1 lines)

Lines 2-8	Link Here

Section: univention

Section: univention

Maintainer: Univention GmbH <packages@univention.de>

Maintainer: Univention GmbH <packages@univention.de>

Standards-Version: 3.5.5

Standards-Version: 3.5.5

Build-Depends: debhelper (>>7), ucslint, libssl-dev, libldap2-dev, libdb4.8-dev, python2.6-dev, libunivention-debug-dev (>= 0.8), libunivention-config-dev, libunivention-policy-dev, univention-config-dev, libunivention-policy-dev

Build-Depends: debhelper (>>7), ucslint, libssl-dev, libldap2-dev, libdb3-dev, python2.6-dev, libunivention-debug-dev (>= 0.8), libunivention-config-dev, libunivention-policy-dev, univention-config-dev, libunivention-policy-dev

Package: univention-directory-listener

Package: univention-directory-listener

Architecture: any

Architecture: any

(-)debian/rules (-1 / +1 lines)

Lines 50-56	Link Here

	dh_installinit -a --no-start -r -u"defaults 50"

	dh_installinit -a --no-start -r -u"defaults 50"

override_dh_auto_build:

override_dh_auto_build:

	cd src; $(MAKE) clean; $(MAKE) DB_CFLAGS="-I/usr/include/db -DWITH_DB48" DB_LDADD="-ldb-4.8"; cd -

	cd src; $(MAKE) clean; $(MAKE) DB_CFLAGS="-I/usr/include/db3 -DWITH_DB3" DB_LDADD="-ldb3"; cd -

	dh_auto_build

	dh_auto_build

override_dh_auto_test:

override_dh_auto_test:




int notifier_listen(univention_ldap_parameters_t *lp,
		univention_krb5_parameters_t *kp,
		int write_transaction_file,
		univention_ldap_parameters_t *lp_local)
{
	NotifierID	id;

#ifndef WITH_DB42
	/* we should only get here, if the cache has previously been
	   initialized; thus, *some* ID should've been stored in the
	   cache */
	cache_get_int("notifier_id", &id, -1);
	if ((long)id == -1) {
		univention_debug(UV_DEBUG_LISTENER, UV_DEBUG_ERROR, "failed to get last transaction ID from cache; possibly, it hasn't been initialized yet");
		return 1;
	}
#endif

	for (;;) {
		NotifierEntry	entry;
		int		msgid;
		time_t		timeout = DELAY_LDAP_CLOSE;
		int		rv;

		if ((msgid = notifier_get_dn(NULL, id+1)) < 1)
			break;

		/* wait for data; on timeouts, do maintainance stuff

						univention_debug(UV_DEBUG_LISTENER, UV_DEBUG_ERROR, "failed to get alive answer");
						return 1;
					}
					notifier_resend_get_dn(NULL, msgid, id+1);
				} else {
					if (lp->ld != NULL) {
						ldap_unbind_ext(lp->ld, NULL, NULL);

		}
		univention_debug(UV_DEBUG_LISTENER, UV_DEBUG_INFO, "notifier returned = id: %ld\tdn: %s\tcmd: %c", entry.id, entry.dn, entry.command);

		if (entry.id != id+1) {
			univention_debug(UV_DEBUG_LISTENER, UV_DEBUG_ERROR, "notifier returned transaction id %ld (%ld expected)", entry.id, id+1);
			notifier_entry_free(&entry);
			return 1;
		}

			break;
		}

		id = entry.id;
#ifndef WITH_DB42
		cache_set_int("notifier_id", id);
#endif
		notifier_entry_free(&entry);
	}





#else
typedef void univention_krb5_parameters_t;
#endif
#include "cache.h"

int	notifier_listen	(univention_ldap_parameters_t	*lp,
			 univention_krb5_parameters_t	*kp,
			 int				 write_transaction_file,
			 univention_ldap_parameters_t *lp_local);
			 CacheMasterEntry master_entry);

#endif /* _NOTIFIER_H_ */

(-)src/cache_entry.c (-2 / +2 lines)

Lines 2-8	Link Here

 * Univention Directory Listener

 * Univention Directory Listener

 *  entries in the cache

 *  entries in the cache

 * Copyright 2004-2011 Univention GmbH

 * Copyright 2004-2010 Univention GmbH

 * http://www.univention.de/

 * http://www.univention.de/

Lines 78-84	Link Here

	CacheEntryAttribute **attribute;

	CacheEntryAttribute **attribute;

	char **module;

	char **module;

	unsigned char **value;

	char **value;

	fprintf(fp, "dn: %s\n", dn);

	fprintf(fp, "dn: %s\n", dn);

	for (attribute=entry->attributes; attribute != NULL && *attribute != NULL; attribute++) {

	for (attribute=entry->attributes; attribute != NULL && *attribute != NULL; attribute++) {

(-)src/change.c (+16 lines)

Lines 295-301	Link Here

295

/* Make sure schema is up-to-date */

295

/* Make sure schema is up-to-date */

296

int change_update_schema(univention_ldap_parameters_t *lp)

296

int change_update_schema(univention_ldap_parameters_t *lp)

297

298

#ifdef WITH_DB42

298

	CacheMasterEntry	 master_entry;

299

	CacheMasterEntry	 master_entry;

300

#else

301

	NotifierID		 id = 0;

302

#endif

299

	NotifierID		 new_id = 0;

303

	NotifierID		 new_id = 0;

300

	LDAPMessage		*res,

304

	LDAPMessage		*res,

301

				*cur;

305

				*cur;

Lines 316-332	Link Here

316

	timeout.tv_sec = 300;

320

	timeout.tv_sec = 300;

317

	timeout.tv_usec = 0;

321

	timeout.tv_usec = 0;

318

322

323

#ifdef WITH_DB42

319

	if ((rv=cache_get_master_entry(&master_entry)) == DB_NOTFOUND) {

324

	if ((rv=cache_get_master_entry(&master_entry)) == DB_NOTFOUND) {

320

		master_entry.id = 0;

325

		master_entry.id = 0;

321

		master_entry.schema_id = 0;

326

		master_entry.schema_id = 0;

322

	 } else if (rv != 0)

327

	 } else if (rv != 0)

323

		return rv;

328

		return rv;

329

#else

330

	cache_get_schema_id("notifier_schema_id", &id, 0);

331

#endif

324

	if ((notifier_get_schema_id_s(NULL, &new_id)) != 0) {

332

	if ((notifier_get_schema_id_s(NULL, &new_id)) != 0) {

325

		univention_debug(UV_DEBUG_LISTENER, UV_DEBUG_ERROR, "failed to get schema DN");

333

		univention_debug(UV_DEBUG_LISTENER, UV_DEBUG_ERROR, "failed to get schema DN");

326

		return LDAP_OTHER;

334

		return LDAP_OTHER;

327

335

328

336

337

#ifdef WITH_DB42

329

	if (new_id > master_entry.schema_id) {

338

	if (new_id > master_entry.schema_id) {

339

#else

340

	if (new_id > id) {

341

#endif

330

		if ((rv=ldap_search_ext_s(lp->ld, "cn=Subschema", LDAP_SCOPE_BASE, "(objectClass=*)", attrs, 0, NULL /*serverctrls*/, NULL /*clientctrls*/, &timeout, 0 /*sizelimit*/, &res)) == LDAP_SUCCESS) {

342

		if ((rv=ldap_search_ext_s(lp->ld, "cn=Subschema", LDAP_SCOPE_BASE, "(objectClass=*)", attrs, 0, NULL /*serverctrls*/, NULL /*clientctrls*/, &timeout, 0 /*sizelimit*/, &res)) == LDAP_SUCCESS) {

331

			if ((cur=ldap_first_entry(lp->ld, res)) == NULL) {

343

			if ((cur=ldap_first_entry(lp->ld, res)) == NULL) {

332

				univention_debug(UV_DEBUG_LISTENER, UV_DEBUG_ERROR, "got no entry for schema");

344

				univention_debug(UV_DEBUG_LISTENER, UV_DEBUG_ERROR, "got no entry for schema");

Lines 339-344	Link Here

339

			univention_debug(UV_DEBUG_LISTENER, UV_DEBUG_ERROR, "could not receive schema (%s)", ldap_err2string(rv));

351

			univention_debug(UV_DEBUG_LISTENER, UV_DEBUG_ERROR, "could not receive schema (%s)", ldap_err2string(rv));

340

352

341

353

354

#ifndef WITH_DB42

355

		if (rv == 0)

356

			cache_set_schema_id("notifier_schema_id", new_id);

357

#endif

342

358

343

359

344

	return rv;

360

	return rv;

(-)src/Makefile (-2 / +2 lines)

Lines 30-37	Link Here

# <http://www.gnu.org/licenses/>.

# <http://www.gnu.org/licenses/>.

CC=gcc

CC=gcc

DB_LDADD=-ldb-4.8

DB_LDADD=-ldb3

DB_CFLAGS=-I/usr/include/db -DWITH_DB48

DB_CFLAGS=-I/usr/include/db3 -DWITH_DB3

DB_OBJS=cache.o cache_entry.o cache_lowlevel.o base64.o

DB_OBJS=cache.o cache_entry.o cache_lowlevel.o base64.o

CFLAGS=-g -Wall -D_FILE_OFFSET_BITS=64 $(DB_CFLAGS)

CFLAGS=-g -Wall -D_FILE_OFFSET_BITS=64 $(DB_CFLAGS)





DB *dbp;
DBC *dbc_cur = NULL;
#ifdef WITH_DB42
DB_ENV *dbenvp;
#endif
static FILE *lock_fp=NULL;

#ifdef WITH_DB42
static void cache_panic_call(DB_ENV *dbenvp, int errval)
{
	exit(1);
}
#endif

char* _convert_to_lower(char *dn)
{

	return lower_dn;
}

static void cache_error_message(const char *errpfx, char *msg)
{
	univention_debug(UV_DEBUG_LISTENER, UV_DEBUG_ERROR,
			"database error: %s", msg);

	}
	lockf(fileno(lock_fp), F_LOCK, 0);

#ifdef WITH_DB42
	if ((rv = db_env_create(&dbenvp, 0)) != 0) {
		univention_debug(UV_DEBUG_LISTENER, UV_DEBUG_ERROR,
				"creating database environment failed");

		// FIXME: free dbp
		return rv;
	}
#else
	if ((rv = db_create(&dbp, NULL, 0)) != 0) {
		univention_debug(UV_DEBUG_LISTENER, UV_DEBUG_ERROR,
				"creating database handle failed");
		return rv;
	}
	if ((rv = dbp->open(dbp, file, NULL, DB_BTREE, DB_CREATE, 0600)) != 0) {
		univention_debug(UV_DEBUG_LISTENER, UV_DEBUG_ERROR,
				"opening database failed");
		dbp->err(dbp, rv, "open");
		// FIXME: free dbp
		return rv;
	}
	dbp->set_errcall(dbp, cache_error_message);
#endif
	return 0;
}


	return fclose(fp);
}

#ifdef WITH_DB42
int cache_get_master_entry(CacheMasterEntry *master_entry)
{
	DBT key, data;

	data.data=(void*)master_entry;
	data.size=sizeof(CacheMasterEntry);

#ifdef WITH_DB42
	if (dbtxnp == NULL)
		flags = DB_AUTO_COMMIT;
	else
#endif
		flags = 0;
	
	if ((rv=dbp->put(dbp, dbtxnp, &key, &data, flags)) != 0) {


	return 0;
}
#endif

DB_TXN* cache_new_transaction(NotifierID id, char *dn)
{
#ifdef WITH_DB42
	DB_TXN			*dbtxnp;
	CacheMasterEntry	 master_entry;
	NotifierID		*old_id;

		else
			old_id = &master_entry.id;

		if (*old_id >= id) {
			univention_debug(UV_DEBUG_LISTENER, UV_DEBUG_ERROR,
					"New ID (%ld) is not greater than old"
					" ID (%ld): %s", id, *old_id, dn);
			dbtxnp->abort(dbtxnp);
			return NULL;
		} else
			*old_id = id;

			if (cache_update_master_entry(&master_entry, dbtxnp) != 0) {
				univention_debug(UV_DEBUG_LISTENER, UV_DEBUG_ERROR, "cache_new_transaction: cache_update_master_entry failed");
				dbtxnp->abort(dbtxnp);
				return NULL;
			}
		
		if (cache_update_master_entry(&master_entry, dbtxnp) != 0) {
			dbtxnp->abort(dbtxnp);
			return NULL;
		}
	}

	return dbtxnp;
#else
	return NULL;
#endif
}


/* XXX: The NotifierID is passed for future use. Once the journal is
   implemented, entries other than the most recent one can be returned.
   At the moment, the id parameters for cache_update_entry, and
   cache_delete_entry do nothing (at least if WITH_DB42 is undefined) */
inline int cache_update_entry(NotifierID id, char *dn, CacheEntry *entry)
{
	DBT key, data;

	univention_debug(UV_DEBUG_LISTENER, UV_DEBUG_ALL, "put %d bytes", data.size);

	signals_block();
#ifdef WITH_DB42
	dbtxnp = cache_new_transaction(id, dn);
	if (dbtxnp == NULL) {
		signals_unblock();
		free(data.data);
		return 1;
	}
#else
	dbtxnp = NULL;
#endif

	key.data=dn;
	key.size=strlen(dn)+1;

		univention_debug(UV_DEBUG_LISTENER, UV_DEBUG_ERROR,
				"storing entry in database failed: %s", dn);
		dbp->err(dbp, rv, "put");
#ifdef WITH_DB42
		dbtxnp->abort(dbtxnp);
#endif
		free(data.data);
		return rv;
	}

#ifdef WITH_DB42
	dbtxnp->commit(dbtxnp, 0);
#endif
	if ( !INIT_ONLY ) {
		dbp->sync(dbp, 0);
	}

	key.size=strlen(dn)+1;

	signals_block();
#ifdef WITH_DB42
	dbtxnp = cache_new_transaction(id, dn);
	if (dbtxnp == NULL) {
		signals_unblock();
		return 1;
	}
#else
	dbtxnp = NULL;
#endif

	if ((rv=dbp->del(dbp, dbtxnp, &key, 0)) != 0 && rv != DB_NOTFOUND) {
		signals_unblock();

		dbp->err(dbp, rv, "del");
	}

#ifdef WITH_DB42
	dbtxnp->commit(dbtxnp, 0);
#endif
	if ( !INIT_ONLY ) {
		dbp->sync(dbp, 0);
	}

	if ((rv = dbp->close(dbp, 0)) != 0) {
		dbp->err(dbp, rv, "close");
	}
#ifdef WITH_DB42
	if ((rv = dbenvp->close(dbenvp, 0)) != 0) {
		univention_debug(UV_DEBUG_LISTENER, UV_DEBUG_ERROR,
				"closing database environment failed");
	}
#endif
	if (lock_fp != NULL) {
		int rc=lockf(fileno(lock_fp), F_ULOCK, 0);
		if (rc == 0) {

(-)src/dump.c (-1 / +24 lines)

Lines 63-69	Link Here

int main(int argc, char* argv[])

int main(int argc, char* argv[])

	int debugging = 0, broken_only = 0;

	int debugging = 0, broken_only = 0, id_only = 0;

	char *output_file = NULL;

	char *output_file = NULL;

	FILE *fp;

	FILE *fp;

	int rv;

	int rv;

Lines 94-99	Link Here

		case 'r':

		case 'r':

			broken_only=1;

			broken_only=1;

			break;

			break;

#ifdef WITH_DB42

		case 'i':

			id_only=1;

100

			break;

101

#endif

		default:

102

		default:

			usage();

103

			usage();

			exit(1);

104

			exit(1);

Lines 127-133	Link Here

127

	if (cache_init() != 0)

132

	if (cache_init() != 0)

128

		exit(1);

133

		exit(1);

129

134

135

#ifdef WITH_DB42

136

	if (id_only) {

137

138

		CacheMasterEntry master_entry;

139

		cache_get_master_entry(&master_entry);

140

141

		printf("%ld %ld\n", master_entry.id, master_entry.schema_id);

130

142

143

	} else {

144

145

	cache_print_entries("uid=b95152,cn=users,dc=olb,dc=de");

146

147

	exit(0);

148

#endif

149

131

	for (rv=cache_first_entry(&cur, &dn, &entry); rv != DB_NOTFOUND;

150

	for (rv=cache_first_entry(&cur, &dn, &entry); rv != DB_NOTFOUND;

132

			rv=cache_next_entry(&cur, &dn, &entry)) {

151

			rv=cache_next_entry(&cur, &dn, &entry)) {

133

		if ((rv == 0 && !broken_only) || (rv == -1 && broken_only)) {

152

		if ((rv == 0 && !broken_only) || (rv == -1 && broken_only)) {

Lines 139-144	Link Here

139

158

140

	cache_free_cursor(cur);

159

	cache_free_cursor(cur);

141

160

161

#ifdef WITH_DB42

162

163

#endif

164

142

	cache_close();

165

	cache_close();

143

166

144

	return 0;

167

	return 0;




#include <stdbool.h>


#ifdef WITH_DB42
struct _CacheMasterEntry {
typedef struct _CacheMasterEntry {
	NotifierID id;
	NotifierID schema_id;
} CacheMasterEntry;
#endif

int	cache_init				(void);
#ifdef WITH_DB42
int	cache_get_master_entry			(CacheMasterEntry	 *master_entry);
int	cache_update_master_entry		(CacheMasterEntry	 *master_entry,
						 DB_TXN			 *dptxnp);
#endif
int	cache_update_entry			(NotifierID		  id,
						 char			 *dn,
						 CacheEntry		 *entry);





static void convert_cookie(void)
{
#ifndef WITH_DB42
	char *f;
	struct stat stbuf;

	asprintf(&f, "%s/notifier_id", cache_dir);
	if (stat(f, &stbuf) != 0) {
		free(f);
		asprintf(&f, "%s/cookie", cache_dir);
		FILE *fp = fopen(f, "r");
		if (fp != NULL) {
			univention_debug(UV_DEBUG_LISTENER, UV_DEBUG_INFO, "converting cookie file");
			char buf[1024];
			int  i;
			fgets(buf, 1024, fp);
			fgets(buf, 1024, fp);
			i = atoi(buf);
			if (i > 0)
				cache_set_int("notifier_id", i);
			fclose(fp);
		}
	}
	free(f);
#else
	char *filename;
	FILE *fp;
	CacheMasterEntry master_entry;

		fclose(fp);
	} else
		master_entry.schema_id = 0;
	free(filename);

	if ((rv=cache_update_master_entry(&master_entry, NULL)) != 0)
		exit(1); /* XXX */
#endif
}

void purge_cache(const char *cache_dir)

					 write_transaction_file = 0;
	int				 rv;
	NotifierID			 id = -1;
#ifndef WITH_DB42
	NotifierID			 old_id = -1;
#else
	CacheMasterEntry		 master_entry;
#endif
	struct stat			 stbuf;

	if (stat("/var/lib/univention-directory-listener/bad_cache", &stbuf) == 0) {

	signals_unblock();

	/* if no ID is set, assume the database has just been initialized */
#ifdef WITH_DB42
	if ((rv=cache_get_master_entry(&master_entry)) == DB_NOTFOUND) {
		master_entry.id = id;
		if ((rv=cache_update_master_entry(&master_entry, NULL)) != 0)

	} else if (rv != 0)
		exit(1);
	
#else
	cache_get_int("notifier_id", &old_id, -1);
	if ((long)old_id == -1) {
		cache_set_int("notifier_id", id);
	}
#endif
	
	if (!initialize_only) {
		rv=notifier_listen(lp, kp, write_transaction_file, lp_local);
	}

	if (rv != 0)

Return to bug 23367