public
/
pyceo
27
1
Fork 3
Code Issues 25 Pull Requests 5 Projects Releases 1 Wiki Activity

Merge branch 'master' of caffeine.uwaterloo.ca:/srv/git/public/pyceo

This commit is contained in:
Michael Gregson 2009-01-28 00:48:18 -05:00
parent 4c4cf2b411 1b582abbf5
commit ab4cfdc17c
5 changed files with 90 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ceo/urwid/library.py
View File

@ -131,7 +131,7 @@ class CheckoutPage(WizardPanel):
""" """
self.state["user"] = "ERROR" self.state["user"] = "ERROR"
self.state["task"] = "sign_out" self.state["task"] = "sign_out"
self.user = SingleEdit("Username: ") self.user = LdapWordEdit(csclub_uri, csclub_base, 'uid', "Username: ")
self.widgets = [ self.widgets = [
urwid.Text("Book Checkout"), urwid.Text("Book Checkout"),
@ -251,7 +251,7 @@ class CheckinPage(WizardPanel):
self.state["book"] = None self.state["book"] = None
self.state["user"] = "ERROR" self.state["user"] = "ERROR"
self.state["task"] = "sign_in" self.state["task"] = "sign_in"
self.user = SingleEdit("Username: ") self.user = LdapWordEdit(csclub_uri, csclub_base, 'uid', "Username: ")
self.widgets = [ self.widgets = [
urwid.Text("Book Checkin"), urwid.Text("Book Checkin"),

2
src/Makefile
View File

@ -24,6 +24,8 @@ zfsaddhomedir: util.o zfsaddhomedir.o
config-test: config-test.o parser.o util.o config-test: config-test.o parser.o util.o
$(CC) $(LDFLAGS) $^ -o $@ $(CC) $(LDFLAGS) $^ -o $@
config.o: config.h config-vars.h
install: addmember addclub install: addmember addclub
install -d $(DESTDIR)$(PREFIX)/bin install -d $(DESTDIR)$(PREFIX)/bin
install addmember addclub $(DESTDIR)$(PREFIX)/bin install addmember addclub $(DESTDIR)$(PREFIX)/bin

36
src/config-vars.h Normal file
View File

@ -0,0 +1,36 @@
CONFIG_STR(server_url)
CONFIG_STR(users_base)
CONFIG_STR(groups_base)
CONFIG_STR(sudo_base)
CONFIG_STR(skeleton_dir)
CONFIG_STR(homedir_mode)
CONFIG_STR(refquota)
CONFIG_STR(member_shell)
CONFIG_INT(member_min_id)
CONFIG_INT(member_max_id)
CONFIG_STR(member_home)
CONFIG_STR(member_home_acl)
CONFIG_STR(club_shell)
CONFIG_INT(club_min_id)
CONFIG_INT(club_max_id)
CONFIG_STR(club_home)
CONFIG_STR(club_home_acl)
CONFIG_STR(notify_hook)
CONFIG_STR(realm)
CONFIG_STR(admin_principal)
CONFIG_STR(admin_keytab)
CONFIG_STR(admin_bind_userid)
CONFIG_STR(admin_bind_keytab)
CONFIG_STR(sasl_realm)
CONFIG_STR(sasl_mech)
CONFIG_STR(privileged_group)

116
src/config.c
View File

@ -6,76 +6,45 @@
#include "util.h" #include "util.h"
#define DEF_STR NULL #define DEF_STR NULL
#define DEF_LONG LONG_MIN #define DEF_INT LONG_MIN
char *server_url = DEF_STR; #define CONFIG_STR(x) char *x = DEF_STR;
#define CONFIG_INT(x) long x = DEF_INT;
#include "config-vars.h"
#undef CONFIG_STR
#undef CONFIG_INT
char *users_base = DEF_STR; struct config_var {
char *groups_base = DEF_STR; const char *name;
char *sudo_base = DEF_STR; void *p;
enum { CONFIG_TYPE_STR, CONFIG_TYPE_INT } type;
};
char *skeleton_dir = DEF_STR; #define CONFIG_STR(x) {#x, &x, CONFIG_TYPE_STR },
char *homedir_mode = DEF_STR; #define CONFIG_INT(x) {#x, &x, CONFIG_TYPE_INT },
char *refquota = DEF_STR; static struct config_var config_vars[] = {
#include "config-vars.h"
char *member_shell = DEF_STR; };
long member_min_id = DEF_LONG; #undef CONFIG_STR
long member_max_id = DEF_LONG; #undef CONFIG_INT
char *member_home = DEF_STR;
char *member_home_acl = DEF_STR;
char *club_shell = DEF_STR;
long club_min_id = DEF_LONG;
long club_max_id = DEF_LONG;
char *club_home = DEF_STR;
char *club_home_acl = DEF_STR;
char *notify_hook = DEF_STR;
char *realm = DEF_STR;
char *admin_principal = DEF_STR;
char *admin_keytab = DEF_STR;
char *admin_bind_userid = DEF_STR;
char *admin_bind_keytab = DEF_STR;
char *sasl_realm = DEF_STR;
char *sasl_mech = DEF_STR;
char *privileged_group = DEF_STR;
static char *strvarnames[] = { "server_url", "users_base", "admin_principal",
"admin_keytab", "skeleton_dir", "homedir_mode", "refquota", "member_home",
"member_shell", "club_home", "club_shell", "realm", "admin_bind_userid",
"admin_bind_keytab", "groups_base", "privileged_group", "notify_hook",
"sasl_realm", "sasl_mech", "sudo_base", "member_home_acl",
"club_home_acl" };
static char **strvars[] = { &server_url, &users_base, &admin_principal,
&admin_keytab, &skeleton_dir, &homedir_mode, &refquota, &member_home,
&member_shell, &club_home, &club_shell, &realm, &admin_bind_userid,
&admin_bind_keytab, &groups_base, &privileged_group, &notify_hook,
&sasl_realm, &sasl_mech, &sudo_base, &member_home_acl, &club_home_acl };
static char *longvarnames[] = { "member_min_id", "member_max_id",
"club_min_id", "club_max_id" };
static long *longvars[] = { &member_min_id, &member_max_id,
&club_min_id, &club_max_id };
void config_var(char *var, char *val) { void config_var(char *var, char *val) {
int i; int i;
for (i = 0; i < sizeof(strvars)/sizeof(*strvars); i++) { for (i = 0; i < sizeof(config_vars)/sizeof(*config_vars); i++) {
if (!strcmp(var, strvarnames[i])) { if (!strcmp(var, config_vars[i].name)) {
if (!strvars[i]) switch (config_vars[i].type) {
free(strvars[i]); case CONFIG_TYPE_STR:
*strvars[i] = xstrdup(val); if (*(char **)config_vars[i].p)
} free(*(char **)config_vars[i].p);
} *(char **)config_vars[i].p = xstrdup(val);
break;
for (i = 0; i < sizeof(longvars)/sizeof(*longvars); i++) { case CONFIG_TYPE_INT:
if (!strcmp(var, longvarnames[i])) { *(long *)config_vars[i].p = config_long(var, val);
*longvars[i] = config_long(var, val); break;
default:
fatal("unknown config var type %d", config_vars[i].type);
}
} }
} }
} }
@ -85,13 +54,18 @@ void configure() {
config_parse(CONFIG_FILE); config_parse(CONFIG_FILE);
for (i = 0; i < sizeof(strvars)/sizeof(*strvars); i++) { for (i = 0; i < sizeof(config_vars)/sizeof(*config_vars); i++) {
if (*strvars[i] == DEF_STR) switch (config_vars[i].type) {
badconf("undefined string variable: %s", strvarnames[i]); case CONFIG_TYPE_STR:
} if (*(char **)config_vars[i].p == DEF_STR)
badconf("undefined string variable: %s", config_vars[i].name);
for (i = 0; i < sizeof(longvars)/sizeof(*longvars); i++) { break;
if (*longvars[i] == DEF_LONG) case CONFIG_TYPE_INT:
badconf("undefined long variable: %s", longvarnames[i]); if (*(long *)config_vars[i].p == DEF_INT)
badconf("undefined integer variable: %s", config_vars[i].name);
break;
default:
fatal("unknown config var type %d", config_vars[i].type);
}
} }
} }

43
src/config.h
View File

@ -1,42 +1,9 @@
#define CONFIG_FILE "/etc/csc/accounts.cf" #define CONFIG_FILE "/etc/csc/accounts.cf"
extern char *server_url; #define CONFIG_STR(x) extern char *x;
#define CONFIG_INT(x) extern long x;
extern char *users_base; #include "config-vars.h"
extern char *groups_base; #undef CONFIG_STR
extern char *sudo_base; #undef CONFIG_INT
extern char *skeleton_dir;
extern char *homedir_mode;
extern char *refquota;
extern char *member_shell;
extern long member_min_id;
extern long member_max_id;
extern char *member_home;
extern char *member_home_acl;
extern char *member_home_dacl;
extern char *club_shell;
extern long club_min_id;
extern long club_max_id;
extern char *club_home;
extern char *club_home_acl;
extern char *club_home_dacl;
extern char *notify_hook;
extern char *realm;
extern char *admin_principal;
extern char *admin_keytab;
extern char *admin_bind_userid;
extern char *admin_bind_keytab;
extern char *sasl_realm;
extern char *sasl_mech;
extern char *privileged_group;
void configure(); void configure();