svn commit: samba r2829 - in branches/SAMBA_4_0/source: . script
metze at samba.org
metze at samba.org
Wed Oct 6 13:57:42 GMT 2004
Author: metze
Date: 2004-10-06 13:57:42 +0000 (Wed, 06 Oct 2004)
New Revision: 2829
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source&rev=2829&nolog=1
Log:
REALM and netbiosname are always uppercase
dnsname and dnshostname always lowercase
metze
Modified:
branches/SAMBA_4_0/source/provision.ldif
branches/SAMBA_4_0/source/script/provision.pl
Changeset:
Modified: branches/SAMBA_4_0/source/provision.ldif
===================================================================
--- branches/SAMBA_4_0/source/provision.ldif 2004-10-06 02:05:39 UTC (rev 2828)
+++ branches/SAMBA_4_0/source/provision.ldif 2004-10-06 13:57:42 UTC (rev 2829)
@@ -36,7 +36,7 @@
objectClass: domainDNS
name: ${DOMAIN}
realm: ${REALM}
-dnsDomain: ${REALM}
+dnsDomain: ${DNSDOMAIN}
dc: ${DOMAIN}
objectGUID: ${NEWGUID}
creationTime: ${NTTIME}
Modified: branches/SAMBA_4_0/source/script/provision.pl
===================================================================
--- branches/SAMBA_4_0/source/script/provision.pl 2004-10-06 02:05:39 UTC (rev 2828)
+++ branches/SAMBA_4_0/source/script/provision.pl 2004-10-06 13:57:42 UTC (rev 2829)
@@ -12,6 +12,7 @@
my $opt_nogroup;
my $opt_wheel;
my $opt_users;
+my $dnsdomain;
my $dnsname;
my $basedn;
@@ -87,6 +88,10 @@
return $opt_realm;
}
+ if ($var eq "DNSDOMAIN") {
+ return $dnsdomain;
+ }
+
if ($var eq "HOSTNAME") {
return $opt_hostname;
}
@@ -230,6 +235,10 @@
ShowHelp();
}
+$opt_realm=uc($opt_realm);
+$opt_domain=uc($opt_domain);
+$opt_hostname=uc($opt_hostname);
+
print "Provisioning host '$opt_hostname' for domain '$opt_domain' in realm '$opt_realm'\n";
if (!$opt_nobody) {
@@ -269,7 +278,8 @@
print "generating ldif ...\n";
-$dnsname = "$opt_hostname.$opt_realm";
+$dnsdomain = lc($opt_realm);
+$dnsname = lc($opt_hostname).".".$dnsdomain;
$basedn = "DC=" . join(",DC=", split(/\./, $opt_realm));
my $data = FileLoad("provision.ldif") || die "Unable to load provision.ldif\n";
More information about the samba-cvs
mailing list