Command line printer manipulation client, and build goo.

[moira.git] / afssync / ubik.c

diff --git a/afssync/ubik.c b/afssync/ubik.c
index 6c5622d515727d4f2147f5b13d5a9aac0c5e29fe..1757aa77384889c5122d02dd75cf4d18a2a9d985 100644 (file)
--- a/afssync/ubik.c
+++ b/afssync/ubik.c
@@ -6,11 +6,29 @@
 #include <lock.h>
 #define UBIK_INTERNALS
 #include <stds.h>
-#include <ubik.h>
 #include <rx/xdr.h>
 #include "print.h"
 #include "prserver.h"
 
+/* Stolen bits of ubik.h. */
+
+struct ubik_version {
+  afs_int32 epoch;
+  afs_int32 counter;
+};
+typedef struct ubik_version ubik_version;
+
+/* ubik header file structure */
+struct ubik_hdr {
+  afs_int32 magic;            /* magic number */
+  short pad1;                 /* some 0-initd padding */
+  short size;                 /* header allocation size */
+  struct ubik_version version;        /* the version for this file */
+};
+
+#define HDRSIZE             64  /* bytes of header per dbfile */
+#define UBIK_MAGIC      0x354545
+
 extern int dbase_fd;
 struct ubik_dbase *dbase;
 
@@ -139,18 +157,8 @@ long len;
     return(0);
 }
 
-
-/* Global declarations from ubik.c */
-long ubik_quorum=0;
-struct ubik_dbase *ubik_dbase=0;
-struct ubik_stats ubik_stats;
-long ubik_host;
-long ubik_epochTime = 0;
-long urecovery_state = 0;
-
 struct rx_securityClass *ubik_sc[3];
 
-
 /* Other declarations */
 
 afsconf_GetNoAuthFlag()