[samba] Fix printing initialization.
asn
asn at fedoraproject.org
Thu Oct 4 13:43:26 UTC 2012
commit 4380f14dd8154245cfbe52907e2d0cb2860963a7
Author: Andreas Schneider <asn at cryptomilk.org>
Date: Thu Oct 4 15:40:44 2012 +0200
Fix printing initialization.
samba-4.0.0rc2-build_idmap_manpages.patch | 33 ----
samba-4.0.0rc2-create_smbldaphelper.patch | 84 -----------
samba-4.0.0rc2-fix_panic_action.patch | 42 ------
samba-4.0.0rc2-fix_smb.conf_manpage_build.patch | 155 --------------------
...a-4.0.0rc2-fix_smbldaphelper_without_ldap.patch | 26 ----
samba-4.0.0rc2-make_smbldaphelper_lib.patch | 112 --------------
samba-4.0.0rc2-use_smb_man_style.patch | 30 ----
samba-4.0.0rc3-add_aes_enctypes_to_krb5_conf.patch | 64 ++++++++
samba-4.0.0rc3-fix_pam_smbpass_option.patch | 38 +++++
samba-4.0.0rc3-fix_printing_init.patch | 40 +++++
samba-4.0.0rc3-request_aes_krb_keys.patch | 35 +++++
samba.spec | 16 ++-
12 files changed, 192 insertions(+), 483 deletions(-)
---
diff --git a/samba-4.0.0rc3-add_aes_enctypes_to_krb5_conf.patch b/samba-4.0.0rc3-add_aes_enctypes_to_krb5_conf.patch
new file mode 100644
index 0000000..f34cef2
--- /dev/null
+++ b/samba-4.0.0rc3-add_aes_enctypes_to_krb5_conf.patch
@@ -0,0 +1,64 @@
+commit 06f3b1f0b0dcf9355a8d634cdb62f1f0a8ea4dbe
+Author: Günther Deschner <gd at samba.org>
+AuthorDate: Mon Dec 19 10:52:58 2011 +0100
+Commit: Günther Deschner <gd at samba.org>
+CommitDate: Tue Oct 2 16:22:31 2012 +0200
+
+ s3-kerberos: add aes enctypes to generated krb5.conf.
+
+ Guenther
+---
+ source3/libads/kerberos.c | 29 ++++++++++++++++++++++++-----
+ 1 file changed, 24 insertions(+), 5 deletions(-)
+
+diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c
+index fd39394..3183e26 100644
+--- a/source3/libads/kerberos.c
++++ b/source3/libads/kerberos.c
+@@ -831,6 +831,7 @@ bool create_local_private_krb5_conf_for_domain(const char *realm,
+ int fd;
+ char *realm_upper = NULL;
+ bool result = false;
++ char *aes_enctypes = NULL;
+
+ if (!lp_create_krb5_conf()) {
+ return false;
+@@ -870,15 +871,33 @@ bool create_local_private_krb5_conf_for_domain(const char *realm,
+ goto done;
+ }
+
+- /* FIXME: add aes here - gd */
++ aes_enctypes = talloc_strdup(fname, "");
++ if (aes_enctypes == NULL) {
++ goto done;
++ }
++
++#ifdef HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96
++ aes_enctypes = talloc_asprintf_append(aes_enctypes, "%s", "aes256-cts-hmac-sha1-96 ");
++ if (aes_enctypes == NULL) {
++ goto done;
++ }
++#endif
++#ifdef HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96
++ aes_enctypes = talloc_asprintf_append(aes_enctypes, "%s", "aes128-cts-hmac-sha1-96");
++ if (aes_enctypes == NULL) {
++ goto done;
++ }
++#endif
++
+ file_contents = talloc_asprintf(fname,
+ "[libdefaults]\n\tdefault_realm = %s\n"
+- "\tdefault_tgs_enctypes = RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n"
+- "\tdefault_tkt_enctypes = RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n"
+- "\tpreferred_enctypes = RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n\n"
++ "\tdefault_tgs_enctypes = %s RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n"
++ "\tdefault_tkt_enctypes = %s RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n"
++ "\tpreferred_enctypes = %s RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n\n"
+ "[realms]\n\t%s = {\n"
+ "\t%s\t}\n",
+- realm_upper, realm_upper, kdc_ip_string);
++ realm_upper, aes_enctypes, aes_enctypes, aes_enctypes,
++ realm_upper, kdc_ip_string);
+
+ if (!file_contents) {
+ goto done;
diff --git a/samba-4.0.0rc3-fix_pam_smbpass_option.patch b/samba-4.0.0rc3-fix_pam_smbpass_option.patch
new file mode 100644
index 0000000..3df3aab
--- /dev/null
+++ b/samba-4.0.0rc3-fix_pam_smbpass_option.patch
@@ -0,0 +1,38 @@
+commit fb3cf6c24270d22dad8ac9a1c12e8d77c8189f11
+Author: Andreas Schneider <asn at samba.org>
+AuthorDate: Tue Oct 2 14:25:40 2012 +0200
+Commit: Andreas Schneider <asn at samba.org>
+CommitDate: Thu Oct 4 10:20:35 2012 +0200
+
+ waf: Build pam_smbpass module only if enabled.
+---
+ source3/pam_smbpass/wscript_build | 3 ++-
+ source3/wscript | 3 +++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/source3/pam_smbpass/wscript_build b/source3/pam_smbpass/wscript_build
+index 70b21d5..a2a2d01 100644
+--- a/source3/pam_smbpass/wscript_build
++++ b/source3/pam_smbpass/wscript_build
+@@ -10,5 +10,6 @@ if bld.CONFIG_SET('WITH_PAM_MODULES'):
+ LIBNTLMSSP LIBTSOCKET''',
+ cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR,
+ realname='pam_smbpass.so',
+- install_path='${PAMMODULESDIR}'
++ install_path='${PAMMODULESDIR}',
++ enabled=bld.env.with_pam_smbpass
+ )
+diff --git a/source3/wscript b/source3/wscript
+index 765f761..e4898ef 100644
+--- a/source3/wscript
++++ b/source3/wscript
+@@ -762,6 +762,9 @@ int i; i = PAM_RADIO_TYPE;
+ conf.DEFINE('WITH_PAM', 1)
+ conf.DEFINE('WITH_PAM_MODULES', 1)
+
++ if Options.options.with_pam_smbpass:
++ conf.env.with_pam_smbpass = True
++
+ seteuid = False
+
+ #
diff --git a/samba-4.0.0rc3-fix_printing_init.patch b/samba-4.0.0rc3-fix_printing_init.patch
new file mode 100644
index 0000000..8179241
--- /dev/null
+++ b/samba-4.0.0rc3-fix_printing_init.patch
@@ -0,0 +1,40 @@
+commit 50de2c9bbbc25074f022b4b2cf9d49f8e9a53e01
+Author: Andreas Schneider <asn at samba.org>
+AuthorDate: Tue Oct 2 15:51:08 2012 +0200
+Commit: Andreas Schneider <asn at cryptomilk.org>
+CommitDate: Thu Oct 4 12:06:29 2012 +0200
+
+ s3fs-smbd: Make sure the registry is set up before we init printing.
+
+ Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
+ Autobuild-Date(master): Thu Oct 4 12:06:29 CEST 2012 on sn-devel-104
+---
+ source3/smbd/server.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/source3/smbd/server.c b/source3/smbd/server.c
+index 90bbb62..7dad13b 100644
+--- a/source3/smbd/server.c
++++ b/source3/smbd/server.c
+@@ -1471,6 +1471,10 @@ extern void build_options(bool screen);
+ }
+ }
+
++ if (!dcesrv_ep_setup(ev_ctx, msg_ctx)) {
++ exit(1);
++ }
++
+ /* only start other daemons if we are running as a daemon
+ * -- bad things will happen if smbd is launched via inetd
+ * and we fork a copy of ourselves here */
+@@ -1495,10 +1499,6 @@ extern void build_options(bool screen);
+ }
+ }
+
+- if (!dcesrv_ep_setup(ev_ctx, msg_ctx)) {
+- exit(1);
+- }
+-
+ if (!is_daemon) {
+ int sock;
+
diff --git a/samba-4.0.0rc3-request_aes_krb_keys.patch b/samba-4.0.0rc3-request_aes_krb_keys.patch
new file mode 100644
index 0000000..1c8c950
--- /dev/null
+++ b/samba-4.0.0rc3-request_aes_krb_keys.patch
@@ -0,0 +1,35 @@
+commit 1bf209dd7e5a0f0001b3d1e3798093772bbd3fd3
+Author: Karolin Seeger <kseeger at samba.org>
+AuthorDate: Thu Oct 4 11:43:20 2012 +0200
+Commit: Karolin Seeger <kseeger at samba.org>
+CommitDate: Thu Oct 4 13:48:00 2012 +0200
+
+ html docs: Remove link to Using Samba.
+
+ Thanks to Christian Perrier <bubulle at debian.org> for reporting!
+
+ Fix bug #7826 - HTML docs index file still points to Using Samba.
+
+ Karolin
+
+ Autobuild-User(master): Karolin Seeger <kseeger at samba.org>
+ Autobuild-Date(master): Thu Oct 4 13:48:00 CEST 2012 on sn-devel-104
+---
+ docs-xml/htmldocs.html | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/docs-xml/htmldocs.html b/docs-xml/htmldocs.html
+index 44fcc0f..6fb9e73 100644
+--- a/docs-xml/htmldocs.html
++++ b/docs-xml/htmldocs.html
+@@ -23,10 +23,6 @@
+ <td valign="top">This book provides example configurations, it documents key aspects of Microsoft Windows networking, provides in-depth insight into the important configuration of Samba-3, and helps to put all of these into a useful framework.</td>
+ </tr>
+ <tr>
+- <td valign="top"><a href="using_samba/toc.html">Using Samba</a>, 2nd Edition</td>
+- <td valign="top"><i>Using Samba</i>, Second Edition is a comprehensive guide to Samba administration. It covers all versions of Samba from 2.0 to 2.2, including selected features from an alpha version of 3.0, as well as the SWAT graphical configuration tool. Updated for Windows 2000, ME, and XP, the book also explores Samba's new role as a primary domain controller and domain member server, its support for the use of Windows NT/2000/XP authentication and filesystem security on the host Unix system, and accessing shared files and printers from Unix clients.</td>
+-</tr>
+-<tr>
+ <td valign="top"><a href="manpages/index.html">Man pages</a></td>
+ <td valign="top">The Samba man pages in HTML.</td>
+ </tr>
diff --git a/samba.spec b/samba.spec
index b613ccb..292fd7e 100644
--- a/samba.spec
+++ b/samba.spec
@@ -1,4 +1,4 @@
-%define main_release 151
+%define main_release 152
%define samba_version 4.0.0
%define talloc_version 2.0.7
@@ -65,6 +65,11 @@ Source100: smbprint
Source200: README.dc
Source201: README.downgrade
+Patch0: samba-4.0.0rc3-request_aes_krb_keys.patch
+Patch1: samba-4.0.0rc3-add_aes_enctypes_to_krb5_conf.patch
+Patch2: samba-4.0.0rc3-fix_pam_smbpass_option.patch
+Patch3: samba-4.0.0rc3-fix_printing_init.patch
+
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires(pre): /usr/sbin/groupadd
@@ -377,6 +382,11 @@ link against the SMB, RPC and other protocols.
%prep
%setup -q -n samba-%{version}%{pre_release}
+%patch0 -p1 -b .request_aes_krb_keys
+%patch1 -p1 -b .add_aes_enctypes_to_krb5_conf
+%patch2 -p1 -b .fix_pam_smbpass_option
+%patch3 -p1 -b .fix_printing_init
+
%build
%global _talloc_lib ,talloc,pytalloc,pytalloc-util
%global _tevent_lib ,tevent,pytevent
@@ -1245,6 +1255,10 @@ rm -rf %{buildroot}
%endif # with_libwbclient
%changelog
+* Thu Oct 04 2012 - Andreas Schneider <asn at redhat.com> - 2:4.0.0-152.rc1
+- Add kerberos AES support.
+- Fix printing initialization.
+
* Tue Oct 02 2012 - Andreas Schneider <asn at redhat.com> - 2:4.0.0-151.rc1
- Update to 4.0.0rc2.
More information about the scm-commits
mailing list