[SCM] Samba Shared Repository - branch v3-5-stable updated
Karolin Seeger
kseeger at samba.org
Mon Jun 21 02:33:03 MDT 2010
The branch, v3-5-stable has been updated
via fb5b75d... s3-docs: Add missing whitespace.
via 41a38ac... WHATSNEW: Update changes since 3.5.3.
via 8b5c251... s3-docs: Fix some of ntlm_auth ntlm-server-1 protocol documentation.
via fbbefbc... s3:configure: use cc for linking on IRIX and fix shlib usage
via 0d9db4b... s3:vfs_scannedonly: fix a build issue on IRIX and HP-UX
via 5e6dbbb... check if LD_AS_NEEDED breaks linking with libreadline fixes #7209
via 864a2bd... s3-auth: in make_user_info_for_reply_enc make sure to check length and data pointer of nt and lm hash.
via 4ee20c7... s3-spoolss: fix some crash bugs and missing error codes in AddDriver paths.
via 4d0c756... s3:Makefile: fix a typo in flag variable name
via 4ab4485... s3:build: remove CFLAGS from Solaris LDSHFLAGS, SHLD has them already
via 3a08fd1... s3: final test for working shlib support requires PICFLAG (cherry picked from commit 85cbb1a6b371e2282f0115e87e803c6fdc03c07c)
via a3c43c9... s3: use autoconf macro to get some debug output in config.log (cherry picked from commit 87a0f216eb6929e48b1c3c234426d29fdab38dc8)
via 657a7da... s3: fix check for pie compiler flags
via fa0617b... s3: add m4 macro to check if stderr is empty or not (cherry picked from commit 6f2bf6cf9d2b5ed3ca2992e26f442035764e0762)
via e35985f... s3:configure: add Werror_FLAGS for IBM's xlc (cherry picked from commit 8c4cdf30ae254b4c5ff9eff221529abc98855857)
via 1016be1... s3:Makefile: add missing linker flags for smbfilter
via e9cda33... s3:Makefile: position independency is also needed for shared libs (cherry picked from commit 6a9aa4c2b3bebe06de97524a5c5ca577aaa3d14c)
via e7310c5... s3:build: don't use pieflags twice - ldflags already have them (cherry picked from commit 60ad93f074d83a65df080b85e43ea61722340a1c)
via 4797134... s3:configure: turn "error warnings" into errors
via bf543a1... s3: fix calculation of st_blocks in streams_xattr
via 3e2a38d... s3: Fix EnumDomainAliases when no aliases are in LDAP
via 097ccfa... s3:pdb_ldap: fix bug 7507 - init_sam_from_ldap stores group in sid2uid cache (cherry picked from commit ba809ecb8ab217e4376bf75d2300e146b62b88eb) (cherry picked from commit cc740fb5eb56a0875703753d4a116d2fe33ec186)
via 0d41e47... s3: Fix bug 7253
via ddb2cef... s3-netdomjoin-gui: Fix Bug #7500. Fix 'not a string literal' warning in netdomjoin-gui.
via 3a63572... s3: Allow previous password to be stored and use it to check tickets
via c31ac2e... s3-samr: Fix crash bug in _samr_QueryUserInfo{2} level 18.
via 920e575... s3-selftest: enable RPC-WINREG against s3.
via ecd91e5... s3-winreg_nt: Fixed QueryValue with data=NULL to get the length. (cherry picked from commit 4567bf9df53e62c0f30279235d56d13cb38de190) (cherry picked from commit b541fb1500aad87aee46ef48036f3b4a05b119cd)
via 7ca739f... s3-winreg: change notify call has no meaning when called remotely.
via 19c4053... s3-winreg: make QueryValue pass RPC-WINREG test again.
via fc48f6e... Fix bug #7448 - smbd crash when sambaLMPassword and sambaNTPassword entries missing from ldap.
via c7f814f... s3-selftest: deal with changed samba3 test names.
via 5f7fa42... Fix what looks like a cut-and-paste error in our read_negTokenInit() function.
via a160aed... Fix bug #7410 - samba sends "raw" inode number as uniqueid with unix extensions.
via 7bc852f... s3: Fix a typo found by ITPFS oota <t-oota at dh.jp.nec.com>
via 7cb2740... Fix bug #7188 - Logic error in check of total_data for call_trans2mkdir()
via be88d6e... s3-kerberos: temporary fix for ipv6 in print_kdc_line().
via ad44d0c... s3-kerberos: pass down kdc_name to create_local_private_krb5_conf_for_domain().
via c654bc0... s3-winbind: make the getpeername() checks in cm_prepare_connection IPv6 aware.
via ad8e0a9... s3-spoolss: Added EN ISO 216, A0 and A1 to builtin forms.
from 82ef3f0... WHATSNEW: Prepare Samba 3.5.4 release notes.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-stable
- Log -----------------------------------------------------------------
commit fb5b75d26b882c48ac073b6425dfce15873c243e
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Jun 21 10:30:25 2010 +0200
s3-docs: Add missing whitespace.
Karolin
(cherry picked from commit 2352538362977e456e8d05783f2732ff650cea41)
(cherry picked from commit 9d9a9a0f79ad6fa894f72a4678f59fb40c9fce94)
commit 41a38acddf2cd6fa8e1437ca05e4df0a27f646ae
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Jun 18 13:59:30 2010 +0200
WHATSNEW: Update changes since 3.5.3.
Karolin
(cherry picked from commit 656160ef0643aeba28c7db499ddb1e840c78e4bb)
commit 8b5c25177a7c496bee3e12b23880c2088b21d83d
Author: Günther Deschner <gd at samba.org>
Date: Wed Jun 16 17:08:36 2010 +0200
s3-docs: Fix some of ntlm_auth ntlm-server-1 protocol documentation.
Guenther
(cherry picked from commit cfb67b1a169350a8316532eb5d53de4a3f2bacb3)
(cherry picked from commit b3ccbcb83650cea627ad97e920d3f73659ffa6a0)
commit fbbefbc0e2c821a5a05e7157ad4a9422ea87e4d4
Author: Björn Jacke <bj at sernet.de>
Date: Wed Jun 16 23:36:38 2010 +0200
s3:configure: use cc for linking on IRIX and fix shlib usage
The last two patches address bug #7504 (numerous build glitches to be fixed).
(cherry picked from commit fe9dde3a629db9ae98ff6d94be145aa7e7c2d9ce)
commit 0d9db4b4ad2bd32c461661d641484f35affe1856
Author: Björn Jacke <bj at sernet.de>
Date: Wed Feb 3 23:28:38 2010 +0100
s3:vfs_scannedonly: fix a build issue on IRIX and HP-UX
this is a cherry-pick of ae95e8028c294ee1e2dc66a7a62d006572142629
(cherry picked from commit 4a7f1c92f7a1471f5edf06736835a5dc979af3f7)
commit 5e6dbbb3ffbb388f8a934c8ee9a9c15f68cb50a5
Author: Olaf Flebbe <o.flebbe at science-computing.de>
Date: Tue May 25 13:22:56 2010 +0200
check if LD_AS_NEEDED breaks linking with libreadline fixes #7209
Signed-off-by: Simo Sorce <idra at samba.org>
(cherry picked from commit 7aa8af144efc6d57f33b90ac856096aa7089468d)
(cherry picked from commit f2330cc029243c70043b18554241363d890c96e7)
commit 864a2bd71f17c869356770a0d34fbf828b9aa27f
Author: Günther Deschner <gd at samba.org>
Date: Wed Jun 16 14:18:45 2010 +0200
s3-auth: in make_user_info_for_reply_enc make sure to check length and data pointer of nt and lm hash.
This fixes kernel cifs client with sec=ntlmv2.
Guenther
(cherry picked from commit b4364add896d1657263a66c55d867d28bf5ceb1b)
Fix bug #7517 (session setup from linux kernel cifs client fails with
sec=ntlmv2).
(cherry picked from commit a95df865d474b0ba59ad95dcb8c20c923c66f4ba)
commit 4ee20c7d5ff2f3f127b7a198e968d6539bcb5602
Author: Günther Deschner <gd at samba.org>
Date: Fri Apr 23 02:34:43 2010 +0200
s3-spoolss: fix some crash bugs and missing error codes in AddDriver paths.
Found by torture test.
Guenther
(cherry picked from commit 413ffe9adb8eea488133da0249dcb2eca08fd69d)
Addresses bug #7459 (after upgrade to samba 3.4 and 3.5 lose ability to control duplex
for normal domain user).
(cherry picked from commit 286f4b53993fab0ffc53e5619e2987dfb13b0ec2)
commit 4d0c7560b1eb028ad653ca6928234c83238ae9ec
Author: Björn Jacke <bj at sernet.de>
Date: Wed Jun 16 13:48:53 2010 +0200
s3:Makefile: fix a typo in flag variable name
This is the backport of 60cba59ff8ee75e3d476c1b293ca2f545b7f9e49 and fixes
another build error on AIX.
see also bug #7504 (numerous build glitches to be fixed)
(cherry picked from commit be585bb0cd81f5ddd3345f04990eaddfa1e13eda)
commit 4ab4485676d3ae203e83718d954e7ec6d695b33a
Author: Björn Jacke <bj at sernet.de>
Date: Wed May 12 19:05:37 2010 +0200
s3:build: remove CFLAGS from Solaris LDSHFLAGS, SHLD has them already
The last 9 patches address bug #7504 (numerous build glitches to be fixed).
(cherry picked from commit 6c78aca691a9951a5a5c27e538df8c8376a74db1)
commit 3a08fd15283a026c8781eb75386af451e8cd9c79
Author: Björn Jacke <bj at sernet.de>
Date: Mon May 31 00:26:01 2010 +0200
s3: final test for working shlib support requires PICFLAG
(cherry picked from commit 85cbb1a6b371e2282f0115e87e803c6fdc03c07c)
commit a3c43c9a9905c6b6fc05f41979f8b4272eedc4b7
Author: Björn Jacke <bj at sernet.de>
Date: Sun May 30 23:50:48 2010 +0200
s3: use autoconf macro to get some debug output in config.log
(cherry picked from commit 87a0f216eb6929e48b1c3c234426d29fdab38dc8)
commit 657a7da5211f11928de7f4c83b3fd56fb609951a
Author: Björn Jacke <bj at sernet.de>
Date: Sat May 29 01:40:21 2010 +0200
s3: fix check for pie compiler flags
some compilers (HP and Sun e.g.) output warning messages on stderr for unknown
options and we ended up partly using some unwanted random compile flags we
did't intend to use.
(cherry picked from commit e8468ab02b201885b6a211c4b27913014ee9a5a2)
commit fa0617bca326e69aa51a6046adecdfde9829cd06
Author: Björn Jacke <bj at sernet.de>
Date: Sat May 29 01:39:16 2010 +0200
s3: add m4 macro to check if stderr is empty or not
(cherry picked from commit 6f2bf6cf9d2b5ed3ca2992e26f442035764e0762)
commit e35985f96c7c04cbf0a5128e6da275a09aa8e5f6
Author: Björn Jacke <bj at sernet.de>
Date: Mon May 24 23:28:44 2010 +0200
s3:configure: add Werror_FLAGS for IBM's xlc
(cherry picked from commit 8c4cdf30ae254b4c5ff9eff221529abc98855857)
commit 1016be19742a379531c0547a6f768562dc3a8efd
Author: Björn Jacke <bj at sernet.de>
Date: Wed May 26 17:22:24 2010 +0200
s3:Makefile: add missing linker flags for smbfilter
this should fix the AIX build
(cherry picked from commit 634577b29d8eea085c79e35d34d6e242a0a9f5a2)
commit e9cda33a7d399de293b0586463939a434cc2aa3c
Author: Björn Jacke <bj at sernet.de>
Date: Mon May 24 12:21:40 2010 +0200
s3:Makefile: position independency is also needed for shared libs
(cherry picked from commit 6a9aa4c2b3bebe06de97524a5c5ca577aaa3d14c)
commit e7310c576e829865eeea964da93dc0ce1ff744e4
Author: Björn Jacke <bj at sernet.de>
Date: Sat May 22 16:48:16 2010 +0200
s3:build: don't use pieflags twice - ldflags already have them
(cherry picked from commit 60ad93f074d83a65df080b85e43ea61722340a1c)
commit 4797134ac2523f5521161024391424a6d8dd37df
Author: Björn Jacke <bj at sernet.de>
Date: Mon May 24 23:34:00 2010 +0200
s3:configure: turn "error warnings" into errors
By default "Missing argument(s)" is just an "error warning" for xlc :-)
The change to turn "error warnings" into errors should fix bug #7427.
(cherry picked from commit ff0872d59d78ad42212c88313ef924ea4eb7a8a1)
Fix bug #7427 (Using IBM xl_C compiler produces wrong results in configure).
(cherry picked from commit 08c1c5f87e249a6f42dc5d78d8429689e1ec7274)
commit bf543a1372bbb3aada53e0bd249ba52209cc07cd
Author: Björn Jacke <bj at sernet.de>
Date: Wed Jun 9 15:24:26 2010 +0200
s3: fix calculation of st_blocks in streams_xattr
Thanks to Joachim Schmitz for finding that miscalculation.
(cherry picked from commit 6a6bb768c6542d738a8b2b6da282159a65ed611d)
Fix bug #7503 (vfs_stream_xattr calculates st_blocks wrong).
(cherry picked from commit 3f8a03cfdaa29e54b50738df4e7b782228e2d931)
commit 3e2a38d6ebdbfad1e7b6d6f86dfa85cd1f591e89
Author: Volker Lendecke <vl at samba.org>
Date: Thu Jun 10 15:40:14 2010 +0200
s3: Fix EnumDomainAliases when no aliases are in LDAP
We used to return NT_STATUS_ACCESS_DENIED, now we just return 0 entries, just
like W2k8 does.
usrmgr.exe was pretty unhappy with the NT_STATUS_ACCESS_DENIED
(cherry picked from commit f66cc827096c53d4d16b8c850c83a3b5664e9725)
Fix bug #7262 (Unable to maintain users' groups via UsrMgr).
(cherry picked from commit 1439a1d7ff406dd5dce885100349751151c14bf6)
commit 097ccfaaf1b45b965ddde492b0fb7f9edf752775
Author: Michael Adam <obnox at samba.org>
Date: Thu Jun 10 11:56:15 2010 +0200
s3:pdb_ldap: fix bug 7507 - init_sam_from_ldap stores group in sid2uid cache
(cherry picked from commit ba809ecb8ab217e4376bf75d2300e146b62b88eb)
(cherry picked from commit cc740fb5eb56a0875703753d4a116d2fe33ec186)
commit 0d41e47068d96c800ae91fc805c4032228297d2d
Author: Volker Lendecke <vl at samba.org>
Date: Tue Mar 16 21:03:34 2010 +0100
s3: Fix bug 7253
acct_ctrl is 32 bit in LOGIN_CACHE, but "w" as a format specifier for
tdb_unpack only writes 16 bits. Okay on x86, not okay on Solaris.
Thanks to Vladimir.Marek at Sun.COM!
Volker
(cherry picked from commit 556b6f83d66d7268651ac7ba153fa47ff6a5e776)
commit ddb2cef5304109580d85ab077f958c878f4325d3
Author: Günther Deschner <gd at samba.org>
Date: Tue Jun 8 11:25:00 2010 +0200
s3-netdomjoin-gui: Fix Bug #7500. Fix 'not a string literal' warning in netdomjoin-gui.
Patch from Buchan Milne <bgmilne at mandriva.org>.
Thanks!
Guenther
(cherry picked from commit 575b1018c65312e9eab562cf4851524cf2f8f24a)
(cherry picked from commit 1419c154d67b8ffaf0d6e2e3ba103121ab3736f5)
commit 3a635728edb2a54c7cf6eb2d0660457b4840034b
Author: Matthieu Patou <mat at matws.net>
Date: Fri May 21 11:57:29 2010 +0400
s3: Allow previous password to be stored and use it to check tickets
This patch is to fix bug 7099. It stores the current password in the
previous password key when the password is changed. It also check the
user ticket against previous password.
Signed-off-by: Günther Deschner <gd at samba.org>
Fix bug #7099 (Every Thursday at 11:08-11:15am Windows Client
Connections break with Kerberos errors).
(cherry picked from commit 89eea1fa9154c67ae4d3e729a8db7ad17ec9b9d7)
commit c31ac2ebd5ce850f87f4e29dab8e009def1b4e87
Author: Günther Deschner <gd at samba.org>
Date: Fri May 28 14:11:53 2010 +0200
s3-samr: Fix crash bug in _samr_QueryUserInfo{2} level 18.
Guenther
Fix bug #7479 (Crash bug in _samr_QueryUserInfo{2} level 18.)
(cherry picked from commit 386a4621b8c9e8f7956320a44679789b731d7b10)
commit 920e5757f764f25290241b54769a334ca4dd7d5b
Author: Günther Deschner <gd at samba.org>
Date: Tue May 25 14:13:20 2010 +0200
s3-selftest: enable RPC-WINREG against s3.
Guenther
The last 4 patches address bug #7453 (winreg: QueryValue crashes on NULL pointer
dereference).
(cherry picked from commit 73d413524e62796fdcfa4ac06a6499ecd6b9978f)
commit ecd91e5fae95bef8be26418238be1b0f01d0e431
Author: Andreas Schneider <asn at samba.org>
Date: Fri Apr 16 11:04:27 2010 +0200
s3-winreg_nt: Fixed QueryValue with data=NULL to get the length. (cherry picked from commit 4567bf9df53e62c0f30279235d56d13cb38de190)
(cherry picked from commit b541fb1500aad87aee46ef48036f3b4a05b119cd)
commit 7ca739f14880d3e892b438b761aa6815063f4333
Author: Günther Deschner <gd at samba.org>
Date: Tue Mar 16 15:29:14 2010 +0100
s3-winreg: change notify call has no meaning when called remotely.
Just return not supported to make smbtorture happy.
Guenther
(cherry picked from commit e46d3d9475c59af8ba6810aeb1403c1aa9e37d9d)
(cherry picked from commit 5d9f173d28fab6ea1afc36978c88f881bb7da52e)
commit 19c4053598e44966f5bd02ed8b52a815e89a9b1b
Author: Günther Deschner <gd at samba.org>
Date: Thu Mar 11 20:48:24 2010 +0100
s3-winreg: make QueryValue pass RPC-WINREG test again.
Guenther
(cherry picked from commit 24a7f8f2dbae73e862b9b3d4c6f0692054c354b3)
(cherry picked from commit 4f527cf96a2c208c32f97073b6453386b4a1825c)
commit fc48f6e03afb6bf8f78694f5bfe8a3ab09289cef
Author: Roel van Meer <rolek at bokxing.nl>
Date: Fri May 21 14:17:17 2010 -0700
Fix bug #7448 - smbd crash when sambaLMPassword and sambaNTPassword entries missing from ldap.
Protect SMBsesskeygen_ntv1() from a NULL pointer.
(cherry picked from commit 4c5a1b6b17b5575ea943eaf0472453222579365a)
commit c7f814f13f0657441256a9a9bd5a046603cc7a06
Author: Günther Deschner <gd at samba.org>
Date: Tue May 25 13:09:46 2010 +0200
s3-selftest: deal with changed samba3 test names.
Guenther
(cherry picked from commit 144b973cc4d0afa4df6ada9243922206437b5fa1)
commit 5f7fa425e04884fbd830004ef933aa6e119fb31d
Author: Jeremy Allison <jra at samba.org>
Date: Thu May 20 14:30:44 2010 -0700
Fix what looks like a cut-and-paste error in our read_negTokenInit() function.
We should never be calling asn1_push_XXX functions inside an asn1
reading function. Change asn1_push_tag() -> asn1_start_tag() and
asn1_pop_tag() -> asn1_end_tag(). This allows us to connect to a
NetApp filer at the Microsoft plugfest.
Andrew PLEASE CHECK !
Jeremy.
Fix bug #7449 (spnego data mis-parsed - returns incorrect mechListMIC string).
(cherry picked from commit 70098b751c10e632738f687976e6ef5e5fb2fc7b)
commit a160aeddea2d9dedaa9e66ac30b4bf713c68192f
Author: Jeremy Allison <jra at samba.org>
Date: Thu May 20 11:36:47 2010 -0700
Fix bug #7410 - samba sends "raw" inode number as uniqueid with unix extensions.
Move to a consistent get_FileIndex() function for all inode returns,
that checks if st_dev on the file is identical to the top directory
dev_t of the exported share, and if so uses the raw 64-bit inode
number. If it isn't (we've traversed a mount point) - return what
we used to do for Windows which is the concatination of the bottom
32-bits of the inode with the 32-bit device number. We can get more
creative with this over time (hashing?) if we want as now all inode returns go
through this single function.
Jeremy.
(cherry picked from commit 920ffe49290cacd30d9bc582c1c3fee38308c260)
commit 7bc852f91dcb977aa70c6ce63c2631881be18b6a
Author: Volker Lendecke <vl at samba.org>
Date: Mon May 24 11:23:42 2010 +0200
s3: Fix a typo found by ITPFS oota <t-oota at dh.jp.nec.com>
Thanks!
(cherry picked from commit d12768cc0ae52d95ffd83070948c83af4ce8704b)
(cherry picked from commit 167c082c1eb18f8360d094c96cbcef4ce48d935b)
commit 7cb2740c55b0387b0d992addcec6eee11ab4e169
Author: Jeremy Allison <jra at samba.org>
Date: Mon Mar 15 15:04:18 2010 -0700
Fix bug #7188 - Logic error in check of total_data for call_trans2mkdir()
Make ea data checks identical for trans2open and trans2mkdir.
Jeremy.
(cherry picked from commit 704a607e3c3a5c3e727b386fab9dbcdff56b5ac4)
(cherry picked from commit 0c20af069105befe8cf530050b5f948cde5391fe)
commit be88d6e2d3b66450a6ac083a046a62520bdc98aa
Author: Günther Deschner <gd at samba.org>
Date: Sat May 15 00:34:35 2010 +0200
s3-kerberos: temporary fix for ipv6 in print_kdc_line().
Currently no krb5 lib supports "kdc = ipv6 address" at all, so for now just fill
in just the kdc_name if we have it and let the krb5 lib figure out the
appropriate ipv6 address
ipv6 gurus, please check.
Guenther
(cherry picked from commit dd5a4e23f8c24564d3fd21bb8d01172321087362)
The last 3 patches fix bug #7341 (winbind not working over IPv6).
(cherry picked from commit 5ab33bec40739c7c86b17536fd6cdc04fc0f91b2)
commit ad44d0c03ff14c0c1a6e2997d6a8ed5fa77a7b8a
Author: Günther Deschner <gd at samba.org>
Date: Fri May 14 23:23:34 2010 +0200
s3-kerberos: pass down kdc_name to create_local_private_krb5_conf_for_domain().
Guenther
(cherry picked from commit e3bdff3d67b46277ee59685218bd90f3788b487d)
(cherry picked from commit 2ce299f16cb2ff292755186894284d6efb296d08)
commit c654bc0470304640b248f7f8704ee623c27a356d
Author: Günther Deschner <gd at samba.org>
Date: Fri May 14 23:21:47 2010 +0200
s3-winbind: make the getpeername() checks in cm_prepare_connection IPv6 aware.
Note that this failure was hard to track, as winbind did only log a super helpful
"cm_prepare_connection: Success" debug message.
IPv6 gurus, please check
Successfully tested in two independent IPv6 networks now.
Guenther
(cherry picked from commit 14ac2bb36ee22be6133ca1d069dc5de6c1891f47)
(cherry picked from commit 72d635514d9c00a09b00ed0d9928cab6a3a2f6f7)
commit ad8e0a92e30899fd4e3c8d15e062bfc0ddbbd966
Author: Andreas Schneider <asn at samba.org>
Date: Wed May 12 18:36:30 2010 +0200
s3-spoolss: Added EN ISO 216, A0 and A1 to builtin forms.
Signed-off-by: Andreas Schneider <asn at samba.org>
Signed-off-by: Günther Deschner <gd at samba.org>
(cherry picked from commit 0953087f82ddbd580e9807e0e8d780e78686c03c)
Fix bug #7423 (Large Formats at printing not available).
(cherry picked from commit 73bec197a91a15aa9a69c9a3868ed51bdd3674ea)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 56 +++++++++++-
docs-xml/manpages-3/net.8.xml | 2 +-
docs-xml/manpages-3/ntlm_auth.1.xml | 6 +-
docs-xml/smbdotconf/protocol/aclmapfullcontrol.xml | 2 +-
libcli/auth/spnego_parse.c | 8 +-
source3/Makefile.in | 18 ++--
source3/auth/auth_sam.c | 3 +
source3/auth/auth_util.c | 4 +-
source3/configure.in | 63 ++++++++++----
source3/include/proto.h | 5 +-
source3/include/secrets.h | 1 +
source3/include/smb.h | 3 +
.../examples/netdomjoin-gui/netdomjoin-gui.c | 2 +-
source3/libads/kerberos.c | 44 +++++++---
source3/libads/kerberos_verify.c | 95 ++++++++++++--------
source3/libsmb/namequery_dc.c | 6 +-
source3/m4/aclocal.m4 | 13 +++
source3/modules/vfs_scannedonly.c | 6 ++
source3/modules/vfs_streams_xattr.c | 6 +-
source3/passdb/login_cache.c | 9 ++-
source3/passdb/pdb_ldap.c | 12 +--
source3/passdb/secrets.c | 81 ++++++++++++++++-
source3/printing/nt_printing.c | 12 ++-
source3/rpc_server/srv_samr_nt.c | 17 +++-
source3/rpc_server/srv_spoolss_nt.c | 4 +
source3/rpc_server/srv_winreg_nt.c | 12 ++-
source3/script/tests/test_posix_s3.sh | 6 +-
source3/smbd/service.c | 1 +
source3/smbd/smb2_create.c | 11 ++-
source3/smbd/trans2.c | 62 ++++++++-----
source3/winbindd/winbindd_cm.c | 36 ++++++--
31 files changed, 453 insertions(+), 153 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index f8fcea6..1be1572 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,6 +1,6 @@
=============================
Release Notes for Samba 3.5.4
- , 2010
+ June 23, 2010
=============================
@@ -8,12 +8,64 @@ This is the latest stable release of Samba 3.5.
Major enhancements in Samba 3.5.4 include:
- o
+ o Fix smbd crash when sambaLMPassword and sambaNTPassword entries missing
+ from ldap (bug #7448).
+ o Fix init_sam_from_ldap storing group in sid2uid cache (bug #7507).
+
Changes since 3.5.3
-------------------
+o Michael Adam <obnox at samba.org>
+ * BUG 7507: Fix init_sam_from_ldap storing group in sid2uid cache.
+
+
+o Jeremy Allison <jra at samba.org>
+ * BUG 7188: Make ea data checks identical for trans2open and trans2mkdir.
+ * BUG 7410: Samba sends "raw" inode number as uniqueid with unix extensions.
+ * BUG 7449: Fix spnego returning incorrect mechListMIC string.
+
+
+o Günther Deschner <gd at samba.org>
+ * BUG 7341: Fix Winbind over IPv6.
+ * BUG 7459: Fix some crash bugs and missing error codes in AddDriver paths.
+ * BUG 7479: Fix crash bug in _samr_QueryUserInfo{2} level 18.
+ * BUG 7517: Fix session setup from linux kernel cifs clients with
+ "sec=ntlmv2".
+
+
+o Olaf Flebbe <o.flebbe at science-computing.de>
+ * BUG 7209: Fix build on RHEL5.
+
+
+o Björn Jacke <bj at sernet.de>
+ * BUG 7427: Using IBM xl_C compiler produces wrong results in configure.
+ * BUG 7503: Fix calculation of st_blocks in vfs_streams_xattr.
+ * BUG 7504: Fix numerous build issues.
+
+
+o Volker Lendecke <vl at samba.org>
+ * BUG 7253: Fix Samba login cache problem on Sparc Architecture.
+ * BUG 7262: Fix editing users' groups via UsrMgr.
+
+
+o Buchan Milne <bgmilne at mandriva.org>
+ * BUG 7500: Fix 'not a string literal' warning in netdomjoin-gui.
+
+
+o Matthieu Patou <mat at matws.net>
+ * BUG 7099: Allow previous password to be stored and use it to check
+ tickets.
+
+
+o Andreas Schneider <asn at samba.org>
+ * BUG 7423: Fix printing large formats.
+
+
+o Roel van Meer <rolek at bokxing.nl>
+ * BUG 7448: Fix smbd crash when sambaLMPassword and sambaNTPassword entries
+ missing from ldap.
######################################################################
diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml
index 51971c8..f7fafcc 100644
--- a/docs-xml/manpages-3/net.8.xml
+++ b/docs-xml/manpages-3/net.8.xml
@@ -1799,7 +1799,7 @@ This example would connect to a computer named XP as the local administrator usi
<para>
Execute a shell command under a global lock. This might be useful to define the
-order in which serveral shell commands will be executed. The locking information
+order in which several shell commands will be executed. The locking information
is stored in a file called <filename>g_lock.tdb</filename>. In setups with CTDB
running, the locking information will be available on all cluster nodes.
</para>
diff --git a/docs-xml/manpages-3/ntlm_auth.1.xml b/docs-xml/manpages-3/ntlm_auth.1.xml
index 3ffc354..071e484 100644
--- a/docs-xml/manpages-3/ntlm_auth.1.xml
+++ b/docs-xml/manpages-3/ntlm_auth.1.xml
@@ -171,13 +171,13 @@
</listitem></varlistentry>
<varlistentry>
- <term>Username</term>
+ <term>NT-Domain</term>
<listitem><para>The user's domain, expected to be in
Samba's <smbconfoption name="unix charset"/>.
</para>
- <para><example>Domain: WORKGROUP</example></para>
- <para><example>Domain:: V09SS0dST1VQ</example></para>
+ <para><example>NT-Domain: WORKGROUP</example></para>
+ <para><example>NT-Domain:: V09SS0dST1VQ</example></para>
</listitem></varlistentry>
<varlistentry>
diff --git a/docs-xml/smbdotconf/protocol/aclmapfullcontrol.xml b/docs-xml/smbdotconf/protocol/aclmapfullcontrol.xml
index c38ac3c..d0b4d7c 100644
--- a/docs-xml/smbdotconf/protocol/aclmapfullcontrol.xml
+++ b/docs-xml/smbdotconf/protocol/aclmapfullcontrol.xml
@@ -6,7 +6,7 @@
<description>
<para>
This boolean parameter controls whether <citerefentry><refentrytitle>smbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>maps a POSIX ACE entry of "rwx" (read/write/execute), the maximum
+ <manvolnum>8</manvolnum></citerefentry> maps a POSIX ACE entry of "rwx" (read/write/execute), the maximum
allowed POSIX permission set, into a Windows ACL of "FULL CONTROL". If this parameter is set to true any POSIX
ACE entry of "rwx" will be returned in a Windows ACL as "FULL CONTROL", is this parameter is set to false any
POSIX ACE entry of "rwx" will be returned as the specific Windows ACL bits representing read, write and
diff --git a/libcli/auth/spnego_parse.c b/libcli/auth/spnego_parse.c
index 3f7047b..86b083d 100644
--- a/libcli/auth/spnego_parse.c
+++ b/libcli/auth/spnego_parse.c
@@ -88,11 +88,11 @@ static bool read_negTokenInit(struct asn1_data *asn1, TALLOC_CTX *mem_ctx,
/* RFC 2478 says we have an Octet String here,
but W2k sends something different... */
char *mechListMIC;
- asn1_push_tag(asn1, ASN1_SEQUENCE(0));
- asn1_push_tag(asn1, ASN1_CONTEXT(0));
+ asn1_start_tag(asn1, ASN1_SEQUENCE(0));
+ asn1_start_tag(asn1, ASN1_CONTEXT(0));
asn1_read_GeneralString(asn1, mem_ctx, &mechListMIC);
- asn1_pop_tag(asn1);
- asn1_pop_tag(asn1);
+ asn1_end_tag(asn1);
+ asn1_end_tag(asn1);
token->targetPrincipal = mechListMIC;
}
diff --git a/source3/Makefile.in b/source3/Makefile.in
index f58bb70..08581a4 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -42,16 +42,16 @@ MODULE_EXPORTS=@MODULE_EXPORTS@
DEVELOPER_CFLAGS=@DEVELOPER_CFLAGS@
CFLAGS=@CFLAGS@
CPPFLAGS=-DHAVE_CONFIG_H @CPPFLAGS@
+PICFLAG=@PICFLAG@
EXEEXT=@EXEEXT@
AR=@AR@
-LDSHFLAGS=@LDSHFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@ -lc @LDSHFLAGS_Z_DEFS@
-LDSHFLAGS_MODULES=@LDSHFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@ @LDSHFLAGS_Z_NODEFS@
+LDSHFLAGS=$(PICFLAG) @LDSHFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@ -lc @LDSHFLAGS_Z_DEFS@
+LDSHFLAGS_MODULES=$(PICFLAG) @LDSHFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@ @LDSHFLAGS_Z_NODEFS@
LDFLAGS=@PIE_LDFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@
-WINBIND_NSS_LDSHFLAGS=@WINBIND_NSS_LDSHFLAGS@ @LDFLAGS@ -lc @LDSHFLAGS_Z_DEFS@
+WINBIND_NSS_LDSHFLAGS=$(PICFLAG) @WINBIND_NSS_LDSHFLAGS@ @LDFLAGS@ -lc @LDSHFLAGS_Z_DEFS@
AWK=@AWK@
-PICFLAG=@PICFLAG@
DYNEXP=@DYNEXP@
PERL=@PERL@
LIBDL=@LIBDL@
@@ -1681,12 +1681,12 @@ bin/talloctort at EXEEXT@: $(BINARY_PREREQS) $(TALLOCTORT_OBJ) @BUILD_POPT@ $(LIBTA
bin/replacetort at EXEEXT@: $(REPLACETORT_OBJ) @BUILD_POPT@ $(LIBTALLOC)
@echo Linking $@
- @$(CC) @PIE_LDFLAGS@ -o $@ $(REPLACETORT_OBJ) $(LDFLAGS) \
+ @$(CC) -o $@ $(REPLACETORT_OBJ) $(LDFLAGS) \
$(DYNEXP) $(LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS)
bin/smbconftort at EXEEXT@: $(SMBCONFTORT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB)
@echo Linking $@
- @$(CC) @PIE_LDFLAGS@ -o $@ $(SMBCONFTORT_OBJ) $(LDFLAGS) \
+ @$(CC) -o $@ $(SMBCONFTORT_OBJ) $(LDFLAGS) \
$(DYNEXP) $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
@@ -1779,7 +1779,7 @@ bin/debug2html at EXEEXT@: $(BINARY_PREREQS) $(DEBUG2HTML_OBJ) @BUILD_POPT@ $(LIBTA
bin/smbfilter at EXEEXT@: $(BINARY_PREREQS) $(SMBFILTER_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
@echo Linking $@
- @$(CC) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(LIBS) \
+ @$(CC) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
$(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
@LIBWBCLIENT_STATIC@ $(LIBWBCLIENT_LIBS) \
$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS)
@@ -2923,14 +2923,14 @@ bin/rpc_open_tcp at EXEEXT@: $(BINARY_PREREQS) $(RPC_OPEN_TCP_OBJ) $(LIBTALLOC) $(L
bin/test_lp_load at EXEEXT@: $(BINARY_PREREQS) $(TEST_LP_LOAD_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB)
@echo "Linking $@"
@$(CC) -o $@ $(TEST_LP_LOAD_OBJ) \
- $(LDFLAGS) $(DYNEEXP) $(LIBS) \
+ $(LDFLAGS) $(DYNEXP) $(LIBS) \
$(LDAP_LIBS) \
$(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
bin/dbwrap_tool at EXEEXT@: $(DBWRAP_TOOL_OBJ) $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
@echo "Linking $@"
@$(CC) -o $@ $(DBWRAP_TOOL_OBJ)\
- $(LDFLAGS) $(DYNEEXP) $(LIBS) \
+ $(LDFLAGS) $(DYNEXP) $(LIBS) \
$(LDAP_LIBS) \
@LIBWBCLIENT_STATIC@ $(LIBWBCLIENT_LIBS) \
$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
diff --git a/source3/auth/auth_sam.c b/source3/auth/auth_sam.c
index bd99b3a..3ac4cdb 100644
--- a/source3/auth/auth_sam.c
+++ b/source3/auth/auth_sam.c
@@ -78,6 +78,9 @@ static NTSTATUS sam_password_ok(const struct auth_context *auth_context,
}
if (client_lm_hash || client_nt_hash) {
+ if (!nt_pw) {
+ return NT_STATUS_WRONG_PASSWORD;
+ }
*user_sess_key = data_blob_talloc(mem_ctx, NULL, 16);
if (!user_sess_key->data) {
return NT_STATUS_NO_MEMORY;
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 8167a80..3fa7224 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -468,8 +468,8 @@ NTSTATUS make_user_info_for_reply_enc(auth_usersupplied_info **user_info,
return make_user_info_map(user_info, smb_name,
client_domain,
get_remote_machine_name(),
- lm_resp.data ? &lm_resp : NULL,
- nt_resp.data ? &nt_resp : NULL,
+ lm_resp.data && (lm_resp.length > 0) ? &lm_resp : NULL,
+ nt_resp.data && (nt_resp.length > 0) ? &nt_resp : NULL,
NULL, NULL, NULL,
True);
}
diff --git a/source3/configure.in b/source3/configure.in
index 74a2479..4360ca6 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -261,7 +261,7 @@ else
fi
AC_SUBST(BROKEN_CC)
-dnl Check if the C compiler understands -Werror
+dnl Check if the C compiler understands -Werror (GNU)
AC_CACHE_CHECK([that the C compiler understands -Werror],samba_cv_HAVE_Werror, [
AC_TRY_RUN_STRICT([
int main(void)
@@ -283,7 +283,7 @@ AC_CACHE_CHECK([that the C compiler understands -w2],samba_cv_HAVE_w2, [
if test x"$samba_cv_HAVE_w2" = x"yes"; then
Werror_FLAGS="-w2"
else
-dnl Check if the C compiler understands -errwarn
+dnl Check if the C compiler understands -errwarn (Sun)
AC_CACHE_CHECK([that the C compiler understands -errwarn],samba_cv_HAVE_errwarn, [
AC_TRY_RUN_STRICT([
int main(void)
@@ -293,6 +293,18 @@ AC_CACHE_CHECK([that the C compiler understands -errwarn],samba_cv_HAVE_errwarn,
samba_cv_HAVE_errwarn=yes,samba_cv_HAVE_errwarn=no,samba_cv_HAVE_errwarn=cross)])
if test x"$samba_cv_HAVE_errwarn" = x"yes"; then
Werror_FLAGS="-errwarn=%all"
+else
+dnl Check if the C compiler understands -qhalt (IBM)
+AC_CACHE_CHECK([that the C compiler understands -qhalt],samba_cv_HAVE_qhalt, [
+ AC_TRY_RUN_STRICT([
+ int main(void)
+ {
+ return 0;
+ }],[$CFLAGS -qhalt=w],[$CPPFLAGS],[$LDFLAGS],
+ samba_cv_HAVE_qhalt=yes,samba_cv_HAVE_qhalt=no,samba_cv_HAVE_qhalt=cross)])
+if test x"$samba_cv_HAVE_qhalt" = x"yes"; then
+ Werror_FLAGS="-qhalt=w"
+fi
fi
fi
fi
@@ -1424,9 +1436,9 @@ then
[
cat > conftest.c <<EOF
int foo;
-main () { return 0;}
+int main () { return 0;}
EOF
- if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -pie -fPIE -o conftest conftest.c 1>&AS_MESSAGE_LOG_FD])
+ if AC_TRY_COMMAND_NO_STDERR([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -pie -fPIE -o conftest conftest.c])
then
samba_cv_fpie=yes
else
@@ -1515,13 +1527,10 @@ DSO_EXPORTS=""
if test "${ac_cv_prog_gnu_ld}" = "yes"; then
DYNEXP="-Wl,-E"
fi
- # TODO: need to add $CFLAGS here for explicit 64-bit builds?
LDSHFLAGS="-shared"
else
PICFLAG="-KPIC"
- ## ${CFLAGS} added for building 64-bit shared
- ## libs using Sun's Compiler
- LDSHFLAGS="-G \${CFLAGS}"
+ LDSHFLAGS="-G"
fi
if test "$ac_cv_prog_gnu_ld" = "yes"; then
SONAMEFLAG="-Wl,-soname="
@@ -1562,9 +1571,8 @@ DSO_EXPORTS=""
;;
esac
BLDSHARED="true"
- LDSHFLAGS="-set_version sgi1.0 -shared"
- SONAMEFLAG="-soname "
- SHLD="\${LD}"
+ LDSHFLAGS="-Wl,-set_version,sgi1.0 -shared"
+ SONAMEFLAG="-Wl,-soname,"
if test "${GCC}" = "yes"; then
PICFLAG="-fPIC"
else
@@ -1583,7 +1591,7 @@ DSO_EXPORTS=""
# .po will just create compile warnings, use po.o:
if test "${GCC}" != "yes"; then
## for funky AIX compiler using strncpy()
- CFLAGS="$CFLAGS -D_LINUX_SOURCE_COMPAT -qmaxmem=32000"
+ CFLAGS="$CFLAGS -D_LINUX_SOURCE_COMPAT -qmaxmem=32000 -qhalt=e"
fi
AC_DEFINE(STAT_ST_BLOCKSIZE,DEV_BSIZE,[The size of a block])
@@ -1697,6 +1705,7 @@ fi
AC_MSG_RESULT($BLDSHARED)
+saved_before_as_needed_ldflags="$LDFLAGS"
for flags in "-Wl,--as-needed" "-Wl,-z,ignore" "-z ignore" ; do
saved_ldflags="$LDFLAGS"
AC_MSG_CHECKING([if $flags works])
@@ -1710,6 +1719,25 @@ for flags in "-Wl,--as-needed" "-Wl,-z,ignore" "-z ignore" ; do
test x"$ld_as_needed_flag_found" = xyes && break
done
+# check if we have to disable LD_AS_NEEDED_FLAG:
+# On some systems for a veriety of reasons linking with
+# -Wl,--as-needed -lreadline -lncurses fails
+# we have to retest, if these combination is detected before.
+# Bugzilla #7209
+
+if test x$ac_cv_lib_readline_rl_callback_handler_install = xyes ; then
+ if test x$ld_as_needed_flag_found = xyes ; then
+ AC_MSG_CHECKING([if $LD_AS_NEEDED_FLAG works with readline])
+ # try if check no fails
+ save_LIBS=$LIBS
+ LIBS="$LIBS $TERMLIBS"
+ AC_TRY_LINK([], [rl_callback_handler_install();], [AC_MSG_RESULT([yes])],[ AC_MSG_RESULT([no]); LDFLAGS="$saved_before_as_needed_ldflags"])
+ LIBS="$save_LIBS"
+ fi
+fi
+
+
+
# for historical reasons almost all linkers don't complain about unresolved
# symbols in shared libs. Except for the internal samba modules we want to get
# errors when we produce a shared lib with unresolved symbols. On some
@@ -1762,10 +1790,13 @@ AC_CACHE_CHECK([whether building shared libraries actually works],
ac_cv_shlib_works=no
# The $SHLD and $LDSHFLAGS variables may contain references to other
# variables so they need to be eval'ed.
- $CC $CPPFLAGS $CFLAGS $PICFLAG -c -o \
- shlib.o ${srcdir-.}/../tests/shlib.c && \
- `eval echo $SHLD` `eval echo $LDSHFLAGS` -o "shlib.$SHLIBEXT" \
- shlib.o && ac_cv_shlib_works=yes
+ if AC_TRY_COMMAND([$CC $CPPFLAGS $CFLAGS $PICFLAG -c -o shlib.o ${srcdir-.}/../tests/shlib.c 1>&AS_MESSAGE_LOG_FD])
+ then
+ if AC_TRY_COMMAND([`eval echo "$SHLD $LDSHFLAGS $PICFLAG"` -o "shlib.$SHLIBEXT" shlib.o 1>&AS_MESSAGE_LOG_FD])
+ then
+ ac_cv_shlib_works=yes
+ fi
+ fi
rm -f "shlib.$SHLIBEXT" shlib.o
])
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 0813f0c..9da40b0 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1809,7 +1809,8 @@ int kerberos_kinit_password(const char *principal,
bool create_local_private_krb5_conf_for_domain(const char *realm,
const char *domain,
const char *sitename,
- struct sockaddr_storage *pss);
+ struct sockaddr_storage *pss,
+ const char *kdc_name);
/* The following definitions come from libads/kerberos_keytab.c */
@@ -4712,6 +4713,7 @@ bool secrets_delete_machine_password(const char *domain);
bool secrets_delete_machine_password_ex(const char *domain);
bool secrets_delete_domain_sid(const char *domain);
bool secrets_store_machine_password(const char *pass, const char *domain, enum netr_SchannelType sec_channel);
+char *secrets_fetch_prev_machine_password(const char *domain);
char *secrets_fetch_machine_password(const char *domain,
time_t *pass_last_set_time,
enum netr_SchannelType *channel);
@@ -7049,6 +7051,7 @@ int sys_statvfs(const char *path, vfs_statvfs_struct *statbuf);
/* The following definitions come from smbd/trans2.c */
uint64_t smb_roundup(connection_struct *conn, uint64_t val);
+uint64_t get_FileIndex(connection_struct *conn, const SMB_STRUCT_STAT *psbuf);
NTSTATUS get_ea_value(TALLOC_CTX *mem_ctx, connection_struct *conn,
files_struct *fsp, const char *fname,
const char *ea_name, struct ea_struct *pea);
diff --git a/source3/include/secrets.h b/source3/include/secrets.h
index f369379..41d1af3 100644
--- a/source3/include/secrets.h
+++ b/source3/include/secrets.h
@@ -25,6 +25,7 @@
*/
#define SECRETS_MACHINE_ACCT_PASS "SECRETS/$MACHINE.ACC"
#define SECRETS_MACHINE_PASSWORD "SECRETS/MACHINE_PASSWORD"
+#define SECRETS_MACHINE_PASSWORD_PREV "SECRETS/MACHINE_PASSWORD.PREV"
#define SECRETS_MACHINE_LAST_CHANGE_TIME "SECRETS/MACHINE_LAST_CHANGE_TIME"
#define SECRETS_MACHINE_SEC_CHANNEL_TYPE "SECRETS/MACHINE_SEC_CHANNEL_TYPE"
#define SECRETS_MACHINE_TRUST_ACCOUNT_NAME "SECRETS/SECRETS_MACHINE_TRUST_ACCOUNT_NAME"
diff --git a/source3/include/smb.h b/source3/include/smb.h
index bc7a90d..202f9d7 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -607,6 +607,9 @@ typedef struct connection_struct {
/* Semantics provided by the underlying filesystem. */
int fs_capabilities;
+ /* Device number of the directory of the share mount.
+ Used to ensure unique FileIndex returns. */
+ SMB_DEV_T base_share_dev;
name_compare_entry *hide_list; /* Per-share list of files to return as hidden. */
name_compare_entry *veto_list; /* Per-share list of files to veto (never show). */
diff --git a/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c b/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
index c482113..50c22d9 100644
--- a/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
+++ b/source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c
@@ -520,7 +520,7 @@ static void callback_do_hostname_change(GtkWidget *widget,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
- str);
+ "%s",str);
gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(state->window_main));
diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c
index 7fb4ec3..df0ec8e 100644
--- a/source3/libads/kerberos.c
+++ b/source3/libads/kerberos.c
@@ -715,7 +715,8 @@ int kerberos_kinit_password(const char *principal,
static char *print_kdc_line(char *mem_ctx,
const char *prev_line,
- const struct sockaddr_storage *pss)
+ const struct sockaddr_storage *pss,
+ const char *kdc_name)
{
char *kdc_str = NULL;
@@ -727,6 +728,9 @@ static char *print_kdc_line(char *mem_ctx,
char addr[INET6_ADDRSTRLEN];
uint16_t port = get_sockaddr_port(pss);
+ DEBUG(10,("print_kdc_line: IPv6 case for kdc_name: %s, port: %d\n",
+ kdc_name, port));
+
if (port != 0 && port != DEFAULT_KRB5_PORT) {
/* Currently for IPv6 we can't specify a non-default
krb5 port with an address, as this requires a ':'.
@@ -743,6 +747,7 @@ static char *print_kdc_line(char *mem_ctx,
"Error %s\n.",
print_canonical_sockaddr(mem_ctx, pss),
gai_strerror(ret)));
+ return NULL;
}
/* Success, use host:port */
kdc_str = talloc_asprintf(mem_ctx,
@@ -751,11 +756,22 @@ static char *print_kdc_line(char *mem_ctx,
hostname,
(unsigned int)port);
} else {
- kdc_str = talloc_asprintf(mem_ctx, "%s\tkdc = %s\n",
- prev_line,
- print_sockaddr(addr,
- sizeof(addr),
- pss));
+
+ /* no krb5 lib currently supports "kdc = ipv6 address"
+ * at all, so just fill in just the kdc_name if we have
+ * it and let the krb5 lib figure out the appropriate
+ * ipv6 address - gd */
+
+ if (kdc_name) {
+ kdc_str = talloc_asprintf(mem_ctx, "%s\tkdc = %s\n",
+ prev_line, kdc_name);
--
Samba Shared Repository
More information about the samba-cvs
mailing list