[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Sun Oct 10 20:48:01 MDT 2010
The branch, master has been updated
via d589430 credentials: Fix the build.
via d74e0ad credentials: Split up into several subsystems.
from c5ae099 kerberos_util: Put into separate subsystem.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d589430fa006dc4fc950be025e3a949b56e1a7bd
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Oct 11 04:05:37 2010 +0200
credentials: Fix the build.
Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
Autobuild-Date: Mon Oct 11 02:47:50 UTC 2010 on sn-devel-104
commit d74e0adb3041036e8e89d4265a67a455354bc308
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Oct 11 02:05:03 2010 +0200
credentials: Split up into several subsystems.
-----------------------------------------------------------------------
Summary of changes:
source4/auth/credentials/credentials.c | 2 +-
source4/auth/credentials/credentials.h | 1 +
source4/auth/credentials/credentials_krb5.h | 3 ++
.../{credentials_files.c => credentials_secrets.c} | 2 +-
source4/auth/credentials/wscript_build | 21 ++++++++++++++++---
source4/auth/gensec/wscript_build | 6 ++--
source4/auth/kerberos/wscript_build | 2 +-
source4/auth/ntlm/wscript_build | 2 +-
source4/dsdb/samdb/ldb_modules/wscript_build | 2 +-
source4/dsdb/wscript_build | 2 +-
source4/lib/cmdline/wscript_build | 2 +-
source4/smbd/wscript_build | 2 +-
12 files changed, 32 insertions(+), 15 deletions(-)
rename source4/auth/credentials/{credentials_files.c => credentials_secrets.c} (99%)
Changeset truncated at 500 lines:
diff --git a/source4/auth/credentials/credentials.c b/source4/auth/credentials/credentials.c
index 30ab46d..3a2e9a6 100644
--- a/source4/auth/credentials/credentials.c
+++ b/source4/auth/credentials/credentials.c
@@ -25,7 +25,7 @@
#include "librpc/gen_ndr/samr.h" /* for struct samrPassword */
#include "auth/credentials/credentials.h"
#include "auth/credentials/credentials_krb5.h"
-#include "auth/credentials/credentials_proto.h"
+#include "auth/kerberos/kerberos_util.h"
#include "libcli/auth/libcli_auth.h"
#include "lib/events/events.h"
#include "param/param.h"
diff --git a/source4/auth/credentials/credentials.h b/source4/auth/credentials/credentials.h
index b7023cd..a468624 100644
--- a/source4/auth/credentials/credentials.h
+++ b/source4/auth/credentials/credentials.h
@@ -299,4 +299,5 @@ NTSTATUS cli_credentials_set_secrets(struct cli_credentials *cred,
char **error_string);
int cli_credentials_get_kvno(struct cli_credentials *cred);
+
#endif /* __CREDENTIALS_H__ */
diff --git a/source4/auth/credentials/credentials_krb5.h b/source4/auth/credentials/credentials_krb5.h
index 3a614ff..1630b21 100644
--- a/source4/auth/credentials/credentials_krb5.h
+++ b/source4/auth/credentials/credentials_krb5.h
@@ -52,4 +52,7 @@ krb5_error_code impersonate_principal_from_credentials(TALLOC_CTX *parent_ctx,
krb5_principal *princ,
const char **error_string);
+void cli_credentials_invalidate_client_gss_creds(struct cli_credentials *cred,
+ enum credentials_obtained obtained);
+
#endif /* __CREDENTIALS_KRB5_H__ */
diff --git a/source4/auth/credentials/credentials_files.c b/source4/auth/credentials/credentials_secrets.c
similarity index 99%
rename from source4/auth/credentials/credentials_files.c
rename to source4/auth/credentials/credentials_secrets.c
index 4a9ccf5..d68ed33 100644
--- a/source4/auth/credentials/credentials_files.c
+++ b/source4/auth/credentials/credentials_secrets.c
@@ -30,7 +30,7 @@
#include "../lib/util/util_ldb.h"
#include "auth/credentials/credentials.h"
#include "auth/credentials/credentials_krb5.h"
-#include "auth/credentials/credentials_proto.h"
+#include "auth/kerberos/kerberos_util.h"
#include "param/param.h"
#include "lib/events/events.h"
#include "dsdb/samdb/samdb.h"
diff --git a/source4/auth/credentials/wscript_build b/source4/auth/credentials/wscript_build
index a8ef95f..9e81e8f 100644
--- a/source4/auth/credentials/wscript_build
+++ b/source4/auth/credentials/wscript_build
@@ -1,17 +1,30 @@
#!/usr/bin/env python
bld.SAMBA_SUBSYSTEM('CREDENTIALS',
- source='credentials.c credentials_files.c credentials_ntlm.c credentials_krb5.c',
+ source='credentials.c',
autoproto='credentials_proto.h',
- public_deps='LIBCLI_AUTH SECRETS LIBCRYPTO KERBEROS KERBEROS_UTIL UTIL_LDB gssapi com_err',
public_headers='credentials.h',
- deps='SECRETS SAMDB'
+ deps='LIBCRYPTO LIBSAMBA-ERRORS LIBEVENTS LIBCLI_AUTH LIBSECURITY',
)
+bld.SAMBA_SUBSYSTEM('CREDENTIALS_KRB5',
+ source='credentials_krb5.c',
+ deps='KERBEROS_UTIL gssapi CREDENTIALS',
+ public_deps='com_err KERBEROS',
+ )
+
+bld.SAMBA_SUBSYSTEM('CREDENTIALS_SECRETS',
+ source='credentials_secrets.c',
+ deps='SECRETS CREDENTIALS_KRB5 CREDENTIALS_NTLM ldb',
+ )
+
+bld.SAMBA_SUBSYSTEM('CREDENTIALS_NTLM',
+ source='credentials_ntlm.c',
+ deps='CREDENTIALS')
bld.SAMBA_PYTHON('pycredentials',
source='pycredentials.c',
- public_deps='CREDENTIALS LIBCMDLINE_CREDENTIALS PYTALLOC pyparam_util',
+ public_deps='CREDENTIALS LIBCMDLINE_CREDENTIALS PYTALLOC pyparam_util CREDENTIALS_KRB5 CREDENTIALS_SECRETS',
realname='samba/credentials.so'
)
diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build
index cf3d783..dff85d6 100644
--- a/source4/auth/gensec/wscript_build
+++ b/source4/auth/gensec/wscript_build
@@ -4,18 +4,18 @@ bld.SAMBA_LIBRARY('gensec',
source='gensec.c socket.c gensec_tstream.c',
pc_files='gensec.pc',
autoproto='gensec_proto.h',
- public_deps='CREDENTIALS LIBSAMBA-UTIL LIBCRYPTO ASN1_UTIL samba_socket LIBPACKET LIBTSOCKET UTIL_TEVENT',
+ public_deps='UTIL_TEVENT LIBSAMBA-UTIL LIBSAMBA-ERRORS LIBPACKET auth_system_session',
public_headers='gensec.h',
deps='com_err',
vnum='0.0.1'
)
-
bld.SAMBA_MODULE('gensec_krb5',
source='gensec_krb5.c',
subsystem='gensec',
init_function='gensec_krb5_init',
- deps='CREDENTIALS KERBEROS auth_session'
+ deps='CREDENTIALS KERBEROS auth_session',
+ internal_module=False,
)
diff --git a/source4/auth/kerberos/wscript_build b/source4/auth/kerberos/wscript_build
index f5f615c..8736b24 100644
--- a/source4/auth/kerberos/wscript_build
+++ b/source4/auth/kerberos/wscript_build
@@ -10,6 +10,6 @@ bld.SAMBA_SUBSYSTEM('KERBEROS',
bld.SAMBA_SUBSYSTEM('KERBEROS_UTIL',
autoproto='kerberos_util.h',
source='kerberos_util.c',
- deps='KERBEROS com_err ldb SECRETS',
+ deps='KERBEROS com_err ldb CREDENTIALS_KRB5 SECRETS',
)
diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build
index c3ce364..936e6f5 100644
--- a/source4/auth/ntlm/wscript_build
+++ b/source4/auth/ntlm/wscript_build
@@ -19,7 +19,7 @@ bld.SAMBA_MODULE('auth_server',
source='auth_server.c',
subsystem='auth',
init_function='auth_server_init',
- deps='LIBSAMBA-UTIL LIBCLI_SMB'
+ deps='LIBSAMBA-UTIL LIBCLI_SMB CREDENTIALS_NTLM'
)
diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build
index 03b138b..57a9f77 100644
--- a/source4/dsdb/samdb/ldb_modules/wscript_build
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build
@@ -223,7 +223,7 @@ bld.SAMBA_MODULE('ldb_update_keytab',
subsystem='ldb',
init_function='LDB_MODULE(update_keytab)',
internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
- deps='talloc LIBEVENTS CREDENTIALS ldb com_err'
+ deps='talloc LIBEVENTS CREDENTIALS ldb com_err KERBEROS_UTIL'
)
diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build
index 4ad3e13..15ca7f9 100644
--- a/source4/dsdb/wscript_build
+++ b/source4/dsdb/wscript_build
@@ -6,7 +6,7 @@ bld.SAMBA_SUBSYSTEM('SAMDB',
source='samdb/samdb.c samdb/samdb_privilege.c samdb/cracknames.c repl/replicated_objects.c',
autoproto='samdb/samdb_proto.h',
public_deps='krb5',
- deps='LIBNDR NDR_DRSUAPI NDR_DRSBLOBS NSS_WRAPPER auth_system_session LIBCLI_AUTH LIBNDR SAMDB_SCHEMA LDBSAMBA SAMDB_COMMON LIBCLI_DRSUAPI LIBCLI_LDAP_NDR LIBSAMBA-UTIL com_err KERBEROS CREDENTIALS'
+ deps='LIBNDR NDR_DRSUAPI NDR_DRSBLOBS NSS_WRAPPER auth_system_session LIBCLI_AUTH LIBNDR SAMDB_SCHEMA LDBSAMBA SAMDB_COMMON LIBCLI_DRSUAPI LIBCLI_LDAP_NDR LIBSAMBA-UTIL com_err KERBEROS CREDENTIALS CREDENTIALS_SECRETS'
)
diff --git a/source4/lib/cmdline/wscript_build b/source4/lib/cmdline/wscript_build
index ac1ff2a..6ef84ce 100644
--- a/source4/lib/cmdline/wscript_build
+++ b/source4/lib/cmdline/wscript_build
@@ -17,7 +17,7 @@ bld.SAMBA_SUBSYSTEM('POPT_SAMBA',
bld.SAMBA_SUBSYSTEM('POPT_CREDENTIALS',
source='popt_credentials.c',
autoproto='popt_credentials.h',
- public_deps='CREDENTIALS LIBCMDLINE_CREDENTIALS popt',
+ public_deps='CREDENTIALS CREDENTIALS_SECRETS LIBCMDLINE_CREDENTIALS popt',
deps='LIBSAMBA-UTIL'
)
diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build
index 622e5f9..e56a510 100644
--- a/source4/smbd/wscript_build
+++ b/source4/smbd/wscript_build
@@ -19,7 +19,7 @@ bld.SAMBA_BINARY('samba',
manpages='samba.8',
subsystem_name='service',
deps='''LIBEVENTS process_model service LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL POPT_SAMBA PIDFILE
- popt gensec registry ntptr ntvfs share CLUSTER DCESRV COMMON_SCHANNELDB''',
+ popt gensec registry ntptr ntvfs share CLUSTER DCESRV COMMON_SCHANNELDB SECRETS''',
pyembed=True,
install_path='${SBINDIR}'
)
--
Samba Shared Repository
More information about the samba-cvs
mailing list