[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha5-429-gc6b8ba8
Andrew Bartlett
abartlet at samba.org
Fri Aug 29 05:27:02 GMT 2008
The branch, v4-0-test has been updated
via c6b8ba893dd3ed90bca32c0ae89fd33be729c238 (commit)
via 1367b94c8fb421dd517e7e8044af7606a4693365 (commit)
from acfa87f3411a61bdd9066fbbba2bcfbe2a60cbbe (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit c6b8ba893dd3ed90bca32c0ae89fd33be729c238
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Aug 29 15:06:30 2008 +1000
It turns out that the Netlogon PAC verification is encrypted.
This test now passes against Win2k3, and a implementation in the
Samba4 server should follow shortly.
Andrew Bartlett
commit 1367b94c8fb421dd517e7e8044af7606a4693365
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Aug 29 13:01:52 2008 +1000
Update packaging per suggestions on the review
Also make the build more C++ friendly with a patch from Brad Hards.
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
packaging/Fedora/cplusplus-headers.patch | 32 ++++++++++++++++++++++++++++++
packaging/Fedora/samba4.spec | 27 +++++++++++++++++++-----
source/librpc/idl/krb5pac.idl | 4 ++-
source/librpc/idl/netlogon.idl | 7 +++++-
source/torture/rpc/remote_pac.c | 4 ++-
5 files changed, 65 insertions(+), 9 deletions(-)
create mode 100644 packaging/Fedora/cplusplus-headers.patch
Changeset truncated at 500 lines:
diff --git a/packaging/Fedora/cplusplus-headers.patch b/packaging/Fedora/cplusplus-headers.patch
new file mode 100644
index 0000000..ce05f54
--- /dev/null
+++ b/packaging/Fedora/cplusplus-headers.patch
@@ -0,0 +1,32 @@
+diff -Naur samba-4.0.0alpha5-orig/source/lib/events/events.h samba-4.0.0alpha5/source/lib/events/events.h
+--- samba-4.0.0alpha5-orig/source/lib/events/events.h 2008-06-30 19:34:11.000000000 +1000
++++ samba-4.0.0alpha5/source/lib/events/events.h 2008-07-25 20:02:56.000000000 +1000
+@@ -53,24 +53,24 @@
+
+ struct fd_event *event_add_fd(struct event_context *ev, TALLOC_CTX *mem_ctx,
+ int fd, uint16_t flags, event_fd_handler_t handler,
+- void *private);
++ void *private_data);
+
+ struct timed_event *event_add_timed(struct event_context *ev, TALLOC_CTX *mem_ctx,
+ struct timeval next_event,
+ event_timed_handler_t handler,
+- void *private);
++ void *private_data);
+
+ struct signal_event *event_add_signal(struct event_context *ev, TALLOC_CTX *mem_ctx,
+ int signum, int sa_flags,
+ event_signal_handler_t handler,
+- void *private);
++ void *private_data);
+
+ struct iocb;
+ struct aio_event *event_add_aio(struct event_context *ev,
+ TALLOC_CTX *mem_ctx,
+ struct iocb *iocb,
+ event_aio_handler_t handler,
+- void *private);
++ void *private_data);
+
+ int event_loop_once(struct event_context *ev);
+ int event_loop_wait(struct event_context *ev);
diff --git a/packaging/Fedora/samba4.spec b/packaging/Fedora/samba4.spec
index 45d1429..dfdd368 100644
--- a/packaging/Fedora/samba4.spec
+++ b/packaging/Fedora/samba4.spec
@@ -1,4 +1,5 @@
-%define main_release 2
+
+%define main_release 5
%define alpha_version 5
%define samba_version 4.0.0alpha%{alpha_version}
%define tarball_name samba-4.0.0alpha%{alpha_version}
@@ -13,12 +14,16 @@ Summary: The Samba4 CIFS and AD client and server suite
Name: samba4
Version: 4.0.0
Release: 0.%{main_release}.alpha%{alpha_version}%{?dist}
-License: GPLv3+, LGPLv3+, BSD
+License: GPLv3+ and LGPLv3+
Group: System Environment/Daemons
URL: http://www.samba.org/
Source: http://download.samba.org/samba/ftp/samba4/%{tarball_name}.tar.gz
+# To be removed when samba4 alpha6 is released
+# From http://git.samba.org/?p=samba.git;a=commitdiff;h=7ca421eb32bed3c400f863b654712d922c82bfb9
+Patch0: cplusplus-headers.patch
+
# Red Hat specific replacement-files
Source1: %{name}.log
Source4: %{name}.sysconfig
@@ -95,8 +100,6 @@ and Wireshark to parse IDL and similar protocols
Summary: Files used by both Samba servers and clients
Group: Applications/System
Requires: %{name}-libs = %{version}-%{release}
-Requires(post): /sbin/chkconfig, /sbin/service
-Requires(preun): /sbin/chkconfig, /sbin/service
%description common
%{Name}-common provides files necessary for both the server and client
@@ -121,7 +124,7 @@ domains and to use Windows user and group accounts on Linux.
# copy Red Hat specific scripts
# Upstream patches
-#(none)
+%patch0 -p1 -b .
mv source/VERSION source/VERSION.orig
sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&%{release}/' < source/VERSION.orig > source/VERSION
@@ -138,7 +141,7 @@ cd source
--with-piddir=/var/run \
--with-privatedir=/var/lib/%{name}/private \
--with-logfilebase=/var/log/%{name} \
- --with-configdir=%{_sysconfdir}/%{name} \
+ --sysconfdir=%{_sysconfdir}/%{name} \
--with-winbindd-socket-dir=/var/run/winbind \
--with-ntp-signd-socket-dir=/var/run/ntp_signd \
--disable-gnutls
@@ -350,6 +353,18 @@ exit 0
%doc WHATSNEW.txt
%changelog
+* Fri Aug 29 2008 Andrew Bartlett <abartlet at samba.org> - 0:4.0.0-0.5.alpha5.fc10
+- Fix licence tag (the binaries are built into a GPLv3 whole, so the BSD licence need not be mentioned)
+
+* Fri Jul 25 2008 Andrew Bartlett <abartlet at samba.org> - 0:4.0.0-0.4.alpha5.fc10
+- Remove talloc and tdb dependency (per https://bugzilla.redhat.com/show_bug.cgi?id=453083)
+- Fix deps on chkconfig and service to main pkg (not -common)
+ (per https://bugzilla.redhat.com/show_bug.cgi?id=453083)
+
+* Mon Jul 21 2008 Brad Hards <bradh at frogmouth.ent> - 0:4.0.0-0.3.alpha5.fc10
+- Use --sysconfdir instead of --with-configdir
+- Add patch for C++ header compatibility
+
* Mon Jun 30 2008 Andrew Bartlett <abartlet at samba.org> - 0:4.0.0-0.2.alpha5.fc9
- Update per review feedback
- Update for alpha5
diff --git a/source/librpc/idl/krb5pac.idl b/source/librpc/idl/krb5pac.idl
index 699f0b8..dcee280 100644
--- a/source/librpc/idl/krb5pac.idl
+++ b/source/librpc/idl/krb5pac.idl
@@ -100,8 +100,10 @@ interface krb5pac
PAC_BUFFER_RAW buffers[num_buffers];
} PAC_DATA_RAW;
+ const int NETLOGON_GENERIC_KRB5_PAC_VALIDATE = 3;
+
typedef [public] struct {
- uint32 MessageType;
+ [value(NETLOGON_GENERIC_KRB5_PAC_VALIDATE)] uint32 MessageType;
uint32 ChecksumLength;
uint32 SignatureType;
uint32 SignatureLength;
diff --git a/source/librpc/idl/netlogon.idl b/source/librpc/idl/netlogon.idl
index 006411d..2298106 100644
--- a/source/librpc/idl/netlogon.idl
+++ b/source/librpc/idl/netlogon.idl
@@ -240,6 +240,11 @@ interface netlogon
lsa_String unknown4;
} netr_PacInfo;
+ typedef [flag(NDR_PAHEX)] struct {
+ uint32 length;
+ [size_is(length)] uint8 *data;
+ } netr_GenericInfo2;
+
typedef enum {
NetlogonValidationUasInfo = 1,
NetlogonValidationSamInfo = 2,
@@ -252,7 +257,7 @@ interface netlogon
[case(NetlogonValidationSamInfo)] netr_SamInfo2 *sam2;
[case(NetlogonValidationSamInfo2)] netr_SamInfo3 *sam3;
[case(4)] netr_PacInfo *pac;
- [case(NetlogonValidationGenericInfo2)] netr_PacInfo *pac;
+ [case(NetlogonValidationGenericInfo2)] netr_GenericInfo2 *generic;
[case(NetlogonValidationSamInfo4)] netr_SamInfo6 *sam6;
} netr_Validation;
diff --git a/source/torture/rpc/remote_pac.c b/source/torture/rpc/remote_pac.c
index a01077a..58c8ba0 100644
--- a/source/torture/rpc/remote_pac.c
+++ b/source/torture/rpc/remote_pac.c
@@ -154,7 +154,9 @@ static bool test_PACVerify(struct torture_context *tctx,
(ndr_push_flags_fn_t)ndr_push_PAC_Validate);
torture_assert(tctx, NDR_ERR_CODE_IS_SUCCESS(ndr_err), "ndr_push_struct_blob of PACValidate structure failed");
-
+ torture_assert(tctx, (creds->negotiate_flags & NETLOGON_NEG_ARCFOUR), "not willing to even try a PACValidate without RC4 encryption");
+ creds_arcfour_crypt(creds, pac_wrapped.data, pac_wrapped.length);
+
/* Validate it over the netlogon pipe */
generic.identity_info.parameter_control = 0;
--
Samba Shared Repository
More information about the samba-cvs
mailing list