The branch, master has been updated via f12028a... s3-net: fix a "dereferencing type-punned pointer will break strict-aliasing rules" warning. via 8e41f2e... s3-waf: very simple start on getting krb5 build to work. from abf2764... s4:torture/rpc/samr.c: Fix the "ValidatePassword" test
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit f12028a3fd5c64bc8e13996cb9a18a19ec0929e0 Author: Günther Deschner <g...@samba.org> Date: Tue May 25 12:43:00 2010 +0200 s3-net: fix a "dereferencing type-punned pointer will break strict-aliasing rules" warning. Guenther commit 8e41f2e66a6be425e161ee2ec1cea386332a6186 Author: Günther Deschner <g...@samba.org> Date: Tue May 25 12:27:02 2010 +0200 s3-waf: very simple start on getting krb5 build to work. Guenther ----------------------------------------------------------------------- Summary of changes: source3/utils/net_ads.c | 4 ++-- source3/wscript | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c index 8945d99..9665a3a 100644 --- a/source3/utils/net_ads.c +++ b/source3/utils/net_ads.c @@ -541,7 +541,7 @@ static int ads_user_info(struct net_context *c, int argc, const char **argv) char *escaped_user; struct dom_sid primary_group_sid; uint32_t group_rid; - enum SID_NAME_USE type; + enum wbcSidType type; if (argc < 1 || c->display_usage) { return net_ads_user_usage(c, argc, argv); @@ -596,7 +596,7 @@ static int ads_user_info(struct net_context *c, int argc, const char **argv) wbc_status = wbcLookupSid((struct wbcDomainSid *)&primary_group_sid, NULL, /* don't look up domain */ &primary_group, - (enum wbcSidType *) &type); + &type); if (!WBC_ERROR_IS_OK(wbc_status)) { d_fprintf(stderr, "wbcLookupSid: %s\n", wbcErrorString(wbc_status)); diff --git a/source3/wscript b/source3/wscript index a58c524..08044ec 100644 --- a/source3/wscript +++ b/source3/wscript @@ -417,6 +417,8 @@ krb5_get_credentials_for_user krb5_get_host_realm krb5_free_host_realm''', conf.CHECK_DECLS('''krb5_get_credentials_for_user krb5_auth_con_set_req_cksumtype''', headers='krb5.h', always=True) + conf.CHECK_VARIABLE('AP_OPTS_USE_SUBKEY', headers='krb5.h') + else: conf.SET_TARGET_TYPE('krb5', 'EMPTY') conf.SET_TARGET_TYPE('gssapi', 'EMPTY') -- Samba Shared Repository