From: zacheiss Date: Tue, 30 Sep 2008 18:42:42 +0000 (+0000) Subject: Laura Baldwin memorial "don't break hesiod" patch. X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/commitdiff_plain/9910965a2b580f02a505998bc3a31c3514ce85b8 Laura Baldwin memorial "don't break hesiod" patch. --- diff --git a/server/mr_server.h b/server/mr_server.h index 05630980..de730679 100644 --- a/server/mr_server.h +++ b/server/mr_server.h @@ -254,6 +254,7 @@ int setup_dpsv(struct query *q, char *argv[], client *cl); int setup_dcon(struct query *q, char *argv[], client *cl); int setup_acon(struct query *q, char *argv[], client *cl); int setup_scli(struct query *q, char *argv[], client *cl); +int setup_aali(struct query *q, char *argv[], client *cl); /* prototypes from qsupport.pc */ int set_pobox(struct query *q, char *argv[], client *cl); diff --git a/server/qsetup.pc b/server/qsetup.pc index 8c52a8c0..4bea49e8 100644 --- a/server/qsetup.pc +++ b/server/qsetup.pc @@ -1579,6 +1579,27 @@ int hostinfo_check(char *info, int num) return 1; } +int setup_aali(struct query *q, char *argv[], client *cl) +{ + EXEC SQL BEGIN DECLARE SECTION; + int cnt; + char *name, *type, *trans; + EXEC SQL END DECLARE SECTION; + name = argv[0]; + type = argv[1]; + trans = argv[2]; + + if (strcmp(strtrim(type), "FILESYS")) + return MR_SUCCESS; + + EXEC SQL SELECT count(label) INTO :cnt FROM filesys WHERE + label = :trans; + if (cnt > 0) + return MR_EXISTS; + + return MR_SUCCESS; +} + int setup_acon(struct query *q, char *argv[], client *cl) { EXEC SQL BEGIN DECLARE SECTION; diff --git a/server/queries2.c b/server/queries2.c index 35306c5e..10436cbd 100644 --- a/server/queries2.c +++ b/server/queries2.c @@ -3565,7 +3565,7 @@ static struct validate aali_validate = { 3, 0, 0, - 0, + setup_aali, 0, };