[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated -
build_3.2.8_ctdb.56-36-gdd23148
Michael Adam
obnox at samba.org
Tue Mar 24 17:21:37 GMT 2009
The branch, v3-2-ctdb has been updated
via dd23148118fb058b65748cc5fda47474aa8515eb (commit)
via 448443fb31dcb1c830dcb1e66187ed6d0970369c (commit)
via aeabd7ba7294807d608f1e2fa30cdf33844b0248 (commit)
via ec05e2079ad9405507aaa4e51a3f895a2b5f3b09 (commit)
via cbd8c505084bf74b7a2b5869680cfc521dc208b4 (commit)
via 3428fa22e1d111f7372b488bf362d454e83b3cd7 (commit)
via 8ff0e4cf26961cfd7ebe87c7729f70694dc9ad95 (commit)
via 4e27f5fd46c16e7dfcf8a9b66ed86099e2836521 (commit)
via fc435e8b4b75b1d750c703f0fbbd44b1fba6873b (commit)
via 4f24bc02c45bfda9352e14fa6605242c18c3e7b6 (commit)
via be0a09ea769e8132678e73d35ffdc029236e01de (commit)
via 28bbb327d808eb6f8299fbfa44c03c3c3360bfa6 (commit)
via 7368d3b07d5aad57a2bdadc87bb9c02700481303 (commit)
via 2cde6d78de3cd7e01415533d9ecfde96f0e1bbfb (commit)
via b37bf89aadc4393ca804fa4fe4c4a1f6fe958d9f (commit)
via 20e95a8dca1a7ebc8a4d649b6cdfc69e6bdd4277 (commit)
via b84d487e3d0277a994f4016168ec16034873e729 (commit)
via 95dfe11d0f0ec5f9c08e8779d40341dbac58d921 (commit)
via e70a5f4d05327ef83f3907fff6bbb0a6f7ec0d34 (commit)
via ba768f67f3884b60f5229d34a4af93b01e8deac3 (commit)
via a5a5b5b052567e79233e2fdf279cf0ac06e7b7aa (commit)
via 9a03b64f81fc9c4d21b3a1bf6d52128ae9d91c7a (commit)
via 8e462c99ca80a8f68db1f8040fab3b55b1578f6d (commit)
via 1250dba2b2aafa5109f4a658b7fcf34fe3ed99c7 (commit)
via ad792a49ee3bfc2101d8e9d986ae5c2f048c9b79 (commit)
via 19037498aa60b3b0f7a17674b3db3f9e7cc26c42 (commit)
via 4079839e50ec845a6ce193d528306f3407445df3 (commit)
via c9458a4022b6bb6506694fb184e287da88fc92c3 (commit)
via 04e05e884c4e67d45cbee75803819610fbd08fbd (commit)
via eba73c8d91144193ec288b7fe8f9e5214dc8d383 (commit)
via bd34ea450f02f3e96385d0e6bc9718ab91c78e29 (commit)
via 57290aede977914a5c2171c1560e95676f90b672 (commit)
via e860df584b462f306ca75bcb9bb289946b8cae87 (commit)
from 1ebd6ce818f70d8108319231d67d6e4de54d2855 (commit)
http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb
- Log -----------------------------------------------------------------
commit dd23148118fb058b65748cc5fda47474aa8515eb
Author: Jeremy Allison <jra at samba.org>
Date: Wed Feb 25 14:55:19 2009 -0800
Fix more POSIX path lstat calls. Fix bug where close can return
failure if we have a pending modtime and the containing directory
of the file has been renamed (there is no POSIX "update time by
fd" call). This can't happen on Windows as the rename will fail
if there are open files beneath it. Will add a torture test
for this.
Jeremy.
(cherry picked from commit 5fb3b5e903c08013074ba473399ddee30f6c328f)
Signed-off-by: Michael Adam <obnox at samba.org>
commit 448443fb31dcb1c830dcb1e66187ed6d0970369c
Author: Jeremy Allison <jra at samba.org>
Date: Wed Feb 25 13:48:30 2009 -0800
Fix use of streams modules with CIFSFS client.
Jeremy.
(cherry picked from commit 161dc96c1147f637b5ef78bb3f543f6d5e0618c6)
Signed-off-by: Michael Adam <obnox at samba.org>
commit aeabd7ba7294807d608f1e2fa30cdf33844b0248
Author: Jeremy Allison <jra at samba.org>
Date: Tue Feb 24 17:59:19 2009 -0800
Allow set attributes on a stream fnum to be redirected to the base filename.
Fixes the new RAW-STREAMS torture test.
Jeremy.
(cherry picked from commit 73d0c3143eedb5a9fd4d154aaf42d20ba6a19a1f)
Signed-off-by: Michael Adam <obnox at samba.org>
commit ec05e2079ad9405507aaa4e51a3f895a2b5f3b09
Author: Steve French <smfrench at gmail.com>
Date: Tue Feb 24 17:10:19 2009 -0600
Fix guest mounts
guest session setup, login (user id) as anonymous.
This patch is for samba bugzilla bug 4640.
Signed-off-by: Shirish Pargaonkar <shirishp at us.ibm.com>
Acked-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: Steve French <sfrench at samba.org>
(cherry picked from commit 5e6b019d70fef2ad082fc414053c131294bdeb49)
Signed-off-by: Michael Adam <obnox at samba.org>
commit cbd8c505084bf74b7a2b5869680cfc521dc208b4
Author: Steve French <smfrench at gmail.com>
Date: Tue Feb 24 12:52:08 2009 -0600
cifs mount fix for handling -V parameter
also syncs with 3-3 mount.cifs
Acked-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: Steve French <sfrench at samba.org>
(cherry picked from commit e831cd78ee3cf89abee058a475540955fad423ce)
Signed-off-by: Michael Adam <obnox at samba.org>
commit 3428fa22e1d111f7372b488bf362d454e83b3cd7
Author: Björn Jacke <bj at sernet.de>
Date: Sun Feb 22 19:46:40 2009 +0100
prefer gssapi header files from subdirectory
this fixes some compile time noise on FreeBSD 7
(cherry picked from commit 1bfdbb093f7c5e434ea3e653d389e1ccec578af6)
(cherry picked from commit de96e1a82d6e92c00a0ab3020db8d7c0284aadb1)
Signed-off-by: Michael Adam <obnox at samba.org>
commit 8ff0e4cf26961cfd7ebe87c7729f70694dc9ad95
Author: Björn Jacke <bj at sernet.de>
Date: Sun Feb 22 00:43:38 2009 +0100
all BSDs use this evironment variable
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit cd6ae0de52164dd6f50b3614f2511acb3eb15993)
(cherry picked from commit 1ad5f50bdab761c7d3894e94f8fe3b171ec1b219)
(cherry picked from commit bc53054616d442b1b28086181d81776f1c33834f)
Signed-off-by: Michael Adam <obnox at samba.org>
commit 4e27f5fd46c16e7dfcf8a9b66ed86099e2836521
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Feb 23 09:24:50 2009 +0100
s3/docs: Fix typo in man mount.cifs.
Thanks to Tobias Stoeckmann for reporting!
Karolin
(cherry picked from commit 09a7f93f6be66a8f2a124e49b4effe2b5863f01d)
(cherry picked from commit fdb5c65fc51784b6a159748ec4df3953b7d2c1cb)
(cherry picked from commit b19f58ccd088a10e487a1261cadb4f3f41987391)
Signed-off-by: Michael Adam <obnox at samba.org>
commit fc435e8b4b75b1d750c703f0fbbd44b1fba6873b
Author: Jeremy Allison <jra at samba.org>
Date: Fri Feb 20 08:25:29 2009 -0800
Fix bug #6133 - Cannot delete non-ACL files on Solaris/ZFS/NFSv4 ACL filesystem.
As the NFSv4 ACL mapping code doesn't map write directory into the DELETE_CHILD
permission bit (which we require before allowing a delete) no one can delete
files without an explicit DELETE_CHILD bit set on the directory. Add this mapping.
Jeremy.
(cherry picked from commit 44e0e830c4c413054bdb30a62629993c4391c492)
Signed-off-by: Michael Adam <obnox at samba.org>
commit 4f24bc02c45bfda9352e14fa6605242c18c3e7b6
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Feb 20 09:20:16 2009 +0100
s3/docs: Fix several typos.
This fixes bug #6127.
Thanks to Justin T Pryzby <justinpryzby [at] users.sourceforge.net>
for the review!
Karolin
(cherry picked from commit 54dbb030e2c6fed0abd0a3a89d08dad9b8a201a1)
(cherry picked from commit a4548e41c6f12e4703249c53ad3dc727d2839931)
(cherry picked from commit 0d68e3d54b8f0bf2861edc7ac3b26c2f48f242eb)
Signed-off-by: Michael Adam <obnox at samba.org>
commit be0a09ea769e8132678e73d35ffdc029236e01de
Author: Jeremy Allison <jra at samba.org>
Date: Thu Feb 19 11:55:56 2009 -0800
Backport the semantics of when to delete alternate data streams on a file truncate.
Needed to fully support stream semantics.
Jeremy.
(cherry picked from commit cdcb9bbf47396a7213edafeabb009920bb4e16b7)
Signed-off-by: Michael Adam <obnox at samba.org>
commit 28bbb327d808eb6f8299fbfa44c03c3c3360bfa6
Author: Jeremy Allison <jra at samba.org>
Date: Wed Feb 18 16:02:15 2009 -0800
Gah, typo :-(. Sorry.
(cherry picked from commit 301b23cf22ce1db04781b85954155fc93f4caee3)
Signed-off-by: Michael Adam <obnox at samba.org>
commit 7368d3b07d5aad57a2bdadc87bb9c02700481303
Author: Jeremy Allison <jra at samba.org>
Date: Wed Feb 18 15:42:31 2009 -0800
Fix coverity CID-602. Possible use of uninitialized var.
Jeremy.
(cherry picked from commit 3b9874721ee8585e45b60246105fa380db132ac2)
Signed-off-by: Michael Adam <obnox at samba.org>
commit 2cde6d78de3cd7e01415533d9ecfde96f0e1bbfb
Author: Jeremy Allison <jra at samba.org>
Date: Tue Feb 17 15:55:23 2009 -0800
Don't miss an absolute pathname as a kerberos keytab path. From Glenn Machin <gmachin at sandia.gov>.
Jeremy.
(cherry picked from commit 9974c09608d61244133eea8615c37184b0cac57b)
Signed-off-by: Michael Adam <obnox at samba.org>
commit b37bf89aadc4393ca804fa4fe4c4a1f6fe958d9f
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Feb 17 10:28:37 2009 +0100
s3:make: use pidl/pidl for 'make idl'
metze
(cherry picked from commit 3dc256ad0f1d2b1c131d67e033533dd316eab252)
(cherry picked from commit 47bbea27c8972ca320e90c7c678fe6da28a269f1)
Signed-off-by: Michael Adam <obnox at samba.org>
commit 20e95a8dca1a7ebc8a4d649b6cdfc69e6bdd4277
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Feb 17 09:04:58 2009 +0100
librpc: rerun 'PIDL=pidl/pidl make idl'
metze
(cherry picked from commit eb1a2e4aea76462086a4303ba325c4da49e891cd)
(cherry picked from commit e065eff98c9bd57155be824eef319f4c4d191e5e)
Signed-off-by: Michael Adam <obnox at samba.org>
commit b84d487e3d0277a994f4016168ec16034873e729
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 16 10:20:55 2009 +0100
s3:netlogon: implement _netr_LogonGetCapabilities() with NT_STATUS_NOT_IMPLEMENTED
This hopefully fixes bug #6100.
metze
(cherry picked from commit fe417b29bd23b7b935669993e0f01de4c7de2378)
(cherry picked from commit 2f858cb914842e9af1331477ec6eb9782dbd0cf5)
(cherry picked from commit 9edecdaa12fa42a356008b90710475ad9a1ae581)
Signed-off-by: Michael Adam <obnox at samba.org>
commit 95dfe11d0f0ec5f9c08e8779d40341dbac58d921
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 16 10:42:43 2009 +0100
netlogon.idl: add idl for netr_LogonGetCapabilities()
metze
(cherry picked from commit 8339969ed39e4cf3577971869ef2fd127f1c3ae3)
(cherry picked from commit 5410134c70e3302c05b73109610c28dfa1a0dc69)
(cherry picked from commit 4a353efc45480d3de91f91f618135faf8eb0429e)
Signed-off-by: Michael Adam <obnox at samba.org>
commit e70a5f4d05327ef83f3907fff6bbb0a6f7ec0d34
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Jul 21 12:47:08 2008 +0200
Properly cast array length in print functions. (This used to be commit f321240fa91fa19c1131f119c42f64897d220682)
(cherry picked from commit 37a29ad53eae02a29fbb0bf14731487328150d23)
Signed-off-by: Michael Adam <obnox at samba.org>
commit ba768f67f3884b60f5229d34a4af93b01e8deac3
Author: Günther Deschner <gd at samba.org>
Date: Tue Feb 17 03:32:16 2009 +0100
pidl: add pidl in order to be able to regenerate librpc functions.
This is pidl as of 0c6ce977ffb8f53f546596b76c1e0858cc6a88ba.
Guenther
(cherry picked from commit bd53a095de3d221cab4a90a35cd018edd800f79a)
Signed-off-by: Michael Adam <obnox at samba.org>
commit a5a5b5b052567e79233e2fdf279cf0ac06e7b7aa
Author: Yasuma Takeda <yasuma at osstech.co.jp>
Date: Mon Feb 16 14:07:37 2009 +0100
Fix bug 5920
The length of the memcpy was calculated wrong, r->out.return_authenticator is
a pointer
(cherry picked from commit cb9dd0f58d06a78b7724c3e0ec8f81512edc2d29)
Signed-off-by: Michael Adam <obnox at samba.org>
commit 9a03b64f81fc9c4d21b3a1bf6d52128ae9d91c7a
Author: Jeremy Allison <jra at samba.org>
Date: Sun Feb 15 18:18:21 2009 -0800
Attempt to fix bug #6099. According to Microsoft
Windows 7 looks at the negotiate_flags
returned in this structure *even if the
call fails with access denied ! So in order
to allow Win7 to connect to a Samba NT style
PDC we set the flags before we know if it's
an error or not.
Jeremy.
(cherry picked from commit eb82149dc7f6bbcca85e8ef97f3e23952b438770)
Signed-off-by: Michael Adam <obnox at samba.org>
commit 8e462c99ca80a8f68db1f8040fab3b55b1578f6d
Author: Tim Prouty <tprouty at samba.org>
Date: Sat Feb 14 20:34:16 2009 -0800
s3 vfs: Fix SMB_VFS_RECVFILE/SENDFILE macros
(cherry picked from commit 0c4b1974a19d1ee78d3973808e9b854c19847a2b)
Signed-off-by: Michael Adam <obnox at samba.org>
commit 1250dba2b2aafa5109f4a658b7fcf34fe3ed99c7
Author: Jeremy Allison <jra at samba.org>
Date: Fri Feb 13 17:33:24 2009 -0800
Oops. Fix the build (don't use 3.3 references in 3.2 :-).
Jeremy.
(cherry picked from commit a7a3f335e3b867ca6c8d75a53262b15d7c75d7b1)
Signed-off-by: Michael Adam <obnox at samba.org>
commit ad792a49ee3bfc2101d8e9d986ae5c2f048c9b79
Author: Holger Hetterich <hhetter at novell.com>
Date: Fri Feb 13 17:30:22 2009 -0800
Enable total anonymization in vfs_smb_traffic_analyzer, by mapping
any user names to the one given by anonymize_prefix, without
generating a hash number. This setting is optional and is compatible
with the module configuration format of Samba 3.3.
(cherry picked from commit 4b17cca0557a086c5722c221a6e282bad4a2b40a)
Signed-off-by: Michael Adam <obnox at samba.org>
commit 19037498aa60b3b0f7a17674b3db3f9e7cc26c42
Author: Jeremy Allison <jra at samba.org>
Date: Fri Feb 13 16:06:29 2009 -0800
Parameterize in local.h the MAX_RPC_DATA_SIZE, and ensure
that "offered" read from the rpc packet in spoolss is under
that size. Tidyup from analysis from Veracode.
Jeremy.
(cherry picked from commit 3ac4c42e1e5be2f25ef4602efa2ac360d8b603ce)
Signed-off-by: Michael Adam <obnox at samba.org>
commit 4079839e50ec845a6ce193d528306f3407445df3
Author: Jeremy Allison <jra at samba.org>
Date: Fri Feb 13 15:06:13 2009 -0800
Noted by Vericode analysis. Correctly use chroot().
Jeremy.
(cherry picked from commit c604236558b0be1b8a8539c7823e22f8e5eea55b)
Signed-off-by: Michael Adam <obnox at samba.org>
commit c9458a4022b6bb6506694fb184e287da88fc92c3
Author: Volker Lendecke <vl at samba.org>
Date: Fri Feb 13 10:06:26 2009 -0800
Fix Coverity IDs 879 and 880 (RESOURCE_LEAK, REVERSE_INULL)
(cherry picked from commit f7dc45f72145f0bba40c4a2e1a3ac7e4a85fd9cd)
Signed-off-by: Michael Adam <obnox at samba.org>
commit 04e05e884c4e67d45cbee75803819610fbd08fbd
Author: Volker Lendecke <vl at samba.org>
Date: Fri Feb 13 09:58:48 2009 -0800
Fix Coverity ID 742 (RESOURCE_LEAK)
(cherry picked from commit eee6c3cd63c08f999c400d864dd7f7de68c03b85)
Signed-off-by: Michael Adam <obnox at samba.org>
commit eba73c8d91144193ec288b7fe8f9e5214dc8d383
Author: Volker Lendecke <vl at samba.org>
Date: Fri Feb 13 09:53:56 2009 -0800
Fix Coverity ID 744
This was marked as a resource leak. This change makes the code a bit clearer
that we always free error_string.
(cherry picked from commit b03d45e6783e2706bd5d9c98a88ac07933e3adeb)
Signed-off-by: Michael Adam <obnox at samba.org>
commit bd34ea450f02f3e96385d0e6bc9718ab91c78e29
Author: Volker Lendecke <vl at samba.org>
Date: Fri Feb 13 11:18:31 2009 +0100
Fix Coverity ID 745 (RESOURCE_LEAK)
(cherry picked from commit 566f4e92390312feddedf16f2175139ef62ac45e)
Signed-off-by: Michael Adam <obnox at samba.org>
commit 57290aede977914a5c2171c1560e95676f90b672
Author: Dan Sledz <dsledz at isilon.com>
Date: Thu Feb 12 12:01:16 2009 -0800
Fix double free caused by incorrect talloc_steal usage.
(cherry picked from commit 9aeca67cbeb1a04082b02d54150d042a7b5a241d)
Signed-off-by: Michael Adam <obnox at samba.org>
commit e860df584b462f306ca75bcb9bb289946b8cae87
Author: Yasuma Takeda <yasuma at osstech.co.jp>
Date: Wed Feb 11 14:23:29 2009 -0800
Fix bug #6098 - When the DNS server is invalid, the ads_find_dc() does not work correctly with "security = domain"
1. If DNS server is invalid, the get_sorted_dc_list() is called with
realm(FQDN) and it fails.
2. On the next step, the get_sorted_dc_list() is called with realm(FQDN) again.
I think "again" is wrong place.
On the 2nd step, get_sorted_dc_list() should be called with realm(WORKGROUP).
(cherry picked from commit 2f3eafae83d036c5b35e5d7d11be6e29aaab7533)
Signed-off-by: Michael Adam <obnox at samba.org>
-----------------------------------------------------------------------
Summary of changes:
docs-xml/archives/THANKS | 2 +-
docs-xml/manpages-3/mount.cifs.8.xml | 2 +-
docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml | 11 +
docs-xml/smbdotconf/browse/enhancedbrowsing.xml | 2 +-
docs-xml/smbdotconf/locking/strictlocking.xml | 2 +-
docs-xml/smbdotconf/misc/remoteannounce.xml | 4 +-
docs-xml/smbdotconf/misc/usershareallowguests.xml | 2 +-
.../smbdotconf/misc/usershareprefixallowlist.xml | 4 +-
.../smbdotconf/misc/usersharetemplateshare.xml | 2 +-
docs-xml/smbdotconf/printing/useclientdriver.xml | 2 +-
.../smbdotconf/protocol/aclcheckpermissions.xml | 2 +-
docs-xml/smbdotconf/protocol/enableasusupport.xml | 2 +-
docs-xml/smbdotconf/security/clientlanmanauth.xml | 2 +-
docs-xml/smbdotconf/security/clientsigning.xml | 3 +-
docs-xml/smbdotconf/security/lanmanauth.xml | 2 +-
docs-xml/smbdotconf/security/passwordserver.xml | 2 +-
docs-xml/smbdotconf/security/security.xml | 6 +-
docs-xml/smbdotconf/security/serverschannel.xml | 2 +-
docs-xml/smbdotconf/security/serversigning.xml | 3 +-
docs-xml/smbdotconf/security/smbencrypt.xml | 3 +-
docs-xml/smbdotconf/security/updateencrypted.xml | 4 +-
source/Makefile.in | 4 +-
source/auth/auth_util.c | 4 +-
source/client/mount.cifs.c | 30 +-
source/client/umount.cifs.c | 11 +-
source/include/includes.h | 6 +-
source/include/local.h | 3 +
source/include/vfs_macros.h | 8 +-
source/lib/replace/libreplace_ld.m4 | 2 +-
source/libaddns/dns.h | 6 +-
source/libads/ldap.c | 4 +-
source/librpc/gen_ndr/cli_netlogon.c | 32 +-
source/librpc/gen_ndr/cli_netlogon.h | 11 +-
source/librpc/gen_ndr/ndr_netlogon.c | 221 ++-
source/librpc/gen_ndr/ndr_netlogon.h | 5 +-
source/librpc/gen_ndr/netlogon.h | 18 +-
source/librpc/gen_ndr/srv_netlogon.c | 24 +-
source/librpc/gen_ndr/srv_netlogon.h | 2 +-
source/librpc/idl/netlogon.idl | 13 +-
source/libsmb/clikrb5.c | 5 +
source/libsmb/namequery.c | 2 +-
source/modules/nfs4_acls.c | 7 +-
source/modules/vfs_smb_traffic_analyzer.c | 19 +-
source/modules/vfs_streams_depot.c | 14 +-
source/modules/vfs_streams_xattr.c | 15 +-
source/pidl/MANIFEST | 43 +
source/pidl/META.yml | 18 +
source/pidl/Makefile.PL | 17 +
source/pidl/README | 64 +
source/pidl/TODO | 42 +
source/pidl/config.m4 | 9 +
source/pidl/config.mk | 31 +
source/pidl/expr.yp | 150 ++
source/pidl/idl.yp | 485 ++++
source/pidl/lib/Parse/Pidl.pm | 38 +
source/pidl/lib/Parse/Pidl/CUtil.pm | 52 +
source/pidl/lib/Parse/Pidl/Compat.pm | 163 ++
source/pidl/lib/Parse/Pidl/Dump.pm | 294 +++
source/pidl/lib/Parse/Pidl/Expr.pm | 1442 +++++++++++
source/pidl/lib/Parse/Pidl/IDL.pm | 2504 ++++++++++++++++++
source/pidl/lib/Parse/Pidl/NDR.pm | 1211 +++++++++
source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm | 246 ++
source/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm | 268 ++
source/pidl/lib/Parse/Pidl/Samba4.pm | 119 +
source/pidl/lib/Parse/Pidl/Samba4/EJS.pm | 874 +++++++
source/pidl/lib/Parse/Pidl/Samba4/Header.pm | 475 ++++
source/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm | 156 ++
source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 2668 ++++++++++++++++++++
source/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm | 328 +++
source/pidl/lib/Parse/Pidl/Samba4/Python.pm | 1213 +++++++++
source/pidl/lib/Parse/Pidl/Samba4/SWIG.pm | 177 ++
source/pidl/lib/Parse/Pidl/Samba4/TDR.pm | 281 ++
source/pidl/lib/Parse/Pidl/Samba4/Template.pm | 98 +
source/pidl/lib/Parse/Pidl/Typelist.pm | 294 +++
source/pidl/lib/Parse/Pidl/Util.pm | 182 ++
.../pidl/lib/Parse/Pidl/Wireshark/Conformance.pm | 439 ++++
source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm | 1141 +++++++++
source/pidl/lib/Parse/Yapp/Driver.pm | 471 ++++
source/pidl/pidl | 780 ++++++
source/pidl/tests/Util.pm | 179 ++
source/pidl/tests/cutil.pl | 21 +
source/pidl/tests/dump.pl | 15 +
source/pidl/tests/header.pl | 108 +
source/pidl/tests/ndr.pl | 558 ++++
source/pidl/tests/ndr_align.pl | 143 ++
source/pidl/tests/ndr_alloc.pl | 118 +
source/pidl/tests/ndr_array.pl | 37 +
source/pidl/tests/ndr_compat.pl | 21 +
source/pidl/tests/ndr_deprecations.pl | 26 +
source/pidl/tests/ndr_fullptr.pl | 44 +
source/pidl/tests/ndr_refptr.pl | 526 ++++
source/pidl/tests/ndr_represent.pl | 71 +
source/pidl/tests/ndr_simple.pl | 28 +
source/pidl/tests/ndr_string.pl | 90 +
source/pidl/tests/ndr_tagtype.pl | 66 +
source/pidl/tests/parse_idl.pl | 164 ++
source/pidl/tests/samba-ejs.pl | 37 +
source/pidl/tests/samba-ndr.pl | 293 +++
source/pidl/tests/samba3-cli.pl | 128 +
source/pidl/tests/samba3-srv.pl | 18 +
source/pidl/tests/tdr.pl | 49 +
source/pidl/tests/test_util.pl | 21 +
source/pidl/tests/typelist.pl | 85 +
source/pidl/tests/util.pl | 115 +
source/pidl/tests/wireshark-conf.pl | 205 ++
source/pidl/tests/wireshark-ndr.pl | 274 ++
source/rpc_server/srv_netlog_nt.c | 42 +-
source/rpc_server/srv_pipe_hnd.c | 2 +-
source/rpc_server/srv_spoolss_nt.c | 52 +
source/smbd/close.c | 24 +-
source/smbd/open.c | 14 +
source/smbd/server.c | 11 +-
source/smbd/trans2.c | 17 +-
source/utils/net_rpc_join.c | 9 +-
source/utils/ntlm_auth.c | 10 +-
115 files changed, 20784 insertions(+), 140 deletions(-)
create mode 100644 source/pidl/MANIFEST
create mode 100644 source/pidl/META.yml
create mode 100755 source/pidl/Makefile.PL
create mode 100644 source/pidl/README
create mode 100644 source/pidl/TODO
create mode 100644 source/pidl/config.m4
create mode 100644 source/pidl/config.mk
create mode 100644 source/pidl/expr.yp
create mode 100644 source/pidl/idl.yp
create mode 100644 source/pidl/lib/Parse/Pidl.pm
create mode 100644 source/pidl/lib/Parse/Pidl/CUtil.pm
create mode 100644 source/pidl/lib/Parse/Pidl/Compat.pm
create mode 100644 source/pidl/lib/Parse/Pidl/Dump.pm
create mode 100644 source/pidl/lib/Parse/Pidl/Expr.pm
create mode 100644 source/pidl/lib/Parse/Pidl/IDL.pm
create mode 100644 source/pidl/lib/Parse/Pidl/NDR.pm
create mode 100644 source/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
create mode 100644 source/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
create mode 100644 source/pidl/lib/Parse/Pidl/Samba4.pm
create mode 100644 source/pidl/lib/Parse/Pidl/Samba4/EJS.pm
create mode 100644 source/pidl/lib/Parse/Pidl/Samba4/Header.pm
create mode 100644 source/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm
create mode 100644 source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
create mode 100644 source/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
create mode 100644 source/pidl/lib/Parse/Pidl/Samba4/Python.pm
create mode 100644 source/pidl/lib/Parse/Pidl/Samba4/SWIG.pm
create mode 100644 source/pidl/lib/Parse/Pidl/Samba4/TDR.pm
create mode 100644 source/pidl/lib/Parse/Pidl/Samba4/Template.pm
create mode 100644 source/pidl/lib/Parse/Pidl/Typelist.pm
create mode 100644 source/pidl/lib/Parse/Pidl/Util.pm
create mode 100644 source/pidl/lib/Parse/Pidl/Wireshark/Conformance.pm
create mode 100644 source/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
create mode 100644 source/pidl/lib/Parse/Yapp/Driver.pm
create mode 100755 source/pidl/pidl
create mode 100644 source/pidl/tests/Util.pm
create mode 100755 source/pidl/tests/cutil.pl
create mode 100755 source/pidl/tests/dump.pl
create mode 100755 source/pidl/tests/header.pl
create mode 100755 source/pidl/tests/ndr.pl
create mode 100755 source/pidl/tests/ndr_align.pl
create mode 100755 source/pidl/tests/ndr_alloc.pl
create mode 100755 source/pidl/tests/ndr_array.pl
create mode 100755 source/pidl/tests/ndr_compat.pl
create mode 100755 source/pidl/tests/ndr_deprecations.pl
create mode 100755 source/pidl/tests/ndr_fullptr.pl
create mode 100755 source/pidl/tests/ndr_refptr.pl
create mode 100755 source/pidl/tests/ndr_represent.pl
create mode 100755 source/pidl/tests/ndr_simple.pl
create mode 100755 source/pidl/tests/ndr_string.pl
create mode 100755 source/pidl/tests/ndr_tagtype.pl
create mode 100755 source/pidl/tests/parse_idl.pl
create mode 100755 source/pidl/tests/samba-ejs.pl
create mode 100755 source/pidl/tests/samba-ndr.pl
create mode 100755 source/pidl/tests/samba3-cli.pl
create mode 100644 source/pidl/tests/samba3-srv.pl
create mode 100755 source/pidl/tests/tdr.pl
create mode 100755 source/pidl/tests/test_util.pl
create mode 100755 source/pidl/tests/typelist.pl
create mode 100755 source/pidl/tests/util.pl
create mode 100755 source/pidl/tests/wireshark-conf.pl
create mode 100755 source/pidl/tests/wireshark-ndr.pl
Changeset truncated at 500 lines:
diff --git a/docs-xml/archives/THANKS b/docs-xml/archives/THANKS
index 789042f..37ecc99 100644
--- a/docs-xml/archives/THANKS
+++ b/docs-xml/archives/THANKS
@@ -86,7 +86,7 @@ Tom Haapanen (tomh at metrics.com)
consulting firm located in Waterloo, Ontario, Canada. We work
with a variety of environments (such as Windows, Windows NT and
Unix), tools and application areas, and can provide assistance for
- development work ranging from a few days to to multiple man-year
+ development work ranging from a few days to multiple man-year
projects. You can find more information at http://www.metrics.com/.
diff --git a/docs-xml/manpages-3/mount.cifs.8.xml b/docs-xml/manpages-3/mount.cifs.8.xml
index c386592..ca8ae5f 100644
--- a/docs-xml/manpages-3/mount.cifs.8.xml
+++ b/docs-xml/manpages-3/mount.cifs.8.xml
@@ -140,7 +140,7 @@ credentials file properly.
same domain (e.g. running winbind or nss_ldap) and
the server supports the Unix Extensions then the uid
and gid can be retrieved from the server (and uid
- and gid would not have to be specifed on the mount.
+ and gid would not have to be specified on the mount.
For servers which do not support the CIFS Unix
extensions, the default uid (and gid) returned on lookup
of existing files will be the uid (gid) of the person
diff --git a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
index a12f44b..beb4f85 100644
--- a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
+++ b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml
@@ -117,6 +117,17 @@
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>smb_traffic_analyzer:total_anonymization = STRING</term>
+ <listitem>
+ <para>If STRING matches to 'yes', the module will replace
+ any user name with the string given by the option
+ smb_traffic_analyzer:anonymize_prefix, without generating
+ an additional hash number. This means that any transfer data
+ will be mapped to a single user, leading to a total
+ anonymization of user related data.</para>
+ </listitem>
+ </varlistentry>
</variablelist>
</refsect1>
diff --git a/docs-xml/smbdotconf/browse/enhancedbrowsing.xml b/docs-xml/smbdotconf/browse/enhancedbrowsing.xml
index 13f2cd6..7f85616 100644
--- a/docs-xml/smbdotconf/browse/enhancedbrowsing.xml
+++ b/docs-xml/smbdotconf/browse/enhancedbrowsing.xml
@@ -17,7 +17,7 @@
<para>You may wish to disable this option if you have a problem with empty
workgroups not disappearing from browse lists. Due to the restrictions
- of the browse protocols these enhancements can cause a empty workgroup
+ of the browse protocols, these enhancements can cause a empty workgroup
to stay around forever which can be annoying.</para>
<para>In general you should leave this option enabled as it makes
diff --git a/docs-xml/smbdotconf/locking/strictlocking.xml b/docs-xml/smbdotconf/locking/strictlocking.xml
index e3a0ed7..15ad0ad 100644
--- a/docs-xml/smbdotconf/locking/strictlocking.xml
+++ b/docs-xml/smbdotconf/locking/strictlocking.xml
@@ -12,7 +12,7 @@
<para>
When strict locking is set to Auto (the default), the server performs file lock checks only on non-oplocked files.
As most Windows redirectors perform file locking checks locally on oplocked files this is a good trade off for
- inproved performance.
+ improved performance.
</para>
<para>
diff --git a/docs-xml/smbdotconf/misc/remoteannounce.xml b/docs-xml/smbdotconf/misc/remoteannounce.xml
index f23968b..a6bf0c5 100644
--- a/docs-xml/smbdotconf/misc/remoteannounce.xml
+++ b/docs-xml/smbdotconf/misc/remoteannounce.xml
@@ -6,7 +6,7 @@
<description>
<para>
This option allows you to setup <citerefentry><refentrytitle>nmbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry>to periodically announce itself
+ <manvolnum>8</manvolnum></citerefentry> to periodically announce itself
to arbitrary IP addresses with an arbitrary workgroup name.
</para>
@@ -23,7 +23,7 @@
</programlisting>
the above line would cause <command moreinfo="none">nmbd</command> to announce itself
to the two given IP addresses using the given workgroup names. If you leave out the
- workgroup name then the one given in the <smbconfoption name="workgroup"/> parameter
+ workgroup name, then the one given in the <smbconfoption name="workgroup"/> parameter
is used instead.
</para>
diff --git a/docs-xml/smbdotconf/misc/usershareallowguests.xml b/docs-xml/smbdotconf/misc/usershareallowguests.xml
index 738f3a1..a3ae518 100644
--- a/docs-xml/smbdotconf/misc/usershareallowguests.xml
+++ b/docs-xml/smbdotconf/misc/usershareallowguests.xml
@@ -8,7 +8,7 @@
to be accessed by non-authenticated users or not. It is the equivalent
of allowing people who can create a share the option of setting
<parameter moreinfo="none">guest ok = yes</parameter> in a share
- definition. Due to the security sensitive nature of this the default
+ definition. Due to its security sensitive nature, the default
is set to off.</para>
</description>
diff --git a/docs-xml/smbdotconf/misc/usershareprefixallowlist.xml b/docs-xml/smbdotconf/misc/usershareprefixallowlist.xml
index bacc2e9..6c1822a 100644
--- a/docs-xml/smbdotconf/misc/usershareprefixallowlist.xml
+++ b/docs-xml/smbdotconf/misc/usershareprefixallowlist.xml
@@ -6,8 +6,8 @@
<description>
<para>This parameter specifies a list of absolute pathnames
the root of which are allowed to be exported by user defined share definitions.
- If the pathname exported doesn't start with one of the strings in this
- list the user defined share will not be allowed. This allows the Samba
+ If the pathname to be exported doesn't start with one of the strings in this
+ list, the user defined share will not be allowed. This allows the Samba
administrator to restrict the directories on the system that can be
exported by user defined shares.
</para>
diff --git a/docs-xml/smbdotconf/misc/usersharetemplateshare.xml b/docs-xml/smbdotconf/misc/usersharetemplateshare.xml
index efe2e81..9593a6c 100644
--- a/docs-xml/smbdotconf/misc/usersharetemplateshare.xml
+++ b/docs-xml/smbdotconf/misc/usersharetemplateshare.xml
@@ -5,7 +5,7 @@
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>User defined shares only have limited possible parameters
- such as path, guest ok etc. This parameter allows usershares to
+ such as path, guest ok, etc. This parameter allows usershares to
"cloned" from an existing share. If "usershare template share"
is set to the name of an existing share, then all usershares
created have their defaults set from the parameters set on this
diff --git a/docs-xml/smbdotconf/printing/useclientdriver.xml b/docs-xml/smbdotconf/printing/useclientdriver.xml
index 99e8556..4d9b7ab 100644
--- a/docs-xml/smbdotconf/printing/useclientdriver.xml
+++ b/docs-xml/smbdotconf/printing/useclientdriver.xml
@@ -29,7 +29,7 @@
<para>If this parameter is enabled for a printer, then any attempt
to open the printer with the PRINTER_ACCESS_ADMINISTER right is mapped
to PRINTER_ACCESS_USE instead. Thus allowing the OpenPrinterEx()
- call to succeed. <emphasis>This parameter MUST not be able enabled
+ call to succeed. <emphasis>This parameter MUST not be enabled
on a print share which has valid print driver installed on the Samba
server.</emphasis></para>
</description>
diff --git a/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml b/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml
index 6916261..79b6da7 100644
--- a/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml
+++ b/docs-xml/smbdotconf/protocol/aclcheckpermissions.xml
@@ -21,7 +21,7 @@
and allows the open. If the user doesn't have permission to delete the file this will only be
discovered at close time, which is too late for the Windows user tools to display an error message
to the user. The symptom of this is files that appear to have been deleted "magically" re-appearing
- on a Windows explorer refersh. This is an extremely advanced protocol option which should not
+ on a Windows explorer refresh. This is an extremely advanced protocol option which should not
need to be changed. This parameter was introduced in its final form in 3.0.21, an earlier version
with slightly different semantics was introduced in 3.0.20. That older version is not documented here.
</para>
diff --git a/docs-xml/smbdotconf/protocol/enableasusupport.xml b/docs-xml/smbdotconf/protocol/enableasusupport.xml
index cd4f30f..bb56b5a 100644
--- a/docs-xml/smbdotconf/protocol/enableasusupport.xml
+++ b/docs-xml/smbdotconf/protocol/enableasusupport.xml
@@ -5,7 +5,7 @@
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>Hosts running the "Advanced Server for Unix (ASU)" product
- require some special accomodations such as creating a builting [ADMIN$]
+ require some special accomodations such as creating a builtin [ADMIN$]
share that only supports IPC connections. The has been the default
behavior in smbd for many years. However, certain Microsoft applications
such as the Print Migrator tool require that the remote server support
diff --git a/docs-xml/smbdotconf/security/clientlanmanauth.xml b/docs-xml/smbdotconf/security/clientlanmanauth.xml
index 5266fef..967eacf 100644
--- a/docs-xml/smbdotconf/security/clientlanmanauth.xml
+++ b/docs-xml/smbdotconf/security/clientlanmanauth.xml
@@ -11,7 +11,7 @@
password hashes (e.g. Windows NT/2000, Samba, etc... but not
Windows 95/98) will be able to be connected from the Samba client.</para>
- <para>The LANMAN encrypted response is easily broken, due to it's
+ <para>The LANMAN encrypted response is easily broken, due to its
case-insensitive nature, and the choice of algorithm. Clients
without Windows 95/98 servers are advised to disable
this option. </para>
diff --git a/docs-xml/smbdotconf/security/clientsigning.xml b/docs-xml/smbdotconf/security/clientsigning.xml
index bf37cbb..c657e05 100644
--- a/docs-xml/smbdotconf/security/clientsigning.xml
+++ b/docs-xml/smbdotconf/security/clientsigning.xml
@@ -4,8 +4,7 @@
basic="1"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
- <para>This controls whether the client offers or requires
- the server it talks to to use SMB signing. Possible values
+ <para>This controls whether the client is allowed or required to use SMB signing. Possible values
are <emphasis>auto</emphasis>, <emphasis>mandatory</emphasis>
and <emphasis>disabled</emphasis>.
</para>
diff --git a/docs-xml/smbdotconf/security/lanmanauth.xml b/docs-xml/smbdotconf/security/lanmanauth.xml
index 3419522..4e68c5e 100644
--- a/docs-xml/smbdotconf/security/lanmanauth.xml
+++ b/docs-xml/smbdotconf/security/lanmanauth.xml
@@ -12,7 +12,7 @@
Windows 95/98 or the MS DOS network client) will be able to
connect to the Samba host.</para>
- <para>The LANMAN encrypted response is easily broken, due to it's
+ <para>The LANMAN encrypted response is easily broken, due to its
case-insensitive nature, and the choice of algorithm. Servers
without Windows 95/98/ME or MS DOS clients are advised to disable
this option. </para>
diff --git a/docs-xml/smbdotconf/security/passwordserver.xml b/docs-xml/smbdotconf/security/passwordserver.xml
index 0da247d..0e92af9 100644
--- a/docs-xml/smbdotconf/security/passwordserver.xml
+++ b/docs-xml/smbdotconf/security/passwordserver.xml
@@ -7,7 +7,7 @@
<para>By specifying the name of another SMB server
or Active Directory domain controller with this option,
and using <command moreinfo="none">security = [ads|domain|server]</command>
- it is possible to get Samba to
+ it is possible to get Samba
to do all its username/password validation using a specific remote server.</para>
<para>This option sets the name or IP address of the password server to use.
diff --git a/docs-xml/smbdotconf/security/security.xml b/docs-xml/smbdotconf/security/security.xml
index 3ad5175..514ea54 100644
--- a/docs-xml/smbdotconf/security/security.xml
+++ b/docs-xml/smbdotconf/security/security.xml
@@ -47,7 +47,7 @@
want to mainly setup shares without a password (guest shares). This
is commonly used for a shared printer server. It is more difficult
to setup guest shares with <command moreinfo="none">security = user</command>, see
- the <smbconfoption name="map to guest"/>parameter for details.</para>
+ the <smbconfoption name="map to guest"/> parameter for details.</para>
<para>It is possible to use <command moreinfo="none">smbd</command> in a <emphasis>
hybrid mode</emphasis> where it is offers both user and share
@@ -58,7 +58,7 @@
<para><anchor id="SECURITYEQUALSSHARE"/><emphasis>SECURITY = SHARE</emphasis></para>
- <para>When clients connect to a share level security server they
+ <para>When clients connect to a share level security server, they
need not log onto the server with a valid username and password before
attempting to connect to a shared resource (although modern clients
such as Windows 95/98 and Windows NT will send a logon request with
@@ -211,7 +211,7 @@
</para></note>
<note><para>From the client's point of
- view <command moreinfo="none">security = server</command> is the
+ view, <command moreinfo="none">security = server</command> is the
same as <command moreinfo="none">security = user</command>. It
only affects how the server deals with the authentication, it does
not in any way affect what the client sees.</para></note>
diff --git a/docs-xml/smbdotconf/security/serverschannel.xml b/docs-xml/smbdotconf/security/serverschannel.xml
index 6317448..6554635 100644
--- a/docs-xml/smbdotconf/security/serverschannel.xml
+++ b/docs-xml/smbdotconf/security/serverschannel.xml
@@ -13,7 +13,7 @@
</para>
<para>
- Please note that with this set to <literal>no</literal> you will have to apply the WindowsXP
+ Please note that with this set to <literal>no</literal>, you will have to apply the WindowsXP
<filename>WinXP_SignOrSeal.reg</filename> registry patch found in the docs/registry subdirectory of the Samba distribution tarball.
</para>
</description>
diff --git a/docs-xml/smbdotconf/security/serversigning.xml b/docs-xml/smbdotconf/security/serversigning.xml
index f2f5629..ea21a2c 100644
--- a/docs-xml/smbdotconf/security/serversigning.xml
+++ b/docs-xml/smbdotconf/security/serversigning.xml
@@ -5,8 +5,7 @@
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
- <para>This controls whether the server offers or requires
- the client it talks to to use SMB signing. Possible values
+ <para>This controls whether the client is allowed or required to use SMB signing. Possible values
are <emphasis>auto</emphasis>, <emphasis>mandatory</emphasis>
and <emphasis>disabled</emphasis>.
</para>
diff --git a/docs-xml/smbdotconf/security/smbencrypt.xml b/docs-xml/smbdotconf/security/smbencrypt.xml
index eb91ce5..d556166 100644
--- a/docs-xml/smbdotconf/security/smbencrypt.xml
+++ b/docs-xml/smbdotconf/security/smbencrypt.xml
@@ -16,8 +16,7 @@
and MacOS/X clients. Windows clients do not support this feature.
</para>
- <para>This controls whether the server offers or requires
- the client it talks to to use SMB encryption. Possible values
+ <para>This controls whether the remote client is allowed or required to use SMB encryption. Possible values
are <emphasis>auto</emphasis>, <emphasis>mandatory</emphasis>
and <emphasis>disabled</emphasis>. This may be set on a per-share
basis, but clients may chose to encrypt the entire session, not
diff --git a/docs-xml/smbdotconf/security/updateencrypted.xml b/docs-xml/smbdotconf/security/updateencrypted.xml
index da49366..eb54ed9 100644
--- a/docs-xml/smbdotconf/security/updateencrypted.xml
+++ b/docs-xml/smbdotconf/security/updateencrypted.xml
@@ -9,7 +9,7 @@
This boolean parameter allows a user logging on with a plaintext password to have their encrypted (hashed)
password in the smbpasswd file to be updated automatically as they log on. This option allows a site to
migrate from plaintext password authentication (users authenticate with plaintext password over the
- wire, and are checked against a UNIX account atabase) to encrypted password authentication (the SMB
+ wire, and are checked against a UNIX account database) to encrypted password authentication (the SMB
challenge/response authentication mechanism) without forcing all users to re-enter their passwords via
smbpasswd at the time the change is made. This is a convenience option to allow the change over to encrypted
passwords to be made over a longer period. Once all users have encrypted representations of their passwords
@@ -24,7 +24,7 @@
</para>
<para>
- Note that even when this parameter is set a user authenticating to <command moreinfo="none">smbd</command>
+ Note that even when this parameter is set, a user authenticating to <command moreinfo="none">smbd</command>
must still enter a valid password in order to connect correctly, and to update their hashed (smbpasswd)
passwords.
</para>
diff --git a/source/Makefile.in b/source/Makefile.in
index bfa161c..29a41a9 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -1154,8 +1154,10 @@ IDL_FILES = lsa.idl dfs.idl echo.idl winreg.idl initshutdown.idl \
epmapper.idl messaging.idl xattr.idl misc.idl samr.idl security.idl \
dssetup.idl krb5pac.idl ntsvcs.idl libnetapi.idl
+PIDL = "$(srcdir)/pidl/pidl"
+
idl::
- @IDL_FILES="$(IDL_FILES)" CPP="$(CPP)" PERL="$(PERL)" \
+ @IDL_FILES="$(IDL_FILES)" CPP="$(CPP)" PERL="$(PERL)" PIDL="$(PIDL)"\
srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh $(PIDL_ARGS)
diff --git a/source/auth/auth_util.c b/source/auth/auth_util.c
index 662c9dd..5789beb 100644
--- a/source/auth/auth_util.c
+++ b/source/auth/auth_util.c
@@ -565,8 +565,6 @@ NTSTATUS make_server_info_sam(auth_serversupplied_info **server_info,
}
result->sam_account = sampass;
- /* Ensure thaat the sampass will be freed with the result */
- talloc_steal(result, sampass);
result->unix_name = pwd->pw_name;
/* Ensure that we keep pwd->pw_name, because we will free pwd below */
talloc_steal(result, pwd->pw_name);
@@ -650,6 +648,8 @@ NTSTATUS make_server_info_sam(auth_serversupplied_info **server_info,
pdb_get_username(sampass), result->unix_name));
*server_info = result;
+ /* Ensure thaat the sampass will be freed with the result */
+ talloc_steal(result, sampass);
return NT_STATUS_OK;
}
diff --git a/source/client/mount.cifs.c b/source/client/mount.cifs.c
index e7397da..d05115b 100644
--- a/source/client/mount.cifs.c
+++ b/source/client/mount.cifs.c
@@ -485,7 +485,8 @@ static int parse_options(char ** optionsp, int * filesys_flags)
}
} else if (strncmp(data, "sec", 3) == 0) {
if (value) {
- if (!strcmp(value, "none"))
+ if (!strncmp(value, "none", 4) ||
+ !strncmp(value, "krb5", 4))
got_password = 1;
}
} else if (strncmp(data, "ip", 2) == 0) {
@@ -533,8 +534,11 @@ static int parse_options(char ** optionsp, int * filesys_flags)
SAFE_FREE(out);
return 1;
}
- } else if ((strncmp(data, "domain", 3) == 0)
- || (strncmp(data, "workgroup", 5) == 0)) {
+ } else if ((strncmp(data, "dom" /* domain */, 3) == 0)
+ || (strncmp(data, "workg", 5) == 0)) {
+ /* note this allows for synonyms of "domain"
+ such as "DOM" and "dom" and "workgroup"
+ and "WORKGRP" etc. */
if (!value || !*value) {
printf("CIFS: invalid domain name\n");
SAFE_FREE(out);
@@ -646,7 +650,9 @@ static int parse_options(char ** optionsp, int * filesys_flags)
} else if (strncmp(data, "exec", 4) == 0) {
*filesys_flags &= ~MS_NOEXEC;
} else if (strncmp(data, "guest", 5) == 0) {
- got_password=1;
+ user_name = (char *)calloc(1, 1);
+ got_user = 1;
+ got_password = 1;
} else if (strncmp(data, "ro", 2) == 0) {
*filesys_flags |= MS_RDONLY;
} else if (strncmp(data, "rw", 2) == 0) {
@@ -1075,6 +1081,14 @@ int main(int argc, char ** argv)
}
mountpoint = argv[2];
} else {
+ if ((strcmp (argv[1], "--version") == 0) ||
+ ((strcmp (argv[1], "-V") == 0))) {
+ printf ("mount.cifs version: %s.%s%s\n",
+ MOUNT_CIFS_VERSION_MAJOR,
+ MOUNT_CIFS_VERSION_MINOR,
+ MOUNT_CIFS_VENDOR_SUFFIX);
+ exit (0);
+ }
mount_cifs_usage();
exit(EX_USAGE);
}
@@ -1286,7 +1300,13 @@ int main(int argc, char ** argv)
}
if(got_user == 0) {
- user_name = getusername();
+ /* Note that the password will not be retrieved from the
+ USER env variable (ie user%password form) as there is
+ already a PASSWD environment varaible */
+ if (getenv("USER"))
+ user_name = strdup(getenv("USER"));
+ if (user_name == NULL)
+ user_name = getusername();
got_user = 1;
}
diff --git a/source/client/umount.cifs.c b/source/client/umount.cifs.c
index 81925ed..1227e7a 100644
--- a/source/client/umount.cifs.c
+++ b/source/client/umount.cifs.c
@@ -240,10 +240,9 @@ static int remove_from_mtab(char * mountpoint)
static char *
canonicalize(char *path)
{
- char *canonical = malloc (PATH_MAX + 1);
+ char *canonical;
- if (!canonical) {
- fprintf(stderr, "Error! Not enough memory!\n");
+ if (path == NULL) {
return NULL;
}
@@ -252,8 +251,12 @@ canonicalize(char *path)
return NULL;
}
- if (path == NULL)
+ canonical = (char *)malloc (PATH_MAX + 1);
+
+ if (!canonical) {
+ fprintf(stderr, "Error! Not enough memory!\n");
return NULL;
+ }
if (realpath (path, canonical))
return canonical;
diff --git a/source/include/includes.h b/source/include/includes.h
index d140552..2e1161f 100644
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -207,12 +207,12 @@ typedef int ber_int_t;
#undef HAVE_LDAP
#endif
-#if HAVE_GSSAPI_H
-#include <gssapi.h>
-#elif HAVE_GSSAPI_GSSAPI_H
+#if HAVE_GSSAPI_GSSAPI_H
#include <gssapi/gssapi.h>
#elif HAVE_GSSAPI_GSSAPI_GENERIC_H
#include <gssapi/gssapi_generic.h>
+#elif HAVE_GSSAPI_H
+#include <gssapi.h>
#endif
#if HAVE_COM_ERR_H
diff --git a/source/include/local.h b/source/include/local.h
index c125ded..45767ad 100644
--- a/source/include/local.h
+++ b/source/include/local.h
@@ -253,4 +253,7 @@
/* Windows minimum lock resolution timeout in ms */
#define WINDOWS_MINIMUM_LOCK_TIMEOUT_MS 200
+/* Maximum size of RPC data we will accept for one call. */
+#define MAX_RPC_DATA_SIZE (15*1024*1024)
+
#endif
diff --git a/source/include/vfs_macros.h b/source/include/vfs_macros.h
index be57c9e..16eb1d3 100644
--- a/source/include/vfs_macros.h
+++ b/source/include/vfs_macros.h
@@ -54,8 +54,8 @@
#define SMB_VFS_WRITE(fsp, data, n) ((fsp)->conn->vfs.ops.write((fsp)->conn->vfs.handles.write, (fsp), (data), (n)))
#define SMB_VFS_PWRITE(fsp, data, n, off) ((fsp)->conn->vfs.ops.pwrite((fsp)->conn->vfs.handles.pwrite, (fsp), (data), (n), (off)))
--
SAMBA-CTDB repository
More information about the samba-cvs
mailing list