From: Günther Deschner <gd@samba.org>
Date: Tue, 10 Jul 2007 15:14:32 +0000 (+0000)
Subject: r23818: support LDAP_SERVER_SEARCH_OPTIONS_OID in adssearch.
X-Git-Tag: samba-4.0.0alpha6~801^2~5400
X-Git-Url: http://git.samba.org/samba.git/?p=bbaumbach%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=b8d696ebf0beb2dd858ffcb99be8589d2641f446

r23818: support LDAP_SERVER_SEARCH_OPTIONS_OID in adssearch.

Guenther
(This used to be commit 0f0200c43cdf3f7ced17e2dffdce7f4a4e8f533f)
---

diff --git a/examples/misc/adssearch.pl b/examples/misc/adssearch.pl
index bf9f75f8997..b880366c882 100755
--- a/examples/misc/adssearch.pl
+++ b/examples/misc/adssearch.pl
@@ -77,6 +77,7 @@ my (
 	$opt_port,
 	$opt_realm,
 	$opt_saslmech,
+	$opt_search_opt,
 	$opt_scope, 
 	$opt_simpleauth,
 	$opt_starttls,
@@ -108,6 +109,7 @@ GetOptions(
 	'saslmech|Y=s'	=> \$opt_saslmech,
 	'schema|c'	=> \$opt_dump_schema,
 	'scope|s=s'	=> \$opt_scope,
+	'searchopt:i'	=> \$opt_search_opt,
 	'simpleauth|x'	=> \$opt_simpleauth,
 	'tls|Z'		=> \$opt_starttls,
 	'user|U=s'	=> \$opt_user,
@@ -1464,6 +1466,21 @@ sub gen_controls {
 			critical => 'true',
 			value => $opt_display_extendeddn ? $ctl_extended_dn_val : "");
 
+	# setup search options
+	my $search_opt = Convert::ASN1->new;
+	$search_opt->prepare(
+		q<	searchopt ::= SEQUENCE {
+				flags     INTEGER
+			}
+		>
+	);
+
+	my $tmp = $search_opt->encode( flags => $opt_search_opt);
+	my $ctl_search_opt = Net::LDAP::Control->new( 
+		type => $ads_controls{'LDAP_SERVER_SEARCH_OPTIONS_OID'},
+		critical => 'true',
+		value => $tmp);
+
 	# setup notify control
 	my $ctl_notification = Net::LDAP::Control->new( 
 		type => $ads_controls{'LDAP_SERVER_NOTIFICATION_OID'},
@@ -1506,6 +1523,11 @@ sub gen_controls {
 		push(@ctrls_s, "LDAP_SERVER_DOMAIN_SCOPE_OID");
 	}
 
+	if ($opt_search_opt) {
+		push(@ctrls, $ctl_search_opt);
+		push(@ctrls_s, "LDAP_SERVER_SEARCH_OPTIONS_OID");
+	}
+
 	return @ctrls;
 }