The branch, v3-5-test has been updated
via 3f8202cd9e8cefb0cfea7a2245e941b0cf905d56 (commit)
via d988afc43acb7c1e2a0b4d1f1b6357230d483072 (commit)
via 129ef463f9f7d58d3db3da0354b1af6337229131 (commit)
via da19f25bd59dc6c8111af147afc4431efd798634 (commit)
via 13b125d3251dfeb28aa9834496c4bf71b3ba3974 (commit)
from 5148eefe1ea6e215dcbf4ffaa642860bd8dab45f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -----------------------------------------------------------------
commit 3f8202cd9e8cefb0cfea7a2245e941b0cf905d56
Author: Björn Jacke <b...@sernet.de>
Date: Tue Sep 15 06:48:49 2009 +0200
s3: BSD needs sys/sysctl.h included to build properly
FreeBSD (and other BSDs, too) need sys/sysctl.h inclueded to use
sysctlbyname().
Thanks to Timur Bakeyev for that.
commit d988afc43acb7c1e2a0b4d1f1b6357230d483072
Author: Björn Jacke <b...@sernet.de>
Date: Tue Sep 15 03:41:06 2009 +0200
nss_winbind: remove unused variable
commit 129ef463f9f7d58d3db3da0354b1af6337229131
Author: Björn Jacke <b...@sernet.de>
Date: Wed Sep 9 20:07:19 2009 +0200
s3:examples:ldap: allow substing search on more attributes in nds schema
file
commit da19f25bd59dc6c8111af147afc4431efd798634
Author: Björn Jacke <b...@sernet.de>
Date: Wed Sep 9 19:13:32 2009 +0200
s3:examples:ldap: fix some OIDs in various schema files
commit 13b125d3251dfeb28aa9834496c4bf71b3ba3974
Author: Björn Jacke <b...@sernet.de>
Date: Tue Sep 15 19:41:58 2009 +0200
s3: ignore cups-config to tidy up library dependencies
contrary to krb5-config for example, which outputs useful things,
cups-config
--libs does not output libs we have to link against. It outputs libs that
cups
linked against. We just have to link against cups.
-----------------------------------------------------------------------
Summary of changes:
examples/LDAP/samba-nds.schema | 12 ++++++------
examples/LDAP/samba-schema-netscapeds4.x | 6 +++---
examples/LDAP/samba-schema-netscapeds5.x | 6 +++---
examples/LDAP/samba.schema.oc.IBM-DS | 6 +++---
nsswitch/winbind_nss_netbsd.c | 1 -
source3/configure.in | 4 ++--
source3/lib/fault.c | 5 +++++
source3/param/loadparm.c | 4 ++++
8 files changed, 26 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/examples/LDAP/samba-nds.schema b/examples/LDAP/samba-nds.schema
index 8e8c5bc..2fc220f 100644
--- a/examples/LDAP/samba-nds.schema
+++ b/examples/LDAP/samba-nds.schema
@@ -35,7 +35,7 @@ attributeTypes: ( 1.3.6.1.4.1.7165.2.1.25 NAME
'sambaNTPassword' DESC 'MD4 hash
dn: cn=schema
changetype: modify
add: attributetypes
-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 )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.26 NAME 'sambaAcctFlags' DESC 'Account
Flags' EQUALITY caseIgnoreIA5Match SUBSTR caseIgnoreSubstringsMatch SYNTAX
1.3.6.1.4.1.1466.115.121.1.26{16} SINGLE-VALUE )
##
## Password timestamps & policies
@@ -137,7 +137,7 @@ attributeTypes: ( 1.3.6.1.4.1.7165.2.1.54 NAME
'sambaPasswordHistory' DESC 'Conc
dn: cn=schema
changetype: modify
add: attributetypes
-attributeTypes: ( 1.3.6.1.4.1.7165.2.1.20 NAME 'sambaSID' DESC 'Security ID'
EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{64}
SINGLE-VALUE )
+attributeTypes: ( 1.3.6.1.4.1.7165.2.1.20 NAME 'sambaSID' DESC 'Security ID'
EQUALITY caseIgnoreIA5Match SUBSTR caseIgnoreSubstringsMatch SYNTAX
1.3.6.1.4.1.1466.115.121.1.26{64} SINGLE-VALUE )
##
## Primary group SID, compatible with ntSid
@@ -328,22 +328,22 @@ objectClasses: ( 1.3.6.1.4.1.7165.2.2.5 NAME
'sambaDomain' DESC 'Samba Domain In
dn: cn=schema
changetype: modify
add: objectClasses
-objectClasses: ( 1.3.6.1.4.1.7165.1.2.2.7 NAME 'sambaUnixIdPool' DESC 'Pool
for allocating UNIX uids/gids' SUP top AUXILIARY MUST ( uidNumber $ gidNumber ))
+objectClasses: ( 1.3.6.1.4.1.7165.2.2.7 NAME 'sambaUnixIdPool' DESC 'Pool for
allocating UNIX uids/gids' SUP top AUXILIARY MUST ( uidNumber $ gidNumber ))
dn: cn=schema
changetype: modify
add: objectClasses
-objectClasses: ( 1.3.6.1.4.1.7165.1.2.2.8 NAME 'sambaIdmapEntry' DESC 'Mapping
from a SID to an ID' SUP top AUXILIARY MUST ( sambaSID ) MAY ( uidNumber $
gidNumber ))
+objectClasses: ( 1.3.6.1.4.1.7165.2.2.8 NAME 'sambaIdmapEntry' DESC 'Mapping
from a SID to an ID' SUP top AUXILIARY MUST ( sambaSID ) MAY ( uidNumber $
gidNumber ))
dn: cn=schema
changetype: modify
add: objectClasses
-objectClasses: ( 1.3.6.1.4.1.7165.1.2.2.9 NAME 'sambaSidEntry' DESC
'Structural Class for a SID' SUP top STRUCTURAL MUST ( sambaSID ))
+objectClasses: ( 1.3.6.1.4.1.7165.2.2.9 NAME 'sambaSidEntry' DESC 'Structural
Class for a SID' SUP top STRUCTURAL MUST ( sambaSID ))
dn: cn=schema
changetype: modify
add: objectClasses
-objectClasses: ( 1.3.6.1.4.1.7165.1.2.2.10 NAME 'sambaConfig' DESC 'Samba
Configuration Section' SUP top AUXILIARY MAY ( description ))
+objectClasses: ( 1.3.6.1.4.1.7165.2.2.10 NAME 'sambaConfig' DESC 'Samba
Configuration Section' SUP top AUXILIARY MAY ( description ))
dn: cn=schema
changetype: modify
diff --git a/examples/LDAP/samba-schema-netscapeds4.x
b/examples/LDAP/samba-schema-netscapeds4.x
index 9f40966..082471b 100644
--- a/examples/LDAP/samba-schema-netscapeds4.x
+++ b/examples/LDAP/samba-schema-netscapeds4.x
@@ -85,7 +85,7 @@ objectclass sambaDomain
objectclass sambaUnixIdPool
oid
- 1.3.6.1.4.1.7165.1.2.2.7
+ 1.3.6.1.4.1.7165.2.2.7
superior
top
requires
@@ -94,7 +94,7 @@ objectclass sambaUnixIdPool
objectclass sambaIdmapEntry
oid
- 1.3.6.1.4.1.7165.1.2.2.8
+ 1.3.6.1.4.1.7165.2.2.8
superior
top
requires
@@ -105,7 +105,7 @@ objectclass sambaIdmapEntry
objectclass sambaSidEntry
oid
- 1.3.6.1.4.1.7165.1.2.2.9
+ 1.3.6.1.4.1.7165.2.2.9
superior
top
requires
diff --git a/examples/LDAP/samba-schema-netscapeds5.x
b/examples/LDAP/samba-schema-netscapeds5.x
index 661521c..8125adc 100644
--- a/examples/LDAP/samba-schema-netscapeds5.x
+++ b/examples/LDAP/samba-schema-netscapeds5.x
@@ -32,9 +32,9 @@ aci: (targetattr = "*")(version 3.0; acl "SIE Group"; allow
(all)groupdn = "ld
objectClasses: ( 1.3.6.1.4.1.7165.2.2.6 NAME 'sambaSamAccount' SUP top
AUXILIARY DESC 'Samba 3.0 Auxilary SAM Account' MUST ( uid $ sambaSID ) MAY (
cn $ sambaLMPassword $ sambaNTPassword $ sambaPwdLastSet $ sambaLogonTime $
sambaLogoffTime $ sambaKickoffTime $ sambaPwdCanChange $ sambaPwdMustChange $
sambaAcctFlags $ displayName $ sambaHomePath $ sambaHomeDrive $
sambaLogonScript $ sambaProfilePath $ description $ sambaUserWorkstations $
sambaPrimaryGroupSID $ sambaDomainName $ sambaMungedDial $
sambaBadPasswordCount $ sambaBadPasswordTime $ sambaPasswordHistory $
sambaLogonHours) X-ORIGIN 'user defined' )
objectClasses: ( 1.3.6.1.4.1.7165.2.2.4 NAME 'sambaGroupMapping' SUP top
AUXILIARY DESC 'Samba Group Mapping' MUST ( gidNumber $ sambaSID $
sambaGroupType ) MAY ( displayName $ description ) X-ORIGIN 'user defined' )
objectClasses: ( 1.3.6.1.4.1.7165.2.2.5 NAME 'sambaDomain' SUP top STRUCTURAL
DESC 'Samba Domain Information' MUST ( sambaDomainName $ sambaSID ) MAY (
sambaNextRid $ sambaNextGroupRid $ sambaNextUserRid $ sambaAlgorithmicRidBase )
X-ORIGIN 'user defined' )
-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.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.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.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' )
diff --git a/examples/LDAP/samba.schema.oc.IBM-DS
b/examples/LDAP/samba.schema.oc.IBM-DS
index 575aed4..de3cfb6 100644
--- a/examples/LDAP/samba.schema.oc.IBM-DS
+++ b/examples/LDAP/samba.schema.oc.IBM-DS
@@ -6,11 +6,11 @@ objectclasses=( 1.3.6.1.4.1.7165.2.2.4 NAME
'sambaGroupMapping' SUP top AUXILIAR
objectclasses=( 1.3.6.1.4.1.7165.2.2.5 NAME 'sambaDomain' SUP top STRUCTURAL
DESC 'Samba Domain Information' MUST ( sambaDomainName $ sambaSID ) MAY (
sambaNextRid $ sambaNextGroupRid $ sambaNextUserRid $ sambaAlgorithmicRidBase $
sambaMinPwdLength $ sambaPwdHistoryLength $ sambaLogonToChgPwd $ sambaMaxPwdAge
$ sambaMinPwdAge $ sambaLockoutDuration $ sambaLockoutObservationWindow $
sambaLockoutThreshold $ sambaForceLogoff $ sambaRefuseMachinePwdChange ) )
-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 ) )
+objectclasses=( 1.3.6.1.4.1.7165.2.2.7 NAME 'sambaUnixIdPool' SUP top
AUXILIARY DESC 'Pool for allocating UNIX uids/gids' MUST ( uidNumber $
gidNumber ) )
-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 ) )
+objectclasses=( 1.3.6.1.4.1.7165.2.2.8 NAME 'sambaIdmapEntry' SUP top
AUXILIARY DESC 'Mapping from a SID to an ID' MUST ( sambaSID ) MAY ( uidNumber
$ gidNumber ) )
-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 ) )
+objectclasses=( 1.3.6.1.4.1.7165.2.2.9 NAME 'sambaSidEntry' SUP top STRUCTURAL
DESC 'Structural Class for a SID' MUST ( sambaSID ) )
objectclasses=( 1.3.6.1.4.1.7165.2.2.10 NAME 'sambaConfig' SUP top AUXILIARY
DESC 'Samba Configuration Section' MAY ( description ) )
diff --git a/nsswitch/winbind_nss_netbsd.c b/nsswitch/winbind_nss_netbsd.c
index 63c068e..f673806 100644
--- a/nsswitch/winbind_nss_netbsd.c
+++ b/nsswitch/winbind_nss_netbsd.c
@@ -215,7 +215,6 @@ netbsdwinbind_getgroupmembership(void *nsrv, void *nscb,
va_list ap)
{
int *result = va_arg(ap, int *);
const char *uname = va_arg(ap, const char *);
- gid_t agroup = va_arg(ap, gid_t);
gid_t *groups = va_arg(ap, gid_t *);
int maxgrp = va_arg(ap, int);
int *groupc = va_arg(ap, int *);
diff --git a/source3/configure.in b/source3/configure.in
index cf65726..b5ed30d 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -652,7 +652,7 @@ AC_CHECK_HEADERS(aio.h sys/fcntl.h sys/select.h fcntl.h
sys/time.h sys/unistd.h
AC_CHECK_HEADERS(unistd.h grp.h sys/id.h memory.h alloca.h)
AC_CHECK_HEADERS(limits.h float.h pthread.h libintl.h)
AC_CHECK_HEADERS(rpc/rpc.h rpcsvc/nis.h rpcsvc/ypclnt.h)
-AC_CHECK_HEADERS(sys/param.h ctype.h sys/wait.h sys/resource.h sys/ioctl.h
sys/ipc.h sys/prctl.h)
+AC_CHECK_HEADERS(sys/param.h ctype.h sys/wait.h sys/resource.h sys/ioctl.h
sys/ipc.h sys/prctl.h sys/sysctl.h)
AC_CHECK_HEADERS(sys/mman.h sys/filio.h sys/priv.h sys/shm.h string.h
strings.h stdlib.h)
AC_CHECK_HEADERS(sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h
termio.h)
AC_CHECK_HEADERS(sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h)
@@ -743,7 +743,7 @@ if test x$enable_cups != xno; then
ac_save_PRINT_LIBS=$PRINT_LIBS
CFLAGS="$CFLAGS `$CUPS_CONFIG --cflags`"
LDFLAGS="$LDFLAGS `$CUPS_CONFIG --ldflags`"
- PRINT_LIBS="$PRINT_LIBS `$CUPS_CONFIG --libs`"
+ PRINT_LIBS="-lcups"
AC_CHECK_HEADERS(cups/cups.h cups/language.h)
if test x"$ac_cv_header_cups_cups_h" = xyes -a \
x"$ac_cv_header_cups_language_h" = xyes; then
diff --git a/source3/lib/fault.c b/source3/lib/fault.c
index 51fc53b..bf61bb2 100644
--- a/source3/lib/fault.c
+++ b/source3/lib/fault.c
@@ -20,6 +20,11 @@
#include "includes.h"
+#ifdef HAVE_SYS_SYSCTL_H
+#include <sys/sysctl.h>
+#endif
+
+
#ifdef HAVE_SYS_PRCTL_H
#include <sys/prctl.h>
#endif
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index c91f676..b278b96 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -54,6 +54,10 @@
#include "includes.h"
#include "printing.h"
+#ifdef HAVE_SYS_SYSCTL_H
+#include <sys/sysctl.h>
+#endif
+
#ifdef HAVE_HTTPCONNECTENCRYPT
#include <cups/http.h>
#endif
--
Samba Shared Repository
