[SCM] Samba Shared Repository - branch v3-5-stable updated
Karolin Seeger
kseeger at samba.org
Mon May 17 05:51:39 MDT 2010
The branch, v3-5-stable has been updated
via 4ae81a9... WHATSNEW: Add major enhancements in 3.5.3.
via b0ed654... WHATSNEW: Update changes since 3.5.2.
via 8bbeccb... mount.cifs: check for NULL addr pointer before handling scopeid
via 5de0ffa... s3-docs: Unify capitalization.
via c7b8f3e... s3-docs: Add documentation of the net g_lock subcommand.
via feae5d0... s3-docs: Move -D option to the right paragraph in man winbindd.
via a8871c6... work around AIX6.1 name space pollution rename mod_name to module_name
via 75c12a4... lib/replace: make sure IPV6_V6ONLY is available for IPv6 support
via 1f0f830... lib/replace: add replacement for IPV6_V6ONLY on linux systems with broken headers
via fa773cd... tsocket_bsd: Always use a real length for the sa_socklen, and keep it around
via 82ee4a2... tsocket: only copy the specific part of sockaddr*
via 18717ca... tsocket: allow AF_UNIX sockaddrs smaller than sizeof(sockaddr_un)
via 2975e65... s3:configure: use correct SONAMEFLAG on Solaris depending on which linker is being used (cherry picked from commit 358a3855c20153d7fe742ca2e6b9bd8a9c92e525)
via 03f4400... s3:configure: not simply check for "ld" but for the linker used by $CC
via b2fe935... s3-net: Fix Bug #7417. 'net rpc user password' can set the wrong password.
via a9c442e... s3-spoolss: Fix _spoolss_EnumPrinters servername handling.
via 1eb5581... s3-spoolss: in spoolss_EnumPrinters r->in.server is a *unique* pointer!
via 6b5ab87... Fix bug #7263 - Unable to print using Samba 3.5.1 and cups-1.1.23-40.46 on SLES10.
via 23a8770... s3-rpcclient: Fix Bug #7277. rpcclient was sending invalid data, causing cupsaddsmb to fail.
via 753be37... tsocket: Improve the tsocket_address_bsd_sockaddr documentation.
via 535b96d... Spelling fixes for tsocket API documentation.
via c5f192e... tsocket: Fix the description of tstream_writev_queue_send/recv (cherry picked from commit 88099bcc93fabebe3d4548f8a5aa26b585886a1c)
via 309fcce... tsocket: Fix description for tstream_readv_pdu_queue_send/recv (cherry picked from commit 9184f524f0e5fe828b723200182969e0e3e8685d)
via ec5d9fa... tsocket: Added complete doxygen documentation.
via 2ca53f0... tsocket: Added doxygen config file.
via 7f40864... s3: Fix bug 7398 -- rename problems with full_audit (cherry picked from commit a9be37010b465346d5008edc5f8311180ff9e4f4)
via 66d9db0... s3/packaging: make rpm build work by overriding strict linker flags (cherry picked from commit 8f74d38c3a4a853f608fed0bed1b55915d01555a) (cherry picked from commit 1c39ce13c551b0fb5ca1569d7be82a34284f7f06)
via 8e9e6ed... s3: Fix a winbind crash when scanning trusts
via f3868de... Fix bug #7384 - dptr_Close has a bitmap leak.
via aa14278... s3-net_conf: Display an error on net conf import failures.
via 6c52bb5... s3 torture: Prevent smbcli segfault when running smbtorture3 against an smbd with security=share
via 758730f... s3-docs: Improve "winbind nss info" section in man smb.conf.
via e245f46... Fix bug #7288 - SMB job IDs in CUPS job names wrong.
via e0fccc3... s3-libsmbclient: Fix incomplete description of function return values in libsmbclient.h.
via 4d9210e... libwbclient: Re-Fix a bug that was fixed with e5741e27c4c
via c6c4606... s3:winbindd: make "smbcontrol winbindd validate-cache" reliable again
via c0ba225... s3:winbindd: remove unused variables
via 853e2a8... s3:winbindd: fix problems with SIGCHLD handling (bug #7317)
via 2862e0e... s3-docs: Fix typo in man idmap_ad.
via 1915731... s3:lib/time: remove TIME_T_MIN/MAX defines
via c107d64... lib/util: move TIME_T_MIN/MAX defines into header file (cherry picked from commit 571ee54b791b93ad46e09ed563ef4a5582dcf0c8) (cherry picked from commit 42d89dbd9407fcdef989387208dd8cae8472a6e8)
via ba710ca... Fix bug #7339 - MSDFS is non-functional in 3.5.x
from 4edb5b0... WHATSNEW: Start release notes for Samba 3.5.3.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-stable
- Log -----------------------------------------------------------------
commit 4ae81a924339aa4fb743b163b3edb4ec8f8c5485
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon May 17 13:49:42 2010 +0200
WHATSNEW: Add major enhancements in 3.5.3.
Karolin
(cherry picked from commit 813cfd7cb1f069ea622724e01d4b75b18bfcf482)
commit b0ed6540463582ac458e0c56c8a377d72142a48c
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon May 17 10:21:08 2010 +0200
WHATSNEW: Update changes since 3.5.2.
Karolin
(cherry picked from commit ffd5a0f90fd43d1e3a995e60acade1a07d8ef1c8)
commit 8bbeccb9c35661c5a4d219398889b9f66aed7de7
Author: Jeff Layton <jlayton at redhat.com>
Date: Wed May 12 07:05:10 2010 -0400
mount.cifs: check for NULL addr pointer before handling scopeid
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Fix bug #7315 (mount.cifs segfaults after upgrade to 2.6.33).
(cherry picked from commit 78a6eb582d28d92db5ffab6ded40785be54cf540)
commit 5de0ffa2e337fa650ef106d32f1be2b43d3f1544
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed May 12 16:21:56 2010 +0200
s3-docs: Unify capitalization.
Karolin
(cherry picked from commit da64913f55fa2c3d0b34cda3b8c4953894c4ed66)
(cherry picked from commit f4d87160444eaa4f5a0239ad58159f13e03a851e)
commit c7b8f3e1a79561df1a45e9ca15133f79eb9b3f85
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed May 12 16:17:33 2010 +0200
s3-docs: Add documentation of the net g_lock subcommand.
Karolin
(cherry picked from commit ad6f63822915463011074c9e5f3ed938b48579f4)
(cherry picked from commit 4b55c32a614f47849f8e6e12eccdd06fbbea5e96)
commit feae5d09e7dcf1943f6d1d2baceb54df53ecf664
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed May 12 11:24:57 2010 +0200
s3-docs: Move -D option to the right paragraph in man winbindd.
Fix bug #7260 (Command line option documentation in wrong place in winbindd man
page.). Thanks to Ged Haywood <samba at jubileegroup.co.uk> for reporting!
Karolin
(cherry picked from commit da5c49d727150eea7d2a4b83da1a02ac1f26e77c)
(cherry picked from commit b737434fbf60c250166f10cf196af8030b388bdb)
commit a8871c6c02cf9c89320f4bfc94c4fdb4b0b8c595
Author: Olaf Flebbe <o.flebbe at science-computing.de>
Date: Tue May 11 11:30:04 2010 +0200
work around AIX6.1 name space pollution rename mod_name to module_name
Fix bug #7421 (samba 3.4.7 does not compile on AIX 6.1).
(cherry picked from commit 9649538f81aec325be47b704a5a056b5ae16be22)
commit 75c12a4c078a689c728213d02c99ee49dcfef592
Author: Stefan Metzmacher <metze at samba.org>
Date: Sat Apr 24 13:07:50 2010 +0200
lib/replace: make sure IPV6_V6ONLY is available for IPv6 support
We rely on IPV6_V6ONLY being supported. See bug #7196.
metze
(cherry picked from commit 41cd6f992829c45c890f5daf78eb3019633f3620)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit ae0ee660a5666b18ffaa43bebbe6808781a82c37)
commit 1f0f830dce26e31232c9d2abb08ceb743e914251
Author: Stefan Metzmacher <metze at samba.org>
Date: Sat Apr 24 19:02:22 2010 +0200
lib/replace: add replacement for IPV6_V6ONLY on linux systems with broken headers
This is needed on SLES8. See bug 7196.
metze
(cherry picked from commit e06cf3950252a46486aa046a4552ed6ebff175b3)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 15b509b4b03a2c19caf4abfe475666f0720b4441)
commit fa773cde00d0bf24f78fee1ffc508b0f7c81bbd9
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Apr 7 10:42:37 2010 +1000
tsocket_bsd: Always use a real length for the sa_socklen, and keep it around
The previous code assumed the OS would happily accept sizeof(struct
sockaddr_storage). It seems some versions of Solaris do not like
this.
Andrew Bartlett
(cherry picked from commit f1aa4c34bf0bd7d42627024af333963b741babea)
Fix for bug #7354.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 109e407554c55a602b0c184eb7eec2ed1833b68b)
commit 82ee4a2c5a4ba969768156d8bbdfea56cd53a187
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Dec 23 19:34:32 2009 +0100
tsocket: only copy the specific part of sockaddr*
This makes sure we fill the unspefic bytes with 0
and have zero termination for sockaddr_un.
metze
(cherry picked from commit 17c804a67593cdb4d8646b5be6b50fddf56b3e27)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit e96605da78f1a0afbaf3b0aedaf7a4730d64d3a5)
commit 18717cad039d251ff9b3c4813f6e67911e0ebebc
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Dec 23 19:31:41 2009 +0100
tsocket: allow AF_UNIX sockaddrs smaller than sizeof(sockaddr_un)
This is needed as getpeername() truncates the length to 2 if the
peer socket has no name.
metze
(cherry picked from commit 4784c8c3bea98592486ca973d57c99671eb68cb2)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit e9f7d271e2a96d5dbce63bc454c68930cbc52d62)
commit 2975e65e505c1d3c166bc1ee4be2f20a180086eb
Author: Björn Jacke <bj at sernet.de>
Date: Fri May 7 11:56:38 2010 +0200
s3:configure: use correct SONAMEFLAG on Solaris depending on which linker is being used
(cherry picked from commit 358a3855c20153d7fe742ca2e6b9bd8a9c92e525)
Fix bug #7385 (Can't compile. Undefined symbol 'main').
(cherry picked from commit 47e2bd2e29dca9cb5b503ae07f8935e70c687c71)
commit 03f440071cf33aa24733f730cdfcded68c8b3e34
Author: Björn Jacke <bj at sernet.de>
Date: Wed May 5 20:17:39 2010 +0200
s3:configure: not simply check for "ld" but for the linker used by $CC
this hopefully fixes Solaris' gcc build which uses the system ld by default.
All in all we should clean up most of the compiler and linker flags depending
on the actual compilers and linkers we use. Only some tweaks are OS-specific.
A cleanup in this area should be done along with the move to a new build
system (whensoever that will be ...).
(cherry picked from commit 1969b4acc3fd7c124e288d0495b9b4665d4b42db)
Fix bug #7385 (Can't compile. Undefined symbol 'main').
(cherry picked from commit eff42fa66e561069959c401492c3b82a09b4742b)
commit b2fe935f1bed08706820cecd3876ec9ec4946916
Author: Günther Deschner <gd at samba.org>
Date: Sat May 8 02:16:37 2010 +0200
s3-net: Fix Bug #7417. 'net rpc user password' can set the wrong password.
Guenther
(cherry picked from commit 7887d99a60387e93ce5ce4a3bfe9117939d1e4c8)
(cherry picked from commit b4b36e1a486296d049c96ea66e201d9c01e7165d)
commit a9c442ebaeb6c84da4b12c1d98c68bf5ae74fd16
Author: Günther Deschner <gd at samba.org>
Date: Thu Feb 18 12:40:00 2010 +0100
s3-spoolss: Fix _spoolss_EnumPrinters servername handling.
Guenther
(cherry picked from commit b3c2b2260a503079b9abf22f6b35b56c61c2b372)
The last two patches address bug #7418 ("net rpc printer list" command is
inoperative).
(cherry picked from commit df5f448fe371a1227a507cedc2642fa1a4b77e65)
commit 1eb5581e4db8173848676e594be8cecec6980870
Author: Günther Deschner <gd at samba.org>
Date: Thu Feb 18 02:03:53 2010 +0100
s3-spoolss: in spoolss_EnumPrinters r->in.server is a *unique* pointer!
Guenther
(cherry picked from commit 8ce66fba03f782c0b9948a9835bb488cfa74acf9)
(cherry picked from commit cb6fcb9b16b36fcdc68bef382dbd7ecf89521d4e)
commit 6b5ab8701ea945874232144915f97ff5d8038b47
Author: Luca Olivetti <luca at wetron.es>
Date: Tue May 4 15:07:57 2010 -0700
Fix bug #7263 - Unable to print using Samba 3.5.1 and cups-1.1.23-40.46 on SLES10.
Fix cups encryption setting
I had the same problem and it's due to the fact that samba doesn't respect the
"cups encryption" setting since lp_cups_encrypt changes the value: if you set
"cups encryption=no", the first call will change it to HTTP_ENCRYPT_NEVER,
since that is 1 (i.e. true), the next call will change it to
HTTP_ENCRYPT_ALWAYS and after that it'll remain set as HTTP_ENCRYPT_ALWAYS.
This patch fixes this problem.
Don't mix up the HTTP_ENCRYPT_XXX constants up with the
enumeration constants (True, False, Auto) used in the
loadparm code.
(cherry picked from commit a9e008ee36c8fd9ca79b3bdfdc78111939c3e539)
(cherry picked from commit 7f57b627800baba4bc030d9c3748ead9ac53397d)
commit 23a87705187dd8da4c93d31e1a9c50afe6de5994
Author: Günther Deschner <gd at samba.org>
Date: Mon May 3 15:54:14 2010 +0200
s3-rpcclient: Fix Bug #7277. rpcclient was sending invalid data, causing cupsaddsmb to fail.
Guenther
(cherry picked from commit 9cc10e6a5742f09261f01a2c0b3a94b7b772e573)
(cherry picked from commit 0fc2424ee2f5082a74dad45a03226b457b6b00a8)
commit 753be37c601ed8267c79b28d781b5d72e8cc318e
Author: Andreas Schneider <asn at redhat.com>
Date: Thu Feb 25 14:32:39 2010 +0100
tsocket: Improve the tsocket_address_bsd_sockaddr documentation.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 1983256c70cf07b8c8afddd024ee5fd2522ee83c)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 672b1c8f9d090b294f89bc322320d65375670660)
commit 535b96d56c2b76e5683a13d2b0fbc4f7f92efb52
Author: Brad Hards <bradh at frogmouth.net>
Date: Sun Feb 21 16:34:22 2010 +1100
Spelling fixes for tsocket API documentation.
Signed-off-by: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
(cherry picked from commit 319d3bf9d93ddfc1afbfb0c759f6d91906f915c1)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 3ebaa433c1d223147b649ac50540fda733c5380e)
commit c5f192efcc9f335157838802ab131fbf5a7e6195
Author: Kai Blin <kai at samba.org>
Date: Thu Jan 28 11:16:24 2010 +0100
tsocket: Fix the description of tstream_writev_queue_send/recv (cherry picked from commit 88099bcc93fabebe3d4548f8a5aa26b585886a1c)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 5f8cb2a49e94f29da85dd62237a5f8967c44d826)
commit 309fcce878a6206f3b38648c729c5cfc6c1d2860
Author: Kai Blin <kai at samba.org>
Date: Thu Jan 28 11:11:33 2010 +0100
tsocket: Fix description for tstream_readv_pdu_queue_send/recv (cherry picked from commit 9184f524f0e5fe828b723200182969e0e3e8685d)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 89abb42c9b1697a5b3727cfeed8e32da44732980)
commit ec5d9fa7c969a8c8c97a877898e72738d911d725
Author: Andreas Schneider <asn at redhat.com>
Date: Wed Dec 16 13:26:48 2009 +0100
tsocket: Added complete doxygen documentation.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 574f77f89e78997844dd6e993f9bf53476555026)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 75ed29b8b72113302dafaf2ecb149a8b52b2206d)
commit 2ca53f0cfc4e38732969214b7f0e0ac9bb4b7a05
Author: Andreas Schneider <asn at redhat.com>
Date: Mon Dec 21 12:44:00 2009 +0100
tsocket: Added doxygen config file.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 04f3f27f7e7a4e7ae3584fe9b7ed7c5f5d556ec7)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 8810302313831195645fc83145cf930b4f5bd983)
commit 7f40864bee1d2441a25df1decb2f3e0bf83ffc66
Author: Volker Lendecke <vl at samba.org>
Date: Thu Apr 29 20:07:35 2010 +0200
s3: Fix bug 7398 -- rename problems with full_audit
(cherry picked from commit a9be37010b465346d5008edc5f8311180ff9e4f4)
commit 66d9db03282b0db0ad69872a20d20919611ed35f
Author: Björn Jacke <bj at sernet.de>
Date: Tue Apr 27 17:06:55 2010 +0200
s3/packaging: make rpm build work by overriding strict linker flags
(cherry picked from commit 8f74d38c3a4a853f608fed0bed1b55915d01555a)
(cherry picked from commit 1c39ce13c551b0fb5ca1569d7be82a34284f7f06)
commit 8e9e6ed2b2ea06106b99541b404d046a22fa75ee
Author: Volker Lendecke <vl at samba.org>
Date: Wed Apr 21 17:04:49 2010 +0200
s3: Fix a winbind crash when scanning trusts
add_trusted_domain() for a new domain always needs to be followed by a
setup_domain_child(). This was not always done, in particular not when walking
to the forest root for additional trusts.
This is a minimal patch, we need to fix add_trusted_domain().
Fix bug #7389 (Fix a winbind crash when scanning trusted domains).
(cherry picked from commit a356b04933e65aed9a6c38611bcbfce3b297d092)
commit f3868dea15cf8c28ac24b774ff07dbe19f326145
Author: Ira Cooper <samba at ira.wakeful.net>
Date: Fri Apr 23 10:55:46 2010 -0700
Fix bug #7384 - dptr_Close has a bitmap leak.
s3: Fix to dptr_Close
This fixes a bitmap "leak" in dptr_Close by making it use the same internal
routines the rest of the code does.
(cherry picked from commit dd2025947136f28b22b70de59309e149a1f45f3d)
(cherry picked from commit 3e6f961a7a6b4d0e41d0cf2c47ca2aebeea8f6af)
commit aa14278c67cec5a296956a5d9af471a525a1d75a
Author: Jim McDonough <jmcd at samba.org>
Date: Wed Apr 21 20:51:54 2010 +0200
s3-net_conf: Display an error on net conf import failures.
When something goes wrong, such as a typo in a parameter
name, we'll now display the failure instead of just returning
with -1 and no message.
Fix bug #7378 ("net conf import" fails silently on parameter typo).
(cherry picked from commit c1ae6d36d09569732408fdd6c079a1db7a5a65a5)
commit 6c52bb5a363660f1ace852b8d5e687455dfe1ea4
Author: Tim Prouty <tprouty at samba.org>
Date: Mon Jan 4 12:57:34 2010 -0800
s3 torture: Prevent smbcli segfault when running smbtorture3 against an smbd with security=share
Fix bug #7370 (3.5.2 smbclient segfaults when used against old samba
"security = share").
(cherry picked from commit db511272f3393a35a1e596740b88487333ebeb24)
commit 758730f4b4cdfd2cffe1cef015671ee4cd89cee1
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Apr 16 09:23:30 2010 +0200
s3-docs: Improve "winbind nss info" section in man smb.conf.
Karolin
(cherry picked from commit 20fc769179377bf037f4d5efe1afbaf77d4c9292)
(cherry picked from commit fb1b0901ec93afe998145bb7a7549bbdb13c712c)
commit e245f46c407666b320cdacd8af03b21fba7dd4b5
Author: Jeremy Allison <jra at samba.org>
Date: Thu Mar 25 18:22:16 2010 -0700
Fix bug #7288 - SMB job IDs in CUPS job names wrong.
Based on a patch from Michael Karcher <samba at mkarcher.dialup.fu-berlin.de>.
I think this is the correct fix. It causes cups_job_submit to use
print_parse_jobid(), which I've moved into printing/lpq_parse.c (to allow the
link to work).
It turns out the old print_parse_jobid() was *broken*, in that the pjob
filename was set as an absolute path - not relative to the sharename (due to it
not going through the VFS calls).
This meant that the original code doing a strncmp on the first part of the
filename would always fail - it starts with a "/", not the relative pathname of
PRINT_SPOOL_PREFIX ("smbprn.").
This fix could fix some other mysterious printing bugs - probably the ones
Guenther noticed where job control fails on non-cups backends.
Contains c79ca41baf15b4ef7eb287d343b17a53ba41e852 and
92332fb2368c641db1552d1f2a2f7b3deaa11519 from master.
Jeremy.
(cherry picked from commit 12936bfeb36ae867b52fe48d0f6d3d17d5c8b110)
commit e0fccc374a3c209c6eea9a5bcb62ce84a3472cc1
Author: Derrell Lipman <derrell at dworkin.(none)>
Date: Tue Apr 13 20:32:14 2010 +0200
s3-libsmbclient: Fix incomplete description of function return values in libsmbclient.h.
Fix bug #7345.
(cherry picked from commit ce565b0498608714e2c4f7c9f9373dddcbfba568)
commit 4d9210ef9cca057ddb2a6e648a0215996b3362f0
Author: Volker Lendecke <vl at samba.org>
Date: Tue Apr 13 12:09:21 2010 +0200
libwbclient: Re-Fix a bug that was fixed with e5741e27c4c
> r21878: Fix a bug with smbd serving a windows terminal server: If winbind
> decides smbd to be idle it might happen that smbd needs to do a winbind
> operation (for example sid2name) as non-root. This then fails to get the
> privileged pipe. When later on on the same connection another authentication
> request comes in, we try to do the CRAP auth via the non-privileged pipe.
>
> This adds a winbindd_priv_request_response() request that kills the existing
> winbind pipe connection if it's not privileged.
The fix for this was lost during the conversion to libwbclient.
Thanks to Ira Cooper <samba at ira.wakeful.net> for pointing this out!
Volker
Fix bug #7357.
(cherry picked from commit 5c5e646ab3546aae4660b6598a6c89c66c3b4687)
commit c6c4606dac3035a76ab36233e5b877a984c95ab2
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 8 12:45:54 2010 +0200
s3:winbindd: make "smbcontrol winbindd validate-cache" reliable again
commit 73577205cf81644e7fe853eaf3e6459f7f443096
(s3:winbindd: fix problems with SIGCHLD handling (bug #7317))
broke this.
metze
(cherry picked from commit eb9b7d0363669574de8ec380089407890f15eac2)
(cherry picked from commit bc30dc6983835ee376125861a5450975cc5af2ff)
commit c0ba225f50b623e8a0d2f7ecb5e3d9066ee109af
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 1 18:10:47 2010 +0200
s3:winbindd: remove unused variables
metze
(cherry picked from commit e18ddb6036f5e0a2211e89a7c9b5514c30a653cf)
(cherry picked from commit 284f94b01d70db2e55dd8c1f3f8a353c1b4c1b8e)
commit 853e2a8b8a1aea8c6cee1a6232a5d641c1fee6cd
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 1 16:23:06 2010 +0200
s3:winbindd: fix problems with SIGCHLD handling (bug #7317)
The main problem is that we call CatchChild() within the
parent winbindd, which overwrites the signal handler
that was registered by winbindd_setup_sig_chld_handler().
That means winbindd_sig_chld_handler() and winbind_child_died()
are never triggered when a winbindd domain child dies.
As a result will get "broken pipe" for all requests to that domain.
To reduce the risk of similar bugs in future we call
CatchChild() in winbindd_reinit_after_fork() now.
We also use a full winbindd_reinit_after_fork() in the
cache validation child now instead instead of just resetting
the SIGCHLD handler by hand. This will also fix possible
tdb problems on systems without pread/pwrite and disabled mmap
as we now correctly reopen the tdb handle for the child.
metze
(cherry picked from commit 73577205cf81644e7fe853eaf3e6459f7f443096)
(cherry picked from commit e7b9c148d6fe155bd8afb8ff9b148eaf4092ff4e)
commit 2862e0e5b316348d9ca942f855949022b9bb4fc3
Author: Karolin Seeger <kseeger at samba.org>
Date: Tue Apr 13 20:06:14 2010 +0200
s3-docs: Fix typo in man idmap_ad.
Karolin
(cherry picked from commit 6389fac6db2f54d148222009b5e209cef5c6bdd7)
(cherry picked from commit 39dbf73a6fb4ad45eac259124b70042994d4f215)
commit 1915731be9d04af662bd51b2ee79f3a2bcfac0c8
Author: Björn Jacke <bj at sernet.de>
Date: Thu Jan 7 00:41:50 2010 +0100
s3:lib/time: remove TIME_T_MIN/MAX defines
we already get them from lib/util/time.h
(cherry picked from commit f5729dbb6e720cb6076ea053f1ad0680259e6b39)
The last two patches address bug #7352 (TIME_T_MAX defines inconsistent).
(cherry picked from commit 3668914ce12d0dc5a2f84159a8bd3e82a2ca32a1)
commit c107d6410544fc813974680f7d0da94255884c6c
Author: Björn Jacke <bj at sernet.de>
Date: Thu Jan 7 00:40:09 2010 +0100
lib/util: move TIME_T_MIN/MAX defines into header file (cherry picked from commit 571ee54b791b93ad46e09ed563ef4a5582dcf0c8)
(cherry picked from commit 42d89dbd9407fcdef989387208dd8cae8472a6e8)
commit ba710ca1f15fc275b9ca630370155958abc9fd86
Author: Jeremy Allison <jra at samba.org>
Date: Thu Apr 8 20:32:36 2010 -0700
Fix bug #7339 - MSDFS is non-functional in 3.5.x
In the refactoring around filename_convert, the split between the functions
resolve_dfspath() and resolve_dfspath_wcard() was lost, leaving us only with
resolve_dfspath_wcard().
Internally resolve_dfspath_wcard() calls dfs_redirect() only with a
"allow_wcards" flag of true, wheras the old resolve_dfspath() would call with a
value of false. The loss of this case causes dfs_redirect to always masquerade
DFS links as directories, even when they are being queried directly by a trans2
QPATHINFO call. We should only masquerade DFS links as directories when called
from a SMBsearch or trans2 findfirst/findnext - which was the intent of the
"allow_wcards" flag.
This patch adds back an allow_wcards bool parameter to
resolve_dfspath_wcard(). This bool is set from the state of the ucf_flags when
filename_convert() is called.
I will follow this up with a new smbclient-based torture test that will prevent
us from ever regressing our DFS support again.
Jeremy.
(cherry picked from commit 358781559526f962c96c1af88cd104946c507d05)
(cherry picked from commit d614655f918fdbafe4520e9cc4d5de82e15b7d7d)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 56 ++-
client/mount.cifs.c | 2 +-
docs-xml/manpages-3/idmap_ad.8.xml | 2 +-
docs-xml/manpages-3/net.8.xml | 40 +
docs-xml/manpages-3/winbindd.8.xml | 20 +-
docs-xml/smbdotconf/winbind/winbindnssinfo.xml | 18 +-
lib/replace/libreplace_network.m4 | 52 ++
lib/replace/system/network.h | 7 +
.../Doxyfile => lib/tsocket/doxy.config | 509 +++++++++---
lib/tsocket/tsocket.h | 846 +++++++++++++++++++-
lib/tsocket/tsocket_bsd.c | 96 +--
lib/tsocket/tsocket_helpers.c | 52 --
lib/util/time.c | 14 -
lib/util/time.h | 14 +
nsswitch/libwbclient/wbc_idmap.c | 32 +-
nsswitch/libwbclient/wbc_pam.c | 18 +-
nsswitch/libwbclient/wbclient.c | 31 +-
nsswitch/libwbclient/wbclient_internal.h | 4 +
packaging/RHEL/samba.spec.tmpl | 3 +
source3/configure.in | 14 +-
source3/include/libsmbclient.h | 22 +-
source3/include/proto.h | 2 +
source3/lib/time.c | 8 -
source3/libnet/libnet_samsync_ldif.c | 16 +-
source3/libsmb/cliconnect.c | 5 +
source3/m4/aclocal.m4 | 4 +-
source3/modules/vfs_full_audit.c | 2 +-
source3/param/loadparm.c | 9 +-
source3/printing/lpq_parse.c | 21 +
source3/printing/print_cups.c | 11 +-
source3/printing/printing.c | 21 -
source3/rpc_server/srv_spoolss_nt.c | 8 +-
source3/rpcclient/cmd_spoolss.c | 27 +-
source3/smbd/dir.c | 4 +-
source3/smbd/filename.c | 2 +
source3/smbd/msdfs.c | 3 +-
source3/smbd/trans2.c | 1 +
source3/utils/net_conf.c | 4 +
source3/utils/net_rpc.c | 5 +-
source3/winbindd/winbindd.c | 17 +-
source3/winbindd/winbindd_cm.c | 3 -
source3/winbindd/winbindd_dual.c | 6 +-
source3/winbindd/winbindd_util.c | 6 +
source4/lib/com/tables.c | 6 +-
44 files changed, 1618 insertions(+), 425 deletions(-)
copy nsswitch/libwbclient/Doxyfile => lib/tsocket/doxy.config (73%)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 8d79905..caec0a0 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -8,13 +8,67 @@ This is the latest stable release of Samba 3.5.
Major enhancements in Samba 3.5.3 include:
- o
+ o Fix MS-DFS functionality (bug #7339).
+ o Fix a Winbind crash when scanning trusts (bug #7389).
+ o Fix problems with SIGCHLD handling in Winbind (bug #7317).
Changes since 3.5.2
-------------------
+o Jeremy Allison <jra at samba.org>
+ * BUG 7288: Fix SMB job IDs in CUPS job names.
+ * BUG 7339: Fix MS-DFS functionality.
+
+
+o Andrew Bartlett <abartlet at samba.org>
+ * BUG 7354: Fix CLDAP tsocket problem on Solaris.
+
+
+o Ira Cooper <samba at ira.wakeful.net>
+ * BUG 7384: Fix bitmap leak in dptr_Close.
+
+
+o Günther Deschner <gd at samba.org>
+ * BUG 7277: Fix exporting printers via 'cupsaddsmb' command.
+ * BUG 7417: Fix setting of passwords via 'net rpc user password' command.
+ * BUG 7418: Fix 'net rpc printer list' command.
+
+
+o Olaf Flebbe <o.flebbe at science-computing.de>
+ * BUG 7421: Rename mod_name to module_name.
+
+
+o Björn Jacke <bj at sernet.de>
+ * BUG 7352: Make TIME_T_MAX defines consistent.
+ * BUG 7385: Fix building with Solaris' gcc.
+
+
+o Jeff Layton <jlayton at redhat.com>
+ * BUG 7315: Fix segfault in mount.cifs.
+
+
+o Volker Lendecke <vl at samba.org>
+ * BUG 7357: Re-fix a bug with smbd serving a windows terminal server.
+ * BUG 7389: Fix a Winbind crash when scanning trusts.
+ * BUG 7398: Fix rename problems with full_audit VFS module.
+
+
+o Jim McDonough <jmcd at samba.org>
+ * BUG 7378: Display an error on 'net conf import' failures.
+
+
+o Stefan Metzmacher <metze at samba.org>
+ * BUG 7196: Add replacement for IPV6_V6ONLY on linux systems with broken
+ headers.
+ * BUG 7317: Fix problems with SIGCHLD handling in Winbind.
+ * BUG 7354: Fix CLDAP tsocket problem on Solaris.
+
+
+o Luca Olivetti <luca at wetron.es>
+ * BUG 7263: Fix cups encryption setting.
+
######################################################################
Reporting bugs & Development Discussion
diff --git a/client/mount.cifs.c b/client/mount.cifs.c
index 0b8d5b4..1b472c2 100644
--- a/client/mount.cifs.c
+++ b/client/mount.cifs.c
@@ -1648,7 +1648,7 @@ mount_retry:
}
}
- if (addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) {
+ if (addr && addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) {
strlcat(options, "%", options_size);
current_len = strnlen(options, options_size);
optionstail = options + current_len;
diff --git a/docs-xml/manpages-3/idmap_ad.8.xml b/docs-xml/manpages-3/idmap_ad.8.xml
index 01e059a..4ca107f 100644
--- a/docs-xml/manpages-3/idmap_ad.8.xml
+++ b/docs-xml/manpages-3/idmap_ad.8.xml
@@ -58,7 +58,7 @@
<title>EXAMPLES</title>
<para>
The following example shows how to retrieve idmappings from our principal and
- and trusted AD domains. If trusted domains are present id conflicts must be
+ trusted AD domains. If trusted domains are present id conflicts must be
resolved beforehand, there is no
guarantee on the order conflicting mappings would be resolved at this point.
diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml
index 76ef51f..51971c8 100644
--- a/docs-xml/manpages-3/net.8.xml
+++ b/docs-xml/manpages-3/net.8.xml
@@ -1790,6 +1790,46 @@ This example would connect to a computer named XP as the local administrator usi
</refsect2>
<refsect2>
+<title>G_LOCK</title>
+
+<para>Manage global locks.</para>
+
+<refsect3>
+<title>G_LOCK DO <replaceable>lockname</replaceable> <replaceable>timeout</replaceable> <replaceable>command</replaceable></title>
+
+<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
+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>
+
+<itemizedlist>
+<listitem><para><replaceable>LOCKNAME</replaceable> defines the name of the global lock.</para></listitem>
+<listitem><para><replaceable>TIMEOUT</replaceable> defines the timeout.</para></listitem>
+<listitem><para><replaceable>COMMAND</replaceable> defines the shell command to execute.</para></listitem>
+</itemizedlist>
+</refsect3>
+
+<refsect3>
+<title>G_LOCK LOCKS</title>
+
+<para>
+Print a list of all currently existing locknames.
+</para>
+</refsect3>
+
+<refsect3>
+<title>G_LOCK DUMP <replaceable>lockname</replaceable></title>
+
+<para>
+Dump the locking table of a certain global lock.
+</para>
+</refsect3>
+
+</refsect2>
+
+<refsect2>
<title>HELP [COMMAND]</title>
<para>Gives usage information for the specified command.</para>
diff --git a/docs-xml/manpages-3/winbindd.8.xml b/docs-xml/manpages-3/winbindd.8.xml
index 91ac2c8..ba20c5e 100644
--- a/docs-xml/manpages-3/winbindd.8.xml
+++ b/docs-xml/manpages-3/winbindd.8.xml
@@ -80,16 +80,6 @@
<variablelist>
<varlistentry>
- <term>-D</term>
- <listitem><para>If specified, this parameter causes
- the server to operate as a daemon. That is, it detaches
- itself and runs in the background on the appropriate port.
- This switch is assumed if <command>winbindd</command> is
- executed on the command line of a shell.
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
<term>hosts</term>
<listitem><para>This feature is only available on IRIX.
User information traditionally stored in
@@ -147,6 +137,16 @@ hosts: files wins
<variablelist>
<varlistentry>
+ <term>-D</term>
+ <listitem><para>If specified, this parameter causes
+ the server to operate as a daemon. That is, it detaches
+ itself and runs in the background on the appropriate port.
+ This switch is assumed if <command>winbindd</command> is
+ executed on the command line of a shell.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>-F</term>
<listitem><para>If specified, this parameter causes
the main <command>winbindd</command> process to not daemonize,
diff --git a/docs-xml/smbdotconf/winbind/winbindnssinfo.xml b/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
index d6e40c6..318727c 100644
--- a/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
+++ b/docs-xml/smbdotconf/winbind/winbindnssinfo.xml
@@ -6,35 +6,33 @@
<description>
<para>This parameter is designed to control how Winbind retrieves Name
- Service Information to construct a user's home directory and login shell.
- Currently the following settings are available:
+ Service Information to construct a user's home directory and login shell.
+ Currently the following settings are available:
<itemizedlist>
<listitem>
- <para><parameter moreinfo="none">template</parameter>
- - The default, using the parameters of <parameter moreinfo="none">template
+ <para><parameter moreinfo="none">template</parameter>
+ - The default, using the parameters of <parameter moreinfo="none">template
shell</parameter> and <parameter moreinfo="none">template homedir</parameter>)
</para>
</listitem>
-
+
<listitem>
<para><parameter moreinfo="none"><sfu | rfc2307 ></parameter>
- When Samba is running in security = ads and your Active Directory
Domain Controller does support the Microsoft "Services for Unix" (SFU)
LDAP schema, winbind can retrieve the login shell and the home
directory attributes directly from your Directory Server. Note that
- retrieving UID and GID from your ADS-Server requires to
- use <parameter moreinfo="non">idmap backend</parameter> = ad
- or <parameter moreinfo="non">idmap config DOMAIN:backend</parameter> = ad
+ retrieving UID and GID from your ADS-Server requires to
+ use <parameter moreinfo="none">idmap config DOMAIN:backend</parameter> = ad
as well.
</para>
</listitem>
-
</itemizedlist>
</para>
</description>
<value type="default">template</value>
-<value type="example">template sfu</value>
+<value type="example">sfu</value>
</samba:parameter>
diff --git a/lib/replace/libreplace_network.m4 b/lib/replace/libreplace_network.m4
index b7d15ea..d8ed8a1 100644
--- a/lib/replace/libreplace_network.m4
+++ b/lib/replace/libreplace_network.m4
@@ -350,6 +350,50 @@ if test x"$libreplace_cv_HAVE_IFACE_IFREQ" = x"yes"; then
fi
fi
+dnl Some old Linux systems have broken header files and
+dnl miss the IPV6_V6ONLY define in netinet/in.h,
+dnl but have it in linux/in6.h.
+dnl We can't include both files so we just check if the value
+dnl if defined and do the replacement in system/network.h
+AC_CACHE_CHECK([for IPV6_V6ONLY support],libreplace_cv_HAVE_IPV6_V6ONLY,[
+ AC_TRY_COMPILE([
+#include <stdlib.h> /* for NULL */
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <netdb.h>
+#include <netinet/in.h>
+ ],
+ [
+#ifndef IPV6_V6ONLY
+#error no IPV6_V6ONLY
+#endif
+ ],[
+ libreplace_cv_HAVE_IPV6_V6ONLY=yes
+ ],[
+ libreplace_cv_HAVE_IPV6_V6ONLY=no
+ ])
+])
+if test x"$libreplace_cv_HAVE_IPV6_V6ONLY" != x"yes"; then
+ dnl test for IPV6_V6ONLY
+ AC_CACHE_CHECK([for IPV6_V6ONLY in linux/in6.h],libreplace_cv_HAVE_LINUX_IPV6_V6ONLY_26,[
+ AC_TRY_COMPILE([
+ #include <linux/in6.h>
+ ],
+ [
+ #if (IPV6_V6ONLY != 26)
+ #error no linux IPV6_V6ONLY
+ #endif
+ ],[
+ libreplace_cv_HAVE_LINUX_IPV6_V6ONLY_26=yes
+ ],[
+ libreplace_cv_HAVE_LINUX_IPV6_V6ONLY_26=no
+ ])
+ ])
+ if test x"$libreplace_cv_HAVE_LINUX_IPV6_V6ONLY_26" = x"yes"; then
+ AC_DEFINE(HAVE_LINUX_IPV6_V6ONLY_26,1,[Whether the system has IPV6_V6ONLY in linux/in6.h])
+ fi
+fi
+
dnl test for ipv6
AC_CACHE_CHECK([for ipv6 support],libreplace_cv_HAVE_IPV6,[
AC_TRY_LINK([
@@ -370,6 +414,14 @@ if (ret != 0) {
const char *es = gai_strerror(ret);
}
freeaddrinfo(ai);
+{
+ int val = 1;
+ #ifdef HAVE_LINUX_IPV6_V6ONLY_26
+ #define IPV6_V6ONLY 26
+ #endif
+ ret = setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY,
+ (const void *)&val, sizeof(val));
+}
],[
libreplace_cv_HAVE_IPV6=yes
],[
diff --git a/lib/replace/system/network.h b/lib/replace/system/network.h
index 1f51035..93d533c 100644
--- a/lib/replace/system/network.h
+++ b/lib/replace/system/network.h
@@ -360,6 +360,13 @@ struct addrinfo {
#define ifr_netmask ifr_addr
#endif
+/* Some old Linux systems have broken header files */
+#ifdef HAVE_IPV6
+#ifdef HAVE_LINUX_IPV6_V6ONLY_26
+#define IPV6_V6ONLY 26
+#endif /* HAVE_LINUX_IPV6_V6ONLY_26 */
+#endif /* HAVE_IPV6 */
+
#ifdef SOCKET_WRAPPER
#ifndef SOCKET_WRAPPER_DISABLE
#ifndef SOCKET_WRAPPER_NOT_REPLACE
diff --git a/nsswitch/libwbclient/Doxyfile b/lib/tsocket/doxy.config
similarity index 73%
copy from nsswitch/libwbclient/Doxyfile
copy to lib/tsocket/doxy.config
index 529a16f..584ae73 100644
--- a/nsswitch/libwbclient/Doxyfile
+++ b/lib/tsocket/doxy.config
@@ -1,4 +1,4 @@
-# Doxyfile 1.5.3
+# Doxyfile 1.6.1
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project
@@ -14,31 +14,31 @@
# Project related configuration options
#---------------------------------------------------------------------------
-# This tag specifies the encoding used for all characters in the config file that
-# follow. The default is UTF-8 which is also the encoding used for all text before
-# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into
-# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of
-# possible encodings.
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
DOXYFILE_ENCODING = UTF-8
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.
-PROJECT_NAME = Samba
+PROJECT_NAME = tsocket
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = HEAD
+PROJECT_NUMBER = 0.1
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
# If a relative path is entered, it will be relative to the location
# where doxygen was started. If left blank the current directory will be used.
-OUTPUT_DIRECTORY = dox
+OUTPUT_DIRECTORY = doc
# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
# 4096 sub-directories (in 2 levels) under the output directory of each output
@@ -54,10 +54,11 @@ CREATE_SUBDIRS = NO
# information to generate all constant output in the proper language.
# The default language is English, other supported languages are:
# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian,
-# Italian, Japanese, Japanese-en (Japanese with English messages), Korean,
-# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian,
-# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak,
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
OUTPUT_LANGUAGE = English
@@ -85,7 +86,17 @@ REPEAT_BRIEF = YES
# "The $name file" "is" "provides" "specifies" "contains"
# "represents" "a" "an" "the"
-ABBREVIATE_BRIEF =
+ABBREVIATE_BRIEF = "The $name class" \
+ "The $name widget" \
+ "The $name file" \
+ is \
+ provides \
+ specifies \
+ contains \
+ represents \
+ a \
+ an \
+ the
# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
# Doxygen will generate a detailed section even if there is only a brief
@@ -113,7 +124,7 @@ FULL_PATH_NAMES = YES
# If left blank the directory from which doxygen is run is used as the
# path to strip.
-STRIP_FROM_PATH = $(PWD)/
+STRIP_FROM_PATH =
# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
# the path mentioned in the documentation of a class, which tells
@@ -154,13 +165,6 @@ QT_AUTOBRIEF = NO
MULTILINE_CPP_IS_BRIEF = NO
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen
-# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member
-# documentation.
-
-DETAILS_AT_TOP = NO
-
# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
# member inherits the documentation from any documented member that it
# re-implements.
@@ -195,14 +199,37 @@ ALIASES =
OPTIMIZE_OUTPUT_FOR_C = YES
# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for Java.
-# For instance, namespaces will be presented as packages, qualified scopes
-# will look different, etc.
+# sources only. Doxygen will then generate output that is more tailored for
+# Java. For instance, namespaces will be presented as packages, qualified
+# scopes will look different, etc.
OPTIMIZE_OUTPUT_JAVA = NO
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to
-# include (a tag file for) the STL sources as input, then you should
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources only. Doxygen will then generate output that is more tailored for
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it parses.
+# With this tag you can assign which parser to use for a given extension.
+# Doxygen has a built-in mapping, but you can override or extend it using this tag.
+# The format is ext=language, where ext is a file extension, and language is one of
+# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP,
+# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat
+# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
+
+EXTENSION_MAPPING =
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should
# set this tag to YES in order to let doxygen match functions declarations and
# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
# func(std::string) {}). This also make the inheritance and collaboration
@@ -215,6 +242,21 @@ BUILTIN_STL_SUPPORT = NO
CPP_CLI_SUPPORT = NO
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
+# Doxygen will parse them like normal C++ but will assume all classes use public
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate getter
+# and setter methods for a property. Setting this option to YES (the default)
+# will make doxygen to replace the get and set methods by a property in the
+# documentation. This will only work if the methods are indeed getting or
+# setting a simple type. If this is not the case, or you want to show the
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT = YES
+
# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
# tag is set to YES, then doxygen will reuse the documentation of the first
# member in the group (if any) for the other members of the group. By default
--
Samba Shared Repository
More information about the samba-cvs
mailing list