s4:setup/spn_update_list - reorder and update with other SPNs

1 files changed, 15 insertions, 13 deletions

diff --git a/source4/setup/spn_update_list b/source4/setup/spn_update_list
index 0029921a9e..7e2e678f29 100644
--- a/source4/setup/spn_update_list
+++ b/source4/setup/spn_update_list
@@ -2,25 +2,27 @@
 # that we need to add on our account. It is processed by
 # the samba_spnupdate script
 
-ldap/${HOSTNAME}/${DNSDOMAIN}
-ldap/${HOSTNAME}
-ldap/${NETBIOSNAME}
+DNS/${HOSTNAME}
+HOST/${HOSTNAME}
+HOST/${HOSTNAME}/${WORKGROUP}
 ldap/${HOSTNAME}/${WORKGROUP}
-ldap/${NTDSGUID}._msdcs.${DNSDOMAIN}
-ldap/${NETBIOSNAME}/${WORKGROUP}
-E3514235-4B06-11D1-AB04-00C04FC2DCD2/${NTDSGUID}/${DNSDOMAIN}
+GC/${HOSTNAME}/${DNSDOMAIN}
+ldap/${HOSTNAME}
 HOST/${HOSTNAME}/${DNSDOMAIN}
-HOST/${HOSTNAME}
+ldap/${HOSTNAME}/${DNSDOMAIN}
 HOST/${NETBIOSNAME}
-HOST/${HOSTNAME}/${WORKGROUP}
-HOST/${NETBIOSNAME}/${WORKGROUP}
+E3514235-4B06-11D1-AB04-00C04FC2DCD2/${NTDSGUID}/${DNSDOMAIN}
+ldap/${NTDSGUID}._msdcs.${DNSDOMAIN}
+ldap/${NETBIOSNAME}
 RestrictedKrbHost/${NETBIOSNAME}
 RestrictedKrbHost/${HOSTNAME}
-GC/${HOSTNAME}/${DNSDOMAIN}
 
-# these are not supported yet
+# These are not supported yet:
+# NtFrs-88f5d2bd-b646-11d2-a6d3-00c04fc9b232/${HOSTNAME}
 # Dfsr-12F9A27C-BF97-4787-9364-D31B6C55EB04/${HOSTNAME}
-# TERMSRV/${HOSTNAME}
-# TERMSRV/${NETBIOSNAME}
 # ldap/${HOSTNAME}/DomainDnsZones.${DNSDOMAIN}
 # ldap/${HOSTNAME}/ForestDnsZones.${DNSDOMAIN}
+#
+# Only used on Terminal Server mode:
+# TERMSRV/${HOSTNAME}
+# TERMSRV/${NETBIOSNAME}