From 0f364e1f5c3a41a9ca50b6770f60a0a24e630e20 Mon Sep 17 00:00:00 2001
From: konrad <konrad@6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33>
Date: Tue, 3 Feb 2009 15:31:36 +0000
Subject: [PATCH] move user tables to user wolf

git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@261 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33
---
 wob/basics.wolf |   40 ----------------------------------------
 wob/user.wolf   |   39 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/wob/basics.wolf b/wob/basics.wolf
index 60ab614..37a76ee 100644
--- a/wob/basics.wolf
+++ b/wob/basics.wolf
@@ -19,46 +19,6 @@
 		<Preset><V col="ckey" val="VoucherIDChars"/><V col="cval" val="10"/></Preset>
 	</Table>
 	
-	<!-- // ////////////////////
-	     // Machine Interface Stuff
-	-->
-	<Table name="host" backup="yes">
-		<Column name="hostname" type="string:64" primarykey="yes"/>
-		<!-- if hostkey is NULL it is a special host (_any, _anon, _online) -->
-		<Column name="hostkey" type="string" />
-		
-		<Preset><V col="hostname" code='translate("SpecialHost","_any")'/></Preset>
-		<Preset><V col="hostname" code='translate("SpecialHost","_anon")'/></Preset>
-		<Preset><V col="hostname" code='translate("SpecialHost","_online")'/></Preset>
-	</Table>
-	
-	<Table name="users" backup="yes">
-		<Column name="uname" type="string:64" primarykey="yes"/>
-		<Column name="passwd" type="string" notnull="yes"/>
-		<!-- more detailed data that can be displayed to admins -->
-		<Column name="description" type="text"/>
-	</Table>
-	
-	<Table name="userrole" backup="yes">
-		<Column name="uname" type="string:64" notnull="yes" foreignkey="users:uname" index="yes" primarykey="yes"/>
-		<Column name="role" type="string:32" notnull="yes" primarykey="yes"/>
-	</Table>
-	
-	<Table name="userhosts" backup="yes">
-		<Column name="uname" type="string:64" notnull="yes" foreignkey="users:uname" index="yes" primarykey="yes"/>
-		<Column name="host" type="string:64" notnull="yes" foreignkey="host:hostname" primarykey="yes"/>
-	</Table>
-	
-	<Table name="session">
-		<Column name="sessionid" type="string:64" primarykey="yes"/>
-		<!-- if empty: not authenticated -->
-		<Column name="user" type="string:64"/>
-		<!-- used during authentication; emptied after authentication: -->
-		<Column name="hchallenge" type="string:64"/>
-		<Column name="uchallenge" type="string:64"/>
-		<!-- unix timestamp at which to delete this session -->
-		<Column name="timeout" type="int64" notnull="yes"/>
-	</Table>
 	
 	<Table name="template" backup="yes">
 		<Column name="filename" type="string" primarykey="yes"/>
diff --git a/wob/user.wolf b/wob/user.wolf
index d01ac53..119742a 100644
--- a/wob/user.wolf
+++ b/wob/user.wolf
@@ -7,10 +7,47 @@
   - see COPYING.AGPL for details
   -->
 <Wolf>
+	<Table name="host" backup="yes">
+		<Column name="hostname" type="string:64" primarykey="yes"/>
+		<!-- if hostkey is NULL it is a special host (_any, _anon, _online) -->
+		<Column name="hostkey" type="string" />
+		
+		<Preset><V col="hostname" code='translate("SpecialHost","_any")'/></Preset>
+		<Preset><V col="hostname" code='translate("SpecialHost","_anon")'/></Preset>
+		<Preset><V col="hostname" code='translate("SpecialHost","_online")'/></Preset>
+	</Table>
+	
+	<Table name="users" backup="yes">
+		<Column name="uname" type="string:64" primarykey="yes"/>
+		<Column name="passwd" type="string" notnull="yes"/>
+		<!-- more detailed data that can be displayed to admins -->
+		<Column name="description" type="text"/>
+	</Table>
+	
+	<Table name="userrole" backup="yes">
+		<Column name="uname" type="string:64" notnull="yes" foreignkey="users:uname" index="yes" primarykey="yes"/>
+		<Column name="role" type="string:32" notnull="yes" primarykey="yes"/>
+	</Table>
+	
+	<Table name="userhosts" backup="yes">
+		<Column name="uname" type="string:64" notnull="yes" foreignkey="users:uname" index="yes" primarykey="yes"/>
+		<Column name="host" type="string:64" notnull="yes" foreignkey="host:hostname" primarykey="yes"/>
+	</Table>
+	
+	<Table name="session">
+		<Column name="sessionid" type="string:64" primarykey="yes"/>
+		<!-- if empty: not authenticated -->
+		<Column name="user" type="string:64"/>
+		<!-- used during authentication; emptied after authentication: -->
+		<Column name="hchallenge" type="string:64"/>
+		<Column name="uchallenge" type="string:64"/>
+		<!-- unix timestamp at which to delete this session -->
+		<Column name="timeout" type="int64" notnull="yes"/>
+	</Table>
+	
 	<Class name="User">
 		<Property name="name" column="uname" type="astring"/>
 		<Property name="password" column="passwd" type="string"/>
 		<Property name="description" type="string"/>
-		
 	</Class>
 </Wolf>
\ No newline at end of file
-- 
1.7.2.5