diff src/auth/auth-settings.c @ 9834:3f4d796db5fd HEAD

config: Auth settings now require the "auth_" prefix also inside auth blocks.
author Timo Sirainen <tss@iki.fi>
date Mon, 31 Aug 2009 12:43:23 -0400
parents d86490ef27bd
children cf27080f3fcf
line wrap: on
line diff
--- a/src/auth/auth-settings.c	Mon Aug 31 12:20:38 2009 -0400
+++ b/src/auth/auth-settings.c	Mon Aug 31 12:43:23 2009 -0400
@@ -60,15 +60,16 @@
 	MEMBER(struct_size) sizeof(struct auth_userdb_settings)
 };
 
+/* we're kind of kludging here to avoid "auth_" prefix in the struct fields */
 #undef DEF
 #undef DEFLIST
 #define DEF(type, name) \
-	{ type, #name, offsetof(struct auth_settings, name), NULL }
+	{ type, "auth_"#name, offsetof(struct auth_settings, name), NULL }
 #define DEFLIST(field, name, defines) \
 	{ SET_DEFLIST, name, offsetof(struct auth_settings, field), defines }
 
 static struct setting_define auth_setting_defines[] = {
-	DEF(SET_STR, name),
+	{ SET_STR, "name", offsetof(struct auth_settings, name), NULL },
 	DEF(SET_STR, mechanisms),
 	DEF(SET_STR, realms),
 	DEF(SET_STR, default_realm),