Changeset 930 for branches/client-3.0/src/smbwrp.c

Timestamp:

Jul 25, 2016, 11:55:48 AM (9 years ago)

Author:

Paul Smedley

Message:

Add support to enable Kerberos support, and make the plugin connect using kerberos when it's enabled

File:

• branches/client-3.0/src/smbwrp.c (modified) (2 diffs)

branches/client-3.0/src/smbwrp.c

@@ -245 +245 @@
         const char *name = NULL;
 
-        debuglocal(1,"Connecting to \\\\%s:*********@%s:%s\\%s. Master %s:%d\n", srv->username,  workgroup, server, share, srv->master, srv->ifmastergroup);
-
-        cli_set_timeout(c, 10000); /* 10 seconds. */
-
-        if (pRes->krb5support == 1)
-        {
-            debuglocal(1,"Kerberos support enabled\n");
-            c->use_kerberos = True;
+        if (!pRes->krb5support)
+                debuglocal(1,"Connecting to \\\\%s:*********@%s:%s\\%s. Master %s:%d\n", srv->username,  workgroup, server, share, srv->master, srv->ifmastergroup);
+        else
+                debuglocal(1,"Connecting to \\\\%s:%s\\%s using kerberos authentication. Master %s:%d\n", workgroup, server, share, srv->master, srv->ifmastergroup);
+
+        if (pRes->krb5support) {
+                flags |= CLI_FULL_CONNECTION_USE_KERBEROS;
         }
 
@@ -290 +289 @@
 
                 /* try an anonymous login if it failed */
-                if (!NT_STATUS_IS_OK(cli_session_setup(c, "", "", 0,"", 0, workgroup))) {
-                        debuglocal(4,"Anonymous login failed\n");
+                
+                /* If a password was not supplied then
+                 * try again with a null username. */
+                if (srv->password[0] || !srv->username[0] ||
+                        pRes->krb5support ||
+                !NT_STATUS_IS_OK(status = cli_session_setup(c, "",
+                                        "", 0,
+                                        "", 0,
+                                        workgroup))) {
+                        debuglocal(1,"session setup failed: %s\n",
+                                 nt_errstr(status));
+
+                        if ((NT_STATUS_EQUAL(status,
+                                            NT_STATUS_MORE_PROCESSING_REQUIRED)) ||
+                             NT_STATUS_EQUAL(status,
+                                            NT_STATUS_INTERNAL_ERROR)){
+                                debuglocal(4,"did you forget to run kinit?\n");
+                        } else
+                                debuglocal(4,"Anonymous login failed\n");
+
                         cli_shutdown(c);
                         return 6;