X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=etc%2Fphpldapadmin%2Ftemplates%2Fcreation%2FsambaMachine.xml;h=fe5e5d33df54cfb2a41992a6fb11585fd5358023;hb=818442a9ed320ab8feaba86ebf3c56f33a180683;hp=bc5d37f2a9aee8d7fc1905c947f4fcb193445916;hpb=202368ea600f1c63978b6e130adb9e47d3d752d3;p=matthijs%2Fservers%2Fdrsnuggles.git

diff --git a/etc/phpldapadmin/templates/creation/sambaMachine.xml b/etc/phpldapadmin/templates/creation/sambaMachine.xml
index bc5d37f..fe5e5d3 100644
--- a/etc/phpldapadmin/templates/creation/sambaMachine.xml
+++ b/etc/phpldapadmin/templates/creation/sambaMachine.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE template SYSTEM "template.dtd">
+
 <template>
-<title>Samba3 Machine</title>
-<!--<regexp>^ou=People,o=.*,</regexp>-->
-<icon>images/server.png</icon>
-<description>New Samba3 Machine</description>
 <askcontainer>1</askcontainer>
+<description>New Samba3 Machine</description>
+<icon>server.png</icon>
+<invalid>0</invalid>
 <rdn>uid</rdn>
+<!--<regexp>^ou=People,o=.*,</regexp>-->
+<title>Samba: Machine</title>
 <visible>1</visible>
 
 <objectClasses>
@@ -19,47 +21,47 @@
 <attribute id="uid">
 	<display>Machine Name</display>
 	<hint>The machine name should end with a $</hint>
-        <icon>images/terminal.png</icon>
-	<onchange>autoFill:cn,%uid%</onchange>
+	<icon>terminal.png</icon>
+	<onchange>=autoFill(cn;%uid%)</onchange>
 	<order>1</order>
 	<page>1</page>
 </attribute>
 <attribute id="uidNumber">
-        <display>UID Number</display>
-        <hint>Automatically determined</hint>
-        <value>=php.GetNextNumber(/,uid)</value>
+	<display>UID Number</display>
+	<order>2</order>
+	<page>1</page>
 	<readonly>1</readonly>
-        <order>2</order>
-        <page>1</page>
+	<value>=php.GetNextNumber(/;uidNumber)</value>
 </attribute>
 <attribute id="gidNumber">
-        <display>GID Number</display>
-	<option>=php.PickList(/,(objectClass=posixGroup),gidNumber,%cn%)</option>
-        <order>3</order>
-        <page>1</page>
+	<display>GID Number</display>
+	<order>3</order>
+	<page>1</page>
+	<value><![CDATA[=php.PickList(/;(&(objectClass=posixGroup));gidNumber;%cn%;;;;cn)]]></value>
 </attribute>
 <attribute id="sambaSID">
 	<display>Samba SID</display>
-        <option>=php.PickList(/,(objectClass=sambaDomain),sambaSID,%sambaSID% (%sambaDomainName%))</option>
 	<helper>
 		<id>sidsuffix</id>
 		<value></value>
 	</helper>
-        <post>=php.Join(-,(%sambaSID%,%sidsuffix%))</post>
 	<order>2</order>
 	<page>1</page>
+	<post>=php.Join(-;%sambaSID%,%sidsuffix%)</post>
+	<value><![CDATA[=php.PickList(/;(&(objectClass=sambaDomain));sambaSID;%sambaSID% (%sambaDomainName%);;;;sambaDomainName)]]></value>
 </attribute>
 <attribute id="sambaAcctFlags">
-	<value>[W]</value>
 	<hidden>1</hidden>
+	<value>[W]</value>
 </attribute>
 <attribute id="homeDirectory">
-	<value>/dev/null</value>
 	<hidden>1</hidden>
+	<value>/dev/null</value>
 </attribute>
 <attribute id="cn">
-	<value></value>
 	<hidden>1</hidden>
+	<value></value>
 </attribute>
 </attributes>
+
 </template>