introduced new attr type 'sw_uname_assign_mode' required by serweb

db/schema/attr_types.xml

@@ -446,6 +446,18 @@
 		<value col="at.order">120</value>
 	</row>
 	
+	<row vendor-controlled="1">
+		<value col="at.name">sw_uname_assign_mode</value>
+		<value col="at.type">2</value>
+		<value col="at.rich_t">list</value>
+		<value col="at.desc">@ff_uname_assign_mode</value>
+		<value col="at.d_flags">32</value>
+		<value col="at.flags">0</value>
+		<value col="at.prior">1073807360</value>
+		<value col="at.order">122</value>
+		<value col="at.type_spec">a:3:{s:4:"fcfs";s:23:"first come first served";s:5:"email";s:18:"email verification";s:9:"adminonly";s:10:"admin only";}</value>
+	</row>
+	
 	<row vendor-controlled="1">
 		<value col="at.name">sw_send_missed</value>
 		<value col="at.type">0</value>

db/schema/global_attrs.xml

@@ -221,6 +221,13 @@
 		<value col="global_attrs.value">57</value>
 		<value col="global_attrs.flags">32</value>
 	</row>
+
+	<row vendor-controlled="1">
+		<value col="global_attrs.name">sw_uname_assign_mode</value>
+		<value col="global_attrs.type">2</value>
+		<value col="global_attrs.value">fcfs</value>
+		<value col="global_attrs.flags">32</value>
+	</row>
 		
 	<row>
 		<value col="global_attrs.name">sw_show_status</value>

scripts/dbtext/ser_db/attr_types

@@ -28,6 +28,7 @@ sw_is_hostmaster:boolean:0::hostmaster privilege:32:0:0:0:0:other
 sw_confirmation:string:2::registration confirmation:32:0:0:0:0:other
 sw_pending_ts:string:2::registration timestamp:32:0:0:0:0:other
 sw_require_confirm:boolean:0::@ff_reg_confirmation:32:0:1073807360:0:120:other
+sw_uname_assign_mode:list:2:a\:3\:{s\:4\:"fcfs";s\:23\:"first come first served";s\:5\:"email";s\:18\:"email verification";s\:9\:"adminonly";s\:10\:"admin only";}:@ff_uname_assign_mode:32:0:1073807360:0:122:other
 sw_send_missed:boolean:0::@ff_send_daily_missed_calls:32:0:1073807616:0:130:other
 uid_format:list:2:a\:3\:{i\:0;s\:14\:"username@realm";i\:1;s\:21\:"integer (incremental)";i\:2;s\:15\:"UUID by RFC4122";}:@ff_uid_format:32:0:1073741824:0:160:other
 did_format:list:2:a\:3\:{i\:0;s\:11\:"domain name";i\:1;s\:21\:"integer (incremental)";i\:2;s\:15\:"UUID by RFC4122";}:@ff_did_format:32:0:1073741824:0:170:other

scripts/dbtext/ser_db/global_attrs

@@ -2,6 +2,7 @@ name(str) type(int) value(str,null) flags(int)
 sw_domain_default_flags:0:33:32
 sw_credential_default_flags:0:33:32
 sw_uri_default_flags:0:57:32
+sw_uname_assign_mode:2:fcfs:32
 sw_show_status:0:1:32
 sw_require_conf:0:1:32
 lang:2:en:33

scripts/mysql/my_data.sql

@@ -56,6 +56,8 @@ DELETE FROM attr_types WHERE name='sw_pending_ts';
 INSERT IGNORE INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_pending_ts', '2', 'string', 'registration timestamp', '32', '0', '0');
 DELETE FROM attr_types WHERE name='sw_require_confirm';
 INSERT IGNORE INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_require_confirm', '0', 'boolean', '@ff_reg_confirmation', '32', '0', '1073807360', '120');
+DELETE FROM attr_types WHERE name='sw_uname_assign_mode';
+INSERT IGNORE INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering, type_spec) VALUES ('sw_uname_assign_mode', '2', 'list', '@ff_uname_assign_mode', '32', '0', '1073807360', '122', 'a:3:{s:4:"fcfs";s:23:"first come first served";s:5:"email";s:18:"email verification";s:9:"adminonly";s:10:"admin only";}');
 DELETE FROM attr_types WHERE name='sw_send_missed';
 INSERT IGNORE INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_send_missed', '0', 'boolean', '@ff_send_daily_missed_calls', '32', '0', '1073807616', '130');
 DELETE FROM attr_types WHERE name='uid_format';
@@ -71,6 +73,8 @@ DELETE FROM global_attrs WHERE name='sw_credential_default_flags';
 INSERT IGNORE INTO global_attrs (name, type, value, flags) VALUES ('sw_credential_default_flags', '0', '33', '32');
 DELETE FROM global_attrs WHERE name='sw_uri_default_flags';
 INSERT IGNORE INTO global_attrs (name, type, value, flags) VALUES ('sw_uri_default_flags', '0', '57', '32');
+DELETE FROM global_attrs WHERE name='sw_uname_assign_mode';
+INSERT IGNORE INTO global_attrs (name, type, value, flags) VALUES ('sw_uname_assign_mode', '2', 'fcfs', '32');
 INSERT IGNORE INTO global_attrs (name, type, value, flags) VALUES ('sw_show_status', '0', '1', '32');
 INSERT IGNORE INTO global_attrs (name, type, value, flags) VALUES ('sw_require_conf', '0', '1', '32');
 INSERT IGNORE INTO global_attrs (name, type, value, flags) VALUES ('lang', '2', 'en', '33');

scripts/oracle/or_data.sql

@@ -56,6 +56,8 @@ DELETE FROM attr_types WHERE name='sw_pending_ts';
 INSERT IGNORE INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_pending_ts', '2', 'string', 'registration timestamp', '32', '0', '0');
 DELETE FROM attr_types WHERE name='sw_require_confirm';
 INSERT IGNORE INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_require_confirm', '0', 'boolean', '@ff_reg_confirmation', '32', '0', '1073807360', '120');
+DELETE FROM attr_types WHERE name='sw_uname_assign_mode';
+INSERT IGNORE INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering, type_spec) VALUES ('sw_uname_assign_mode', '2', 'list', '@ff_uname_assign_mode', '32', '0', '1073807360', '122', 'a:3:{s:4:"fcfs";s:23:"first come first served";s:5:"email";s:18:"email verification";s:9:"adminonly";s:10:"admin only";}');
 DELETE FROM attr_types WHERE name='sw_send_missed';
 INSERT IGNORE INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_send_missed', '0', 'boolean', '@ff_send_daily_missed_calls', '32', '0', '1073807616', '130');
 DELETE FROM attr_types WHERE name='uid_format';
@@ -71,6 +73,8 @@ DELETE FROM global_attrs WHERE name='sw_credential_default_flags';
 INSERT IGNORE INTO global_attrs (name, type, value, flags) VALUES ('sw_credential_default_flags', '0', '33', '32');
 DELETE FROM global_attrs WHERE name='sw_uri_default_flags';
 INSERT IGNORE INTO global_attrs (name, type, value, flags) VALUES ('sw_uri_default_flags', '0', '57', '32');
+DELETE FROM global_attrs WHERE name='sw_uname_assign_mode';
+INSERT IGNORE INTO global_attrs (name, type, value, flags) VALUES ('sw_uname_assign_mode', '2', 'fcfs', '32');
 INSERT IGNORE INTO global_attrs (name, type, value, flags) VALUES ('sw_show_status', '0', '1', '32');
 INSERT IGNORE INTO global_attrs (name, type, value, flags) VALUES ('sw_require_conf', '0', '1', '32');
 INSERT IGNORE INTO global_attrs (name, type, value, flags) VALUES ('lang', '2', 'en', '33');

scripts/postgres/pg_data.sql

@@ -56,6 +56,8 @@ DELETE FROM attr_types WHERE name='sw_pending_ts';
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority) VALUES ('sw_pending_ts', '2', 'string', 'registration timestamp', '32', '0', '0');
 DELETE FROM attr_types WHERE name='sw_require_confirm';
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_require_confirm', '0', 'boolean', '@ff_reg_confirmation', '32', '0', '1073807360', '120');
+DELETE FROM attr_types WHERE name='sw_uname_assign_mode';
+INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering, type_spec) VALUES ('sw_uname_assign_mode', '2', 'list', '@ff_uname_assign_mode', '32', '0', '1073807360', '122', 'a:3:{s:4:"fcfs";s:23:"first come first served";s:5:"email";s:18:"email verification";s:9:"adminonly";s:10:"admin only";}');
 DELETE FROM attr_types WHERE name='sw_send_missed';
 INSERT INTO attr_types (name, raw_type, rich_type, description, default_flags, flags, priority, ordering) VALUES ('sw_send_missed', '0', 'boolean', '@ff_send_daily_missed_calls', '32', '0', '1073807616', '130');
 DELETE FROM attr_types WHERE name='uid_format';
@@ -71,6 +73,8 @@ DELETE FROM global_attrs WHERE name='sw_credential_default_flags';
 INSERT INTO global_attrs (name, type, value, flags) VALUES ('sw_credential_default_flags', '0', '33', '32');
 DELETE FROM global_attrs WHERE name='sw_uri_default_flags';
 INSERT INTO global_attrs (name, type, value, flags) VALUES ('sw_uri_default_flags', '0', '57', '32');
+DELETE FROM global_attrs WHERE name='sw_uname_assign_mode';
+INSERT INTO global_attrs (name, type, value, flags) VALUES ('sw_uname_assign_mode', '2', 'fcfs', '32');
 INSERT INTO global_attrs (name, type, value, flags) VALUES ('sw_show_status', '0', '1', '32');
 INSERT INTO global_attrs (name, type, value, flags) VALUES ('sw_require_conf', '0', '1', '32');
 INSERT INTO global_attrs (name, type, value, flags) VALUES ('lang', '2', 'en', '33');