Changeset 930 for branches/client-3.0/src

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

Location:

branches/client-3.0/src

Files:

• ndpsmb.c (modified) (3 diffs)
• rc/rc.dlg (modified) (1 diff)
• rc/rc.h (modified) (1 diff)
• rc/rc.rc_ (modified) (2 diffs)
• smbwrp.c (modified) (2 diffs)

branches/client-3.0/src/ndpsmb.c

@@ -110 +110 @@
         {ND_PROP_ULONG, 0, "CLD", "32"},
         {ND_PROP_ULONG, 0, "EASUPPORT", "1"},
+        {ND_PROP_ULONG, 0, "KRB5SUPPORT", "0"},
         {ND_PROP_STRING, 0, NULL, NULL}
 };
@@ -364 +365 @@
         pRes->rootlevel = 0;
         pRes->easupport = 1;
-#ifdef HAVE_KRB5_H
-        pRes->krb5support = 1;
-#else
         pRes->krb5support = 0;
-#endif
         pRes->pdc = NULL;
 
@@ -473 +470 @@
         }
 
+        t = 0;
+        rc = ph->fsphQueryUlongProperty (properties, "KRB5SUPPORT", &t);
+        if (!rc)
+        {
+                if (t > 1)
+                {
+                        rc = ERROR_INVALID_PARAMETER;
+                }
+                else
+                {
+                        pRes->krb5support = t;
+                }
+        }
         t = 0;
         rc = ph->fsphQueryUlongProperty (properties, "CTO", &t);

branches/client-3.0/src/rc/rc.dlg

@@ -33 +33 @@
                         DT_WORDBREAK
         AUTOCHECKBOX    "", CHK_EASUPPORT, 180, 132, 10, 10, WS_GROUP
+        LTEXT           "Supports KRB5", LBL_KRB5SUPPORT, 195, 140, 52, 10, 
+                        DT_WORDBREAK
+        AUTOCHECKBOX    "", CHK_KRB5SUPPORT, 180, 142, 10, 10, WS_GROUP
         PUSHBUTTON      "Cancel", DID_CANCEL, 7, 6, 56, 14
                         PRESPARAMS PP_FONTNAMESIZE, "9.WarpSans Bold"

branches/client-3.0/src/rc/rc.h

@@ -23 +23 @@
 #define GB_CACHE                     1025
 #define GB_BROWSE                   1027
+#define LBL_KRB5SUPPORT               1028
+#define CHK_KRB5SUPPORT               1029
 #define LBL_CACHETIMEOUT        1014
 #define SPIN_CACHETIMEOUT       1015

branches/client-3.0/src/rc/rc.rc_

@@ -48 +48 @@
    "    mastertype - 0 if 'master' is the name of master server, 1 if 'master' is the name of master workgroup\r\n"
    "    easupport - 0 to not support EA, 1 to support\r\n"
+   "    krb5support - 0 to not support kerberos authentication, 1 to support\r\n"
    "\r\n"
 }
@@ -126 +127 @@
 RCDATA (DLG_ID + 11)
 {
+    CHK_KRB5SUPPORT, PARMTYPE_INT, 0L, 1L, "krb5support", "%d", 0L
+}
+
+RCDATA (DLG_ID + 12)
     1
 }

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;