Command line printer manipulation client, and build goo.

[moira.git] / dbck / dbck.h

diff --git a/dbck/dbck.h b/dbck/dbck.h
index 873a45aec376185b58bbdc9d1066a6f78f9a2d0a..fdb7c75a285c8154be7a83beb288e859fc8b277c 100644 (file)
--- a/dbck/dbck.h
+++ b/dbck/dbck.h
@@ -9,6 +9,7 @@
 
 #include <mit-copyright.h>
 #include <moira_site.h>
+#include <moira_schema.h>
 
 #define MODE_ASK 1
 #define MODE_NO 2
@@ -16,16 +17,17 @@
 #define MODE_YES 4
 
 extern int debug, mode, fast, dcmenable, warn;
-extern struct hash *users, *machines, *clusters, *lists;
+extern struct hash *users, *machines, *clusters, *lists, *printservers;
 extern struct hash *filesys, *nfsphys, *strings, *subnets, *string_dups;
+extern struct hash *containers;
 
-#define MAX_ID_VALUE 32765
+#define MAX_ID_VALUE 131072
 #define MIN_ID_VALUE 100
 
 #define dprintf if (debug) printf
 
 struct user {
-  char login[9];
+  char login[USERS_LOGIN_SIZE];
   char potype;
   char *fullname;
   int status;
@@ -36,10 +38,12 @@ struct user {
   int fmodby;
   int pmodby;
   int sigwho;
+  char sponsor_type;
+  int sponsor_id;
 };
 
 struct machine {
-  char name[33];
+  char name[MACHINE_NAME_SIZE];
   char owner_type;
   int owner_id;
   int snet_id;
@@ -52,7 +56,7 @@ struct machine {
 };
 
 struct subnet {
-  char name[33];
+  char name[SUBNET_NAME_SIZE];
   char owner_type;
   int owner_id;
   int snet_id;
@@ -60,16 +64,19 @@ struct subnet {
 };
 
 struct cluster {
-  char name[33];
+  char name[CLUSTERS_NAME_SIZE];
   int clu_id;
   int modby;
 };
 
 struct list {
-  char name[33];
+  char name[LIST_NAME_SIZE];
   char acl_type;
+  char memacl_type;
   int list_id;
-  int  acl_id;
+  int acl_id;
+  int memacl_id;
+  int modby;
   int members;
 };
 
@@ -80,8 +87,8 @@ struct string {
 };
 
 struct filesys {
-  char name[33];
-  char dir[81];
+  char name[FILESYS_LABEL_SIZE];
+  char dir[FILESYS_NAME_SIZE];
   char type;
   int filsys_id;
   int mach_id;
@@ -91,11 +98,32 @@ struct filesys {
 };
 
 struct nfsphys {
-  char dir[33];
+  char dir[NFSPHYS_DIR_SIZE];
   int mach_id;
   int nfsphys_id;
-  int allocated;
-  int count;
+  unsigned long long allocated;
+  int modby;
+  unsigned long long count;
+};
+
+struct printserver {
+  int mach_id;
+  int printer_types;
+  char owner_type;
+  int owner_id;
+  int lpc_acl;
+  int modby;
+};
+
+struct container {
+  char name[CONTAINERS_NAME_SIZE];
+  int cnt_id;
+  int list_id;
+  char acl_type;
+  int acl_id;
+  char memacl_type;
+  int memacl_id;
+  int modby;
 };
 
 void dbmserr(void);