diff options
| -rw-r--r-- | source4/VERSION | 4 | ||||
| -rw-r--r-- | source4/kdc/policy.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source4/VERSION b/source4/VERSION index 262ebb788e..f80aca6d6b 100644 --- a/source4/VERSION +++ b/source4/VERSION @@ -89,7 +89,7 @@ SAMBA_VERSION_RC_RELEASE= # e.g. SAMBA_VERSION_IS_SVN_SNAPSHOT=yes # # -> "3.0.0-SVN-build-199" # ######################################################## -SAMBA_VERSION_IS_GIT_SNAPSHOT=no +SAMBA_VERSION_IS_GIT_SNAPSHOT=yes ######################################################## # This is for specifying a release nickname # @@ -98,7 +98,7 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=no # smbd --version will then give: # # -> "4.0.0-tp1-VendorVersion (Nicky Nickname)" # ######################################################## -SAMBA_VERSION_RELEASE_NICKNAME=randomdata +SAMBA_VERSION_RELEASE_NICKNAME= ######################################################## # This can be set by vendors if they want... # diff --git a/source4/kdc/policy.c b/source4/kdc/policy.c index 7502148b5f..8f62c48649 100644 --- a/source4/kdc/policy.c +++ b/source4/kdc/policy.c @@ -34,11 +34,11 @@ void kdc_get_policy(struct loadparm_context *lp_ctx, k->authentication_options = LSA_POLICY_KERBEROS_VALIDATE_CLIENT; unix_to_nt_time(&k->service_tkt_lifetime, - lpcfg_parm_int(lp_ctx, NULL, "kdc", "service ticket lifefime", 10) * 60 * 60); + lpcfg_parm_int(lp_ctx, NULL, "kdc", "service ticket lifetime", 10) * 60 * 60); unix_to_nt_time(&k->user_tkt_lifetime, - lpcfg_parm_int(lp_ctx, NULL, "kdc", "user ticket lifefime", 10) * 60 * 60); + lpcfg_parm_int(lp_ctx, NULL, "kdc", "user ticket lifetime", 10) * 60 * 60); unix_to_nt_time(&k->user_tkt_renewaltime, - lpcfg_parm_int(lp_ctx, NULL, "kdc", "renewal lifefime", 24*7) * 60 * 60); + lpcfg_parm_int(lp_ctx, NULL, "kdc", "renewal lifetime", 24*7) * 60 * 60); if (smb_krb5_context) { unix_to_nt_time(&k->clock_skew, krb5_get_max_time_skew(smb_krb5_context->krb5_context)); |