Revert "BROKEN: s4:ntvfs/cifs: add "cifs:s4u2proxy-target-principal" option WAS 593c5...

This reverts commit 7f35c5eaa4456e47dc0d664e8246299fcbf6329e.

diff --git a/source4/ntvfs/cifs/vfs_cifs.c b/source4/ntvfs/cifs/vfs_cifs.c
index e37f90e9563e3eab33168af74a04d4a7578fcf6d..c9ddc3b89dc091dbe3fb1df09a35cfe9b56618f8 100644 (file)
--- a/source4/ntvfs/cifs/vfs_cifs.c
+++ b/source4/ntvfs/cifs/vfs_cifs.c
@@ -101,7 +101,6 @@ NTSTATUS ntvfs_cifs_init(TALLOC_CTX *);
 #define CIFS_SHARE             "cifs:share"
 #define CIFS_USE_MACHINE_ACCT  "cifs:use-machine-account"
 #define CIFS_USE_S4U2PROXY     "cifs:use-s4u2proxy"
-#define CIFS_S4U2PROXY_TARGET_PRINCIPAL "cifs:s4u2proxy-target-principal"
 #define CIFS_MAP_GENERIC       "cifs:map-generic"
 #define CIFS_MAP_TRANS2                "cifs:map-trans2"
 
@@ -155,7 +154,6 @@ static NTSTATUS cvfs_connect(struct ntvfs_module_context *ntvfs,
        struct cli_credentials *credentials;
        bool machine_account;
        bool s4u2proxy;
-       const char *s4u2proxy_target;
        const char* sharename;
        TALLOC_CTX *tmp_ctx;
 
@@ -200,7 +198,6 @@ static NTSTATUS cvfs_connect(struct ntvfs_module_context *ntvfs,
 
        machine_account = share_bool_option(scfg, CIFS_USE_MACHINE_ACCT, CIFS_USE_MACHINE_ACCT_DEFAULT);
        s4u2proxy = share_bool_option(scfg, CIFS_USE_S4U2PROXY, CIFS_USE_S4U2PROXY_DEFAULT);
-       s4u2proxy_target = share_string_option(scfg, CIFS_S4U2PROXY_TARGET_PRINCIPAL, NULL);
 
        p = talloc_zero(ntvfs, struct cvfs_private);
        if (!p) {
@@ -260,28 +257,10 @@ static NTSTATUS cvfs_connect(struct ntvfs_module_context *ntvfs,
                                                req->session_info->info->account_name,
                                                req->session_info->info->domain_name);
                }
-               if (impersonate_principal == NULL) {
-                       return NT_STATUS_NO_MEMORY;
-               }
 
                self_service = talloc_asprintf(req, "cifs/%s",
                                               lpcfg_netbios_name(ntvfs->ctx->lp_ctx));
-               if (self_service == NULL) {
-                       return NT_STATUS_NO_MEMORY;
-               }
-
-<<<<<<< HEAD
-=======
-               if (s4u2proxy_target) {
-                       target_service = talloc_strdup(req, s4u2proxy_target);
-               } else {
-                       target_service = talloc_asprintf(req, "cifs/%s", host);
-               }
-               if (target_service == NULL) {
-                       return NT_STATUS_NO_MEMORY;
-               }
 
->>>>>>> 593c5d14f0b8... s4:ntvfs/cifs: add "cifs:s4u2proxy-target-principal" option
                DEBUG(5, ("CIFS backend: Using S4U2Proxy credentials\n"));
 
                machine_creds = cli_credentials_init(p);
@@ -309,13 +288,6 @@ static NTSTATUS cvfs_connect(struct ntvfs_module_context *ntvfs,
                                "gave: %s - NT_STATUS_CROSSREALM_DELEGATION_FAILURE\n",
                                nt_errstr(status)));
                        status = NT_STATUS_CROSSREALM_DELEGATION_FAILURE;
-<<<<<<< HEAD
-=======
-                       DEBUG(1,("S4U2Proxy: self[%s] target[%s] user[%s]\n",
-                               self_service, target_service, impersonate_principal));
-                       DEBUG(1,("S4U2Proxy: cli_credentials_get_ccache() gave: ret[%d] str[%s] - %s\n",
-                               ret, err_str, nt_errstr(status)));
->>>>>>> 593c5d14f0b8... s4:ntvfs/cifs: add "cifs:s4u2proxy-target-principal" option
                        goto out;
                }