svn commit: samba r16175 - in branches/SAMBA_3_0_RELEASE: .
source/auth source/lib source/libsmb source/nsswitch
source/passdb source/script
jerry at samba.org
jerry at samba.org
Tue Jun 13 01:50:57 GMT 2006
Author: jerry
Date: 2006-06-13 01:50:55 +0000 (Tue, 13 Jun 2006)
New Revision: 16175
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16175
Log:
sync up with SAMBA_3_0 to release (r16156)
Modified:
branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
branches/SAMBA_3_0_RELEASE/source/auth/auth_util.c
branches/SAMBA_3_0_RELEASE/source/lib/ldap_escape.c
branches/SAMBA_3_0_RELEASE/source/libsmb/clispnego.c
branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd.c
branches/SAMBA_3_0_RELEASE/source/passdb/pdb_smbpasswd.c
branches/SAMBA_3_0_RELEASE/source/script/installbin.sh.in
branches/SAMBA_3_0_RELEASE/source/script/uninstallbin.sh.in
Changeset:
Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
===================================================================
--- branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2006-06-12 23:03:02 UTC (rev 16174)
+++ branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2006-06-13 01:50:55 UTC (rev 16175)
@@ -14,6 +14,10 @@
We believe that RC2 is in much better shape in a large part due
to his efforts.
+We would also like to thank the developers of Klokwork for their
+anaylsis of the Samba source tree. This release candidates includes
+multiple fixes based on reports from the klockwork code anaylzer.
+
Common issues addressed in 3.0.23rc2 include:
o Winbindd & Samba PDC integration issues.
@@ -56,6 +60,10 @@
* Remove extra add-byte in the trans2 UNIX_BASIC infolevel.
+o Alexander Bokovoy <ab at samba.org>
+ * Fix absolute symlinks in the installbin.sh script.
+
+
o Gerald (Jerry) Carter <jerry at samba.org>
* Only call the printer publishing calls if 'security = ads'.
@@ -79,6 +87,7 @@
* Fix a eDir related memory leak.
* Don't try to add the sn attribute twice to an LDAP
inetOrgPerson + samSamAccount entry.
+ * Fix winbind function table typo.
o Aleksey Fedoseev <fedoseev at ru.ibm.com>
@@ -112,6 +121,8 @@
'add machine script'.
* Correct parsing error in parse_net.c for user's with no group
membership.
+ * Fix off by one error in client SPNEGO code and other klokwork
+ bug fixes.
o Jason Mader <jason at ncac.gwu.edu>
Modified: branches/SAMBA_3_0_RELEASE/source/auth/auth_util.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/auth/auth_util.c 2006-06-12 23:03:02 UTC (rev 16174)
+++ branches/SAMBA_3_0_RELEASE/source/auth/auth_util.c 2006-06-13 01:50:55 UTC (rev 16175)
@@ -1243,10 +1243,9 @@
}
result = make_server_info(NULL);
-
- if (!NT_STATUS_IS_OK(status)) {
+ if (result == NULL) {
TALLOC_FREE(sampass);
- return status;
+ return NT_STATUS_NO_MEMORY;
}
result->sam_account = sampass;
@@ -1279,8 +1278,7 @@
Make (and fill) a user_info struct for a guest login.
This *must* succeed for smbd to start. If there is no mapping entry for
the guest gid, then create one.
-**********************
-*****************************************************/
+***************************************************************************/
static NTSTATUS make_new_server_info_guest(auth_serversupplied_info **server_info)
{
Modified: branches/SAMBA_3_0_RELEASE/source/lib/ldap_escape.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/lib/ldap_escape.c 2006-06-12 23:03:02 UTC (rev 16174)
+++ branches/SAMBA_3_0_RELEASE/source/lib/ldap_escape.c 2006-06-13 01:50:55 UTC (rev 16175)
@@ -40,6 +40,10 @@
const char *sub;
int i = 0;
char *p = output;
+
+ if (output == NULL) {
+ return NULL;
+ }
while (*s)
{
Modified: branches/SAMBA_3_0_RELEASE/source/libsmb/clispnego.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/libsmb/clispnego.c 2006-06-12 23:03:02 UTC (rev 16174)
+++ branches/SAMBA_3_0_RELEASE/source/libsmb/clispnego.c 2006-06-13 01:50:55 UTC (rev 16175)
@@ -140,7 +140,7 @@
asn1_start_tag(&data,ASN1_CONTEXT(0));
asn1_start_tag(&data,ASN1_SEQUENCE(0));
- for (i=0; asn1_tag_remaining(&data) > 0 && i < ASN1_MAX_OIDS; i++) {
+ for (i=0; asn1_tag_remaining(&data) > 0 && i < ASN1_MAX_OIDS-1; i++) {
char *oid_str = NULL;
asn1_read_OID(&data,&oid_str);
OIDs[i] = oid_str;
@@ -229,7 +229,7 @@
asn1_start_tag(&data, ASN1_CONTEXT(0));
asn1_start_tag(&data, ASN1_SEQUENCE(0));
- for (i=0; asn1_tag_remaining(&data) > 0 && i < ASN1_MAX_OIDS; i++) {
+ for (i=0; asn1_tag_remaining(&data) > 0 && i < ASN1_MAX_OIDS-1; i++) {
char *oid_str = NULL;
asn1_read_OID(&data,&oid_str);
OIDs[i] = oid_str;
Modified: branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd.c 2006-06-12 23:03:02 UTC (rev 16174)
+++ branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd.c 2006-06-13 01:50:55 UTC (rev 16175)
@@ -235,7 +235,7 @@
{ WINBINDD_UID_TO_SID, winbindd_uid_to_sid, "UID_TO_SID" },
{ WINBINDD_GID_TO_SID, winbindd_gid_to_sid, "GID_TO_SID" },
{ WINBINDD_ALLOCATE_UID, winbindd_allocate_uid, "ALLOCATE_UID" },
- { WINBINDD_ALLOCATE_GID, winbindd_allocate_uid, "ALLOCATE_GID" },
+ { WINBINDD_ALLOCATE_GID, winbindd_allocate_gid, "ALLOCATE_GID" },
/* Miscellaneous */
Modified: branches/SAMBA_3_0_RELEASE/source/passdb/pdb_smbpasswd.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/passdb/pdb_smbpasswd.c 2006-06-12 23:03:02 UTC (rev 16174)
+++ branches/SAMBA_3_0_RELEASE/source/passdb/pdb_smbpasswd.c 2006-06-13 01:50:55 UTC (rev 16175)
@@ -1157,7 +1157,7 @@
if (rid == DOMAIN_USER_RID_GUEST) {
struct passwd *passwd = getpwnam_alloc(NULL, lp_guestaccount());
if (!passwd) {
- DEBUG(0, ("Could not find gest account via getpwnam()! (%s)\n", lp_guestaccount()));
+ DEBUG(0, ("Could not find guest account via getpwnam()! (%s)\n", lp_guestaccount()));
return False;
}
smb_pw->smb_userid=passwd->pw_uid;
Modified: branches/SAMBA_3_0_RELEASE/source/script/installbin.sh.in
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/script/installbin.sh.in 2006-06-12 23:03:02 UTC (rev 16174)
+++ branches/SAMBA_3_0_RELEASE/source/script/installbin.sh.in 2006-06-13 01:50:55 UTC (rev 16175)
@@ -4,6 +4,7 @@
DESTDIR=$2
prefix=`echo $3 | sed 's/\/\//\//g'`
BINDIR=`echo $4 | sed 's/\/\//\//g'`
+SBINDIR=@sbindir@
shift
shift
shift
Modified: branches/SAMBA_3_0_RELEASE/source/script/uninstallbin.sh.in
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/script/uninstallbin.sh.in 2006-06-12 23:03:02 UTC (rev 16174)
+++ branches/SAMBA_3_0_RELEASE/source/script/uninstallbin.sh.in 2006-06-13 01:50:55 UTC (rev 16175)
@@ -5,6 +5,7 @@
DESTDIR=$2
prefix=`echo $3 | sed 's/\/\//\//g'`
BINDIR=`echo $4 | sed 's/\/\//\//g'`
+SBINDIR=@sbindir@
shift
shift
shift
More information about the samba-cvs
mailing list