Imported Upstream version 4.0.0+dfsg1upstream/4.0.0+dfsg1

1 files changed, 29 insertions, 32 deletions

diff --git a/source3/auth/wscript_build b/source3/auth/wscript_build
index 8bf2051526..e518de98fd 100644
--- a/source3/auth/wscript_build
+++ b/source3/auth/wscript_build
@@ -3,46 +3,49 @@
 AUTH_BUILTIN_SRC = 'auth_builtin.c'
 AUTH_DOMAIN_SRC = 'auth_domain.c'
 AUTH_SAM_SRC = 'auth_sam.c'
-AUTH_SERVER_SRC = 'auth_server.c'
 AUTH_UNIX_SRC = 'auth_unix.c'
 AUTH_WINBIND_SRC = 'auth_winbind.c'
 AUTH_WBC_SRC = 'auth_wbc.c'
 AUTH_SCRIPT_SRC = 'auth_script.c'
-AUTH_NETLOGOND_SRC = 'auth_netlogond.c'
 
 AUTH_SRC = '''auth.c
            user_krb5.c
-           auth_compat.c auth_ntlmssp.c'''
+           auth_ntlmssp.c auth_generic.c'''
 
 bld.SAMBA3_SUBSYSTEM('TOKEN_UTIL',
                     source='token_util.c',
+                    deps='samba-util pdb',
                     vars=locals())
 
+bld.SAMBA3_SUBSYSTEM('USER_UTIL',
+                     source='user_util.c',
+                     deps='TOKEN_UTIL')
+
 bld.SAMBA3_SUBSYSTEM('AUTH_COMMON',
                     source='''auth_util.c
-			      user_util.c
 			      check_samsec.c
 			      server_info.c
 			      server_info_sam.c
-			      user_info.c
-			      user_util.c''',
+			      user_info.c''',
+                     deps='TOKEN_UTIL DCUTIL USER_UTIL',
                     vars=locals())
 
-bld.SAMBA3_SUBSYSTEM('auth',
+bld.SAMBA3_LIBRARY('auth',
                     source=AUTH_SRC,
-                    deps='''PLAINTEXT_AUTH SLCACHE DCUTIL TOKEN_UTIL AUTH_COMMON''',
-                    vars=locals())
+                   deps='''PLAINTEXT_AUTH SLCACHE DCUTIL TOKEN_UTIL AUTH_COMMON libcli_netlogon3 samba-hostconfig''',
+                   private_library=True)
 
 bld.SAMBA3_MODULE('auth_sam',
                  subsystem='auth',
                  source=AUTH_SAM_SRC,
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_sam'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_sam'))
+                 internal_module=True)
 
 bld.SAMBA3_MODULE('auth_unix',
                  subsystem='auth',
                  source=AUTH_UNIX_SRC,
+                 deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_unix'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_unix'))
@@ -50,45 +53,31 @@ bld.SAMBA3_MODULE('auth_unix',
 bld.SAMBA3_MODULE('auth_winbind',
                  subsystem='auth',
                  source=AUTH_WINBIND_SRC,
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_winbind'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_winbind'))
+                 internal_module=True)
 
 bld.SAMBA3_MODULE('auth_wbc',
                  subsystem='auth',
                  source=AUTH_WBC_SRC,
+                 deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_wbc'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_wbc'))
 
-bld.SAMBA3_MODULE('auth_server',
-                 subsystem='auth',
-                 source=AUTH_SERVER_SRC,
-                 init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_server'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_server'))
-
 bld.SAMBA3_MODULE('auth_domain',
                  subsystem='auth',
                  source=AUTH_DOMAIN_SRC,
-                 deps='RPC_CLIENT_SCHANNEL',
+                 deps='RPC_CLIENT_SCHANNEL trusts_util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_domain'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_domain'))
+                 internal_module=True)
 
 bld.SAMBA3_MODULE('auth_builtin',
                  subsystem='auth',
                  source=AUTH_BUILTIN_SRC,
+                 deps='samba-util',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_builtin'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_builtin'))
-
-bld.SAMBA3_MODULE('auth_netlogond',
-                 subsystem='auth',
-                 source=AUTH_NETLOGOND_SRC,
-                 init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_netlogond'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_netlogond'))
+                 internal_module=True)
 
 bld.SAMBA3_MODULE('auth_script',
                  subsystem='auth',
@@ -96,3 +85,11 @@ bld.SAMBA3_MODULE('auth_script',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_script'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_script'))
+
+bld.SAMBA3_MODULE('auth_samba4',
+                  subsystem='auth',
+                  source='auth_samba4.c',
+                  init_function='',
+                  deps='auth4 samba_server_gensec gensec',
+                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_samba4') and bld.AD_DC_BUILD_IS_ENABLED(),
+                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_samba4') and bld.AD_DC_BUILD_IS_ENABLED())