Changeset 988 for vendor/current/examples/misc

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

Location:

vendor/current/examples/misc

Files:

• adssearch.pl (modified) (3 diffs)
• swat.pl (deleted)
• wall.perl (modified) (1 diff)

vendor/current/examples/misc/adssearch.pl

@@ -43 +43 @@
 
 my $tdbdump     = "/usr/bin/tdbdump";
+my $ntdbdump    = "/usr/bin/ntdbdump";
 my $testparm    = "/usr/bin/testparm";
 my $net         = "/usr/bin/net";
@@ -48 +49 @@
 my $nmblookup   = "/usr/bin/nmblookup";
 my $secrets_tdb = "/etc/samba/secrets.tdb";
+my $secrets_ntdb = "/etc/samba/secrets.ntdb";
 my $klist       = "/usr/bin/klist";
 my $kinit       = "/usr/bin/kinit";
@@ -724 +726 @@
         $workgroup = uc($workgroup);
 
-        my ($found, $tmp);
-        -x $tdbdump || die "tdbdump is not installed. cannot proceed autodetection\n";
-        -r $secrets_tdb || die "cannot read $secrets_tdb. cannot proceed autodetection\n";
+        my ($found, $tmp, $dbdump, $db);
+        if (-r $secrets_ntdb) {
+            -x $ntdbdump || die "ntdbdump is not installed. cannot proceed autodetection\n";
+            $dbdump = $ntdbdump;
+            $db = $secrets_ntdb;
+        } else {
+            -x $tdbdump || die "tdbdump is not installed. cannot proceed autodetection\n";
+            -r $secrets_tdb || die "cannot read $secrets_tdb. cannot proceed autodetection\n";
+            $dbdump = $tdbdump;
+            $db = $secrets_tdb;
+        }
 
         # get machine-password
         my $key = sprintf("SECRETS/MACHINE_PASSWORD/%s", $workgroup);
-        open(SECRETS,"$tdbdump $secrets_tdb |");
+        open(SECRETS,"$dbdump $db |");
         while(my $line = <SECRETS>) {
                 chomp($line);

vendor/current/examples/misc/wall.perl

@@ -1 @@
-#!/usr/bin/perl
+#!/usr/local/bin/perl
 # 
 #@(#) smb-wall.pl Description: