The branch, v3-2-stable has been updated
via 400609bce5cd1ce7e3330b9f00bb1f08de9d3a12 (commit)
via efdf6faba161cae9d4a0a2c693ea0b261dc73ce2 (commit)
via 5f00c79ac22ecfa846eebd910e7c25d326595f8e (commit)
via 39f712048d7408ba91301b59752f2e87e894a3f0 (commit)
via 901936edd33ae710c6f23bea528132ee5e10e097 (commit)
via f85ddd10d644a7212922e1c7e8e2e2793e9703c8 (commit)
from a390bcf9403df4cf4d5eef42b35ebccbe253882e (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-stable
- Log -----------------------------------------------------------------
commit 400609bce5cd1ce7e3330b9f00bb1f08de9d3a12
Author: Karolin Seeger <[EMAIL PROTECTED]>
Date: Fri Feb 29 16:34:07 2008 +0100
Fix release script.
commit efdf6faba161cae9d4a0a2c693ea0b261dc73ce2
Author: Karolin Seeger <[EMAIL PROTECTED]>
Date: Fri Feb 29 16:15:39 2008 +0100
Prepare for release 3.2.0pre2
Karolin
commit 5f00c79ac22ecfa846eebd910e7c25d326595f8e
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date: Fri Feb 29 06:55:33 2008 -0800
Patch to fix the "Invalid read of size 4" errors. Bug #3617.
Jeremy.
(cherry picked from commit fa12667ec284fdda45b79cbf6bf548ab0faae34f)
commit 39f712048d7408ba91301b59752f2e87e894a3f0
Author: Andreas Schneider <[EMAIL PROTECTED]>
Date: Thu Feb 28 14:06:11 2008 +0100
Rename the 'hidden' variable to 'administrative share'.
(cherry picked from commit eff3d3bad5a8860b99375cc0be9dc24f3679e416)
commit 901936edd33ae710c6f23bea528132ee5e10e097
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Fri Feb 29 12:38:29 2008 +0100
Fix linking of smbget when there is no shared library support.
smbget needs libwbclient.
Michael
(cherry picked from commit 78bc496ecf72b5c2474911302e81a90c488e3070)
commit f85ddd10d644a7212922e1c7e8e2e2793e9703c8
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Fri Feb 29 11:43:06 2008 +0100
Fill in WHATSNEW.txt.
Guenther
(cherry picked from commit 55e85ccd3ec59afc05b955f1458d9fc655cee752)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 44 ++++++++++++++++++++++++++++++++-
release-scripts/create-tarball | 13 +++++++--
source/Makefile.in | 2 +-
source/VERSION | 4 +-
source/nmbd/nmbd_responserecordsdb.c | 18 ++++++++++++++
source/param/loadparm.c | 10 ++++----
source/rpc_server/srv_srvsvc_nt.c | 2 +-
7 files changed, 79 insertions(+), 14 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 2ac227d..00b47d8 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -25,17 +25,23 @@ Major enhancements in Samba 3.2.0 include:
o Support for IPv6 in the server, and client tools and libraries.
o Support for storing alternate data streams in xattrs.
o Encrypted SMB transport in client tools and libraries, and server.
+ o Support for Vista clients authenticating via Kerberos.
Winbind and Active Directory Integration:
o Full support for Windows 2003 cross-forest, transitive trusts
and one-way domain trusts.
o Support for userPrincipalName logons via pam_winbind and NSS
lookups.
- o Support in pam_winbind for logging on using the userPrincipalName.
o Expansion of nested domain groups via NSS calls.
o Support for Active Directory LDAP Signing policy.
o New LGPL Winbind client library (libwbclient.so).
+ Joining:
+ o New NetApi library for domain join related queries (libnetapi.so)
+ and example GTK+ Domain join gui.
+ o New client and server support for remotely joining and unjoining
+ Domains.
+ o Support for joining into Windows 2008 domains.
Users & Groups:
o New ldb backend for local group mapping tables
@@ -124,7 +130,7 @@ smb.conf changes
mangle map Removed
min receive file size New 0
open files database hashsize Removed
- read bmpx Removed
+ read bmpx Removed
registry shares New No
winbind expand groups New 1
winbind rpc only New No
@@ -189,6 +195,40 @@ o Guenther Deschner <[EMAIL PROTECTED]>
(including calls from "net dom" command).
* Add libnetapi.so library for joining domains including
sample GTK+ app.
+ * Fixes for Vista SP1 Kerberos authdata handling to only pickup
+ the PAC.
+ * Various error code and error message fixes.
+ * Add initial draft of libnetconf to allow programmatic
+ configuration changes.
+ * Add libnet_join internal library for programmatically joining
+ and unjoining Domains.
+ * Add various fixes and new calls to libnetapi.so library.
+ * Various fixes for DsGetDcName and conversion to IDL based
+ structures.
+ * Fixes for pidl to correctly generate WERROR based client calls.
+ * Fixes for pidl to generate output that complies to coding
+ conventions.
+ * Various IDL fixes.
+ * Add ads_get_joinable_ous() to libads to get list of joinable ous.
+ * Add get_logon_hours_from_pdb() to comply with new IDL based
+ structures.
+ * Add debugging capabilities to dump AD connections to libads
+ (using ndr_print).
+ * Add "dump-domain-list" command for smbcontrol to retrieve better
+ debugging information out of winbindd.
+ * Migration of the entire client and server DCE/RPC code to IDL
+ based structures and autogenerated code for DSSETUP, LSA, SAMR
+ and NETLOGON.
+ * Started migration of client and server DCE/RPC code to IDL based
+ structures and autogenerated code for NTSSVC, SVCCTL and
+ EVENTLOG.
+ * Use IDL and autogenerated code for samlogoncache and Kerberos
+ PAC handling.
+ * Various fixes and cleanup of Kerberos PAC handling.
+ * Fix segfault in _srv_net_file_enum.
+ * Conversion of client join and unjoin code to libnet_join.
+ * Add remote join/unjoin server-side implementation.
+ * Removed a lot of code which has become obsolete.
o Steve Langasek <[EMAIL PROTECTED]>
diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index 4592272..7dcc6c3 100755
--- a/release-scripts/create-tarball
+++ b/release-scripts/create-tarball
@@ -19,7 +19,7 @@ if [ $? -ne 0 ]; then
fi
VER_H=source/include/version.h
-(cd source && ./autogen.sh)
+(cd source && ./script/mkversion.sh)
if [ ! -f $VER_H ]; then
echo "Failed to find $VER_H! Exiting...."
@@ -27,7 +27,10 @@ if [ ! -f $VER_H ]; then
fi
version=`grep SAMBA_VERSION_OFFICIAL_STRING $VER_H | awk '{print $3}'`
-version="$version-`grep SAMBA_VERSION_VENDOR_SUFFIX $VER_H | awk '{print $3}'`"
+vendor_version=`grep SAMBA_VERSION_VENDOR_SUFFIX $VER_H | awk '{print $3}'`
+if [ -n "$vendor_version" ]; then
+ version="$version-$vendor_version"
+fi
version=`echo $version | sed 's/\"//g'`
echo "Creating release tarball for Samba $version"
@@ -49,7 +52,7 @@ if [ "x$docsdir" != "x" ]; then
/bin/rm -rf docs
mkdir docs
- rsync -a $docsdir/ docs/
+ rsync -a --exclude=.svn $docsdir/ docs/
cd docs
/bin/rm -rf test.pdf Samba4*pdf htmldocs/Samba4* htmldocs/test
@@ -58,6 +61,10 @@ if [ "x$docsdir" != "x" ]; then
cd ..
fi
+cd source
+./autogen.sh
+cd ..
+
cd ..
tar cf samba-${version}.tar --exclude=.git* --exclude=CVS --exclude=.svn
samba-${version}
gpg --detach-sign --armor samba-${version}.tar
diff --git a/source/Makefile.in b/source/Makefile.in
index 2f963e2..35a4480 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -733,7 +733,7 @@ PDBEDIT_OBJ = utils/pdbedit.o $(PASSWD_UTIL_OBJ)
$(PARAM_OBJ) $(PASSDB_OBJ) @LIB
$(SECRETS_OBJ) $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) libsmb/asn1.o \
$(RPC_PARSE_OBJ1) $(DOSERR_OBJ) $(LDB_OBJ) $(ERRORMAP_OBJ)
-SMBGET_OBJ = utils/smbget.o $(POPT_LIB_OBJ) $(LIBSMBCLIENT_OBJ0)
+SMBGET_OBJ = utils/smbget.o $(POPT_LIB_OBJ) $(LIBSMBCLIENT_OBJ0)
@LIBWBCLIENT_STATIC@
DISPLAY_SEC_OBJ= lib/display_sec.o
diff --git a/source/VERSION b/source/VERSION
index f0883b9..814d171 100644
--- a/source/VERSION
+++ b/source/VERSION
@@ -68,7 +68,7 @@ SAMBA_VERSION_RC_RELEASE=
# e.g. SAMBA_VERSION_IS_SVN_SNAPSHOT=yes #
# -> "3.0.0-SVN-build-199" #
########################################################
-SAMBA_VERSION_IS_GIT_SNAPSHOT=yes
+SAMBA_VERSION_IS_GIT_SNAPSHOT=
########################################################
# This can be set by vendors if they want... #
@@ -95,5 +95,5 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=yes
# e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version() #
# -> "CVS 3.0.0rc2-VendorVersion" #
########################################################
-SAMBA_VERSION_VENDOR_SUFFIX="stable"
+SAMBA_VERSION_VENDOR_SUFFIX=
SAMBA_VERSION_VENDOR_PATCH=
diff --git a/source/nmbd/nmbd_responserecordsdb.c
b/source/nmbd/nmbd_responserecordsdb.c
index 6498ce0..b042fb4 100644
--- a/source/nmbd/nmbd_responserecordsdb.c
+++ b/source/nmbd/nmbd_responserecordsdb.c
@@ -46,6 +46,24 @@ static void add_response_record(struct subnet_record *subrec,
void remove_response_record(struct subnet_record *subrec,
struct response_record *rrec)
{
+ /* It is possible this can be called twice,
+ with a rrec pointer that has been freed. So
+ before we inderect into rrec, search for it
+ on the responselist first. Bug #3617. JRA. */
+
+ struct response_record *p = NULL;
+
+ for (p = subrec->responselist; p; p = p->next) {
+ if (p == rrec) {
+ break;
+ }
+ }
+
+ if (p == NULL) {
+ /* We didn't find rrec on the list. */
+ return;
+ }
+
DLIST_REMOVE(subrec->responselist, rrec);
if(rrec->userdata) {
diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index e23c307..5651a43 100644
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -420,7 +420,7 @@ typedef struct {
bool bRead_only;
bool bNo_set_dir;
bool bGuest_only;
- bool bHidden;
+ bool bAdministrative_share;
bool bGuest_ok;
bool bPrint_ok;
bool bMap_system;
@@ -563,7 +563,7 @@ static service sDefault = {
True, /* bRead_only */
True, /* bNo_set_dir */
False, /* bGuest_only */
- False, /* bHidden */
+ False, /* bAdministrative_share */
False, /* bGuest_ok */
False, /* bPrint_ok */
False, /* bMap_system */
@@ -973,7 +973,7 @@ static struct parm_struct parm_table[] = {
{"inherit owner", P_BOOL, P_LOCAL, &sDefault.bInheritOwner, NULL, NULL,
FLAG_ADVANCED | FLAG_SHARE},
{"guest only", P_BOOL, P_LOCAL, &sDefault.bGuest_only, NULL, NULL,
FLAG_ADVANCED | FLAG_SHARE},
{"only guest", P_BOOL, P_LOCAL, &sDefault.bGuest_only, NULL, NULL,
FLAG_HIDE},
- {"hidden", P_BOOL, P_LOCAL, &sDefault.bHidden, NULL, NULL,
FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT},
+ {"administrative share", P_BOOL, P_LOCAL,
&sDefault.bAdministrative_share, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE |
FLAG_PRINT},
{"guest ok", P_BOOL, P_LOCAL, &sDefault.bGuest_ok, NULL, NULL,
FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT},
{"public", P_BOOL, P_LOCAL, &sDefault.bGuest_ok, NULL, NULL,
FLAG_HIDE},
@@ -2140,7 +2140,7 @@ FN_LOCAL_BOOL(lp_readonly, bRead_only)
FN_LOCAL_BOOL(lp_no_set_dir, bNo_set_dir)
FN_LOCAL_BOOL(lp_guest_ok, bGuest_ok)
FN_LOCAL_BOOL(lp_guest_only, bGuest_only)
-FN_LOCAL_BOOL(lp_hidden, bHidden)
+FN_LOCAL_BOOL(lp_administrative_share, bAdministrative_share)
FN_LOCAL_BOOL(lp_print_ok, bPrint_ok)
FN_LOCAL_BOOL(lp_map_hidden, bMap_hidden)
FN_LOCAL_BOOL(lp_map_archive, bMap_archive)
@@ -2778,7 +2778,7 @@ static bool lp_add_ipc(const char *ipc_name, bool
guest_ok)
ServicePtrs[i]->bAvailable = True;
ServicePtrs[i]->bRead_only = True;
ServicePtrs[i]->bGuest_only = False;
- ServicePtrs[i]->bHidden = True;
+ ServicePtrs[i]->bAdministrative_share = True;
ServicePtrs[i]->bGuest_ok = guest_ok;
ServicePtrs[i]->bPrint_ok = False;
ServicePtrs[i]->bBrowseable = sDefault.bBrowseable;
diff --git a/source/rpc_server/srv_srvsvc_nt.c
b/source/rpc_server/srv_srvsvc_nt.c
index 37bd204..8a25b6c 100644
--- a/source/rpc_server/srv_srvsvc_nt.c
+++ b/source/rpc_server/srv_srvsvc_nt.c
@@ -232,7 +232,7 @@ static uint32 get_share_type(int snum)
type = STYPE_PRINTQ;
if (strequal(lp_fstype(snum), "IPC"))
type = STYPE_IPC;
- if (lp_hidden(snum))
+ if (lp_administrative_share(snum))
type |= STYPE_HIDDEN;
return type;
--
Samba Shared Repository
