diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-09-09 21:24:49 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-10-06 07:18:07 +0200 |
| commit | 7d33ec3dfe78723d62f4941684060baeb9c4bda6 (patch) | |
| tree | 0ca105c694d41ebda5d6b7e9c50e0b57d4204858 /source4/auth | |
| parent | 040055bb6a578516007ab6f56ebe2ee77b0f8605 (diff) | |
| download | samba-7d33ec3dfe78723d62f4941684060baeb9c4bda6.tar.gz samba-7d33ec3dfe78723d62f4941684060baeb9c4bda6.tar.bz2 samba-7d33ec3dfe78723d62f4941684060baeb9c4bda6.zip | |
lib/util: consolidate module loading into common code
This creates a samba-modules private libary that handles the details.
Andrew Bartlett
Diffstat (limited to 'source4/auth')
| -rw-r--r-- | source4/auth/gensec/gensec_start.c | 1 | ||||
| -rw-r--r-- | source4/auth/gensec/wscript_build | 2 | ||||
| -rw-r--r-- | source4/auth/ntlm/auth.c | 1 | ||||
| -rw-r--r-- | source4/auth/ntlm/wscript_build | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/source4/auth/gensec/gensec_start.c b/source4/auth/gensec/gensec_start.c index d754bb0cde..d400685a49 100644 --- a/source4/auth/gensec/gensec_start.c +++ b/source4/auth/gensec/gensec_start.c @@ -35,6 +35,7 @@ #include "param/param.h" #include "lib/util/tsort.h" #include "auth/gensec/gensec_toplevel_proto.h" +#include "lib/util/samba_modules.h" /* the list of currently registered GENSEC backends */ static struct gensec_security_ops **generic_security_ops; diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build index c5c0c340ac..a7fa12f56a 100644 --- a/source4/auth/gensec/wscript_build +++ b/source4/auth/gensec/wscript_build @@ -4,7 +4,7 @@ bld.SAMBA_LIBRARY('gensec', source='gensec_start.c socket.c gensec_tstream.c', pc_files='gensec.pc', autoproto='gensec_proto.h', - public_deps='tevent-util samba-util errors LIBPACKET auth_system_session gensec_runtime', + public_deps='tevent-util samba-util errors LIBPACKET auth_system_session gensec_runtime samba-modules', public_headers='', deps='com_err', vnum='0.0.1' diff --git a/source4/auth/ntlm/auth.c b/source4/auth/ntlm/auth.c index 69cbff6e9a..802bc1b40f 100644 --- a/source4/auth/ntlm/auth.c +++ b/source4/auth/ntlm/auth.c @@ -27,6 +27,7 @@ #include "param/param.h" #include "dsdb/samdb/samdb.h" #include "libcli/wbclient/wbclient.h" +#include "lib/util/samba_modules.h" /*************************************************************************** Set a fixed challenge diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build index 48f28f5775..29190f76f3 100644 --- a/source4/auth/ntlm/wscript_build +++ b/source4/auth/ntlm/wscript_build @@ -51,7 +51,7 @@ bld.SAMBA_MODULE('auth4_unix', bld.SAMBA_LIBRARY('auth4', source='auth.c auth_util.c auth_simple.c', autoproto='auth_proto.h', - deps='samba-util security samdb samba-credentials tevent-util LIBWBCLIENT_OLD auth_unix_token', + deps='samba-util security samdb samba-credentials tevent-util LIBWBCLIENT_OLD auth_unix_token samba-modules', private_library=True ) |