[SCM] Samba Shared Repository - branch v3-4-stable updated - release-3-4-0-35-ge1d73ad
Karolin Seeger
kseeger at samba.org
Mon Aug 17 04:57:19 MDT 2009
The branch, v3-4-stable has been updated
via e1d73ad5256466c078cee699a71244fb4de7f8a4 (commit)
via 0f05b1585485ec6dee142bd811e6cc85923bed23 (commit)
via ce3636bb502da954dfd79afdeb040b1fbfef6faf (commit)
via 3ac99dded70132326ec3f310ad93993ffc68952a (commit)
from 2cc5abf53dfe00a4d0fea1edb9d0445fc2f6fa23 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-stable
- Log -----------------------------------------------------------------
commit e1d73ad5256466c078cee699a71244fb4de7f8a4
Author: Karolin Seeger <kseeger at samba.org>
Date: Mon Aug 17 12:50:41 2009 +0200
WHATSNEW: Update changes since 3.4.0.
Karolin
(cherry picked from commit 7505f03eee949bb861f6138be8b5ef86be9c7b7f)
commit 0f05b1585485ec6dee142bd811e6cc85923bed23
Author: Günther Deschner <gd at samba.org>
Date: Thu Aug 6 17:17:26 2009 +0200
s3-ldap: Fix Bug #5879. Update LDAP schema for Netscape DS 5.
Patch from TAKEDA Yasuma <yasuma at osstech.co.jp>.
Guenther
(cherry picked from commit 9fa042bb9f71057fc869e37d4cc180e8a772b1bb)
commit ce3636bb502da954dfd79afdeb040b1fbfef6faf
Author: Matt Kraai <mkraai at beckman.com>
Date: Wed Aug 12 08:49:24 2009 +0200
libreplace: undef AI_ADDRCONFIG on QNX 6.3.0 (fix bug #6630)
Some of the functions in source3/lib/util_sock.c use AI_ADDRCONFIG. On QNX
6.3.0, this macro is defined but, if it's used, getaddrinfo will fail. This
prevents smbd from opening any sockets.
If I undefine AI_ADDRCONFIG on such systems and allow
lib/replace/system/network.h to define it to be 0, this works around the issue.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
(cherry picked from commit 91d13b68be55728a85b3832e2da9267dbf4f2464)
Fixes bug #6630.
(cherry picked from commit 3be12b15f1758b54456d49368dbca7f25a99f4cc)
commit 3ac99dded70132326ec3f310ad93993ffc68952a
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Aug 14 16:18:36 2009 +0200
WHATSNEW: Update changes.
Karolin
(cherry picked from commit e873995e31e2f04e708194287a64c66a32cc4948)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 8 ++++++--
examples/LDAP/samba-schema-netscapeds5.x | 7 ++++++-
lib/replace/system/network.h | 14 ++++++++++++++
3 files changed, 26 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index fb63551..2d89514 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -41,6 +41,10 @@ o Günther Deschner <gd at samba.org>
* BUG 6607: Fix crash bug in spoolss_addprinterex_level_2.
+o Matt Kraai <mkraai at beckman.com>
+ * BUG 6630: Fix opening of sockets on QNX.
+
+
o Volker Lendecke <vl at samba.org>
* BUG 6611: Fix a valgrind error in chain_reply.
* Fix linking on Solaris.
@@ -60,8 +64,8 @@ o Rusty Russell <rusty at rustcorp.com.au>
* BUG 6601: Avoid global fd limits.
-o Jelmer Vernooij <jelmer at samba.org>
- * Fix build with external talloc.
+o TAKEDA Yasuma <yasuma at osstech.co.jp>
+ * BUG 5879: Update LDAP schema for Netscape DS 5.
o Bo Yang <boyang at samba.org>
diff --git a/examples/LDAP/samba-schema-netscapeds5.x b/examples/LDAP/samba-schema-netscapeds5.x
index efc528b..661521c 100644
--- a/examples/LDAP/samba-schema-netscapeds5.x
+++ b/examples/LDAP/samba-schema-netscapeds5.x
@@ -4,9 +4,11 @@
## Thomas Mueller 12.04.2003, thomas.mueller at christ-wasser.de
## Richard Renard rrenard at idealx.com 2005-01-28
## - added support for MungedDial, BadPasswordCount, BadPasswordTime, PasswordHistory, LogonHours
+## TAKEDA Yasuma yasuma at osstech.co.jp 2008-11-06
+## - added sambaTrustedDomainPassword objectClasses
## - in Sun One 5.2 copy it as 99samba-schema-netscapeds5.ldif
##
-## Samba 3.0 schema file for Netscape DS 5.x
+## Samba 3.2 schema file for Netscape DS 5.x
##
## INSTALL-DIRECTORY/slapd-your_name/config/schema/samba-schema-netscapeds5.ldif
####################################################################
@@ -33,6 +35,7 @@ objectClasses: ( 1.3.6.1.4.1.7165.2.2.5 NAME 'sambaDomain' SUP top STRUCTURAL DE
objectClasses: ( 1.3.6.1.4.1.7165.1.2.2.7 NAME 'sambaUnixIdPool' SUP top AUXILIARY DESC 'Pool for allocating UNIX uids/gids' MUST ( uidNumber $ gidNumber ) X-ORIGIN 'user defined' )
objectClasses: ( 1.3.6.1.4.1.7165.1.2.2.8 NAME 'sambaIdmapEntry' SUP top AUXILIARY DESC 'Mapping from a SID to an ID' MUST ( sambaSID ) MAY ( uidNumber $ gidNumber ) X-ORIGIN 'user defined' )
objectClasses: ( 1.3.6.1.4.1.7165.1.2.2.9 NAME 'sambaSidEntry' SUP top STRUCTURAL DESC 'Structural Class for a SID' MUST ( sambaSID ) X-ORIGIN 'user defined' )
+objectClasses: ( 1.3.6.1.4.1.7165.2.2.15 NAME 'sambaTrustedDomainPassword' SUP top STRUCTURAL DESC 'Samba Trusted Domain Password' MUST ( sambaDomainName $ sambaSID $ sambaClearTextPassword $ sambaPwdLastSet ) MAY ( sambaPreviousClearTextPassword ) X-ORIGIN 'user defined')
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.24 NAME 'sambaLMPassword' DESC 'LanManager Password' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE X-ORIGIN 'user defined' )
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.25 NAME 'sambaNTPassword' DESC 'MD4 hash of the unicode password' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE X-ORIGIN 'user defined' )
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.26 NAME 'sambaAcctFlags' DESC 'Account Flags' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{16} SINGLE-VALUE X-ORIGIN 'user defined' )
@@ -60,3 +63,5 @@ attributeTypes: ( 1.3.6.1.4.1.7165.2.1.21 NAME 'sambaNextUserRid' DESC 'Next NT
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.22 NAME 'sambaNextGroupRid' DESC 'Next NT rid to give out for groups' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user defined' )
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.39 NAME 'sambaNextRid' DESC 'Next NT rid to give out for anything' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user defined' )
attributeTypes: ( 1.3.6.1.4.1.7165.2.1.40 NAME 'sambaAlgorithmicRidBase' DESC 'Base at which the samba RID generation algorithm should operate' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user defined' )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.68 NAME 'sambaClearTextPassword' DESC 'Clear text password (used for trusted domain passwords)' EQUALITY octetStringMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 X-ORIGIN 'user defined')
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.69 NAME 'sambaPreviousClearTextPassword' DESC 'Previous clear text password (used for trusted domain passwords)' EQUALITY octetStringMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 X-ORIGIN 'user defined')
diff --git a/lib/replace/system/network.h b/lib/replace/system/network.h
index 6add99c..4fe1084 100644
--- a/lib/replace/system/network.h
+++ b/lib/replace/system/network.h
@@ -195,6 +195,20 @@ int rep_socketpair(int d, int type, int protocol, int sv[2]);
#endif
#endif
+/*
+ * Some of the functions in source3/lib/util_sock.c use AI_ADDRCONFIG. On QNX
+ * 6.3.0, this macro is defined but, if it's used, getaddrinfo will fail. This
+ * prevents smbd from opening any sockets.
+ *
+ * If I undefine AI_ADDRCONFIG on such systems and define it to be 0,
+ * this works around the issue.
+ */
+#ifdef __QNX__
+#include <sys/neutrino.h>
+#if _NTO_VERSION == 630
+#undef AI_ADDRCONFIG
+#endif
+#endif
#ifndef AI_ADDRCONFIG
/*
* logic copied from AI_NUMERICHOST
--
Samba Shared Repository
More information about the samba-cvs
mailing list