Changeset 107 for branches/samba-3.0/source/ndpsmb/ndpsmb.c

Timestamp:

Dec 10, 2007, 9:00:50 PM (18 years ago)

Author:

Paul Smedley

Message:

Add configurable kerberos support for Netdrive plugin

File:

• branches/samba-3.0/source/ndpsmb/ndpsmb.c (modified) (7 diffs)

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;
                 }
         }