Changeset 107

Timestamp:

12/10/07 21:00:50 (12 months ago)

Author:

psmedley

Message:

Add configurable kerberos support for Netdrive plugin

Location:

branches/samba-3.0/source/ndpsmb

Files:

• ndpsmb.c (modified) (7 diffs)
• rc/rc.dlg (modified) (2 diffs)
• rc/rc.h (modified) (1 diff)
• rc/rc.rc (modified) (1 diff)
• smbcd.c (modified) (6 diffs)
• smbwrp.c (modified) (2 diffs)
• smbwrp.h (modified) (1 diff)

branches/samba-3.0/source/ndpsmb/ndpsmb.c

@@ -156 +156 @@
         { ND_PROP_ULONG, 0, "LOGLEVEL", "0"},
         { ND_PROP_ULONG, 0, "EASUPPORT", "1"},
+        { ND_PROP_ULONG, 0, "KRB5SUPPORT", "1"},
         {ND_PROP_STRING, 0, NULL, NULL}
 };
@@ -208 +209 @@
         char loglevel;
         int easupport;
+        int krb5support;
 } Resource;
 
@@ -244 +246 @@
                 sd.FgBg = SSF_FGBG_BACK;
                 sd.PgmName = EXECNAME;
+                if (pRes->krb5support)
+                {
+                        StrNCat(params, " -k ", sizeof(params) - 1);
+                }
                 if (pRes->loglevel)
                 {
@@ -257 +263 @@
                         StrNCat(params, pRes->logfile, sizeof(params) - 1);
                 }
+
                 log("params <%s>\n", params);
                 sd.PgmInputs = *params ? params : NULL;
@@ -267 +274 @@
                         char failed[CCHMAXPATH + 1] = {0};
                         RESULTCODES res = {0};
-                        char * p = params;
-                        StrCpy(p, EXECNAME);
-                        p += StrLen(p) + 1;
-                        if (*pRes->logfile)
-                        {
-                                StrCpy(p, "-l ");
-                                StrNCat(p, pRes->logfile, sizeof(params) - (p - (char *)params));
-                                p += StrLen(p) + 1;
-                                if (pRes->loglevel)
-                                {
-                                        char level[2];
-                                        level[0] = pRes->loglevel + '0';
-                                        level[1] = 0;
-                                        StrCpy(p, "-d ");
-                                        StrNCat(p, level, sizeof(params) - (p - (char *)params));
-                                        p += StrLen(p) + 1;
-                                }
-                        }
-                        else
-                        {
-                                StrCpy(p, "-q");
-                                p += StrLen(p) + 1;
-                        }
-                        *p = 0;         
-                        rc = DosExecPgm(failed, sizeof(failed), EXEC_BACKGROUND, params, NULL, &res, EXECNAME);
+                        UCHAR pszArgString[CCHMAXPATH+41] ; /* Argument string */
+                        sprintf(pszArgString, "smbcd %s\0", params);
+                        if (params!=NULL)
+                                pszArgString[5] = '\0' ;
+                        rc = DosExecPgm(failed, sizeof(failed), EXEC_BACKGROUND, pszArgString, NULL, &res, EXECNAME);
                         log("smbcd DosExecPgm codeTerminate %d codeResult %d rc %d\n", res.codeTerminate, res.codeResult, rc);
                 }
-                if (!rc)
+                if (!rc) 
                 {
                         DosSleep(500);
@@ -392 +379 @@
         pRes->loglevel = 0;
         pRes->easupport = 1;
+        pRes->krb5support = 0;
 
         t = 0, q = NULL;
@@ -496 +484 @@
                 {
                         pRes->memlen = t * 65536;
+                }
+        }
+
+        t = 0;
+        rc = ph->fsphQueryUlongProperty (pRes->properties, "KRB5SUPPORT", &t);
+        if (!rc)
+        {
+                if (t > 1)
+                {
+                        rc = ERROR_INVALID_PARAMETER;
+                }
+                else
+                {
+                        pRes->krb5support = t;
                 }
         }

branches/samba-3.0/source/ndpsmb/rc/rc.dlg

@@ -9 +9 @@
             FCF_TITLEBAR
     BEGIN
-        CTEXT           "SMB resource properties:", LBL_PROP, 5, 129, 190, 10, 
-                        DT_VCENTER
-
-        RTEXT           "Workgroup:", LBL_WORKGRP, 5, 117, 60, 10, 
-                        DT_BOTTOM
+        CTEXT           "SMB resource properties:", LBL_PROP, 5, 129, 190, 
+                        10, DT_VCENTER
+        RTEXT           "Workgroup:", LBL_WORKGRP, 5, 117, 60, 10, DT_BOTTOM
         ENTRYFIELD      "", ENT_WORKGRP, 67, 118, 100, 8, ES_MARGIN
-
-        RTEXT           "Server:", LBL_SERVER, 5, 105, 60, 10, 
-                        DT_BOTTOM
+        RTEXT           "Server:", LBL_SERVER, 5, 105, 60, 10, DT_BOTTOM
         ENTRYFIELD      "", ENT_SERVER, 67, 106, 100, 8, ES_MARGIN
-
-        RTEXT           "Share:", LBL_SHARE, 5, 93, 60, 10, 
-                        DT_BOTTOM
+        RTEXT           "Share:", LBL_SHARE, 5, 93, 60, 10, DT_BOTTOM
         ENTRYFIELD      "", ENT_SHARE, 67, 94, 100, 8, ES_MARGIN
-
-        RTEXT           "User:", LBL_USER, 5, 81, 60, 10, 
-                        DT_BOTTOM
+        RTEXT           "User:", LBL_USER, 5, 81, 60, 10, DT_BOTTOM
         ENTRYFIELD      "", ENT_USER, 67, 82, 100, 8, ES_MARGIN
-
-        RTEXT           "Password:", LBL_PASS, 5, 69, 60, 10, 
-                        DT_BOTTOM 
-        ENTRYFIELD      "", ENT_PASS, 67, 70, 100, 8, ES_MARGIN | ES_UNREADABLE
-
-        RTEXT           "Master", LBL_MASTER, 5, 57, 30, 10, 
-                        DT_BOTTOM
+        RTEXT           "Password:", LBL_PASS, 5, 69, 60, 10, DT_BOTTOM
+        ENTRYFIELD      "", ENT_PASS, 67, 70, 100, 8, ES_MARGIN | 
+                        ES_UNREADABLE
+        RTEXT           "Master", LBL_MASTER, 5, 57, 30, 10, DT_BOTTOM
         CONTROL         "", CMB_MASTER, 37, 35, 50, 33, WC_COMBOBOX, 
                         CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | 
@@ -43 +32 @@
                         CBS_DROPDOWNLIST | WS_GROUP | WS_TABSTOP | 
                         WS_VISIBLE
-
-        RTEXT           "Logfile:", LBL_LOGFILE, 5, 33, 60, 10, 
+        RTEXT           "Logfile:", LBL_LOGFILE, 5, 33, 60, 10, DT_BOTTOM
+        ENTRYFIELD      "", ENT_LOGFILE, 67, 33, 100, 8, ES_MARGIN
+        RTEXT           "Loglevel:", LBL_LOGLEVEL, 5, 21, 60, 10, DT_BOTTOM
+        SPINBUTTON      CMB_LOGLEVEL, 67, 18, 20, 35, SPBS_NUMERICONLY | 
+                        SPBS_MASTER | SPBS_JUSTRIGHT | WS_GROUP
+        LTEXT           "EA Support", LBL_EASUPPORT, 107, 20, 28, 10, 
                         DT_BOTTOM
-        ENTRYFIELD      "", ENT_LOGFILE, 67, 33, 100, 8, ES_MARGIN
-
-        RTEXT           "Loglevel:", LBL_LOGLEVEL, 5, 21, 60, 10, 
-                        DT_BOTTOM
-        CONTROL         "", CMB_LOGLEVEL, 67, 18, 20, 35, WC_SPINBUTTON, 
-                        SPBS_NUMERICONLY | SPBS_JUSTRIGHT | SPBS_MASTER | WS_GROUP | WS_TABSTOP | 
-                        WS_VISIBLE
-
-        LTEXT           "EA Support", LBL_EASUPPORT, 121, 20, 50, 10, 
-                        DT_BOTTOM
-        CONTROL         "", CHK_EASUPPORT, 110, 20, 10, 10, WC_BUTTON, 
-                        BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | 
-                        WS_VISIBLE
-
+        AUTOCHECKBOX    "", CHK_EASUPPORT, 97, 20, 10, 10, WS_GROUP
         PUSHBUTTON      "Cancel", DID_CANCEL, 2, 2, 40, 14
         PUSHBUTTON      "<<Previous", BTN_PREV, 49, 2, 59, 14
         DEFPUSHBUTTON   "Done", DID_OK, 113, 2, 40, 14
         PUSHBUTTON      "Help", BTN_HELP, 158, 2, 40, 14, BS_HELP
+        LTEXT           "KRB5 Support", LBL_KRB5SUPPORT, 164, 19, 32, 10, 
+                        DT_BOTTOM
+        AUTOCHECKBOX    "", CHK_KRB5SUPPORT, 152, 19, 10, 10, WS_GROUP
     END
 END

branches/samba-3.0/source/ndpsmb/rc/rc.h

@@ -24 +24 @@
 #define LBL_EASUPPORT               1021
 #define CHK_EASUPPORT               1022
+#define CHK_KRB5SUPPORT               1023
+#define LBL_KRB5SUPPORT             1024

branches/samba-3.0/source/ndpsmb/rc/rc.rc

@@ -142 +142 @@
     "1"
 }
+
+RCDATA (DLG_ID + 11)
+{
+    CHK_KRB5SUPPORT, PARMTYPE_INT, 0L, 1L, "krb5support", "%d", 1L, 
+    "0", 
+    "1"
+}
     
-RCDATA (DLG_ID + 11)
+RCDATA (DLG_ID + 12)
 {
     0

branches/samba-3.0/source/ndpsmb/smbcd.c

@@ -15 +15 @@
 
 int debuglevel = 0;
+int krb5support = 0;
 HMTX logmutex = 0;
 char *logfile = NULL;
@@ -306 +307 @@
         data = req->param + req->paramlen;
 //      memset(res, 0, sizeof(*res));
+
         debuglocal(1,"Client request %d paramlen %d len %d, reconnect %d. State %08x\n",  req->request, req->paramlen, req->length, *reconnect, cli);
         if (*reconnect == 2)
         {
                 debuglocal(1,"Reconnecting to last server requested\n");
-                res->rc = smbwrp_connect(srv, _cli);
+                res->rc = smbwrp_connect(srv, _cli, krb5support);
                 if (res->rc)
                 {
@@ -343 +345 @@
                                 break;
                         }
-                        res->rc = smbwrp_connect((smbwrp_server *)req->param, _cli);
+                        res->rc = smbwrp_connect((smbwrp_server *)req->param, _cli, krb5support);
                         if (!res->rc)
                         {
@@ -739 +741 @@
 void help(void)
 {
-        printf("Usage: smbcd [-d/--debug <debuglevel>] [-q/--quiet] [-l/--logfile <logfile>]\n");
+        printf("Usage: smbcd [-d/--debug <debuglevel>] [-q/--quiet] [-l/--logfile <logfile>] [-k/--kerberos]\n");
 }
 
@@ -756 +758 @@
         printf( "Daemon priority set to PRTYC_FOREGROUNDSERVER\n");
 #endif
-
+        debuglocal(0,"Entering main()\n");
         for (argc--, argv++; argc > 0; argc--, argv++)
         {
@@ -807 +809 @@
                         quiet = 1;
                 } else
+                if (strcmp(argv[0], "-k") == 0 || strcmp(argv[0], "--kerberos") == 0)
+                {
+                        krb5support = 1;
+                } else
                 {
                         printf("Unknown parameter <%s>\n", argv[0]);

branches/samba-3.0/source/ndpsmb/smbwrp.c

@@ -373 +373 @@
 return a connection to a server
 *******************************************************/
-int _System smbwrp_connect(smbwrp_server * srv, struct cli_state ** cli)
+int _System smbwrp_connect(smbwrp_server * srv, struct cli_state ** cli, int krb5support)
 {
         char * server = srv->server_name;
@@ -434 +434 @@
                 return 3;
         }
+
+        if (krb5support == 1){
+        debuglocal(1,"Kerberos support enabled\n");
+                c->use_kerberos = True;}
+
         if (!cli_session_request(c, &calling, &called)) {
                 cli_shutdown(c);

branches/samba-3.0/source/ndpsmb/smbwrp.h

@@ -121 +121 @@
 int _System smbwrp_getclisize(void);
 int _System smbwrp_init(void);
-int _System smbwrp_connect(smbwrp_server * srv, cli_state ** c);
+int _System smbwrp_connect(smbwrp_server * srv, cli_state ** c, int krb5support);
 void _System smbwrp_disconnect(cli_state ** cli);
 int _System smbwrp_open(cli_state * cli, smbwrp_file * file);