Author: tridge Date: 2004-10-03 10:31:12 +0000 (Sun, 03 Oct 2004) New Revision: 2804
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source&rev=2804&nolog=1 Log: - setup some reasonable default SAM to unixName mappings in the provisioning. - enable the unixuid module by default on all backends Modified: branches/SAMBA_4_0/source/param/loadparm.c branches/SAMBA_4_0/source/provision.ldif branches/SAMBA_4_0/source/script/provision.pl Changeset: Modified: branches/SAMBA_4_0/source/param/loadparm.c =================================================================== --- branches/SAMBA_4_0/source/param/loadparm.c 2004-10-03 10:25:06 UTC (rev 2803) +++ branches/SAMBA_4_0/source/param/loadparm.c 2004-10-03 10:31:12 UTC (rev 2804) @@ -886,7 +886,7 @@ init_printer_values(); do_parameter("fstype", FSTYPE_STRING); - do_parameter("ntvfs handler", "default"); + do_parameter("ntvfs handler", "unixuid default"); do_parameter("dcerpc endpoint servers", "epmapper srvsvc wkssvc rpcecho samr netlogon lsarpc spoolss"); do_parameter("server services", "smb rpc"); Modified: branches/SAMBA_4_0/source/provision.ldif =================================================================== --- branches/SAMBA_4_0/source/provision.ldif 2004-10-03 10:25:06 UTC (rev 2803) +++ branches/SAMBA_4_0/source/provision.ldif 2004-10-03 10:31:12 UTC (rev 2804) @@ -191,6 +191,8 @@ sAMAccountType: 0x30000000 objectCategory: CN=Person,CN=Schema,CN=Configuration,${BASEDN} isCriticalSystemObject: TRUE +unicodePwd: ${ADMINPASS} +unixName: root dn: CN=Guest,CN=Users,${BASEDN} objectClass: top @@ -247,6 +249,7 @@ groupType: 0x80000005 objectCategory: CN=Group,CN=Schema,CN=Configuration,${BASEDN} isCriticalSystemObject: TRUE +unixName: root dn: CN=Users,CN=Builtin,${BASEDN} objectClass: top @@ -290,6 +293,7 @@ groupType: 0x80000005 objectCategory: CN=Group,CN=Schema,CN=Configuration,${BASEDN} isCriticalSystemObject: TRUE +unixName: nogroup dn: CN=Print Operators,CN=Builtin,${BASEDN} objectClass: top @@ -562,6 +566,7 @@ groupType: -2147483646 objectCategory: CN=Group,CN=Schema,CN=Configuration,${BASEDN} isCriticalSystemObject: TRUE +unixName: root dn: CN=Enterprise Admins,CN=Users,${BASEDN} objectClass: top @@ -584,6 +589,7 @@ groupType: -2147483646 objectCategory: CN=Group,CN=Schema,CN=Configuration,${BASEDN} isCriticalSystemObject: TRUE +unixName: root dn: CN=Cert Publishers,CN=Users,${BASEDN} objectClass: top @@ -625,6 +631,7 @@ groupType: -2147483646 objectCategory: CN=Group,CN=Schema,CN=Configuration,${BASEDN} isCriticalSystemObject: TRUE +unixName: root dn: CN=Domain Users,CN=Users,${BASEDN} objectClass: top @@ -645,6 +652,7 @@ groupType: -2147483646 objectCategory: CN=Group,CN=Schema,CN=Configuration,${BASEDN} isCriticalSystemObject: TRUE +unixName: users dn: CN=Domain Guests,CN=Users,${BASEDN} objectClass: top @@ -685,6 +693,7 @@ groupType: -2147483646 objectCategory: CN=Group,CN=Schema,CN=Configuration,${BASEDN} isCriticalSystemObject: TRUE +unixName: root dn: CN=RAS and IAS Servers,CN=Users,${BASEDN} objectClass: top @@ -839,3 +848,4 @@ name: TemplateGroup instanceType: 4 sAMAccountType: 0x10000000 + Modified: branches/SAMBA_4_0/source/script/provision.pl =================================================================== --- branches/SAMBA_4_0/source/script/provision.pl 2004-10-03 10:25:06 UTC (rev 2803) +++ branches/SAMBA_4_0/source/script/provision.pl 2004-10-03 10:31:12 UTC (rev 2804) @@ -139,10 +139,11 @@ ####################################################################### # add a foreign security principle -sub add_foreign($$) +sub add_foreign($$$) { my $sid = shift; my $desc = shift; + my $unixname = shift; return " dn: CN=$sid,CN=ForeignSecurityPrincipals,\${BASEDN} objectClass: top @@ -160,6 +161,7 @@ objectGUID: \${NEWGUID} objectSid: $sid objectCategory: CN=Foreign-Security-Principal,CN=Schema,CN=Configuration,\${BASEDN} +unixName: $unixname "; } @@ -209,9 +211,9 @@ my $data = FileLoad("provision.ldif") || die "Unable to load provision.ldif\n"; -$data .= add_foreign("S-1-5-7", "Anonymous"); -$data .= add_foreign("S-1-5-18", "System"); -$data .= add_foreign("S-1-5-11", "Authenticated Users"); +$data .= add_foreign("S-1-5-7", "Anonymous", "nobody"); +$data .= add_foreign("S-1-5-18", "System", "root"); +$data .= add_foreign("S-1-5-11", "Authenticated Users", "users"); if (!$opt_adminpass) { $opt_adminpass = randpass();