[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-196-gc2295ec

Jelmer Vernooij jelmer at samba.org
Thu Jul 2 23:01:46 GMT 2009


The branch, master has been updated
       via  c2295ec65bef4f96991a68048a72b45c228f0509 (commit)
       via  4d9a929f8dd6fc597bc5ed6209548f85d30a64d3 (commit)
       via  e6fed3a87911a01a4acbcdff98f12c426c8d9512 (commit)
       via  b9cf441f82eb2ac8368ac7aac8ef8152d056958e (commit)
      from  909d42278a80bb463108e3716053da7155301753 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit c2295ec65bef4f96991a68048a72b45c228f0509
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Jul 1 14:49:18 2009 +0200

    s4 docs: Git has revision SHA's, not numbers.

commit 4d9a929f8dd6fc597bc5ed6209548f85d30a64d3
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Jul 1 16:54:02 2009 +0200

    s4: Remove stub endpoint mapper script.

commit e6fed3a87911a01a4acbcdff98f12c426c8d9512
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Jun 19 16:48:19 2009 +0200

    TOSHARG: Fix typo: s/aquire/acquire/

commit b9cf441f82eb2ac8368ac7aac8ef8152d056958e
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Jun 19 16:17:08 2009 +0200

    pidl: Don't run compile tests inside the tree, won't work yet.

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/Samba3-HOWTO/TOSHARG-BDC.xml |    2 +-
 pidl/tests/Util.pm                    |   12 ++++++++----
 source4/BUGS                          |    2 +-
 source4/scripting/bin/epdump          |   24 ------------------------
 4 files changed, 10 insertions(+), 30 deletions(-)
 delete mode 100755 source4/scripting/bin/epdump


Changeset truncated at 500 lines:

diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-BDC.xml b/docs-xml/Samba3-HOWTO/TOSHARG-BDC.xml
index ec3dea7..5aabb8b 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-BDC.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-BDC.xml
@@ -564,7 +564,7 @@ The creation of a BDC requires some steps to prepare the Samba server before
 	stored in the file <filename>private/MACHINE.SID</filename>.  For all versions of Samba released since 2.2.5
 	the domain SID is stored in the file <filename>private/secrets.tdb</filename>. This file is unique to each
 	server and cannot be copied from a PDC to a BDC; the BDC will generate a new SID at startup. It will overwrite
-	the PDC domain SID with the newly created BDC SID.  There is a procedure that will allow the BDC to aquire the
+	the PDC domain SID with the newly created BDC SID.  There is a procedure that will allow the BDC to acquire the
 	domain SID. This is described here.
 	</para>
 
diff --git a/pidl/tests/Util.pm b/pidl/tests/Util.pm
index 4ad216a..cfc5cf3 100644
--- a/pidl/tests/Util.pm
+++ b/pidl/tests/Util.pm
@@ -13,6 +13,8 @@ use strict;
 use FindBin qw($RealBin);
 use lib "$RealBin/../lib";
 
+use Parse::Pidl::Samba4 qw(is_intree);
+
 use Parse::Pidl;
 my $warnings = "";
 undef &Parse::Pidl::warning;
@@ -66,8 +68,12 @@ sub test_samba4_ndr
 
 SKIP: {
 
-	skip "no samba environment available, skipping compilation", 3 
-		if (system("pkg-config --exists ndr") != 0);
+	my $flags;
+	if (system("pkg-config --exists ndr") == 0 and !is_intree()) {
+		$flags = `pkg-config --libs --cflags ndr`;
+	} else {
+		skip "no samba environment available, skipping compilation", 3;
+	}
 
 	my $main = "
 #define uint_t unsigned int
@@ -134,8 +140,6 @@ $c
 		$cc = "cc";
 	}
 
-	my $flags = `pkg-config --libs --cflags ndr`;
-
 	my $cmd = "$cc $cflags -x c - -o $outfile $flags $ldflags";
 	$cmd =~ s/\n//g;
 	open CC, "|$cmd";
diff --git a/source4/BUGS b/source4/BUGS
index 1a9790d..c1df944 100644
--- a/source4/BUGS
+++ b/source4/BUGS
@@ -21,4 +21,4 @@ backup all configuration and data.
 
 We welcome your testing, please file bug reports at
 https://bugzilla.samba.org/, product: Samba4.  Please include as much
-information as possible, such as GIT revision number and backtraces.
+information as possible, such as GIT revision SHA and backtraces.
diff --git a/source4/scripting/bin/epdump b/source4/scripting/bin/epdump
deleted file mode 100755
index 15dee33..0000000
--- a/source4/scripting/bin/epdump
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/python
-
-# Unix SMB/CIFS implementation.
-# Copyright (C) Jelmer Vernooij <jelmer at samba.org> 2008
-#   
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#   
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#   
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-import sys
-
-if len(sys.argv) < 2:
-    print "Usage: %s <binding-string>" % sys.argv[0]
-    sys.exit(1)


-- 
Samba Shared Repository


More information about the samba-cvs mailing list