problem adding shahms ldap patch

[Shahms E. King]

On 30 Jul 2001 17:54:55 +0200, Claudia Moroder wrote:
> Hello,
> 
> I patched my samba 2.2.1a with shahms patch from Fri Jul 20 with patch -p0
> <patchfile and the patch worked.
> 
> I reinstalled the originale source and tried the Thu Jul 26 patch but now I
> get the following errors.
> 
> patching file samba-2.2.1a/source/configure.in
> Hunk #1 FAILED at 1712.
> 1 out of 1 hunk FAILED -- saving rejects to file
> samba-2.2.1a/source/configure.in.rej
> patching file samba-2.2.1a/source/include/smb.h
> patching file samba-2.2.1a/source/param/loadparm.c
> Hunk #4 FAILED at 771.
> Hunk #5 FAILED at 969.
> Hunk #6 FAILED at 1311.
> Hunk #8 FAILED at 1513.
> Hunk #9 FAILED at 1611.
> 5 out of 9 hunks FAILED -- saving rejects to file
> samba-2.2.1a/source/param/loadparm.c.rej
> patching file samba-2.2.1a/source/passdb/ldap.c
> Hunk #2 FAILED at 21.
> Hunk #4 FAILED at 1137.
> 2 out of 4 hunks FAILED -- saving rejects to file
> samba-2.2.1a/source/passdb/ldap.c.rej
> 
> 
> Is it right to use patch -p0 <patchfile ?
> Do I need to start autoconf to have the updated configure file ? ( patch
> changes only configure.in )
> 
> Shahms asked for testers. I would like to test the patches because at the
> office we need desperately samba using openldap. What I need is
> documentation on what schema to add to openldap and what attributes I must
> set.
> Is there docu available ?
> 
> Bye and thank you for samba.
> 
> Andreas Moroder

Documentation and schema info. will be forthcoming, at the moment I'm
mostly interested in making sure it's working.  I'm surprised it failed
to apply, given that the patch was made against a fresh 2.2.1a tar ball.
I will see what I can do.  Attachted is the OpenLDAP 2 schema file i'm
using at the moment.

--Shahms

-------------- next part --------------
##
## schema file for OpenLDAP 2.0.x
## Schema for storing Samba's smbpasswd file in LDAP
## OIDs are owned by the Samba Team
##
## Prerequisite schemas - uid & uidNumber (nis.schema)
##
## 1.3.1.5.1.4.1.7165.2.1.x - attributetypes
## 1.3.1.5.1.4.1.7165.2.2.x - objectclasses
##

attributetype ( 1.3.6.1.4.1.7165.2.1.1 NAME 'lmPassword'
	DESC 'LanManager Passwd'
	EQUALITY caseIgnoreIA5Match
	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} )

attributetype ( 1.3.6.1.4.1.7165.2.1.2 NAME 'ntPassword'
	DESC 'NT Passwd'
	EQUALITY caseIgnoreIA5Match
	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} )

attributetype ( 1.3.6.1.4.1.7165.2.1.3 NAME 'pwdLastSet'
	DESC 'NT pwdLastSet'
	EQUALITY caseIgnoreIA5Match
	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{8} )

attributetype ( 1.3.6.1.4.1.7165.2.1.4 NAME 'acctFlags'
	DESC 'Account Flags'
	EQUALITY caseIgnoreIA5Match
	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{16} )

attributetype ( 1.3.6.1.4.1.7165.2.1.5 NAME 'logonTime'
	DESC 'NT logonTime'
	EQUALITY caseIgnoreIA5Match
	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{8} )

attributetype ( 1.3.6.1.4.1.7165.2.1.6 NAME 'logoffTime'
	DESC 'NT logoffTime'
	EQUALITY caseIgnoreIA5Match
	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{8} )

attributetype ( 1.3.6.1.4.1.7165.2.1.7 NAME 'kickoffTime'
	DESC 'NT kickoffTime'
	EQUALITY caseIgnoreIA5Match
	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{8} )

attributetype ( 1.3.6.1.4.1.7165.2.1.8 NAME 'pwdCanChange'
	DESC 'NT pwdCanChange'
	EQUALITY caseIgnoreIA5Match
	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{8} )

attributetype ( 1.3.6.1.4.1.7165.2.1.9 NAME 'pwdMustChange'
	DESC 'NT pwdMustChange'
	EQUALITY caseIgnoreIA5Match
	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{8} )

attributetype ( 1.3.6.1.4.1.7165.2.1.10 NAME 'homeDrive'
	DESC 'NT homeDrive'
	EQUALITY caseIgnoreIA5Match
	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{4} )

attributetype ( 1.3.6.1.4.1.7165.2.1.11 NAME 'scriptPath'
	DESC 'NT scriptPath'
	EQUALITY caseIgnoreIA5Match
	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{255} )

attributetype ( 1.3.6.1.4.1.7165.2.1.12 NAME 'profilePath'
	DESC 'NT profilePath'
	EQUALITY caseIgnoreIA5Match
	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{255} )

attributetype ( 1.3.6.1.4.1.7165.2.1.13 NAME 'userWorkstations'
	DESC 'userWorkstations'
	EQUALITY caseIgnoreIA5Match
	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{255} )

objectclass ( 1.3.1.5.1.4.1.7165.2.2.1 NAME 'sambaAccount' SUP top STRUCTURAL
	DESC 'Samba Account'
	MUST ( uid $ uidNumber ) 
	MAY  ( cn $ 
	       gidNumber $
               lmPassword $ 
               ntPassword $ 
               pwdLastSet $ 
               logonTime $
               logoffTime $
               kickoffTime $
               pwdCanChange $
               pwdMustChange $
               acctFlags $ 
               displayName $
               homeDirectory $
               homeDrive $
               scriptPath $
               profilePath $
               description $
               userWorkstations ))