diff options
| author | Günther Deschner <gd@samba.org> | 2008-01-09 12:47:13 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2008-01-09 12:48:08 +0100 |
| commit | fbd9a15996ba4beb48c12a5632ca812e862e984c (patch) | |
| tree | 8aa31ae9dd767d0dcc3f62a424c897dc4cf568f3 | |
| parent | 3d87cba590b714e95c4e02946bdba8588c3d3700 (diff) | |
| download | samba-fbd9a15996ba4beb48c12a5632ca812e862e984c.tar.gz samba-fbd9a15996ba4beb48c12a5632ca812e862e984c.tar.bz2 samba-fbd9a15996ba4beb48c12a5632ca812e862e984c.zip | |
Another attempt to fix builds w/o ldap and/or krb5.
Guenther
(This used to be commit e73e3da772bd024f1d74fc41b832f181ba5c43bd)
| -rw-r--r-- | source3/libnet/libnet_join.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c index d139fa04a1..1bb2a82959 100644 --- a/source3/libnet/libnet_join.c +++ b/source3/libnet/libnet_join.c @@ -418,7 +418,7 @@ static ADS_STATUS libnet_join_set_os_attributes(TALLOC_CTX *mem_ctx, return ads_gen_mod(r->in.ads, r->out.dn, mods); } -#endif +#endif /* HAVE_LDAP */ /**************************************************************** ****************************************************************/ @@ -429,16 +429,15 @@ static bool libnet_join_create_keytab(TALLOC_CTX *mem_ctx, if (!lp_use_kerberos_keytab()) { return true; } - -#ifdef WITH_KRB5 +#ifdef HAVE_KRB5 if (!ads_keytab_create_default(r->in.ads)) { return false; } -#endif +#endif /* HAVE_KRB5 */ return true; } -#ifdef HAVE_LDAP +#ifdef HAVE_KRB5 /**************************************************************** ****************************************************************/ @@ -487,7 +486,8 @@ static bool libnet_join_derive_salting_principal(TALLOC_CTX *mem_ctx, return kerberos_secrets_store_des_salt(salt); } -#endif + +#endif /* HAVE_KRB5 */ /**************************************************************** ****************************************************************/ @@ -1034,7 +1034,7 @@ static WERROR libnet_DomainJoin(TALLOC_CTX *mem_ctx, r->in.join_flags &= ~WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE; } -#endif +#endif /* HAVE_LDAP */ status = libnet_join_joindomain_rpc(mem_ctx, r); if (!NT_STATUS_IS_OK(status)) { if (NT_STATUS_EQUAL(status, NT_STATUS_USER_EXISTS)) { @@ -1075,7 +1075,7 @@ static WERROR libnet_DomainJoin(TALLOC_CTX *mem_ctx, if (!libnet_join_derive_salting_principal(mem_ctx, r)) { return WERR_GENERAL_FAILURE; } -#endif +#endif /* HAVE_LDAP */ if (!libnet_join_create_keytab(mem_ctx, r)) { libnet_join_set_error_string(mem_ctx, r, "failed to create kerberos keytab\n"); @@ -1150,7 +1150,7 @@ static WERROR libnet_DomainUnjoin(TALLOC_CTX *mem_ctx, ads_errstr(ads_status)); } } -#endif +#endif /* HAVE_LDAP */ libnet_join_unjoindomain_remove_secrets(mem_ctx, r); return WERR_OK; |