[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Wed Nov 27 20:18:04 MST 2013
The branch, master has been updated
via 92489bf Cope with first element in hdb_method having a different name in different heimdal versions.
via a0eac12 Use heim_octet_string typedef.
via ac27e88 Remove no longer used et_deps.pl.
via 09e6a5e Remove no longer used asn1_deps.pl.
from 91c1053 Add a basic guide on pytalloc.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 92489bfed4e6350b6858d5e39d538f41768912ae
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Nov 23 19:46:29 2013 +0000
Cope with first element in hdb_method having a different name in different heimdal versions.
It's called `interface_version` in older Heimdal versions and
`version` in newer versions.
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Thu Nov 28 04:17:55 CET 2013 on sn-devel-104
commit a0eac12d5a19b1101a5273a1359508998fe5a0c9
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Nov 23 19:46:28 2013 +0000
Use heim_octet_string typedef.
The struct version is not provided by newer versions of heimdal.
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit ac27e88502734e1868c4f297f4df2e7729457367
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Nov 23 19:46:27 2013 +0000
Remove no longer used et_deps.pl.
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 09e6a5e1562218c3bb8d1e498e02a5bb4543d481
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Nov 23 19:46:26 2013 +0000
Remove no longer used asn1_deps.pl.
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
-----------------------------------------------------------------------
Summary of changes:
source4/heimdal_build/asn1_deps.pl | 103 -----------------------
source4/heimdal_build/et_deps.pl | 17 ----
source4/kdc/hdb-samba4-plugin.c | 2 +-
source4/rpc_server/backupkey/dcesrv_backupkey.c | 3 +-
4 files changed, 2 insertions(+), 123 deletions(-)
delete mode 100755 source4/heimdal_build/asn1_deps.pl
delete mode 100755 source4/heimdal_build/et_deps.pl
Changeset truncated at 500 lines:
diff --git a/source4/heimdal_build/asn1_deps.pl b/source4/heimdal_build/asn1_deps.pl
deleted file mode 100755
index 26be254..0000000
--- a/source4/heimdal_build/asn1_deps.pl
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/usr/bin/perl
-# Generate make dependency rules for asn1 files
-# Jelmer Vernooij <jelmer at samba.org> 2005
-# Andrew Bartlett <abartlet at samba.org> 2006-2009
-# Stefan Metzmacher <metze at samba.org> 2007
-# GPL
-
-use File::Basename;
-
-my $file = shift;
-my $prefix = shift;
-my $dirname = shift;
-my $options = join(' ', @ARGV);
-my $import;
-my @imports = ();
-my $dep;
-my @deps = ();
-
-$basename = basename($file);
-if (not defined $options) {
- $options = "";
-}
-
-my $header = "$dirname/$prefix.h";
-my $headerx = "$dirname/$prefix.hx";
-my $headerpriv = "$dirname/$prefix-priv.h";
-my $headerprivx = "$dirname/$prefix-priv.hx";
-my $o_file = "$dirname/asn1_$prefix.o";
-my $c_file = "$dirname/asn1_$prefix.c";
-my $x_file = "$dirname/asn1_$prefix.x";
-my $output_file = "$dirname/" . $prefix . "_asn1_files";
-
-print "basics:: $header\n";
-print "$output_file: \$(heimdalsrcdir)/$file \$(ASN1C)\n";
-print "\t\@echo \"Compiling ASN1 file \$(heimdalsrcdir)/$file\"\n";
-print "\t\@\$(heimdalbuildsrcdir)/asn1_compile_wrapper.sh \$(builddir) $dirname \$(ASN1C) \$(call abspath,\$(heimdalsrcdir)/$file) $prefix $options --one-code-file && touch $output_file\n";
-print "$headerx: $output_file\n";
-print "$header: $headerx\n";
-print "\t\@cp $headerx $header\n";
-print "$headerpriv: $headerprivx\n";
-print "\t\@cp $headerprivx $headerpriv\n";
-print "$x_file: $header $headerpriv\n";
-print "$c_file: $x_file\n";
-print "\t\@echo \"#include \\\"config.h\\\"\" > $c_file && cat $x_file >> $c_file\n\n";
-
-open(IN,"heimdal/$file") or die("Can't open heimdal/$file: $!");
-my @lines = <IN>;
-close(IN);
-foreach my $line (@lines) {
- if ($line =~ /^(\s*IMPORT)([\w\,\s])*(\s+FROM\s+)([\w]+[\w\-]+);/) {
- $import = $line;
- chomp $import;
- push @imports, $import;
- $import = undef;
- } elsif ($line =~ /^(\s*IMPORT).*/) {
- $import = $line;
- chomp $import;
- } elsif (defined($import) and ($line =~ /;/)) {
- $import .= $line;
- chomp $import;
- push @imports, $import;
- $import = undef;
- } elsif (defined($import)) {
- $import .= $line;
- chomp $import;
- }
-}
-
-foreach $import (@imports) {
- next unless ($import =~ /^(\s*IMPORT)([\w\,\s])*(\s+FROM\s+)([\w]+[\w\-]+);/);
-
- my @froms = split (/\s+FROM\s+/, $import);
- foreach my $from (@froms) {
- next if ($from =~ /^(\s*IMPORT).*/);
- if ($from =~ /^(\w+)/) {
- my $f = $1;
- $dep = 'HEIMDAL_'.uc($f).'_ASN1';
- push @deps, $dep;
- }
- }
-}
-
-unshift @deps, "HEIMDAL_HEIM_ASN1" unless grep /HEIMDAL_HEIM_ASN1/, @deps;
-my $depstr = join(' ', @deps);
-
-print '[SUBSYSTEM::HEIMDAL_'.uc($prefix).']'."\n";
-print "CFLAGS = -Iheimdal_build -Iheimdal/lib/roken -I$dirname\n";
-print "PUBLIC_DEPENDENCIES = $depstr\n\n";
-
-print "HEIMDAL_".uc($prefix)."_OBJ_FILES = ";
-print "\\\n\t$o_file";
-
-print "\n\n";
-
-print "clean:: \n";
-print "\t\@echo \"Deleting ASN1 output files generated from $file\"\n";
-print "\t\@rm -f $output_file\n";
-print "\t\@rm -f $header\n";
-print "\t\@rm -f $c_file\n";
-print "\t\@rm -f $x_file\n";
-print "\t\@rm -f $dirname/$prefix\_files\n";
-print "\t\@rm -f $dirname/$prefix\.h\n";
-print "\n";
diff --git a/source4/heimdal_build/et_deps.pl b/source4/heimdal_build/et_deps.pl
deleted file mode 100755
index 5914425..0000000
--- a/source4/heimdal_build/et_deps.pl
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/perl
-
-use File::Basename;
-
-my $file = shift;
-my $dirname = shift;
-my $basename = basename($file);
-
-my $header = "$dirname/$basename"; $header =~ s/\.et$/.h/;
-my $source = "$dirname/$basename"; $source =~ s/\.et$/.c/;
-print "basics:: $header\n";
-print "$header $source: \$(heimdalsrcdir)/$file \$(ET_COMPILER)\n";
-print "\t\@echo \"Compiling error table $file\"\n";
-print "\t\@\$(heimdalbuildsrcdir)/et_compile_wrapper.sh \$(builddir) $dirname \$(ET_COMPILER) \$(call abspath,\$(heimdalsrcdir)/$file) $source\n\n";
-
-print "clean:: \n";
-print "\t\@rm -f $header $source\n\n";
diff --git a/source4/kdc/hdb-samba4-plugin.c b/source4/kdc/hdb-samba4-plugin.c
index 568386d..9135df8 100644
--- a/source4/kdc/hdb-samba4-plugin.c
+++ b/source4/kdc/hdb-samba4-plugin.c
@@ -78,7 +78,7 @@ static krb5_error_code hdb_samba4_create(krb5_context context, struct HDB **db,
* The <address> is the string form of a pointer to a talloced struct hdb_samba_context
*/
struct hdb_method hdb_samba4_interface = {
- .interface_version = HDB_INTERFACE_VERSION,
+ HDB_INTERFACE_VERSION,
.prefix = "samba4",
.create = hdb_samba4_create
};
diff --git a/source4/rpc_server/backupkey/dcesrv_backupkey.c b/source4/rpc_server/backupkey/dcesrv_backupkey.c
index 83fb2bd..9020da7 100644
--- a/source4/rpc_server/backupkey/dcesrv_backupkey.c
+++ b/source4/rpc_server/backupkey/dcesrv_backupkey.c
@@ -972,8 +972,7 @@ static WERROR create_req(TALLOC_CTX *ctx, hx509_context *hctx, hx509_request *re
/* Return an error when we fail to generate a certificate */
static WERROR generate_bkrp_cert(TALLOC_CTX *ctx, struct dcesrv_call_state *dce_call, struct ldb_context *ldb_ctx, const char *dn)
{
-
- struct heim_octet_string data;
+ heim_octet_string data;
WERROR w_err;
RSA *rsa;
hx509_context hctx;
--
Samba Shared Repository
More information about the samba-cvs
mailing list