[SCM] Samba Shared Repository - branch v3-6-test updated
Günther Deschner
gd at samba.org
Fri Aug 6 06:06:29 MDT 2010
The branch, v3-6-test has been updated
via 2616dfe... s3-printing: cope with missing printers in print migration
via 55f3b5c... s3-secrets: only include secrets.h when needed.
via 49f8403... s3: avoid global include of ads.h.
via 0fc95a2... s3-libnet_join: add ads.h as helper header to IDL.
via 31fc9cd... s3-printing: move AD related printing components to an own file.
from 04f2fb7... small optimizations for shadowcopy2 module
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 2616dfeed7808002bee04ecea3ce47e4d2151a10
Author: Andrew Tridgell <tridge at samba.org>
Date: Fri Aug 6 13:06:42 2010 +1000
s3-printing: cope with missing printers in print migration
The printers database may be completely missing in a new install, and
we may have SECDESC entries for printers that have been removed. Don't
consider these fatal errors in the migration.
Signed-off-by: Günther Deschner <gd at samba.org>
(cherry picked from commit fe5f4d91ce5067c4222648967719f67f6e670642)
commit 55f3b5c8fe14fe0e175aafd8a6e6191f47f505fc
Author: Günther Deschner <gd at samba.org>
Date: Thu Aug 5 02:25:37 2010 +0200
s3-secrets: only include secrets.h when needed.
Guenther
(cherry picked from commit c136b84f0d28d1a88c5918b06f81766a271a3780)
commit 49f8403bd5351cf3b91d13dbbc66db7a015556be
Author: Günther Deschner <gd at samba.org>
Date: Fri Jul 2 00:32:52 2010 +0200
s3: avoid global include of ads.h.
Guenther
(cherry picked from commit e7a6a3ec0da01666c8e0c9772007ce7146df9d75)
commit 0fc95a2320ceb8f637f5f2557cbaa50c27b14dbe
Author: Günther Deschner <gd at samba.org>
Date: Wed Aug 4 16:49:43 2010 +0200
s3-libnet_join: add ads.h as helper header to IDL.
Guenther
(cherry picked from commit 385adcce732e3a0788ce935fbc76363feb9ff22f)
commit 31fc9cde5246f3d277bed325e5a9d9686adaee37
Author: Günther Deschner <gd at samba.org>
Date: Wed Aug 4 15:31:08 2010 +0200
s3-printing: move AD related printing components to an own file.
Guenther
(cherry picked from commit 31c484edb95c09b0b400cff9bab6b6cb2c33b120)
-----------------------------------------------------------------------
Summary of changes:
libgpo/gpo.h | 1 +
source3/Makefile.in | 14 +-
source3/auth/auth_domain.c | 1 +
source3/auth/auth_netlogond.c | 1 +
source3/auth/token_util.c | 1 +
source3/include/ads.h | 8 +-
source3/include/includes.h | 6 -
source3/include/passdb.h | 9 +
source3/include/proto.h | 285 ---------------
source3/include/secrets.h | 56 +++-
source3/include/smb_krb5.h | 2 +
source3/include/smbldap.h | 6 +
source3/lib/netapi/joindomain.c | 3 +-
source3/lib/netapi/netapi.c | 1 +
source3/lib/smbldap.c | 5 +-
source3/lib/substitute.c | 1 +
source3/lib/util.c | 1 +
source3/libads/ads_proto.h | 171 +++++++++
source3/libads/ads_struct.c | 1 +
source3/libads/ads_utils.c | 1 +
source3/libads/authdata.c | 1 +
source3/libads/disp_sec.c | 1 +
source3/libads/kerberos.c | 54 +---
source3/libads/kerberos_keytab.c | 2 +
source3/libads/kerberos_proto.h | 67 ++++
source3/libads/kerberos_util.c | 107 ++++++
source3/libads/kerberos_verify.c | 2 +
source3/libads/krb5_setpw.c | 31 +--
source3/libads/ldap.c | 1 +
source3/libads/ldap_printer.c | 1 +
source3/libads/ldap_schema.c | 1 +
source3/libads/ldap_user.c | 1 +
source3/libads/ldap_utils.c | 1 +
source3/libads/ndr.c | 1 +
source3/libads/sasl.c | 2 +
source3/libads/sasl_wrapping.c | 1 +
source3/libads/util.c | 2 +
source3/libnet/libnet_join.c | 3 +-
source3/librpc/idl/libnet_join.idl | 3 +-
source3/libsmb/cliconnect.c | 1 +
source3/libsmb/libsmb_context.c | 1 +
source3/libsmb/namequery_dc.c | 1 +
source3/libsmb/trusts_util.c | 1 +
source3/modules/vfs_smb_traffic_analyzer.c | 1 +
source3/nmbd/nmbd_processlogon.c | 1 +
source3/pam_smbpass/support.c | 1 +
source3/param/loadparm.c | 2 +
source3/passdb/lookup_sid.c | 1 +
source3/passdb/machine_account_secrets.c | 1 +
source3/passdb/machine_sid.c | 1 +
source3/passdb/passdb.c | 1 +
source3/passdb/pdb_ads.c | 1 +
source3/passdb/pdb_interface.c | 1 +
source3/passdb/pdb_ldap.c | 1 +
source3/passdb/secrets.c | 1 +
source3/printing/nt_printing.c | 441 +----------------------
source3/printing/nt_printing_ads.c | 467 ++++++++++++++++++++++++
source3/printing/nt_printing_migrate.c | 10 +
source3/rpc_client/cli_pipe.c | 1 +
source3/rpc_server/srv_dssetup_nt.c | 1 +
source3/rpc_server/srv_lsa_nt.c | 1 +
source3/rpc_server/srv_samr_nt.c | 1 +
source3/rpc_server/srv_spoolss_nt.c | 1 +
source3/rpc_server/srv_spoolss_util.c | 1 +
source3/rpcclient/cmd_netlogon.c | 1 +
source3/smbd/server.c | 1 +
source3/smbd/sesssetup.c | 1 +
source3/smbd/smb2_sesssetup.c | 1 +
source3/utils/net.c | 1 +
source3/utils/net_ads.c | 3 +-
source3/utils/net_ads_gpo.c | 1 +
source3/utils/net_idmap.c | 1 +
source3/utils/net_proto.h | 6 +-
source3/utils/net_rpc.c | 1 +
source3/utils/net_rpc_join.c | 1 +
source3/utils/net_util.c | 1 +
source3/utils/ntlm_auth.c | 1 +
source3/utils/smbpasswd.c | 1 +
source3/utils/smbta-util.c | 2 +-
source3/winbindd/idmap_ad.c | 2 +
source3/winbindd/idmap_adex/cell_util.c | 1 +
source3/winbindd/idmap_adex/domain_util.c | 1 +
source3/winbindd/idmap_adex/gc_util.c | 1 +
source3/winbindd/idmap_adex/idmap_adex.c | 2 +
source3/winbindd/idmap_adex/likewise_cell.c | 2 +
source3/winbindd/idmap_adex/provider_unified.c | 1 +
source3/winbindd/idmap_hash/idmap_hash.c | 1 +
source3/winbindd/idmap_ldap.c | 1 +
source3/winbindd/nss_info.c | 1 +
source3/winbindd/nss_info_template.c | 1 +
source3/winbindd/winbindd.c | 1 +
source3/winbindd/winbindd_ads.c | 2 +
source3/winbindd/winbindd_cache.c | 1 +
source3/winbindd/winbindd_cm.c | 2 +
source3/winbindd/winbindd_cred_cache.c | 1 +
source3/winbindd/winbindd_dual.c | 1 +
source3/winbindd/winbindd_pam.c | 1 +
source3/winbindd/winbindd_proto.h | 3 +-
source3/winbindd/winbindd_util.c | 1 +
source3/wscript_build | 16 +-
100 files changed, 1018 insertions(+), 845 deletions(-)
create mode 100644 source3/libads/ads_proto.h
create mode 100644 source3/libads/kerberos_proto.h
create mode 100644 source3/libads/kerberos_util.c
create mode 100644 source3/printing/nt_printing_ads.c
Changeset truncated at 500 lines:
diff --git a/libgpo/gpo.h b/libgpo/gpo.h
index 6e71e3c..ba9e0b7 100644
--- a/libgpo/gpo.h
+++ b/libgpo/gpo.h
@@ -24,6 +24,7 @@
#include "source4/libgpo/ads_convenience.h"
#else
struct loadparm_context;
+#include "ads.h"
#endif
enum GPO_LINK_TYPE {
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 1b641a4..054c4b9 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -456,7 +456,9 @@ LIBGPO_OBJ = $(LIBGPO_OBJ0)
LIBADS_OBJ = libads/ldap.o libads/ldap_printer.o \
libads/sasl.o libads/sasl_wrapping.o \
- libads/krb5_setpw.o libads/ldap_user.o \
+ libads/krb5_setpw.o \
+ libads/kerberos_util.o \
+ libads/ldap_user.o \
libads/ads_struct.o libads/kerberos_keytab.o \
libads/disp_sec.o libads/ads_utils.o libads/ldap_utils.o \
libads/ldap_schema.o libads/util.o libads/ndr.o
@@ -860,9 +862,13 @@ PRINTING_OBJ = printing/pcap.o printing/print_svid.o printing/print_aix.o \
printing/print_iprint.o printing/print_standard.o
PRINTBASE_OBJ = printing/notify.o printing/printing_db.o
-PRINTBACKEND_OBJ = printing/printing.o printing/nt_printing.o \
- printing/nt_printing_tdb.o printing/nt_printing_migrate.o \
- librpc/gen_ndr/ndr_ntprinting.o ../librpc/ndr/ndr_ntprinting.o \
+PRINTBACKEND_OBJ = printing/printing.o \
+ printing/nt_printing.o \
+ printing/nt_printing_tdb.o \
+ printing/nt_printing_migrate.o \
+ printing/nt_printing_ads.o \
+ librpc/gen_ndr/ndr_ntprinting.o \
+ ../librpc/ndr/ndr_ntprinting.o \
$(PRINTBASE_OBJ)
SMBD_OBJ = $(SMBD_OBJ_BASE) $(SMBD_OBJ_MAIN)
diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c
index f25fb4a..0fc6410 100644
--- a/source3/auth/auth_domain.c
+++ b/source3/auth/auth_domain.c
@@ -22,6 +22,7 @@
#include "../libcli/auth/libcli_auth.h"
#include "../librpc/gen_ndr/ndr_netlogon.h"
#include "rpc_client/cli_netlogon.h"
+#include "secrets.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_AUTH
diff --git a/source3/auth/auth_netlogond.c b/source3/auth/auth_netlogond.c
index 7eea5af..8be2c6a 100644
--- a/source3/auth/auth_netlogond.c
+++ b/source3/auth/auth_netlogond.c
@@ -21,6 +21,7 @@
#include "../libcli/auth/libcli_auth.h"
#include "../librpc/gen_ndr/ndr_netlogon.h"
#include "rpc_client/cli_netlogon.h"
+#include "secrets.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_AUTH
diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c
index 3a288dd..7634e76 100644
--- a/source3/auth/token_util.c
+++ b/source3/auth/token_util.c
@@ -25,6 +25,7 @@
/* functions moved from auth/auth_util.c to minimize linker deps */
#include "includes.h"
+#include "secrets.h"
/****************************************************************************
Check for a SID in an NT_USER_TOKEN
diff --git a/source3/include/ads.h b/source3/include/ads.h
index 0637cc8..b45d53d 100644
--- a/source3/include/ads.h
+++ b/source3/include/ads.h
@@ -148,6 +148,12 @@ typedef struct {
int critical;
} ads_control;
-#define ADS_IGNORE_PRINCIPAL "not_defined_in_RFC4178 at please_ignore"
+#include "libads/ads_proto.h"
+
+#ifdef HAVE_LDAP
+#include "libads/ads_ldap_protos.h"
+#endif
+
+#include "libads/kerberos_proto.h"
#endif /* _INCLUDE_ADS_H_ */
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 2573585..318c747 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -628,7 +628,6 @@ extern void *cmdline_lp_ctx;
#include "krb5_env.h"
#include "libads/ads_status.h"
-#include "ads.h"
#include "interfaces.h"
#include "trans2.h"
#include "../libcli/util/error.h"
@@ -643,7 +642,6 @@ extern void *cmdline_lp_ctx;
#include "smb_signing.h"
#include "smb.h"
#include "nameserv.h"
-#include "secrets.h"
#include "../lib/util/byteorder.h"
#include "privileges.h"
#include "rpc_misc.h"
@@ -736,10 +734,6 @@ enum flush_reason_enum {
#include "modules/vfs_irixacl.h"
#endif
-#ifdef HAVE_LDAP
-#include "libads/ads_ldap_protos.h"
-#endif
-
/* We need this after proto.h to reference GetTimeOfDay(). */
#include "smbprofile.h"
diff --git a/source3/include/passdb.h b/source3/include/passdb.h
index 0837701..b07c117 100644
--- a/source3/include/passdb.h
+++ b/source3/include/passdb.h
@@ -219,6 +219,15 @@ struct pdb_domain_info {
};
/*
+ * trusted domain entry/entries returned by secrets_get_trusted_domains
+ * (used in _lsa_enum_trust_dom call)
+ */
+struct trustdom_info {
+ char *name;
+ struct dom_sid sid;
+};
+
+/*
* Types of account policy.
*/
enum pdb_policy_type {
diff --git a/source3/include/proto.h b/source3/include/proto.h
index a1af19b..0a38aec 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1729,244 +1729,6 @@ void wins_srv_tags_free(char **list);
struct in_addr wins_srv_ip_tag(const char *tag, struct in_addr src_ip);
unsigned wins_srv_count_tag(const char *tag);
-/* The following definitions come from libads/ads_struct.c */
-
-char *ads_build_path(const char *realm, const char *sep, const char *field, int reverse);
-char *ads_build_dn(const char *realm);
-char *ads_build_domain(const char *dn);
-ADS_STRUCT *ads_init(const char *realm,
- const char *workgroup,
- const char *ldap_server);
-bool ads_set_sasl_wrap_flags(ADS_STRUCT *ads, int flags);
-void ads_destroy(ADS_STRUCT **ads);
-
-const char *ads_get_ldap_server_name(ADS_STRUCT *ads);
-
-/* The following definitions come from libads/authdata.c */
-
-NTSTATUS kerberos_return_pac(TALLOC_CTX *mem_ctx,
- const char *name,
- const char *pass,
- time_t time_offset,
- time_t *expire_time,
- time_t *renew_till_time,
- const char *cache_name,
- bool request_pac,
- bool add_netbios_addr,
- time_t renewable_time,
- const char *impersonate_princ_s,
- struct PAC_LOGON_INFO **logon_info);
-
-/* The following definitions come from libads/disp_sec.c */
-
-void ads_disp_sd(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, struct security_descriptor *sd);
-
-/* The following definitions come from libads/kerberos.c */
-
-int kerberos_kinit_password_ext(const char *principal,
- const char *password,
- int time_offset,
- time_t *expire_time,
- time_t *renew_till_time,
- const char *cache_name,
- bool request_pac,
- bool add_netbios_addr,
- time_t renewable_time,
- NTSTATUS *ntstatus);
-int ads_kinit_password(ADS_STRUCT *ads);
-int ads_kdestroy(const char *cc_name);
-char* kerberos_standard_des_salt( void );
-bool kerberos_secrets_store_des_salt( const char* salt );
-char* kerberos_secrets_fetch_des_salt( void );
-char *kerberos_get_default_realm_from_ccache( void );
-char *kerberos_get_realm_from_hostname(const char *hostname);
-
-bool kerberos_secrets_store_salting_principal(const char *service,
- int enctype,
- const char *principal);
-int kerberos_kinit_password(const char *principal,
- const char *password,
- int time_offset,
- const char *cache_name);
-bool create_local_private_krb5_conf_for_domain(const char *realm,
- const char *domain,
- const char *sitename,
- struct sockaddr_storage *pss,
- const char *kdc_name);
-
-/* The following definitions come from libads/kerberos_keytab.c */
-
-int ads_keytab_add_entry(ADS_STRUCT *ads, const char *srvPrinc);
-int ads_keytab_flush(ADS_STRUCT *ads);
-int ads_keytab_create_default(ADS_STRUCT *ads);
-int ads_keytab_list(const char *keytab_name);
-
-/* The following definitions come from libads/kerberos_verify.c */
-
-NTSTATUS ads_verify_ticket(TALLOC_CTX *mem_ctx,
- const char *realm,
- time_t time_offset,
- const DATA_BLOB *ticket,
- char **principal,
- struct PAC_LOGON_INFO **logon_info,
- DATA_BLOB *ap_rep,
- DATA_BLOB *session_key,
- bool use_replay_cache);
-
-/* The following definitions come from libads/krb5_errs.c */
-
-
-/* The following definitions come from libads/krb5_setpw.c */
-
-ADS_STATUS ads_krb5_set_password(const char *kdc_host, const char *princ,
- const char *newpw, int time_offset);
-ADS_STATUS kerberos_set_password(const char *kpasswd_server,
- const char *auth_principal, const char *auth_password,
- const char *target_principal, const char *new_password,
- int time_offset);
-ADS_STATUS ads_set_machine_password(ADS_STRUCT *ads,
- const char *machine_account,
- const char *password);
-
-/* The following definitions come from libads/ldap.c */
-
-bool ads_sitename_match(ADS_STRUCT *ads);
-bool ads_closest_dc(ADS_STRUCT *ads);
-ADS_STATUS ads_connect(ADS_STRUCT *ads);
-ADS_STATUS ads_connect_user_creds(ADS_STRUCT *ads);
-ADS_STATUS ads_connect_gc(ADS_STRUCT *ads);
-void ads_disconnect(ADS_STRUCT *ads);
-ADS_STATUS ads_do_search_all_fn(ADS_STRUCT *ads, const char *bind_path,
- int scope, const char *expr, const char **attrs,
- bool (*fn)(ADS_STRUCT *, char *, void **, void *),
- void *data_area);
-char *ads_parent_dn(const char *dn);
-ADS_MODLIST ads_init_mods(TALLOC_CTX *ctx);
-ADS_STATUS ads_mod_str(TALLOC_CTX *ctx, ADS_MODLIST *mods,
- const char *name, const char *val);
-ADS_STATUS ads_mod_strlist(TALLOC_CTX *ctx, ADS_MODLIST *mods,
- const char *name, const char **vals);
-ADS_STATUS ads_gen_mod(ADS_STRUCT *ads, const char *mod_dn, ADS_MODLIST mods);
-ADS_STATUS ads_gen_add(ADS_STRUCT *ads, const char *new_dn, ADS_MODLIST mods);
-ADS_STATUS ads_del_dn(ADS_STRUCT *ads, char *del_dn);
-char *ads_ou_string(ADS_STRUCT *ads, const char *org_unit);
-char *ads_default_ou_string(ADS_STRUCT *ads, const char *wknguid);
-ADS_STATUS ads_add_strlist(TALLOC_CTX *ctx, ADS_MODLIST *mods,
- const char *name, const char **vals);
-uint32 ads_get_kvno(ADS_STRUCT *ads, const char *account_name);
-uint32_t ads_get_machine_kvno(ADS_STRUCT *ads, const char *machine_name);
-ADS_STATUS ads_clear_service_principal_names(ADS_STRUCT *ads, const char *machine_name);
-ADS_STATUS ads_add_service_principal_name(ADS_STRUCT *ads, const char *machine_name,
- const char *my_fqdn, const char *spn);
-ADS_STATUS ads_create_machine_acct(ADS_STRUCT *ads, const char *machine_name,
- const char *org_unit);
-ADS_STATUS ads_move_machine_acct(ADS_STRUCT *ads, const char *machine_name,
- const char *org_unit, bool *moved);
-int ads_count_replies(ADS_STRUCT *ads, void *res);
-ADS_STATUS ads_USN(ADS_STRUCT *ads, uint32 *usn);
-ADS_STATUS ads_current_time(ADS_STRUCT *ads);
-ADS_STATUS ads_domain_func_level(ADS_STRUCT *ads, uint32 *val);
-ADS_STATUS ads_domain_sid(ADS_STRUCT *ads, struct dom_sid *sid);
-ADS_STATUS ads_site_dn(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, const char **site_name);
-ADS_STATUS ads_site_dn_for_machine(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, const char *computer_name, const char **site_dn);
-ADS_STATUS ads_upn_suffixes(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, char ***suffixes, size_t *num_suffixes);
-ADS_STATUS ads_get_joinable_ous(ADS_STRUCT *ads,
- TALLOC_CTX *mem_ctx,
- char ***ous,
- size_t *num_ous);
-ADS_STATUS ads_get_sid_from_extended_dn(TALLOC_CTX *mem_ctx,
- const char *extended_dn,
- enum ads_extended_dn_flags flags,
- struct dom_sid *sid);
-char* ads_get_dnshostname( ADS_STRUCT *ads, TALLOC_CTX *ctx, const char *machine_name );
-char* ads_get_upn( ADS_STRUCT *ads, TALLOC_CTX *ctx, const char *machine_name );
-char* ads_get_samaccountname( ADS_STRUCT *ads, TALLOC_CTX *ctx, const char *machine_name );
-ADS_STATUS ads_join_realm(ADS_STRUCT *ads, const char *machine_name,
- uint32 account_type, const char *org_unit);
-ADS_STATUS ads_leave_realm(ADS_STRUCT *ads, const char *hostname);
-ADS_STATUS ads_find_samaccount(ADS_STRUCT *ads,
- TALLOC_CTX *mem_ctx,
- const char *samaccountname,
- uint32 *uac_ret,
- const char **dn_ret);
-ADS_STATUS ads_config_path(ADS_STRUCT *ads,
- TALLOC_CTX *mem_ctx,
- char **config_path);
-const char *ads_get_extended_right_name_by_guid(ADS_STRUCT *ads,
- const char *config_path,
- TALLOC_CTX *mem_ctx,
- const struct GUID *rights_guid);
-ADS_STATUS ads_check_ou_dn(TALLOC_CTX *mem_ctx,
- ADS_STRUCT *ads,
- const char **account_ou);
-
-/* The following definitions come from libads/ldap_printer.c */
-
-ADS_STATUS ads_mod_printer_entry(ADS_STRUCT *ads, char *prt_dn,
- TALLOC_CTX *ctx, const ADS_MODLIST *mods);
-ADS_STATUS ads_add_printer_entry(ADS_STRUCT *ads, char *prt_dn,
- TALLOC_CTX *ctx, ADS_MODLIST *mods);
-WERROR get_remote_printer_publishing_data(struct rpc_pipe_client *cli,
- TALLOC_CTX *mem_ctx,
- ADS_MODLIST *mods,
- const char *printer);
-
-/* The following definitions come from libads/ldap_user.c */
-
-ADS_STATUS ads_add_user_acct(ADS_STRUCT *ads, const char *user,
- const char *container, const char *fullname);
-ADS_STATUS ads_add_group_acct(ADS_STRUCT *ads, const char *group,
- const char *container, const char *comment);
-
-/* The following definitions come from libads/ldap_utils.c */
-
-ADS_STATUS ads_ranged_search(ADS_STRUCT *ads,
- TALLOC_CTX *mem_ctx,
- int scope,
- const char *base,
- const char *filter,
- void *args,
- const char *range_attr,
- char ***strings,
- size_t *num_strings);
-ADS_STATUS ads_ranged_search_internal(ADS_STRUCT *ads,
- TALLOC_CTX *mem_ctx,
- int scope,
- const char *base,
- const char *filter,
- const char **attrs,
- void *args,
- const char *range_attr,
- char ***strings,
- size_t *num_strings,
- uint32 *first_usn,
- int *num_retries,
- bool *more_values);
-
-/* The following definitions come from libads/ndr.c */
-
-void ndr_print_ads_auth_flags(struct ndr_print *ndr, const char *name, uint32_t r);
-void ndr_print_ads_struct(struct ndr_print *ndr, const char *name, const struct ads_struct *r);
-
-/* The following definitions come from libads/sasl.c */
-
-ADS_STATUS ads_sasl_bind(ADS_STRUCT *ads);
-
-/* The following definitions come from libads/sasl_wrapping.c */
-
-ADS_STATUS ads_setup_sasl_wrapping(ADS_STRUCT *ads,
- const struct ads_saslwrap_ops *ops,
- void *private_data);
-ADS_STATUS ads_setup_sasl_wrapping(ADS_STRUCT *ads,
- const struct ads_saslwrap_ops *ops,
- void *private_data);
-
-/* The following definitions come from libads/util.c */
-
-ADS_STATUS ads_change_trust_account_password(ADS_STRUCT *ads, char *host_principal);
-ADS_STATUS ads_guess_service_principal(ADS_STRUCT *ads,
- char **returned_principal);
-
/* The following definitions come from librpc/ndr/util.c */
enum ndr_err_code ndr_push_server_id(struct ndr_push *ndr, int ndr_flags, const struct server_id *r);
@@ -4605,53 +4367,6 @@ NTSTATUS pdb_wbc_sam_init(void);
bool init_sam_from_buffer_v2(struct samu *sampass, uint8_t *buf, uint32_t buflen);
NTSTATUS pdb_tdbsam_init(void);
-/* The following definitions come from passdb/secrets.c */
-
-bool secrets_init(void);
-struct db_context *secrets_db_ctx(void);
-void secrets_shutdown(void);
-void *secrets_fetch(const char *key, size_t *size);
-bool secrets_store(const char *key, const void *data, size_t size);
-bool secrets_delete(const char *key);
-bool secrets_store_domain_sid(const char *domain, const struct dom_sid *sid);
-bool secrets_fetch_domain_sid(const char *domain, struct dom_sid *sid);
-bool secrets_store_domain_guid(const char *domain, struct GUID *guid);
-bool secrets_fetch_domain_guid(const char *domain, struct GUID *guid);
-void *secrets_get_trust_account_lock(TALLOC_CTX *mem_ctx, const char *domain);
-enum netr_SchannelType get_default_sec_channel(void);
-bool secrets_fetch_trust_account_password_legacy(const char *domain,
- uint8 ret_pwd[16],
- time_t *pass_last_set_time,
- enum netr_SchannelType *channel);
-bool secrets_fetch_trust_account_password(const char *domain, uint8 ret_pwd[16],
- time_t *pass_last_set_time,
- enum netr_SchannelType *channel);
-bool secrets_fetch_trusted_domain_password(const char *domain, char** pwd,
- struct dom_sid *sid, time_t *pass_last_set_time);
-bool secrets_store_trusted_domain_password(const char* domain, const char* pwd,
- const struct dom_sid *sid);
-bool secrets_delete_machine_password(const char *domain);
-bool secrets_delete_machine_password_ex(const char *domain);
-bool secrets_delete_domain_sid(const char *domain);
-bool secrets_store_machine_password(const char *pass, const char *domain, enum netr_SchannelType sec_channel);
-char *secrets_fetch_prev_machine_password(const char *domain);
-char *secrets_fetch_machine_password(const char *domain,
- time_t *pass_last_set_time,
- enum netr_SchannelType *channel);
-bool trusted_domain_password_delete(const char *domain);
-bool secrets_store_ldap_pw(const char* dn, char* pw);
-bool fetch_ldap_pw(char **dn, char** pw);
-NTSTATUS secrets_trusted_domains(TALLOC_CTX *mem_ctx, uint32 *num_domains,
- struct trustdom_info ***domains);
-bool secrets_store_afs_keyfile(const char *cell, const struct afs_keyfile *keyfile);
-bool secrets_fetch_afs_key(const char *cell, struct afs_key *result);
-void secrets_fetch_ipc_userpass(char **username, char **domain, char **password);
-bool secrets_store_generic(const char *owner, const char *key, const char *secret);
-char *secrets_fetch_generic(const char *owner, const char *key);
-bool secrets_delete_generic(const char *owner, const char *key);
-bool secrets_store_local_schannel_key(uint8_t schannel_key[16]);
-bool secrets_fetch_local_schannel_key(uint8_t schannel_key[16]);
-
/* The following definitions come from passdb/util_builtin.c */
bool lookup_builtin_rid(TALLOC_CTX *mem_ctx, uint32 rid, const char **name);
diff --git a/source3/include/secrets.h b/source3/include/secrets.h
index 624b146..095ab6e 100644
--- a/source3/include/secrets.h
+++ b/source3/include/secrets.h
@@ -62,15 +62,6 @@ struct machine_acct_pass {
};
/*
- * trusted domain entry/entries returned by secrets_get_trusted_domains
- * (used in _lsa_enum_trust_dom call)
- */
-struct trustdom_info {
- char *name;
- struct dom_sid sid;
-};
-
-/*
* Format of an OpenAFS keyfile
*/
@@ -88,4 +79,51 @@ struct afs_keyfile {
#define SECRETS_AFS_KEYFILE "SECRETS/AFS_KEYFILE"
+/* The following definitions come from passdb/secrets.c */
+
+bool secrets_init(void);
+struct db_context *secrets_db_ctx(void);
+void secrets_shutdown(void);
+void *secrets_fetch(const char *key, size_t *size);
+bool secrets_store(const char *key, const void *data, size_t size);
+bool secrets_delete(const char *key);
+bool secrets_store_domain_sid(const char *domain, const struct dom_sid *sid);
+bool secrets_fetch_domain_sid(const char *domain, struct dom_sid *sid);
+bool secrets_store_domain_guid(const char *domain, struct GUID *guid);
+bool secrets_fetch_domain_guid(const char *domain, struct GUID *guid);
+void *secrets_get_trust_account_lock(TALLOC_CTX *mem_ctx, const char *domain);
+enum netr_SchannelType get_default_sec_channel(void);
+bool secrets_fetch_trust_account_password_legacy(const char *domain,
+ uint8 ret_pwd[16],
+ time_t *pass_last_set_time,
+ enum netr_SchannelType *channel);
+bool secrets_fetch_trust_account_password(const char *domain, uint8 ret_pwd[16],
+ time_t *pass_last_set_time,
+ enum netr_SchannelType *channel);
+bool secrets_fetch_trusted_domain_password(const char *domain, char** pwd,
+ struct dom_sid *sid, time_t *pass_last_set_time);
+bool secrets_store_trusted_domain_password(const char* domain, const char* pwd,
--
Samba Shared Repository
More information about the samba-cvs
mailing list