svn commit: samba r23827 - in branches: SAMBA_3_2/examples/misc SAMBA_3_2_0/examples/misc

[gd at samba.org]

Author: gd
Date: 2007-07-11 09:49:10 +0000 (Wed, 11 Jul 2007)
New Revision: 23827

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23827

Log:
Fix schema dump.

Guenther

Modified:
   branches/SAMBA_3_2/examples/misc/adssearch.pl
   branches/SAMBA_3_2_0/examples/misc/adssearch.pl


Changeset:
Modified: branches/SAMBA_3_2/examples/misc/adssearch.pl
===================================================================
--- branches/SAMBA_3_2/examples/misc/adssearch.pl	2007-07-11 09:39:08 UTC (rev 23826)
+++ branches/SAMBA_3_2/examples/misc/adssearch.pl	2007-07-11 09:49:10 UTC (rev 23827)
@@ -837,7 +837,8 @@
 
 	my $server = shift || "";
 	$dse = shift || get_dse($server,$async_ldap_hd) || return -1;
-	return $dse->get_value('defaultNamingContext');
+	return $dse->get_value($opt_dump_schema ? 'schemaNamingContext':
+						  'defaultNamingContext');
 }
 
 sub get_realm_from_rootdse {
@@ -1499,7 +1500,7 @@
 		critical => 'true',
 		value => "");
 
-	if (defined($opt_paging)) {
+	if (defined($opt_paging) || $opt_dump_schema) {
 		push(@ctrls, $ctl_paged);
 		push(@ctrls_s, "LDAP_PAGED_RESULT_OID_STRING" );
 	}
@@ -1787,9 +1788,9 @@
 
 	if ($opt_dump_schema) {
 		print "Dumping Schema:\n";
-		my $ads_schema = $async_ldap_hd->schema;
-		$ads_schema->dump;
-		exit 0;
+#		my $ads_schema = $async_ldap_hd->schema;
+#		$ads_schema->dump;
+#		exit 0;
 	}
 
 	while (1) {

Modified: branches/SAMBA_3_2_0/examples/misc/adssearch.pl
===================================================================
--- branches/SAMBA_3_2_0/examples/misc/adssearch.pl	2007-07-11 09:39:08 UTC (rev 23826)
+++ branches/SAMBA_3_2_0/examples/misc/adssearch.pl	2007-07-11 09:49:10 UTC (rev 23827)
@@ -837,7 +837,8 @@
 
 	my $server = shift || "";
 	$dse = shift || get_dse($server,$async_ldap_hd) || return -1;
-	return $dse->get_value('defaultNamingContext');
+	return $dse->get_value($opt_dump_schema ? 'schemaNamingContext':
+						  'defaultNamingContext');
 }
 
 sub get_realm_from_rootdse {
@@ -1499,7 +1500,7 @@
 		critical => 'true',
 		value => "");
 
-	if (defined($opt_paging)) {
+	if (defined($opt_paging) || $opt_dump_schema) {
 		push(@ctrls, $ctl_paged);
 		push(@ctrls_s, "LDAP_PAGED_RESULT_OID_STRING" );
 	}
@@ -1787,9 +1788,9 @@
 
 	if ($opt_dump_schema) {
 		print "Dumping Schema:\n";
-		my $ads_schema = $async_ldap_hd->schema;
-		$ads_schema->dump;
-		exit 0;
+#		my $ads_schema = $async_ldap_hd->schema;
+#		$ads_schema->dump;
+#		exit 0;
 	}
 
 	while (1) {