diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-01-02 01:07:44 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:35:49 -0500 |
| commit | bea88a10285f814415ede4ee1ff1c34a4fd4e000 (patch) | |
| tree | e29d96ffd54ef604ae2bc1c435c334268776acb8 /source4/lib | |
| parent | 7ffdd1246d10cf969fe733e05595664921cdfb81 (diff) | |
| download | samba-bea88a10285f814415ede4ee1ff1c34a4fd4e000.tar.gz samba-bea88a10285f814415ede4ee1ff1c34a4fd4e000.tar.bz2 samba-bea88a10285f814415ede4ee1ff1c34a4fd4e000.zip | |
r20455: Apply some of the patches from Martin Kuehl <kuehl@univention.de> to
better handle the Samba3 backend.
I've refactored the password format patch to use the routines in
lib/samba3/smbpasswd.c, which has required me to move this into a
seperate subsystem, due to recursive dependencies.
Andrew Bartlett
(This used to be commit 14e2c877a82d1fcf060455f9b46de5767b71438d)
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/samba3/config.mk | 13 | ||||
| -rw-r--r-- | source4/lib/samba3/samba3.h | 1 |
2 files changed, 12 insertions, 2 deletions
diff --git a/source4/lib/samba3/config.mk b/source4/lib/samba3/config.mk index 8fb48fb522..b6441c4dcd 100644 --- a/source4/lib/samba3/config.mk +++ b/source4/lib/samba3/config.mk @@ -6,10 +6,19 @@ SO_VERSION = 0 DESCRIPTION = Library for reading Samba3 data files PRIVATE_PROTO_HEADER = samba3_proto.h PUBLIC_HEADERS = samba3.h -OBJ_FILES = smbpasswd.o tdbsam.o policy.o \ +OBJ_FILES = tdbsam.o policy.o \ idmap.o winsdb.o samba3.o group.o \ registry.o secrets.o share_info.o PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBTDB NDR_SECURITY \ - CREDENTIALS + CREDENTIALS SMBPASSWD +# End SUBSYSTEM LIBSAMBA3 +################################################ + +################################################ +# Start SUBSYSTEM LIBSAMBA3 +[SUBSYSTEM::SMBPASSWD] +PRIVATE_PROTO_HEADER = samba3_smbpasswd_proto.h +PUBLIC_HEADERS = samba3.h +OBJ_FILES = smbpasswd.o # End SUBSYSTEM LIBSAMBA3 ################################################ diff --git a/source4/lib/samba3/samba3.h b/source4/lib/samba3/samba3.h index c860c4eddd..18b76f8c67 100644 --- a/source4/lib/samba3/samba3.h +++ b/source4/lib/samba3/samba3.h @@ -211,5 +211,6 @@ struct samba3 }; #include "lib/samba3/samba3_proto.h" +#include "lib/samba3/samba3_smbpasswd_proto.h" #endif /* _SAMBA3_H */ |