diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-11-07 00:48:36 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:25:00 -0500 |
| commit | 13dbee3ffea6065a826f010e50c9b4eb2c6ad109 (patch) | |
| tree | eede29a3bff4c6de3432c16f5555dc9640267327 /source4/lib | |
| parent | c755bb5025ee60ae41de9cc32d3fa54e3671941d (diff) | |
| download | samba-13dbee3ffea6065a826f010e50c9b4eb2c6ad109.tar.gz samba-13dbee3ffea6065a826f010e50c9b4eb2c6ad109.tar.bz2 samba-13dbee3ffea6065a826f010e50c9b4eb2c6ad109.zip | |
r19598: Ahead of a merge to current lorikeet-heimdal:
Break up auth/auth.h not to include the world.
Add credentials_krb5.h with the kerberos dependent prototypes.
Andrew Bartlett
(This used to be commit 2b569c42e0fbb596ea82484d0e1cb22e193037b9)
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/cmdline/config.mk | 2 | ||||
| -rw-r--r-- | source4/lib/cmdline/popt_credentials.c | 2 | ||||
| -rw-r--r-- | source4/lib/ldb/ldb_ildap/ldb_ildap.c | 1 | ||||
| -rw-r--r-- | source4/lib/ldb/tools/cmdline.c | 1 | ||||
| -rw-r--r-- | source4/lib/registry/registry.h | 3 | ||||
| -rw-r--r-- | source4/lib/replace/system/kerberos.h | 1 |
6 files changed, 7 insertions, 3 deletions
diff --git a/source4/lib/cmdline/config.mk b/source4/lib/cmdline/config.mk index 2c392865aa..f8502596fa 100644 --- a/source4/lib/cmdline/config.mk +++ b/source4/lib/cmdline/config.mk @@ -11,5 +11,5 @@ PUBLIC_DEPENDENCIES = LIBPOPT [SUBSYSTEM::POPT_CREDENTIALS] PRIVATE_PROTO_HEADER = popt_credentials.h OBJ_FILES = popt_credentials.o -PUBLIC_DEPENDENCIES = CREDENTIALS LIBCMDLINE_CREDENTIALS LIBPOPT +PUBLIC_DEPENDENCIES = CREDENTIALS_KRB5 LIBCMDLINE_CREDENTIALS LIBPOPT diff --git a/source4/lib/cmdline/popt_credentials.c b/source4/lib/cmdline/popt_credentials.c index 5e9b6e97a5..ab1d11bfbf 100644 --- a/source4/lib/cmdline/popt_credentials.c +++ b/source4/lib/cmdline/popt_credentials.c @@ -22,6 +22,8 @@ #include "includes.h" #include "lib/cmdline/popt_common.h" #include "lib/cmdline/credentials.h" +#include "auth/credentials/credentials.h" +#include "auth/credentials/credentials_krb5.h" #include "auth/gensec/gensec.h" /* Handle command line options: diff --git a/source4/lib/ldb/ldb_ildap/ldb_ildap.c b/source4/lib/ldb/ldb_ildap/ldb_ildap.c index 5a3ccd6977..51ae031cf9 100644 --- a/source4/lib/ldb/ldb_ildap/ldb_ildap.c +++ b/source4/lib/ldb/ldb_ildap/ldb_ildap.c @@ -49,6 +49,7 @@ #include "libcli/ldap/ldap.h" #include "libcli/ldap/ldap_client.h" #include "auth/auth.h" +#include "auth/credentials/credentials.h" struct ildb_private { struct ldap_connection *ldap; diff --git a/source4/lib/ldb/tools/cmdline.c b/source4/lib/ldb/tools/cmdline.c index 09bb99c096..928519f3bb 100644 --- a/source4/lib/ldb/tools/cmdline.c +++ b/source4/lib/ldb/tools/cmdline.c @@ -29,6 +29,7 @@ #if (_SAMBA_BUILD_ >= 4) #include "lib/cmdline/popt_common.h" #include "lib/ldb/samba/ldif_handlers.h" +#include "auth/gensec/gensec.h" #include "auth/auth.h" #include "db_wrap.h" #endif diff --git a/source4/lib/registry/registry.h b/source4/lib/registry/registry.h index e5cf7d9111..4c1eb8f39e 100644 --- a/source4/lib/registry/registry.h +++ b/source4/lib/registry/registry.h @@ -23,7 +23,6 @@ #define _REGISTRY_H #include "librpc/gen_ndr/security.h" -#include "auth/credentials/credentials.h" /* Handles for the predefined keys */ #define HKEY_CLASSES_ROOT 0x80000000 @@ -128,6 +127,8 @@ struct hive_operations { WERROR (*del_value)(const struct registry_key *, const char *valname); }; +struct cli_credentials; + struct registry_hive { const struct hive_operations *functions; diff --git a/source4/lib/replace/system/kerberos.h b/source4/lib/replace/system/kerberos.h index b24196fc25..1617b96aad 100644 --- a/source4/lib/replace/system/kerberos.h +++ b/source4/lib/replace/system/kerberos.h @@ -126,7 +126,6 @@ #define KRB5_PRINC_REALM_RETURNS_REALM 1 #include "heimdal/lib/krb5/krb5.h" -#include "heimdal/lib/gssapi/gssapi.h" #include "heimdal/lib/com_err/com_err.h" #endif |