diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-02-19 14:45:23 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-02-19 14:45:23 +1100 |
| commit | e51ec1d8cfbcce0dbc1b4bbe95eef73feffbd1a1 (patch) | |
| tree | 643566bbcf1312cd9ae1fed9e235d702c7281a8f /source4/auth | |
| parent | 5842df9d0fb71430d1bcda1c4c748589b38ecb00 (diff) | |
| parent | 9368ea67cdbb0d1fe5ef2258cc7e8c20c66e6ecd (diff) | |
| download | samba-e51ec1d8cfbcce0dbc1b4bbe95eef73feffbd1a1.tar.gz samba-e51ec1d8cfbcce0dbc1b4bbe95eef73feffbd1a1.tar.bz2 samba-e51ec1d8cfbcce0dbc1b4bbe95eef73feffbd1a1.zip | |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit 837eb8a0bc011cd84bc7e8d2849028313d709928)
Diffstat (limited to 'source4/auth')
| -rw-r--r-- | source4/auth/config.mk | 8 | ||||
| -rw-r--r-- | source4/auth/gensec/config.mk | 2 | ||||
| -rw-r--r-- | source4/auth/ntlmssp/config.mk | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source4/auth/config.mk b/source4/auth/config.mk index 37581b95f3..5b320bcf36 100644 --- a/source4/auth/config.mk +++ b/source4/auth/config.mk @@ -1,8 +1,8 @@ # auth server subsystem -include gensec/config.mk -include kerberos/config.mk -include ntlmssp/config.mk -include credentials/config.mk +mkinclude gensec/config.mk +mkinclude kerberos/config.mk +mkinclude ntlmssp/config.mk +mkinclude credentials/config.mk [SUBSYSTEM::auth_session] OBJ_FILES = session.o diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk index a53dff8bfe..9aab2c704e 100644 --- a/source4/auth/gensec/config.mk +++ b/source4/auth/gensec/config.mk @@ -62,7 +62,7 @@ INIT_FUNCTION = gensec_schannel_init OBJ_FILES = schannel.o \ schannel_sign.o PRIVATE_DEPENDENCIES = SCHANNELDB NDR_SCHANNEL CREDENTIALS LIBNDR -OUTPUT_TYPE = INTEGRATED +OUTPUT_TYPE = MERGED_OBJ # End MODULE gensec_schannel ################################################ diff --git a/source4/auth/ntlmssp/config.mk b/source4/auth/ntlmssp/config.mk index 544850264a..9033384b1f 100644 --- a/source4/auth/ntlmssp/config.mk +++ b/source4/auth/ntlmssp/config.mk @@ -13,6 +13,6 @@ OBJ_FILES = ntlmssp.o \ ntlmssp_client.o \ ntlmssp_server.o PRIVATE_DEPENDENCIES = MSRPC_PARSE CREDENTIALS -OUTPUT_TYPE = INTEGRATED +OUTPUT_TYPE = MERGED_OBJ # End MODULE gensec_ntlmssp ################################################ |