summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2003-01-06 17:57:52 +0000
committerGerald Carter <jerry@samba.org>2003-01-06 17:57:52 +0000
commit52457e109308c6204858b3483fd16171b89ebaee (patch)
treec369d80fc678d3b64db685f7d27b72b93bec196e
parent0ba7c143b32da62ee83e5757f6933ab8be000ffd (diff)
downloadsamba-52457e109308c6204858b3483fd16171b89ebaee.tar.gz
samba-52457e109308c6204858b3483fd16171b89ebaee.tar.bz2
samba-52457e109308c6204858b3483fd16171b89ebaee.zip
removed idpool from schema file (experimental) to remove the dependency
on nis.schema. add $(LDFLAGS) to libsmbclient build (This used to be commit cd16064784a5e5fd9d2a67d4dfba605f7d8046ac)
-rw-r--r--examples/LDAP/samba.schema12
-rw-r--r--source3/Makefile.in2
2 files changed, 7 insertions, 7 deletions
diff --git a/examples/LDAP/samba.schema b/examples/LDAP/samba.schema
index 61dface0a2..f71c344e06 100644
--- a/examples/LDAP/samba.schema
+++ b/examples/LDAP/samba.schema
@@ -142,11 +142,11 @@ objectclass ( 1.3.6.1.4.1.7165.2.2.3 NAME 'sambaAccount' SUP top AUXILIARY
##
## Used for Winbind experimentation
##
-objectclass ( 1.3.6.1.4.1.7165.1.2.2.3 NAME 'uidPool' SUP top AUXILIARY
- DESC 'Pool for allocating UNIX uids'
- MUST ( uidNumber $ cn ) )
+#objectclass ( 1.3.6.1.4.1.7165.1.2.2.3 NAME 'uidPool' SUP top AUXILIARY
+# DESC 'Pool for allocating UNIX uids'
+# MUST ( uidNumber $ cn ) )
-objectclass ( 1.3.6.1.4.1.7165.1.2.2.4 NAME 'gidPool' SUP top AUXILIARY
- DESC 'Pool for allocating UNIX gids'
- MUST ( gidNumber $ cn ) )
+#objectclass ( 1.3.6.1.4.1.7165.1.2.2.4 NAME 'gidPool' SUP top AUXILIARY
+# DESC 'Pool for allocating UNIX gids'
+# MUST ( gidNumber $ cn ) )
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 6df647258b..3c6e9725a5 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -800,7 +800,7 @@ bin/smbwrapper.32.@SHLIBEXT@: $(PICOBJS32)
bin/libsmbclient.@SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS)
@echo Linking libsmbclient shared library $@
- $(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LIBS) \
+ $(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(LIBS) \
@SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
bin/libsmbclient.a: $(LIBSMBCLIENT_PICOBJS)