krb5 fallback

diff --git a/auth/kerberos/gensec_gssapi_helper.c b/auth/kerberos/gensec_gssapi_helper.c
index 3fdbf0163dff688a4ed777e184c259f2b5b7c931..97ddbfff6b1b7624b3bba43bf3596fb39dc482a1 100644 (file)
--- a/auth/kerberos/gensec_gssapi_helper.c
+++ b/auth/kerberos/gensec_gssapi_helper.c
@@ -88,3 +88,12 @@ NTSTATUS gensec_gssapi_try_kerberos(struct gensec_security *gensec_security)
        TALLOC_FREE(frame);
        return NT_STATUS_OK;
 }
+
+NTSTATUS gensec_gssapi_map_krb5_error(struct gensec_security *gensec_security,
+                                     uint32_t gss_maj, uint32_t gss_min)
+{
+       TALLOC_CTX *frame = talloc_stackframe();
+
+       TALLOC_FREE(frame);
+       return NT_STATUS_OK;
+}

diff --git a/source3/client/smbspool.c b/source3/client/smbspool.c
index 4f312a6d2949efd02537bf73a033977af2b41657..cd02673eea2c05cb8dc07f52e07a5ccdef6075ad 100644 (file)
--- a/source3/client/smbspool.c
+++ b/source3/client/smbspool.c
@@ -366,6 +366,8 @@ get_exit_code(struct cli_state * cli,
                NT_STATUS_ACCESS_DENIED, NT_STATUS_ACCESS_VIOLATION,
                NT_STATUS_SHARING_VIOLATION, NT_STATUS_PRIVILEGE_NOT_HELD,
                NT_STATUS_INVALID_ACCOUNT_NAME, NT_STATUS_NO_SUCH_USER,
+               NT_STATUS_INVALID_USER_PRINCIPAL_NAME,
+               NT_STATUS_INVALID_COMPUTER_NAME,
                NT_STATUS_WRONG_PASSWORD, NT_STATUS_LOGON_FAILURE,
                NT_STATUS_ACCOUNT_RESTRICTION, NT_STATUS_INVALID_LOGON_HOURS,
                NT_STATUS_PASSWORD_EXPIRED, NT_STATUS_ACCOUNT_DISABLED

diff --git a/source3/libads/krb5_errs.c b/source3/libads/krb5_errs.c
index 0c2ada59966bc6cb5fc62412745ac7a15a5844f5..87ae6b74b03aa8decc419bb6ab00456e298f77a6 100644 (file)
--- a/source3/libads/krb5_errs.c
+++ b/source3/libads/krb5_errs.c
@@ -31,7 +31,7 @@ static const struct {
        {KRB5_CC_IO, NT_STATUS_UNEXPECTED_IO_ERROR},
        {KRB5KDC_ERR_BADOPTION, NT_STATUS_INVALID_PARAMETER},
        {KRB5KDC_ERR_CLIENT_REVOKED, NT_STATUS_ACCOUNT_LOCKED_OUT},
-       {KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN, NT_STATUS_INVALID_ACCOUNT_NAME},
+       {KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN, NT_STATUS_INVALID_USER_PRINCIPAL_NAME},
        {KRB5KDC_ERR_ETYPE_NOSUPP, NT_STATUS_LOGON_FAILURE},
 #if defined(KRB5KDC_ERR_KEY_EXP) /* MIT */
        {KRB5KDC_ERR_KEY_EXP, NT_STATUS_PASSWORD_EXPIRED},
@@ -43,7 +43,7 @@ static const struct {
        {KRB5KDC_ERR_POLICY, NT_STATUS_INVALID_WORKSTATION},
        {KRB5KDC_ERR_PREAUTH_FAILED, NT_STATUS_LOGON_FAILURE},
        {KRB5KDC_ERR_SERVICE_REVOKED, NT_STATUS_ACCESS_DENIED},
-       {KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN, NT_STATUS_INVALID_ACCOUNT_NAME},
+       {KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN, NT_STATUS_INVALID_COMPUTER_NAME},
        {KRB5KDC_ERR_SUMTYPE_NOSUPP, NT_STATUS_LOGON_FAILURE},
        {KRB5KDC_ERR_TGT_REVOKED, NT_STATUS_ACCESS_DENIED},
        {KRB5_KDC_UNREACH, NT_STATUS_NO_LOGON_SERVERS},