Attachment #365350 for bug #494278

Lines 90-95 afmongodb_option Link Here

(-)a/modules/afmongodb/afmongodb-grammar.ym (+2 lines)
90	}	90	}
91	\| KW_DATABASE '(' string ')' { afmongodb_dd_set_database(last_driver, $3); free($3); }	91	\| KW_DATABASE '(' string ')' { afmongodb_dd_set_database(last_driver, $3); free($3); }
92	\| KW_COLLECTION '(' string ')' { afmongodb_dd_set_collection(last_driver, $3); free($3); }	92	\| KW_COLLECTION '(' string ')' { afmongodb_dd_set_collection(last_driver, $3); free($3); }
		93	\| KW_USERNAME '(' string ')' { afmongodb_dd_set_user(last_driver, $3); free($3); }
		94	\| KW_PASSWORD '(' string ')' { afmongodb_dd_set_password(last_driver, $3); free($3); }
93	\| KW_SAFE_MODE '(' yesno ')' { afmongodb_dd_set_safe_mode(last_driver, $3); }	95	\| KW_SAFE_MODE '(' yesno ')' { afmongodb_dd_set_safe_mode(last_driver, $3); }
94	\| value_pair_option { afmongodb_dd_set_value_pairs(last_driver, $1); }	96	\| value_pair_option { afmongodb_dd_set_value_pairs(last_driver, $1); }
95	\| dest_driver_option	97	\| dest_driver_option

Lines 33-38 Link Here

(-)a/modules/afmongodb/afmongodb-parser.c (+2 lines)
33	{ "servers", KW_SERVERS },	33	{ "servers", KW_SERVERS },
34	{ "database", KW_DATABASE },	34	{ "database", KW_DATABASE },
35	{ "collection", KW_COLLECTION },	35	{ "collection", KW_COLLECTION },
		36	{ "username", KW_USERNAME },
		37	{ "password", KW_PASSWORD },
36	{ "safe_mode", KW_SAFE_MODE },	38	{ "safe_mode", KW_SAFE_MODE },
37	{ "host", KW_HOST },	39	{ "host", KW_HOST },
38	{ "port", KW_PORT },	40	{ "port", KW_PORT },

Lines 59-64 Link Here

(-)a/modules/afmongodb/afmongodb.c (+41 lines)
59		59
60	gboolean safe_mode;	60	gboolean safe_mode;
61	LogTemplateOptions template_options;	61	LogTemplateOptions template_options;
		62
		63	gchar *user;
		64	gchar *password;
		65
62	time_t last_msg_stamp;	66	time_t last_msg_stamp;
63		67
64	ValuePairs *vp;	68	ValuePairs *vp;
Lines 76-81 Link Here
76	/*	80	/*
77	* Configuration	81	* Configuration
78	*/	82	*/
		83
		84	void
		85	afmongodb_dd_set_user(LogDriver d, const gchar user)
		86	{
		87	MongoDBDestDriver self = (MongoDBDestDriver )d;
		88
		89	g_free(self->user);
		90	self->user = g_strdup(user);
		91	}
		92
		93	void
		94	afmongodb_dd_set_password(LogDriver d, const gchar password)
		95	{
		96	MongoDBDestDriver self = (MongoDBDestDriver )d;
		97
		98	g_free(self->password);
		99	self->password = g_strdup(password);
		100	}
		101
79	void	102	void
80	afmongodb_dd_set_host(LogDriver d, const gchar host)	103	afmongodb_dd_set_host(LogDriver d, const gchar host)
81	{	104	{
Lines 260-265 Link Here
260	g_free(host);	283	g_free(host);
261	}	284	}
262		285
		286	if (self->user \|\| self->password)
		287	{
		288	if (!self->user \|\| !self->password)
		289	{
		290	msg_error("Neither the username, nor the password can be empty", NULL);
		291	return FALSE;
		292	}
		293
		294	if (!mongo_sync_cmd_authenticate (self->conn, self->db,
		295	self->user, self->password))
		296	{
		297	msg_error("MongoDB authentication failed", NULL);
		298	return FALSE;
		299	}
		300	}
		301
263	return TRUE;	302	return TRUE;
264	}	303	}
265		304
Lines 578-583 Link Here
578		617
579	g_free(self->db);	618	g_free(self->db);
580	g_free(self->coll);	619	g_free(self->coll);
		620	g_free(self->user);
		621	g_free(self->password);
581	g_free(self->address);	622	g_free(self->address);
582	string_list_free(self->servers);	623	string_list_free(self->servers);
583	if (self->vp)	624	if (self->vp)

Lines 34-39 Link Here

(-)a/modules/afmongodb/afmongodb.h (-1 / +2 lines)
34	void afmongodb_dd_set_port(LogDriver *d, gint port);	34	void afmongodb_dd_set_port(LogDriver *d, gint port);
35	void afmongodb_dd_set_database(LogDriver d, const gchar database);	35	void afmongodb_dd_set_database(LogDriver d, const gchar database);
36	void afmongodb_dd_set_collection(LogDriver d, const gchar collection);	36	void afmongodb_dd_set_collection(LogDriver d, const gchar collection);
		37	void afmongodb_dd_set_user(LogDriver d, const gchar user);
		38	void afmongodb_dd_set_password(LogDriver d, const gchar password);
37	void afmongodb_dd_set_value_pairs(LogDriver d, ValuePairs vp);	39	void afmongodb_dd_set_value_pairs(LogDriver d, ValuePairs vp);
38	void afmongodb_dd_set_safe_mode(LogDriver *d, gboolean state);	40	void afmongodb_dd_set_safe_mode(LogDriver *d, gboolean state);
39	void afmongodb_dd_set_path(LogDriver d, const gchar path);	41	void afmongodb_dd_set_path(LogDriver d, const gchar path);
40	-

Return to bug 494278