added subnets

[moira.git] / db / newmoira.dc

diff --git a/db/newmoira.dc b/db/newmoira.dc
index 7b16b1d749de73e8434965f34f1606ecc8ffd5ea..4b96264a4b2ee041c7be6589fee64e19c5d65c87 100644 (file)
--- a/db/newmoira.dc
+++ b/db/newmoira.dc
@@ -120,10 +120,11 @@ main(argc, argv)
 int argc;
 char **argv;
 {
-    char buffer[256];
     EXEC SQL BEGIN DECLARE SECTION;
+    char buffer[256];
     char *db, *tbl, *value, *user, *query, *trans, *type;
     int i, list;
+    char stmt_buf[256];
     EXEC SQL END DECLARE SECTION;
 
     if (argc == 2)
@@ -131,7 +132,7 @@ char **argv;
     else
       db = "sms";
 #ifsql INGRES
-    EXEC SQL CONNECT db;
+    EXEC SQL CONNECT :db;
 #endsql
 #ifsql INFORMIX
     EXEC SQL DATABASE db;
@@ -143,7 +144,8 @@ char **argv;
     while (buffer[0]) {
        for (i = 0; tbl = tables[i]; i++) {
 #ifsql INGRES
-/*         EXEC SQL define permit all on table to user; */
+           sprintf(stmt_buf,"GRANT ALL PRIVILEGES ON TABLE %s TO %s",tbl,user);
+           EXEC SQL EXECUTE IMMEDIATE :stmt_buf;
 #endsql
            if (ingres_errno) {
                printf("Unable to give %s permission to access table %s\n",
@@ -160,9 +162,11 @@ char **argv;
     for (i = 0; tbl = tables[i]; i++) {
        EXEC SQL INSERT INTO tblstats
          (table_name, modtime, appends, updates, deletes)
-         VALUES (:tbl, "now", 0, 0, 0);
+         VALUES (:tbl, 'now', 0, 0, 0);
        if (ingres_errno) {
            printf("Unable to initialize tblstats for %s\n", tbl);
+           EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+           printf("SQL error: %s\n",buffer);
            exit(1);
        }
     }
@@ -172,6 +176,8 @@ char **argv;
          VALUES (:value, 1);
        if (ingres_errno) {
            printf("Unable to install initial value of %s\n", value);
+           EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+           printf("SQL error: %s\n",buffer);
            exit(1);
        }
     }
@@ -181,9 +187,11 @@ char **argv;
     gets(buffer);
     i = atoi(buffer);
     EXEC SQL INSERT INTO numvalues (name, value)
-      VALUES ("uid", :i);
+      VALUES ('uid', :i);
     if (ingres_errno) {
        printf("Unable to install value for uid\n");
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
 
@@ -192,9 +200,11 @@ char **argv;
     gets(buffer);
     i = atoi(buffer);
     EXEC SQL INSERT INTO numvalues (name, value)
-      VALUES ("gid", :i);
+      VALUES ('gid', :i);
     if (ingres_errno) {
        printf("Unable to install value for gid\n");
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
 
@@ -203,82 +213,106 @@ char **argv;
     gets(buffer);
     i = atoi(buffer);
     EXEC SQL INSERT INTO numvalues (name, value)
-      VALUES ("def_quota", :i);
+      VALUES ('def_quota', :i);
     if (ingres_errno) {
        printf("Unable to install value for def_quota\n");
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);       
        exit(1);
     }
 
     /* place holder records */
     EXEC SQL INSERT INTO users (login, potype, users_id)
-      VALUES ("[nobody]", "NONE", 0);
+      VALUES ('[nobody]', 'NONE', 0);
     if (ingres_errno) {
        printf("Unable to install 0 user\n");
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
     EXEC SQL INSERT INTO machine (name, type)
-      VALUES ("[NONE]", "NONE");
+      VALUES ('[NONE]', 'NONE');
     if (ingres_errno) {
        printf("Unable to install 0 machine\n");
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
     EXEC SQL INSERT INTO cluster (name)
-      VALUES ("[unassigned]");
+      VALUES ('[unassigned]');
     if (ingres_errno) {
        printf("Unable to install 0 cluster\n");
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
     EXEC SQL INSERT INTO list (name, acl_type)
-      VALUES ("[none]", "NONE");
+      VALUES ('[none]', 'NONE');
     if (ingres_errno) {
        printf("Unable to install 0 list\n");
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
     EXEC SQL INSERT INTO filesys (label, type)
-      VALUES ("[none]", "NONE");
+      VALUES ('[none]', 'NONE');
     if (ingres_errno) {
        printf("Unable to install 0 filesys\n");
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
     EXEC SQL INSERT INTO nfsphys (device)
-      VALUES ("/dev/null");
+      VALUES ('/dev/null');
     if (ingres_errno) {
        printf("Unable to install 0 nfsphys\n");
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
 
     /* magic for ALL_USERS */
     EXEC SQL INSERT INTO users (login, users_id, potype)
-      VALUES ("default", 1, "NONE");
+      VALUES ('default', 1, 'NONE');
     if (ingres_errno) {
        printf("Unable to install default user\n");
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
     EXEC SQL INSERT INTO list (name, list_id, acl_type)
-      VALUES ("default", 1, "NONE");
+      VALUES ('default', 1, 'NONE');
     if (ingres_errno) {
        printf("Unable to install default list\n");
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
     EXEC SQL INSERT INTO imembers
       (list_id, member_type, member_id, ref_count, direct)
-      VALUES (1, "USER", 1, 1, 1);
+      VALUES (1, 'USER', 1, 1, 1);
     if (ingres_errno) {
        printf("Unable to install default user on default list\n");
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
 
     /* Privileged users */
     EXEC SQL INSERT INTO users (login, users_id, potype)
-      VALUES ("root", 2, "NONE");
+      VALUES ('root', 2, 'NONE');
     if (ingres_errno) {
        printf("Unable to install root user\n");
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
     EXEC SQL INSERT INTO list (name, list_id, acl_type, acl_id)
-      VALUES ("dbadmin", 2, "LIST", 2);
+      VALUES ('dbadmin', 2, 'LIST', 2);
     if (ingres_errno) {
        printf("Unable to install default dbadmin list\n");
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
 
@@ -287,23 +321,29 @@ char **argv;
     gets(buffer);
     user = buffer;
     EXEC SQL INSERT INTO users (login, users_id, potype)
-      VALUES (:user, 3, "NONE");
+      VALUES (:user, 3, 'NONE');
     if (ingres_errno) {
        printf("Unable to install user %s\n", buffer);
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
     EXEC SQL INSERT INTO imembers
       (list_id, member_type, member_id, ref_count, direct)
-      VALUES (2, "USER", 2, 1, 1);
+      VALUES (2, 'USER', 2, 1, 1);
     if (ingres_errno) {
        printf("Unable to put user root on list dbadmin\n");
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
     EXEC SQL INSERT INTO imembers
       (list_id, member_type, member_id, ref_count, direct)
-      VALUES (2, "USER", 3, 1, 1);
+      VALUES (2, 'USER', 3, 1, 1);
     if (ingres_errno) {
        printf("Unable to put user %s on list dbadmin\n", buffer);
+       EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+       printf("SQL error: %s\n",buffer);
        exit(1);
     }
 
@@ -319,11 +359,13 @@ char **argv;
          VALUES (:query, :value, :list);
        if (ingres_errno) {
            printf("Unable to install query ACL for %s (%s)\n", query, value);
+           EXEC SQL INQUIRE_SQL (:buffer = ERRORTEXT);
+           printf("SQL error: %s\n",buffer);
            exit(1);
        }
     }
     EXEC SQL INSERT INTO capacls (capability, tag, list_id)
-      VALUES ("trigger_dcm", "tdcm", 2);
+      VALUES ('trigger_dcm', 'tdcm', 2);
 
     /* and the aliases */
     for (i = 0; aliases[i].name ; i++) {
@@ -334,6 +376,11 @@ char **argv;
          VALUES (:value, :type, :trans);
     }
 
+    printf("\nNow committing work... ");
+#ifsql INGRES
+    EXEC SQL COMMIT WORK;
+#endsql
+
     printf("done.\n");
     exit(0);
 }
@@ -345,11 +392,10 @@ char **argv;
  * database open error.
  */
 
-int ingerr(num)
-    int *num;
+int ingerr()
 {
-    ingres_errno = *num;
-    return *num;
+    ingres_errno = -sqlca.sqlcode;
+    return ingres_errno;
 }
 
 
@@ -413,3 +459,10 @@ int count_members_of_list() {}
 int get_lists_of_member() {}
 int register_user() {}
 int followup_gpce() {}
+int prefetch_value() {}
+int prefetch_filesys() {}
+int followup_dqot() {}
+int followup_guax() {}
+int followup_uuac() {}
+int get_end_members_of_list() {}
+int _sdl_followup() {}