Attachment #7825 for bug #41842





#define HANDLER_PREPARED        000000004

#define HANDLER_HAS_FLAG(handler, flag)		((handler->state & flag) == flag)
#define HANDLER_SET_FLAG(handler, flag)		handler->state |= flag
#define HANDLER_UNSET_FLAG(handler, flag)	handler->state &= ~flag

struct filter {
	char	*base;
	int	 scope;
- 
--
.../management/univention-directory-listener/src/handlers.c   |  2 +-
.../management/univention-directory-listener/src/handlers.h   | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)

(-)a/branches/ucs-4.1/ucs-4.1-2/management/univention-directory-listener/src/handlers.c (-1 / +1 lines)

Lines 262-268 static int handler_import(char* filename)	Link Here

262

	if (state_fp == NULL) {

262

	if (state_fp == NULL) {

263

		handler->state = 0;

263

		handler->state = 0;

264

	} else {

264

	} else {

265

		fscanf(state_fp, "%d", &handler->state);

265

		fscanf(state_fp, "%u", &handler->state);

266

		fclose(state_fp);

266

		fclose(state_fp);

267

268




   initializing, HANDLER_READY will be set; however, if the
   initialization fails, it will be removed again. If it's successful,
   both, HANDLER_INITIALIZED and HANDLER_READY will be set */
enum state {
	HANDLER_INITIALIZED = 1 << 0,
	HANDLER_READY = 1 << 1,
	HANDLER_PREPARED = 1 << 2,
};

struct filter {
	char	*base;

	PyObject	 *setdata;
	struct _Handler	 *next;

	enum state		  state;
	int		  prepared : 1;
} typedef Handler;

- 
--
.../univention-directory-listener/src/handlers.c   | 24 ++++++++++++++--------
.../univention-directory-listener/src/handlers.h   |  1 +
2 files changed, 16 insertions(+), 9 deletions(-)




}


void handler_write_state(Handler *handler) {
int handler_free(Handler *handler)
{
	char **a;
	struct filter **f;
	char state_filename[PATH_MAX];
	FILE *state_fp;
	int rv;

	if ( handler == NULL || handler->name == NULL ) {
		return 0;
	}

	/* write handler state */
	/* XXX: can be removed, once we use a database for this */
	rv = snprintf(state_filename, PATH_MAX, "%s/handlers/%s", cache_dir, handler->name);

		fprintf(state_fp, "%d", handler->state);
		fclose(state_fp);
	}
}


/* Free one handler. */
int handler_free(Handler *handler)
{
	char **a;
	struct filter **f;

	if ( handler == NULL || handler->name == NULL ) {
		return 0;
	}

	handler_write_state(handler);

	/* free list node */
	free(handler->name);

(-)a/branches/ucs-4.1/ucs-4.1-2/management/univention-directory-listener/src/handlers.h (-2 / +1 lines)

Lines 78-83 struct _Handler {	Link Here

int	handlers_init			(void);

int	handlers_init			(void);

int	handlers_free_all		(void);

int	handlers_free_all		(void);

void handler_write_state(Handler *handler);

int	handlers_load_path		(char		*filename);

int	handlers_load_path		(char		*filename);

int	handlers_reload_all_paths	(void);

int	handlers_reload_all_paths	(void);

int	handlers_dump			(void);

int	handlers_dump			(void);

--

.../ucs-4.1-2/management/univention-directory-listener/src/change.c     | 2 ++

.../ucs-4.1-2/management/univention-directory-listener/src/change.c     | 2 ++

1 file changed, 2 insertions(+)

1 file changed, 2 insertions(+)

(-)a/branches/ucs-4.1/ucs-4.1-2/management/univention-directory-listener/src/change.c (-1 / +2 lines)

Lines 240-245 int change_new_modules(univention_ldap_parameters_t *lp)	Link Here

240

				handler->state |= HANDLER_INITIALIZED;

240

				handler->state |= HANDLER_INITIALIZED;

241

			else

241

			else

242

				handler->state ^= HANDLER_READY;

242

				handler->state ^= HANDLER_READY;

243

244

			handler_write_state(handler);

243

245

244

246

245

	INIT_ONLY = old_init_only;

247

	INIT_ONLY = old_init_only;

246

Return to bug 41842